History

Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux

All conflicts were trivial overlapping changes, so reasonably easy to resolve.

David S. Miller committed 8 years ago

Commit c4c55512 parents 40999f1 48e5aee598 files · +5366 −2963Browse files

Showing the changes to include/uapi/linux (4 of 598 files). Show all

Unified · Split

4 files
  1. include/uapi/linux/ethtool.h +1 −1
  2. include/uapi/linux/rseq.h +58 −44
  3. include/uapi/linux/tcp.h +4 −0
  4. include/uapi/linux/types_32_64.h +0 −50
include/uapi/linux/ethtool.h+1−1
@@ -226,7 +226,7 @@ enum tunable_id { · 225 unmodified lines
226 ETHTOOL_TX_COPYBREAK,226 ETHTOOL_TX_COPYBREAK,
227 ETHTOOL_PFC_PREVENTION_TOUT, /* timeout in msecs */227 ETHTOOL_PFC_PREVENTION_TOUT, /* timeout in msecs */
228 /*228 /*
229 * Add your fresh new tubale attribute above and remember to update229 * Add your fresh new tunable attribute above and remember to update
230 * tunable_strings[] in net/core/ethtool.c230 * tunable_strings[] in net/core/ethtool.c
231 */231 */
232 __ETHTOOL_TUNABLE_COUNT,232 __ETHTOOL_TUNABLE_COUNT,
include/uapi/linux/rseq.h+58−44
@@ -10,13 +10,8 @@ · 9 unmodified lines
10 * Copyright (c) 2015-2018 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>10 * Copyright (c) 2015-2018 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
11 */11 */
12 12
13#ifdef __KERNEL__13#include <linux/types.h>
14# include <linux/types.h>14#include <asm/byteorder.h>
15#else
16# include <stdint.h>
17#endif
18
19#include <linux/types_32_64.h>
20 15
21enum rseq_cpu_id_state {16enum rseq_cpu_id_state {
22 RSEQ_CPU_ID_UNINITIALIZED = -1,17 RSEQ_CPU_ID_UNINITIALIZED = -1,
@@ -52,10 +47,10 @@ struct rseq_cs { · 29 unmodified lines
52 __u32 version;47 __u32 version;
53 /* enum rseq_cs_flags */48 /* enum rseq_cs_flags */
54 __u32 flags;49 __u32 flags;
55 LINUX_FIELD_u32_u64(start_ip);50 __u64 start_ip;
56 /* Offset from start_ip. */51 /* Offset from start_ip. */
57 LINUX_FIELD_u32_u64(post_commit_offset);52 __u64 post_commit_offset;
58 LINUX_FIELD_u32_u64(abort_ip);53 __u64 abort_ip;
59} __attribute__((aligned(4 * sizeof(__u64))));54} __attribute__((aligned(4 * sizeof(__u64))));
60 55
61/*56/*
@@ -67,28 +62,30 @@ struct rseq_cs { · 5 unmodified lines
67struct rseq {62struct rseq {
68 /*63 /*
69 * Restartable sequences cpu_id_start field. Updated by the64 * Restartable sequences cpu_id_start field. Updated by the
70 * kernel, and read by user-space with single-copy atomicity65 * kernel. Read by user-space with single-copy atomicity
71 * semantics. Aligned on 32-bit. Always contains a value in the66 * semantics. This field should only be read by the thread which
72 * range of possible CPUs, although the value may not be the67 * registered this data structure. Aligned on 32-bit. Always
73 * actual current CPU (e.g. if rseq is not initialized). This68 * contains a value in the range of possible CPUs, although the
74 * CPU number value should always be compared against the value69 * value may not be the actual current CPU (e.g. if rseq is not
75 * of the cpu_id field before performing a rseq commit or70 * initialized). This CPU number value should always be compared
76 * returning a value read from a data structure indexed using71 * against the value of the cpu_id field before performing a rseq
77 * the cpu_id_start value.72 * commit or returning a value read from a data structure indexed
73 * using the cpu_id_start value.
78 */74 */
79 __u32 cpu_id_start;75 __u32 cpu_id_start;
80 /*76 /*
81 * Restartable sequences cpu_id field. Updated by the kernel,77 * Restartable sequences cpu_id field. Updated by the kernel.
82 * and read by user-space with single-copy atomicity semantics.78 * Read by user-space with single-copy atomicity semantics. This
83 * Aligned on 32-bit. Values RSEQ_CPU_ID_UNINITIALIZED and79 * field should only be read by the thread which registered this
84 * RSEQ_CPU_ID_REGISTRATION_FAILED have a special semantic: the80 * data structure. Aligned on 32-bit. Values
85 * former means "rseq uninitialized", and latter means "rseq81 * RSEQ_CPU_ID_UNINITIALIZED and RSEQ_CPU_ID_REGISTRATION_FAILED
86 * initialization failed". This value is meant to be read within82 * have a special semantic: the former means "rseq uninitialized",
87 * rseq critical sections and compared with the cpu_id_start83 * and latter means "rseq initialization failed". This value is
88 * value previously read, before performing the commit instruction,84 * meant to be read within rseq critical sections and compared
89 * or read and compared with the cpu_id_start value before returning85 * with the cpu_id_start value previously read, before performing
90 * a value loaded from a data structure indexed using the86 * the commit instruction, or read and compared with the
91 * cpu_id_start value.87 * cpu_id_start value before returning a value loaded from a data
88 * structure indexed using the cpu_id_start value.
92 */89 */
93 __u32 cpu_id;90 __u32 cpu_id;
94 /*91 /*
@@ -105,27 +102,44 @@ struct rseq { · 10 unmodified lines
105 * targeted by the rseq_cs. Also needs to be set to NULL by user-space102 * targeted by the rseq_cs. Also needs to be set to NULL by user-space
106 * before reclaiming memory that contains the targeted struct rseq_cs.103 * before reclaiming memory that contains the targeted struct rseq_cs.
107 *104 *
108 * Read and set by the kernel with single-copy atomicity semantics.105 * Read and set by the kernel. Set by user-space with single-copy
109 * Set by user-space with single-copy atomicity semantics. Aligned106 * atomicity semantics. This field should only be updated by the
110 * on 64-bit.107 * thread which registered this data structure. Aligned on 64-bit.
111 */108 */
112 LINUX_FIELD_u32_u64(rseq_cs);109 union {
110 __u64 ptr64;
111#ifdef __LP64__
112 __u64 ptr;
113#else
114 struct {
115#if (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN)) || defined(__BIG_ENDIAN)
116 __u32 padding; /* Initialized to zero. */
117 __u32 ptr32;
118#else /* LITTLE */
119 __u32 ptr32;
120 __u32 padding; /* Initialized to zero. */
121#endif /* ENDIAN */
122 } ptr;
123#endif
124 } rseq_cs;
125
113 /*126 /*
114 * - RSEQ_DISABLE flag:127 * Restartable sequences flags field.
128 *
129 * This field should only be updated by the thread which
130 * registered this data structure. Read by the kernel.
131 * Mainly used for single-stepping through rseq critical sections
132 * with debuggers.
115 *133 *
116 * Fallback fast-track flag for single-stepping.
117 * Set by user-space if lack of progress is detected.
118 * Cleared by user-space after rseq finish.
119 * Read by the kernel.
120 * - RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT134 * - RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT
121 * Inhibit instruction sequence block restart and event135 * Inhibit instruction sequence block restart on preemption
122 * counter increment on preemption for this thread.136 * for this thread.
123 * - RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL137 * - RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL
124 * Inhibit instruction sequence block restart and event138 * Inhibit instruction sequence block restart on signal
125 * counter increment on signal delivery for this thread.139 * delivery for this thread.
126 * - RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE140 * - RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE
127 * Inhibit instruction sequence block restart and event141 * Inhibit instruction sequence block restart on migration for
128 * counter increment on migration for this thread.142 * this thread.
129 */143 */
130 __u32 flags;144 __u32 flags;
131} __attribute__((aligned(4 * sizeof(__u64))));145} __attribute__((aligned(4 * sizeof(__u64))));
include/uapi/linux/tcp.h+4−0
@@ -127,6 +127,10 @@ enum { · 126 unmodified lines
127 127
128#define TCP_CM_INQ TCP_INQ128#define TCP_CM_INQ TCP_INQ
129 129
130#define TCP_REPAIR_ON 1
131#define TCP_REPAIR_OFF 0
132#define TCP_REPAIR_OFF_NO_WP -1 /* Turn off without window probes */
133
130struct tcp_repair_opt {134struct tcp_repair_opt {
131 __u32 opt_code;135 __u32 opt_code;
132 __u32 opt_val;136 __u32 opt_val;
include/uapi/linux/types_32_64.h+0−50
@@ -1,50 +0,0 @@
1/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
2#ifndef _UAPI_LINUX_TYPES_32_64_H
3#define _UAPI_LINUX_TYPES_32_64_H
4
5/*
6 * linux/types_32_64.h
7 *
8 * Integer type declaration for pointers across 32-bit and 64-bit systems.
9 *
10 * Copyright (c) 2015-2018 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
11 */
12
13#ifdef __KERNEL__
14# include <linux/types.h>
15#else
16# include <stdint.h>
17#endif
18
19#include <asm/byteorder.h>
20
21#ifdef __BYTE_ORDER
22# if (__BYTE_ORDER == __BIG_ENDIAN)
23# define LINUX_BYTE_ORDER_BIG_ENDIAN
24# else
25# define LINUX_BYTE_ORDER_LITTLE_ENDIAN
26# endif
27#else
28# ifdef __BIG_ENDIAN
29# define LINUX_BYTE_ORDER_BIG_ENDIAN
30# else
31# define LINUX_BYTE_ORDER_LITTLE_ENDIAN
32# endif
33#endif
34
35#ifdef __LP64__
36# define LINUX_FIELD_u32_u64(field) __u64 field
37# define LINUX_FIELD_u32_u64_INIT_ONSTACK(field, v) field = (intptr_t)v
38#else
39# ifdef LINUX_BYTE_ORDER_BIG_ENDIAN
40# define LINUX_FIELD_u32_u64(field) __u32 field ## _padding, field
41# define LINUX_FIELD_u32_u64_INIT_ONSTACK(field, v) \
42 field ## _padding = 0, field = (intptr_t)v
43# else
44# define LINUX_FIELD_u32_u64(field) __u32 field, field ## _padding
45# define LINUX_FIELD_u32_u64_INIT_ONSTACK(field, v) \
46 field = (intptr_t)v, field ## _padding = 0
47# endif
48#endif
49
50#endif /* _UAPI_LINUX_TYPES_32_64_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t