lael-labs/linux

include/uapi/asm-generic/hugetlb_encode.h+34−0

@@ -0,0 +1,34 @@
	1	#ifndef _ASM_GENERIC_HUGETLB_ENCODE_H_
	2	#define _ASM_GENERIC_HUGETLB_ENCODE_H_
	3
	4	/*
	5	* Several system calls take a flag to request "hugetlb" huge pages.
	6	* Without further specification, these system calls will use the
	7	* system's default huge page size. If a system supports multiple
	8	* huge page sizes, the desired huge page size can be specified in
	9	* bits [26:31] of the flag arguments. The value in these 6 bits
	10	* will encode the log2 of the huge page size.
	11	*
	12	* The following definitions are associated with this huge page size
	13	* encoding in flag arguments. System call specific header files
	14	* that use this encoding should include this file. They can then
	15	* provide definitions based on these with their own specific prefix.
	16	* for example:
	17	* #define MAP_HUGE_SHIFT HUGETLB_FLAG_ENCODE_SHIFT
	18	*/
	19
	20	#define HUGETLB_FLAG_ENCODE_SHIFT 26
	21	#define HUGETLB_FLAG_ENCODE_MASK 0x3f
	22
	23	#define HUGETLB_FLAG_ENCODE_64KB (16 << HUGETLB_FLAG_ENCODE_SHIFT)
	24	#define HUGETLB_FLAG_ENCODE_512KB (19 << HUGETLB_FLAG_ENCODE_SHIFT)
	25	#define HUGETLB_FLAG_ENCODE_1MB (20 << HUGETLB_FLAG_ENCODE_SHIFT)
	26	#define HUGETLB_FLAG_ENCODE_2MB (21 << HUGETLB_FLAG_ENCODE_SHIFT)
	27	#define HUGETLB_FLAG_ENCODE_8MB (23 << HUGETLB_FLAG_ENCODE_SHIFT)
	28	#define HUGETLB_FLAG_ENCODE_16MB (24 << HUGETLB_FLAG_ENCODE_SHIFT)
	29	#define HUGETLB_FLAG_ENCODE_256MB (28 << HUGETLB_FLAG_ENCODE_SHIFT)
	30	#define HUGETLB_FLAG_ENCODE_1GB (30 << HUGETLB_FLAG_ENCODE_SHIFT)
	31	#define HUGETLB_FLAG_ENCODE_2GB (31 << HUGETLB_FLAG_ENCODE_SHIFT)
	32	#define HUGETLB_FLAG_ENCODE_16GB (34 << HUGETLB_FLAG_ENCODE_SHIFT)
	33
	34	#endif /* _ASM_GENERIC_HUGETLB_ENCODE_H_ */

include/uapi/asm-generic/mman-common.h+3−11

 					   overrides the coredump filter bits */
 #define MADV_DODUMP	17		/* Clear the MADV_DONTDUMP flag */
+#define MADV_WIPEONFORK 18		/* Zero memory on fork, child only */
+#define MADV_KEEPONFORK 19		/* Undo MADV_WIPEONFORK */
 /* compatibility flags */
 #define MAP_FILE	0
-/*
- * When MAP_HUGETLB is set bits [26:31] encode the log2 of the huge page size.
- * This gives us 6 bits, which is enough until someone invents 128 bit address
- * spaces.
- *
- * Assume these are all power of twos.
- * When 0 use the default page size.
- */
-#define MAP_HUGE_SHIFT	26
-#define MAP_HUGE_MASK	0x3f
 #define PKEY_DISABLE_ACCESS	0x1
 #define PKEY_DISABLE_WRITE	0x2
 #define PKEY_ACCESS_MASK	(PKEY_DISABLE_ACCESS |\

include/uapi/asm-generic/siginfo.h+46−69

@@ -151,29 +151,6 @@ typedef struct siginfo { · 150 unmodified lines
151	#define si_arch _sifields._sigsys._arch	151	#define si_arch _sifields._sigsys._arch
152	#endif	152	#endif
153		153
154	#ifdef __KERNEL__
155	#define __SI_MASK 0xffff0000u
156	#define __SI_KILL (0 << 16)
157	#define __SI_TIMER (1 << 16)
158	#define __SI_POLL (2 << 16)
159	#define __SI_FAULT (3 << 16)
160	#define __SI_CHLD (4 << 16)
161	#define __SI_RT (5 << 16)
162	#define __SI_MESGQ (6 << 16)
163	#define __SI_SYS (7 << 16)
164	#define __SI_CODE(T,N) ((T) \| ((N) & 0xffff))
165	#else /* __KERNEL__ */
166	#define __SI_KILL 0
167	#define __SI_TIMER 0
168	#define __SI_POLL 0
169	#define __SI_FAULT 0
170	#define __SI_CHLD 0
171	#define __SI_RT 0
172	#define __SI_MESGQ 0
173	#define __SI_SYS 0
174	#define __SI_CODE(T,N) (N)
175	#endif /* __KERNEL__ */
176
177	/*	154	/*
178	* si_code values	155	* si_code values
179	* Digital reserves positive values for kernel-generated signals.	156	* Digital reserves positive values for kernel-generated signals.
@@ -181,8 +158,8 @@ typedef struct siginfo { · 1 unmodified line
181	#define SI_USER 0 /* sent by kill, sigsend, raise */	158	#define SI_USER 0 /* sent by kill, sigsend, raise */
182	#define SI_KERNEL 0x80 /* sent by the kernel from somewhere */	159	#define SI_KERNEL 0x80 /* sent by the kernel from somewhere */
183	#define SI_QUEUE -1 /* sent by sigqueue */	160	#define SI_QUEUE -1 /* sent by sigqueue */
184	#define SI_TIMER __SI_CODE(__SI_TIMER,-2) /* sent by timer expiration */	161	#define SI_TIMER -2 /* sent by timer expiration */
185	#define SI_MESGQ __SI_CODE(__SI_MESGQ,-3) /* sent by real time mesq state change */	162	#define SI_MESGQ -3 /* sent by real time mesq state change */
186	#define SI_ASYNCIO -4 /* sent by AIO completion */	163	#define SI_ASYNCIO -4 /* sent by AIO completion */
187	#define SI_SIGIO -5 /* sent by queued SIGIO */	164	#define SI_SIGIO -5 /* sent by queued SIGIO */
188	#define SI_TKILL -6 /* sent by tkill system call */	165	#define SI_TKILL -6 /* sent by tkill system call */
@@ -194,86 +171,86 @@ typedef struct siginfo { · 5 unmodified lines
194	/*	171	/*
195	* SIGILL si_codes	172	* SIGILL si_codes
196	*/	173	*/
197	#define ILL_ILLOPC (__SI_FAULT\|1) /* illegal opcode */	174	#define ILL_ILLOPC 1 /* illegal opcode */
198	#define ILL_ILLOPN (__SI_FAULT\|2) /* illegal operand */	175	#define ILL_ILLOPN 2 /* illegal operand */
199	#define ILL_ILLADR (__SI_FAULT\|3) /* illegal addressing mode */	176	#define ILL_ILLADR 3 /* illegal addressing mode */
200	#define ILL_ILLTRP (__SI_FAULT\|4) /* illegal trap */	177	#define ILL_ILLTRP 4 /* illegal trap */
201	#define ILL_PRVOPC (__SI_FAULT\|5) /* privileged opcode */	178	#define ILL_PRVOPC 5 /* privileged opcode */
202	#define ILL_PRVREG (__SI_FAULT\|6) /* privileged register */	179	#define ILL_PRVREG 6 /* privileged register */
203	#define ILL_COPROC (__SI_FAULT\|7) /* coprocessor error */	180	#define ILL_COPROC 7 /* coprocessor error */
204	#define ILL_BADSTK (__SI_FAULT\|8) /* internal stack error */	181	#define ILL_BADSTK 8 /* internal stack error */
205	#define NSIGILL 8	182	#define NSIGILL 8
206		183
207	/*	184	/*
208	* SIGFPE si_codes	185	* SIGFPE si_codes
209	*/	186	*/
210	#define FPE_INTDIV (__SI_FAULT\|1) /* integer divide by zero */	187	#define FPE_INTDIV 1 /* integer divide by zero */
211	#define FPE_INTOVF (__SI_FAULT\|2) /* integer overflow */	188	#define FPE_INTOVF 2 /* integer overflow */
212	#define FPE_FLTDIV (__SI_FAULT\|3) /* floating point divide by zero */	189	#define FPE_FLTDIV 3 /* floating point divide by zero */
213	#define FPE_FLTOVF (__SI_FAULT\|4) /* floating point overflow */	190	#define FPE_FLTOVF 4 /* floating point overflow */
214	#define FPE_FLTUND (__SI_FAULT\|5) /* floating point underflow */	191	#define FPE_FLTUND 5 /* floating point underflow */
215	#define FPE_FLTRES (__SI_FAULT\|6) /* floating point inexact result */	192	#define FPE_FLTRES 6 /* floating point inexact result */
216	#define FPE_FLTINV (__SI_FAULT\|7) /* floating point invalid operation */	193	#define FPE_FLTINV 7 /* floating point invalid operation */
217	#define FPE_FLTSUB (__SI_FAULT\|8) /* subscript out of range */	194	#define FPE_FLTSUB 8 /* subscript out of range */
218	#define NSIGFPE 8	195	#define NSIGFPE 8
219		196
220	/*	197	/*
221	* SIGSEGV si_codes	198	* SIGSEGV si_codes
222	*/	199	*/
223	#define SEGV_MAPERR (__SI_FAULT\|1) /* address not mapped to object */	200	#define SEGV_MAPERR 1 /* address not mapped to object */
224	#define SEGV_ACCERR (__SI_FAULT\|2) /* invalid permissions for mapped object */	201	#define SEGV_ACCERR 2 /* invalid permissions for mapped object */
225	#define SEGV_BNDERR (__SI_FAULT\|3) /* failed address bound checks */	202	#define SEGV_BNDERR 3 /* failed address bound checks */
226	#define SEGV_PKUERR (__SI_FAULT\|4) /* failed protection key checks */	203	#define SEGV_PKUERR 4 /* failed protection key checks */
227	#define NSIGSEGV 4	204	#define NSIGSEGV 4
228		205
229	/*	206	/*
230	* SIGBUS si_codes	207	* SIGBUS si_codes
231	*/	208	*/
232	#define BUS_ADRALN (__SI_FAULT\|1) /* invalid address alignment */	209	#define BUS_ADRALN 1 /* invalid address alignment */
233	#define BUS_ADRERR (__SI_FAULT\|2) /* non-existent physical address */	210	#define BUS_ADRERR 2 /* non-existent physical address */
234	#define BUS_OBJERR (__SI_FAULT\|3) /* object specific hardware error */	211	#define BUS_OBJERR 3 /* object specific hardware error */
235	/* hardware memory error consumed on a machine check: action required */	212	/* hardware memory error consumed on a machine check: action required */
236	#define BUS_MCEERR_AR (__SI_FAULT\|4)	213	#define BUS_MCEERR_AR 4
237	/* hardware memory error detected in process but not consumed: action optional*/	214	/* hardware memory error detected in process but not consumed: action optional*/
238	#define BUS_MCEERR_AO (__SI_FAULT\|5)	215	#define BUS_MCEERR_AO 5
239	#define NSIGBUS 5	216	#define NSIGBUS 5
240		217
241	/*	218	/*
242	* SIGTRAP si_codes	219	* SIGTRAP si_codes
243	*/	220	*/
244	#define TRAP_BRKPT (__SI_FAULT\|1) /* process breakpoint */	221	#define TRAP_BRKPT 1 /* process breakpoint */
245	#define TRAP_TRACE (__SI_FAULT\|2) /* process trace trap */	222	#define TRAP_TRACE 2 /* process trace trap */
246	#define TRAP_BRANCH (__SI_FAULT\|3) /* process taken branch trap */	223	#define TRAP_BRANCH 3 /* process taken branch trap */
247	#define TRAP_HWBKPT (__SI_FAULT\|4) /* hardware breakpoint/watchpoint */	224	#define TRAP_HWBKPT 4 /* hardware breakpoint/watchpoint */
248	#define NSIGTRAP 4	225	#define NSIGTRAP 4
249		226
250	/*	227	/*
251	* SIGCHLD si_codes	228	* SIGCHLD si_codes
252	*/	229	*/
253	#define CLD_EXITED (__SI_CHLD\|1) /* child has exited */	230	#define CLD_EXITED 1 /* child has exited */
254	#define CLD_KILLED (__SI_CHLD\|2) /* child was killed */	231	#define CLD_KILLED 2 /* child was killed */
255	#define CLD_DUMPED (__SI_CHLD\|3) /* child terminated abnormally */	232	#define CLD_DUMPED 3 /* child terminated abnormally */
256	#define CLD_TRAPPED (__SI_CHLD\|4) /* traced child has trapped */	233	#define CLD_TRAPPED 4 /* traced child has trapped */
257	#define CLD_STOPPED (__SI_CHLD\|5) /* child has stopped */	234	#define CLD_STOPPED 5 /* child has stopped */
258	#define CLD_CONTINUED (__SI_CHLD\|6) /* stopped child has continued */	235	#define CLD_CONTINUED 6 /* stopped child has continued */
259	#define NSIGCHLD 6	236	#define NSIGCHLD 6
260		237
261	/*	238	/*
262	* SIGPOLL si_codes	239	* SIGPOLL (or any other signal without signal specific si_codes) si_codes
263	*/	240	*/
264	#define POLL_IN (__SI_POLL\|1) /* data input available */	241	#define POLL_IN 1 /* data input available */
265	#define POLL_OUT (__SI_POLL\|2) /* output buffers available */	242	#define POLL_OUT 2 /* output buffers available */
266	#define POLL_MSG (__SI_POLL\|3) /* input message available */	243	#define POLL_MSG 3 /* input message available */
267	#define POLL_ERR (__SI_POLL\|4) /* i/o error */	244	#define POLL_ERR 4 /* i/o error */
268	#define POLL_PRI (__SI_POLL\|5) /* high priority input available */	245	#define POLL_PRI 5 /* high priority input available */
269	#define POLL_HUP (__SI_POLL\|6) /* device disconnected */	246	#define POLL_HUP 6 /* device disconnected */
270	#define NSIGPOLL 6	247	#define NSIGPOLL 6
271		248
272	/*	249	/*
273	* SIGSYS si_codes	250	* SIGSYS si_codes
274	*/	251	*/
275	#define SYS_SECCOMP (__SI_SYS\|1) /* seccomp triggered */	252	#define SYS_SECCOMP 1 /* seccomp triggered */
276	#define NSIGSYS 1	253	#define NSIGSYS 1
277		254
278	/*	255	/*
279	* sigevent definitions	256	* sigevent definitions

include/uapi/asm-generic/socket.h+2−0

@@ -104,4 +104,6 @@ · 103 unmodified lines
104		104
105	#define SO_PEERGROUPS 59	105	#define SO_PEERGROUPS 59
106		106
		107	#define SO_ZEROCOPY 60
		108
107	#endif /* __ASM_GENERIC_SOCKET_H */	109	#endif /* __ASM_GENERIC_SOCKET_H */

include/uapi/drm/armada_drm.h+11−11

@@ -23,27 +23,27 @@ extern "C" { · 22 unmodified lines
23	DRM_##dir(DRM_COMMAND_BASE + DRM_ARMADA_##name, struct drm_armada_##str)	23	DRM_##dir(DRM_COMMAND_BASE + DRM_ARMADA_##name, struct drm_armada_##str)
24		24
25	struct drm_armada_gem_create {	25	struct drm_armada_gem_create {
26	uint32_t handle;	26	__u32 handle;
27	uint32_t size;	27	__u32 size;
28	};	28	};
29	#define DRM_IOCTL_ARMADA_GEM_CREATE \	29	#define DRM_IOCTL_ARMADA_GEM_CREATE \
30	ARMADA_IOCTL(IOWR, GEM_CREATE, gem_create)	30	ARMADA_IOCTL(IOWR, GEM_CREATE, gem_create)
31		31
32	struct drm_armada_gem_mmap {	32	struct drm_armada_gem_mmap {
33	uint32_t handle;	33	__u32 handle;
34	uint32_t pad;	34	__u32 pad;
35	uint64_t offset;	35	__u64 offset;
36	uint64_t size;	36	__u64 size;
37	uint64_t addr;	37	__u64 addr;
38	};	38	};
39	#define DRM_IOCTL_ARMADA_GEM_MMAP \	39	#define DRM_IOCTL_ARMADA_GEM_MMAP \
40	ARMADA_IOCTL(IOWR, GEM_MMAP, gem_mmap)	40	ARMADA_IOCTL(IOWR, GEM_MMAP, gem_mmap)
41		41
42	struct drm_armada_gem_pwrite {	42	struct drm_armada_gem_pwrite {
43	uint64_t ptr;	43	__u64 ptr;
44	uint32_t handle;	44	__u32 handle;
45	uint32_t offset;	45	__u32 offset;
46	uint32_t size;	46	__u32 size;
47	};	47	};
48	#define DRM_IOCTL_ARMADA_GEM_PWRITE \	48	#define DRM_IOCTL_ARMADA_GEM_PWRITE \
49	ARMADA_IOCTL(IOW, GEM_PWRITE, gem_pwrite)	49	ARMADA_IOCTL(IOW, GEM_PWRITE, gem_pwrite)

include/uapi/drm/drm.h+22−0

@@ -700,6 +700,7 @@ struct drm_prime_handle { · 699 unmodified lines
700		700
701	struct drm_syncobj_create {	701	struct drm_syncobj_create {
702	__u32 handle;	702	__u32 handle;
		703	#define DRM_SYNCOBJ_CREATE_SIGNALED (1 << 0)
703	__u32 flags;	704	__u32 flags;
704	};	705	};
705		706
@@ -718,6 +719,24 @@ struct drm_syncobj_handle { · 12 unmodified lines
718	__u32 pad;	719	__u32 pad;
719	};	720	};
720		721
		722	#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL (1 << 0)
		723	#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT (1 << 1)
		724	struct drm_syncobj_wait {
		725	__u64 handles;
		726	/* absolute timeout */
		727	__s64 timeout_nsec;
		728	__u32 count_handles;
		729	__u32 flags;
		730	__u32 first_signaled; /* only valid when not waiting all */
		731	__u32 pad;
		732	};
		733
		734	struct drm_syncobj_array {
		735	__u64 handles;
		736	__u32 count_handles;
		737	__u32 pad;
		738	};
		739
721	#if defined(__cplusplus)	740	#if defined(__cplusplus)
722	}	741	}
723	#endif	742	#endif
@@ -840,6 +859,9 @@ extern "C" { · 116 unmodified lines
840	#define DRM_IOCTL_SYNCOBJ_DESTROY DRM_IOWR(0xC0, struct drm_syncobj_destroy)	859	#define DRM_IOCTL_SYNCOBJ_DESTROY DRM_IOWR(0xC0, struct drm_syncobj_destroy)
841	#define DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD DRM_IOWR(0xC1, struct drm_syncobj_handle)	860	#define DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD DRM_IOWR(0xC1, struct drm_syncobj_handle)
842	#define DRM_IOCTL_SYNCOBJ_FD_TO_HANDLE DRM_IOWR(0xC2, struct drm_syncobj_handle)	861	#define DRM_IOCTL_SYNCOBJ_FD_TO_HANDLE DRM_IOWR(0xC2, struct drm_syncobj_handle)
		862	#define DRM_IOCTL_SYNCOBJ_WAIT DRM_IOWR(0xC3, struct drm_syncobj_wait)
		863	#define DRM_IOCTL_SYNCOBJ_RESET DRM_IOWR(0xC4, struct drm_syncobj_array)
		864	#define DRM_IOCTL_SYNCOBJ_SIGNAL DRM_IOWR(0xC5, struct drm_syncobj_array)
843		865
844	/**	866	/**
845	* Device specific ioctls should only be in their respective headers	867	* Device specific ioctls should only be in their respective headers

include/uapi/drm/drm_fourcc.h+31−0

@@ -185,6 +185,8 @@ extern "C" { · 184 unmodified lines
185	#define DRM_FORMAT_MOD_VENDOR_BROADCOM 0x07	185	#define DRM_FORMAT_MOD_VENDOR_BROADCOM 0x07
186	/* add more to the end as needed */	186	/* add more to the end as needed */
187		187
		188	#define DRM_FORMAT_RESERVED ((1ULL << 56) - 1)
		189
188	#define fourcc_mod_code(vendor, val) \	190	#define fourcc_mod_code(vendor, val) \
189	((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) \| (val & 0x00ffffffffffffffULL))	191	((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) \| (val & 0x00ffffffffffffffULL))
190		192
@@ -196,6 +198,15 @@ extern "C" { · 5 unmodified lines
196	* authoritative source for all of these.	198	* authoritative source for all of these.
197	*/	199	*/
198		200
		201	/*
		202	* Invalid Modifier
		203	*
		204	* This modifier can be used as a sentinel to terminate the format modifiers
		205	* list, or to initialize a variable with an invalid modifier. It might also be
		206	* used to report an error back to userspace for certain APIs.
		207	*/
		208	#define DRM_FORMAT_MOD_INVALID fourcc_mod_code(NONE, DRM_FORMAT_RESERVED)
		209
199	/*	210	/*
200	* Linear Layout	211	* Linear Layout
201	*	212	*
@@ -252,6 +263,26 @@ extern "C" { · 50 unmodified lines
252	*/	263	*/
253	#define I915_FORMAT_MOD_Yf_TILED fourcc_mod_code(INTEL, 3)	264	#define I915_FORMAT_MOD_Yf_TILED fourcc_mod_code(INTEL, 3)
254		265
		266	/*
		267	* Intel color control surface (CCS) for render compression
		268	*
		269	* The framebuffer format must be one of the 8:8:8:8 RGB formats.
		270	* The main surface will be plane index 0 and must be Y/Yf-tiled,
		271	* the CCS will be plane index 1.
		272	*
		273	* Each CCS tile matches a 1024x512 pixel area of the main surface.
		274	* To match certain aspects of the 3D hardware the CCS is
		275	* considered to be made up of normal 128Bx32 Y tiles, Thus
		276	* the CCS pitch must be specified in multiples of 128 bytes.
		277	*
		278	* In reality the CCS tile appears to be a 64Bx64 Y tile, composed
		279	* of QWORD (8 bytes) chunks instead of OWORD (16 bytes) chunks.
		280	* But that fact is not relevant unless the memory is accessed
		281	* directly.
		282	*/
		283	#define I915_FORMAT_MOD_Y_TILED_CCS fourcc_mod_code(INTEL, 4)
		284	#define I915_FORMAT_MOD_Yf_TILED_CCS fourcc_mod_code(INTEL, 5)
		285
255	/*	286	/*
256	* Tiled, NV12MT, grouped in 64 (pixels) x 32 (lines) -sized macroblocks	287	* Tiled, NV12MT, grouped in 64 (pixels) x 32 (lines) -sized macroblocks
257	*	288	*

include/uapi/drm/drm_mode.h+50−0

@@ -712,6 +712,56 @@ struct drm_mode_atomic { · 711 unmodified lines
712	__u64 user_data;	712	__u64 user_data;
713	};	713	};
714		714
		715	struct drm_format_modifier_blob {
		716	#define FORMAT_BLOB_CURRENT 1
		717	/* Version of this blob format */
		718	__u32 version;
		719
		720	/* Flags */
		721	__u32 flags;
		722
		723	/* Number of fourcc formats supported */
		724	__u32 count_formats;
		725
		726	/* Where in this blob the formats exist (in bytes) */
		727	__u32 formats_offset;
		728
		729	/* Number of drm_format_modifiers */
		730	__u32 count_modifiers;
		731
		732	/* Where in this blob the modifiers exist (in bytes) */
		733	__u32 modifiers_offset;
		734
		735	/* __u32 formats[] */
		736	/* struct drm_format_modifier modifiers[] */
		737	};
		738
		739	struct drm_format_modifier {
		740	/* Bitmask of formats in get_plane format list this info applies to. The
		741	* offset allows a sliding window of which 64 formats (bits).
		742	*
		743	* Some examples:
		744	* In today's world with < 65 formats, and formats 0, and 2 are
		745	* supported
		746	* 0x0000000000000005
		747	* ^-offset = 0, formats = 5
		748	*
		749	* If the number formats grew to 128, and formats 98-102 are
		750	* supported with the modifier:
		751	*
		752	* 0x0000003c00000000 0000000000000000
		753	* ^
		754	* \|__offset = 64, formats = 0x3c00000000
		755	*
		756	*/
		757	__u64 formats;
		758	__u32 offset;
		759	__u32 pad;
		760
		761	/* The modifier that applies to the >get_plane format list bitmask. */
		762	__u64 modifier;
		763	};
		764
715	/**	765	/**
716	* Create a new 'blob' data property, copying length bytes from data pointer,	766	* Create a new 'blob' data property, copying length bytes from data pointer,
717	* and returning new blob ID.	767	* and returning new blob ID.

include/uapi/drm/i915_drm.h+49−2

@@ -260,6 +260,8 @@ typedef struct _drm_i915_sarea { · 259 unmodified lines
260	#define DRM_I915_GEM_CONTEXT_GETPARAM 0x34	260	#define DRM_I915_GEM_CONTEXT_GETPARAM 0x34
261	#define DRM_I915_GEM_CONTEXT_SETPARAM 0x35	261	#define DRM_I915_GEM_CONTEXT_SETPARAM 0x35
262	#define DRM_I915_PERF_OPEN 0x36	262	#define DRM_I915_PERF_OPEN 0x36
		263	#define DRM_I915_PERF_ADD_CONFIG 0x37
		264	#define DRM_I915_PERF_REMOVE_CONFIG 0x38
263		265
264	#define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)	266	#define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
265	#define DRM_IOCTL_I915_FLUSH DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)	267	#define DRM_IOCTL_I915_FLUSH DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)
@@ -315,6 +317,8 @@ typedef struct _drm_i915_sarea { · 49 unmodified lines
315	#define DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_GETPARAM, struct drm_i915_gem_context_param)	317	#define DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_GETPARAM, struct drm_i915_gem_context_param)
316	#define DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_SETPARAM, struct drm_i915_gem_context_param)	318	#define DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_SETPARAM, struct drm_i915_gem_context_param)
317	#define DRM_IOCTL_I915_PERF_OPEN DRM_IOW(DRM_COMMAND_BASE + DRM_I915_PERF_OPEN, struct drm_i915_perf_open_param)	319	#define DRM_IOCTL_I915_PERF_OPEN DRM_IOW(DRM_COMMAND_BASE + DRM_I915_PERF_OPEN, struct drm_i915_perf_open_param)
		320	#define DRM_IOCTL_I915_PERF_ADD_CONFIG DRM_IOW(DRM_COMMAND_BASE + DRM_I915_PERF_ADD_CONFIG, struct drm_i915_perf_oa_config)
		321	#define DRM_IOCTL_I915_PERF_REMOVE_CONFIG DRM_IOW(DRM_COMMAND_BASE + DRM_I915_PERF_REMOVE_CONFIG, __u64)
318		322
319	/* Allow drivers to submit batchbuffers directly to hardware, relying	323	/* Allow drivers to submit batchbuffers directly to hardware, relying
320	* on the security mechanisms provided by hardware.	324	* on the security mechanisms provided by hardware.
@@ -431,6 +435,11 @@ typedef struct drm_i915_irq_wait { · 110 unmodified lines
431	*/	435	*/
432	#define I915_PARAM_HAS_EXEC_BATCH_FIRST 48	436	#define I915_PARAM_HAS_EXEC_BATCH_FIRST 48
433		437
		438	/* Query whether DRM_I915_GEM_EXECBUFFER2 supports supplying an array of
		439	* drm_i915_gem_exec_fence structures. See I915_EXEC_FENCE_ARRAY.
		440	*/
		441	#define I915_PARAM_HAS_EXEC_FENCE_ARRAY 49
		442
434	typedef struct drm_i915_getparam {	443	typedef struct drm_i915_getparam {
435	__s32 param;	444	__s32 param;
436	/*	445	/*
@@ -812,6 +821,17 @@ struct drm_i915_gem_exec_object2 { · 375 unmodified lines
812	__u64 rsvd2;	821	__u64 rsvd2;
813	};	822	};
814		823
		824	struct drm_i915_gem_exec_fence {
		825	/**
		826	* User's handle for a drm_syncobj to wait on or signal.
		827	*/
		828	__u32 handle;
		829
		830	#define I915_EXEC_FENCE_WAIT (1<<0)
		831	#define I915_EXEC_FENCE_SIGNAL (1<<1)
		832	__u32 flags;
		833	};
		834
815	struct drm_i915_gem_execbuffer2 {	835	struct drm_i915_gem_execbuffer2 {
816	/**	836	/**
817	* List of gem_exec_object2 structs	837	* List of gem_exec_object2 structs
@@ -826,7 +846,11 @@ struct drm_i915_gem_execbuffer2 { · 8 unmodified lines
826	__u32 DR1;	846	__u32 DR1;
827	__u32 DR4;	847	__u32 DR4;
828	__u32 num_cliprects;	848	__u32 num_cliprects;
829	/** This is a struct drm_clip_rect cliprects /	849	/**
		850	* This is a struct drm_clip_rect *cliprects if I915_EXEC_FENCE_ARRAY
		851	* is not set. If I915_EXEC_FENCE_ARRAY is set, then this is a
		852	* struct drm_i915_gem_exec_fence *fences.
		853	*/
830	__u64 cliprects_ptr;	854	__u64 cliprects_ptr;
831	#define I915_EXEC_RING_MASK (7<<0)	855	#define I915_EXEC_RING_MASK (7<<0)
832	#define I915_EXEC_DEFAULT (0<<0)	856	#define I915_EXEC_DEFAULT (0<<0)
@@ -927,7 +951,14 @@ struct drm_i915_gem_execbuffer2 { · 94 unmodified lines
927	* element).	951	* element).
928	*/	952	*/
929	#define I915_EXEC_BATCH_FIRST (1<<18)	953	#define I915_EXEC_BATCH_FIRST (1<<18)
930	#define __I915_EXEC_UNKNOWN_FLAGS (-(I915_EXEC_BATCH_FIRST<<1))	954
		955	/* Setting I915_FENCE_ARRAY implies that num_cliprects and cliprects_ptr
		956	* define an array of i915_gem_exec_fence structures which specify a set of
		957	* dma fences to wait upon or signal.
		958	*/
		959	#define I915_EXEC_FENCE_ARRAY (1<<19)
		960
		961	#define __I915_EXEC_UNKNOWN_FLAGS (-(I915_EXEC_FENCE_ARRAY<<1))
931		962
932	#define I915_EXEC_CONTEXT_ID_MASK (0xffffffff)	963	#define I915_EXEC_CONTEXT_ID_MASK (0xffffffff)
933	#define i915_execbuffer2_set_context_id(eb2, context) \	964	#define i915_execbuffer2_set_context_id(eb2, context) \
@@ -1467,6 +1498,22 @@ enum drm_i915_perf_record_type { · 533 unmodified lines
1467	DRM_I915_PERF_RECORD_MAX /* non-ABI */	1498	DRM_I915_PERF_RECORD_MAX /* non-ABI */
1468	};	1499	};
1469		1500
		1501	/**
		1502	* Structure to upload perf dynamic configuration into the kernel.
		1503	*/
		1504	struct drm_i915_perf_oa_config {
		1505	/** String formatted like "%08x-%04x-%04x-%04x-%012x" */
		1506	char uuid[36];
		1507
		1508	__u32 n_mux_regs;
		1509	__u32 n_boolean_regs;
		1510	__u32 n_flex_regs;
		1511
		1512	__u64 __user mux_regs_ptr;
		1513	__u64 __user boolean_regs_ptr;
		1514	__u64 __user flex_regs_ptr;
		1515	};
		1516
1470	#if defined(__cplusplus)	1517	#if defined(__cplusplus)
1471	}	1518	}
1472	#endif	1519	#endif

include/uapi/drm/msm_drm.h+3−3

@@ -171,7 +171,7 @@ struct drm_msm_gem_submit_cmd { · 170 unmodified lines
171	__u32 size; /* in, cmdstream size */	171	__u32 size; /* in, cmdstream size */
172	__u32 pad;	172	__u32 pad;
173	__u32 nr_relocs; /* in, number of submit_reloc's */	173	__u32 nr_relocs; /* in, number of submit_reloc's */
174	__u64 __user relocs; /* in, ptr to array of submit_reloc's */	174	__u64 relocs; /* in, ptr to array of submit_reloc's */
175	};	175	};
176		176
177	/* Each buffer referenced elsewhere in the cmdstream submit (ie. the	177	/* Each buffer referenced elsewhere in the cmdstream submit (ie. the
@@ -215,8 +215,8 @@ struct drm_msm_gem_submit { · 37 unmodified lines
215	__u32 fence; /* out */	215	__u32 fence; /* out */
216	__u32 nr_bos; /* in, number of submit_bo's */	216	__u32 nr_bos; /* in, number of submit_bo's */
217	__u32 nr_cmds; /* in, number of submit_cmd's */	217	__u32 nr_cmds; /* in, number of submit_cmd's */
218	__u64 __user bos; /* in, ptr to array of submit_bo's */	218	__u64 bos; /* in, ptr to array of submit_bo's */
219	__u64 __user cmds; /* in, ptr to array of submit_cmd's */	219	__u64 cmds; /* in, ptr to array of submit_cmd's */
220	__s32 fence_fd; /* in/out fence fd (see MSM_SUBMIT_FENCE_FD_IN/OUT) */	220	__s32 fence_fd; /* in/out fence fd (see MSM_SUBMIT_FENCE_FD_IN/OUT) */
221	};	221	};
222		222

include/uapi/drm/qxl_drm.h+3−3

@@ -80,8 +80,8 @@ struct drm_qxl_reloc { · 79 unmodified lines
80	};	80	};
81		81
82	struct drm_qxl_command {	82	struct drm_qxl_command {
83	__u64 __user command; /* void* */	83	__u64 command; /* void* */
84	__u64 __user relocs; /* struct drm_qxl_reloc* */	84	__u64 relocs; /* struct drm_qxl_reloc* */
85	__u32 type;	85	__u32 type;
86	__u32 command_size;	86	__u32 command_size;
87	__u32 relocs_num;	87	__u32 relocs_num;
@@ -91,7 +91,7 @@ struct drm_qxl_command { · 3 unmodified lines
91	struct drm_qxl_execbuffer {	91	struct drm_qxl_execbuffer {
92	__u32 flags; /* for future use */	92	__u32 flags; /* for future use */
93	__u32 commands_num;	93	__u32 commands_num;
94	__u64 __user commands; /* struct drm_qxl_command* */	94	__u64 commands; /* struct drm_qxl_command* */
95	};	95	};
96		96
97	struct drm_qxl_update_area {	97	struct drm_qxl_update_area {

include/uapi/drm/vc4_drm.h+22−0

 #define DRM_VC4_GET_PARAM                         0x07
 #define DRM_VC4_SET_TILING                        0x08
 #define DRM_VC4_GET_TILING                        0x09
+#define DRM_VC4_LABEL_BO                          0x0a
 #define DRM_IOCTL_VC4_SUBMIT_CL           DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_SUBMIT_CL, struct drm_vc4_submit_cl)
 #define DRM_IOCTL_VC4_WAIT_SEQNO          DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_WAIT_SEQNO, struct drm_vc4_wait_seqno)
 #define DRM_IOCTL_VC4_GET_PARAM           DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_GET_PARAM, struct drm_vc4_get_param)
 #define DRM_IOCTL_VC4_SET_TILING          DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_SET_TILING, struct drm_vc4_set_tiling)
 #define DRM_IOCTL_VC4_GET_TILING          DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_GET_TILING, struct drm_vc4_get_tiling)
+#define DRM_IOCTL_VC4_LABEL_BO            DRM_IOWR(DRM_COMMAND_BASE + DRM_VC4_LABEL_BO, struct drm_vc4_label_bo)
 struct drm_vc4_submit_rcl_surface {
 	__u32 hindex; /* Handle index, or ~0 if not present. */
 	__u32 pad:24;
 #define VC4_SUBMIT_CL_USE_CLEAR_COLOR			(1 << 0)
+/* By default, the kernel gets to choose the order that the tiles are
+ * rendered in.  If this is set, then the tiles will be rendered in a
+ * raster order, with the right-to-left vs left-to-right and
+ * top-to-bottom vs bottom-to-top dictated by
+ * VC4_SUBMIT_CL_RCL_ORDER_INCREASING_*.  This allows overlapping
+ * blits to be implemented using the 3D engine.
+ */
+#define VC4_SUBMIT_CL_FIXED_RCL_ORDER			(1 << 1)
+#define VC4_SUBMIT_CL_RCL_ORDER_INCREASING_X		(1 << 2)
+#define VC4_SUBMIT_CL_RCL_ORDER_INCREASING_Y		(1 << 3)
 	__u32 flags;
 	/* Returned value of the seqno of this render job (for the
 #define DRM_VC4_PARAM_SUPPORTS_BRANCHES		3
 #define DRM_VC4_PARAM_SUPPORTS_ETC1		4
 #define DRM_VC4_PARAM_SUPPORTS_THREADED_FS	5
+#define DRM_VC4_PARAM_SUPPORTS_FIXED_RCL_ORDER	6
 struct drm_vc4_get_param {
 	__u32 param;
 	__u64 modifier;
 };
+/**
+ * struct drm_vc4_label_bo - Attach a name to a BO for debug purposes.
+ */
+struct drm_vc4_label_bo {
+	__u32 handle;
+	__u32 len;
+	__u64 name;
+};
 #if defined(__cplusplus)
 }
 #endif

include/uapi/drm/vmwgfx_drm.h+8−3

  * @version: Allows expanding the execbuf ioctl parameters without breaking
  * backwards compatibility, since user-space will always tell the kernel
  * which version it uses.
- * @flags: Execbuf flags. None currently.
+ * @flags: Execbuf flags.
+ * @imported_fence_fd:  FD for a fence imported from another device
  *
  * Argument to the DRM_VMW_EXECBUF Ioctl.
  */
 #define DRM_VMW_EXECBUF_VERSION 2
+#define DRM_VMW_EXECBUF_FLAG_IMPORT_FENCE_FD (1 << 0)
+#define DRM_VMW_EXECBUF_FLAG_EXPORT_FENCE_FD (1 << 1)
 struct drm_vmw_execbuf_arg {
 	__u64 commands;
 	__u32 command_size;
 	__u32 version;
 	__u32 flags;
 	__u32 context_handle;
-	__u32 pad64;
+	__s32 imported_fence_fd;
 };
 /**
  * @passed_seqno: The highest seqno number processed by the hardware
  * so far. This can be used to mark user-space fence objects as signaled, and
  * to determine whether a fence seqno might be stale.
+ * @fd: FD associated with the fence, -1 if not exported
  * @error: This member should've been set to -EFAULT on submission.
  * The following actions should be take on completion:
  * error == -EFAULT: Fence communication failed. The host is synchronized.
 	__u32 mask;
 	__u32 seqno;
 	__u32 passed_seqno;
-	__u32 pad64;
+	__s32 fd;
 	__s32 error;
 };

include/uapi/linux/aio_abi.h+11−10

@@ -28,6 +28,7 @@ · 27 unmodified lines
28	#define __LINUX__AIO_ABI_H	28	#define __LINUX__AIO_ABI_H
29		29
30	#include <linux/types.h>	30	#include <linux/types.h>
		31	#include <linux/fs.h>
31	#include <asm/byteorder.h>	32	#include <asm/byteorder.h>
32		33
33	typedef __kernel_ulong_t aio_context_t;	34	typedef __kernel_ulong_t aio_context_t;
@@ -62,14 +63,6 @@ struct io_event { · 28 unmodified lines
62	__s64 res2; /* secondary result */	63	__s64 res2; /* secondary result */
63	};	64	};
64		65
65	#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN)
66	#define PADDED(x,y) x, y
67	#elif defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN)
68	#define PADDED(x,y) y, x
69	#else
70	#error edit for your odd byteorder.
71	#endif
72
73	/*	66	/*
74	* we always use a 64bit off_t when communicating	67	* we always use a 64bit off_t when communicating
75	* with userland. its up to libraries to do the	68	* with userland. its up to libraries to do the
@@ -79,8 +72,16 @@ struct io_event { · 3 unmodified lines
79	struct iocb {	72	struct iocb {
80	/* these are internal to the kernel/libc. */	73	/* these are internal to the kernel/libc. */
81	__u64 aio_data; /* data to be returned in event's data */	74	__u64 aio_data; /* data to be returned in event's data */
82	__u32 PADDED(aio_key, aio_rw_flags);	75
83	/* the kernel sets aio_key to the req # */	76	#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN)
		77	__u32 aio_key; /* the kernel sets aio_key to the req # */
		78	__kernel_rwf_t aio_rw_flags; /* RWF_* flags */
		79	#elif defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN)
		80	__kernel_rwf_t aio_rw_flags; /* RWF_* flags */
		81	__u32 aio_key; /* the kernel sets aio_key to the req # */
		82	#else
		83	#error edit for your odd byteorder.
		84	#endif
84		85
85	/* common fields */	86	/* common fields */
86	__u16 aio_lio_opcode; /* see IOCB_CMD_ above */	87	__u16 aio_lio_opcode; /* see IOCB_CMD_ above */

include/uapi/linux/android/binder.h+16−0

 /* struct binder_fd_array_object - object describing an array of fds in a buffer
  * @hdr:		common header structure
+ * @pad:		padding to ensure correct alignment
  * @num_fds:		number of file descriptors in the buffer
  * @parent:		index in offset array to buffer holding the fd array
  * @parent_offset:	start offset of fd array in the buffer
  */
 struct binder_fd_array_object {
 	struct binder_object_header	hdr;
+	__u32				pad;
 	binder_size_t			num_fds;
 	binder_size_t			parent;
 	binder_size_t			parent_offset;
 #define BINDER_CURRENT_PROTOCOL_VERSION 8
 #endif
+/*
+ * Use with BINDER_GET_NODE_DEBUG_INFO, driver reads ptr, writes to all fields.
+ * Set ptr to NULL for the first call to get the info for the first node, and
+ * then repeat the call passing the previously returned value to get the next
+ * nodes.  ptr will be 0 when there are no more nodes.
+ */
+struct binder_node_debug_info {
+	binder_uintptr_t ptr;
+	binder_uintptr_t cookie;
+	__u32            has_strong_ref;
+	__u32            has_weak_ref;
+};
 #define BINDER_WRITE_READ		_IOWR('b', 1, struct binder_write_read)
 #define BINDER_SET_IDLE_TIMEOUT		_IOW('b', 3, __s64)
 #define BINDER_SET_MAX_THREADS		_IOW('b', 5, __u32)
 #define BINDER_SET_CONTEXT_MGR		_IOW('b', 7, __s32)
 #define BINDER_THREAD_EXIT		_IOW('b', 8, __s32)
 #define BINDER_VERSION			_IOWR('b', 9, struct binder_version)
+#define BINDER_GET_NODE_DEBUG_INFO	_IOWR('b', 11, struct binder_node_debug_info)
 /*
  * NOTE: Two special error codes you should check for when calling

include/uapi/linux/auto_dev-ioctl.h+1−1

@@ -16,7 +16,7 @@ · 15 unmodified lines
16	#define AUTOFS_DEVICE_NAME "autofs"	16	#define AUTOFS_DEVICE_NAME "autofs"
17		17
18	#define AUTOFS_DEV_IOCTL_VERSION_MAJOR 1	18	#define AUTOFS_DEV_IOCTL_VERSION_MAJOR 1
19	#define AUTOFS_DEV_IOCTL_VERSION_MINOR 0	19	#define AUTOFS_DEV_IOCTL_VERSION_MINOR 1
20		20
21	#define AUTOFS_DEV_IOCTL_SIZE sizeof(struct autofs_dev_ioctl)	21	#define AUTOFS_DEV_IOCTL_SIZE sizeof(struct autofs_dev_ioctl)
22		22

include/uapi/linux/auto_fs4.h+0−2

@@ -155,8 +155,6 @@ enum { · 154 unmodified lines
155	};	155	};
156		156
157	#define AUTOFS_IOC_EXPIRE_MULTI _IOW(AUTOFS_IOCTL, AUTOFS_IOC_EXPIRE_MULTI_CMD, int)	157	#define AUTOFS_IOC_EXPIRE_MULTI _IOW(AUTOFS_IOCTL, AUTOFS_IOC_EXPIRE_MULTI_CMD, int)
158	#define AUTOFS_IOC_EXPIRE_INDIRECT AUTOFS_IOC_EXPIRE_MULTI
159	#define AUTOFS_IOC_EXPIRE_DIRECT AUTOFS_IOC_EXPIRE_MULTI
160	#define AUTOFS_IOC_PROTOSUBVER _IOR(AUTOFS_IOCTL, AUTOFS_IOC_PROTOSUBVER_CMD, int)	158	#define AUTOFS_IOC_PROTOSUBVER _IOR(AUTOFS_IOCTL, AUTOFS_IOC_PROTOSUBVER_CMD, int)
161	#define AUTOFS_IOC_ASKUMOUNT _IOR(AUTOFS_IOCTL, AUTOFS_IOC_ASKUMOUNT_CMD, int)	159	#define AUTOFS_IOC_ASKUMOUNT _IOR(AUTOFS_IOCTL, AUTOFS_IOC_ASKUMOUNT_CMD, int)
162		160

include/uapi/linux/blktrace_api.h+3−0

 	__BLK_TA_REMAP,			/* bio was remapped */
 	__BLK_TA_ABORT,			/* request aborted */
 	__BLK_TA_DRV_DATA,		/* driver-specific binary data */
+	__BLK_TA_CGROUP = 1 << 8,	/* from a cgroup*/
 };
 /*
 	__BLK_TN_PROCESS = 0,		/* establish pid/name mapping */
 	__BLK_TN_TIMESTAMP,		/* include system clock */
 	__BLK_TN_MESSAGE,		/* Character string message */
+	__BLK_TN_CGROUP = __BLK_TA_CGROUP, /* from a cgroup */
 };
 	__u32 cpu;		/* on what cpu did it happen */
 	__u16 error;		/* completion error */
 	__u16 pdu_len;		/* length of data after this trace */
+	/* cgroup id will be stored here if exists */
 };
 /*

include/uapi/linux/bpf.h+71−7

 #define BPF_FROM_LE	BPF_TO_LE
 #define BPF_FROM_BE	BPF_TO_BE
+/* jmp encodings */
 #define BPF_JNE		0x50	/* jump != */
+#define BPF_JLT		0xa0	/* LT is unsigned, '<' */
+#define BPF_JLE		0xb0	/* LE is unsigned, '<=' */
 #define BPF_JSGT	0x60	/* SGT is signed '>', GT in x86 */
 #define BPF_JSGE	0x70	/* SGE is signed '>=', GE in x86 */
+#define BPF_JSLT	0xc0	/* SLT is signed, '<' */
+#define BPF_JSLE	0xd0	/* SLE is signed, '<=' */
 #define BPF_CALL	0x80	/* function call */
 #define BPF_EXIT	0x90	/* function return */
 	BPF_MAP_TYPE_LPM_TRIE,
 	BPF_MAP_TYPE_ARRAY_OF_MAPS,
 	BPF_MAP_TYPE_HASH_OF_MAPS,
+	BPF_MAP_TYPE_DEVMAP,
+	BPF_MAP_TYPE_SOCKMAP,
 };
 enum bpf_prog_type {
 	BPF_PROG_TYPE_LWT_OUT,
 	BPF_PROG_TYPE_LWT_XMIT,
 	BPF_PROG_TYPE_SOCK_OPS,
+	BPF_PROG_TYPE_SK_SKB,
 };
 enum bpf_attach_type {
 	BPF_CGROUP_INET_EGRESS,
 	BPF_CGROUP_INET_SOCK_CREATE,
 	BPF_CGROUP_SOCK_OPS,
+	BPF_SK_SKB_STREAM_PARSER,
+	BPF_SK_SKB_STREAM_VERDICT,
 	__MAX_BPF_ATTACH_TYPE
 };
 #define BPF_NOEXIST	1 /* create new element if it didn't exist */
 #define BPF_EXIST	2 /* update existing element */
+/* flags for BPF_MAP_CREATE command */
 #define BPF_F_NO_PREALLOC	(1U << 0)
 /* Instead of having one common LRU list in the
  * BPF_MAP_TYPE_LRU_[PERCPU_]HASH map, use a percpu LRU list
  * across different LRU lists.
  */
 #define BPF_F_NO_COMMON_LRU	(1U << 1)
+/* Specify numa node during map creation */
+#define BPF_F_NUMA_NODE		(1U << 2)
 union bpf_attr {
 	struct { /* anonymous struct used by BPF_MAP_CREATE command */
 		__u32	key_size;	/* size of key in bytes */
 		__u32	value_size;	/* size of value in bytes */
 		__u32	max_entries;	/* max number of entries in a map */
-		__u32	map_flags;	/* prealloc or not */
+		__u32	map_flags;	/* BPF_MAP_CREATE related
+					 * flags defined above.
+					 */
 		__u32	inner_map_fd;	/* fd pointing to the inner map */
+		__u32	numa_node;	/* numa node (effective only if
+					 * BPF_F_NUMA_NODE is set).
+					 */
 	};
 	struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */
  * int bpf_redirect(ifindex, flags)
  *     redirect to another netdev
  *     @ifindex: ifindex of the net device
- *     @flags: bit 0 - if set, redirect to ingress instead of egress
+ *     @flags:
- *             other bits - reserved
+ *	  cls_bpf:
- *     Return: TC_ACT_REDIRECT
+ *          bit 0 - if set, redirect to ingress instead of egress
+ *          other bits - reserved
+ *	  xdp_bpf:
+ *	    all bits - reserved
+ *     Return: cls_bpf: TC_ACT_REDIRECT on success or TC_ACT_SHOT on error
+ *	       xdp_bfp: XDP_REDIRECT on success or XDP_ABORT on error
+ * int bpf_redirect_map(map, key, flags)
+ *     redirect to endpoint in map
+ *     @map: pointer to dev map
+ *     @key: index in map to lookup
+ *     @flags: --
+ *     Return: XDP_REDIRECT on success or XDP_ABORT on error
  *
  * u32 bpf_get_route_realm(skb)
  *     retrieve a dst's tclassid
  *     @mode: operation mode (enum bpf_adj_room_mode)
  *     @flags: reserved for future use
  *     Return: 0 on success or negative error code
+ *
+ * int bpf_sk_redirect_map(map, key, flags)
+ *     Redirect skb to a sock in map using key as a lookup key for the
+ *     sock in map.
+ *     @map: pointer to sockmap
+ *     @key: key to lookup sock in map
+ *     @flags: reserved for future use
+ *     Return: SK_REDIRECT
+ *
+ * int bpf_sock_map_update(skops, map, key, flags)
+ *	@skops: pointer to bpf_sock_ops
+ *	@map: pointer to sockmap to update
+ *	@key: key to insert/update sock in map
+ *	@flags: same flags as map update elem
  */
 #define __BPF_FUNC_MAPPER(FN)		\
 	FN(unspec),			\
 	FN(get_socket_uid),		\
 	FN(set_hash),			\
 	FN(setsockopt),			\
-	FN(skb_adjust_room),
+	FN(skb_adjust_room),		\
+	FN(redirect_map),		\
+	FN(sk_redirect_map),		\
+	FN(sock_map_update),		\
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper
  * function eBPF program intends to call
 	__u32 data;
 	__u32 data_end;
 	__u32 napi_id;
+	/* accessed by BPF_PROG_TYPE_sk_skb types */
+	__u32 family;
+	__u32 remote_ip4;	/* Stored in network byte order */
+	__u32 local_ip4;	/* Stored in network byte order */
+	__u32 remote_ip6[4];	/* Stored in network byte order */
+	__u32 local_ip6[4];	/* Stored in network byte order */
+	__u32 remote_port;	/* Stored in network byte order */
+	__u32 local_port;	/* stored in host byte order */
 };
 struct bpf_tunnel_key {
 	__u32 family;
 	__u32 type;
 	__u32 protocol;
+	__u32 mark;
+	__u32 priority;
 };
 #define XDP_PACKET_HEADROOM 256
 /* User return codes for XDP prog type.
  * A valid XDP program must return one of these defined values. All other
- * return codes are reserved for future use. Unknown return codes will result
+ * return codes are reserved for future use. Unknown return codes will
- * in packet drop.
+ * result in packet drops and a warning via bpf_warn_invalid_xdp_action().
  */
 enum xdp_action {
 	XDP_ABORTED = 0,
 	XDP_DROP,
 	XDP_PASS,
 	XDP_TX,
+	XDP_REDIRECT,
 };
 /* user accessible metadata for XDP packet hook
 	__u32 data_end;
 };
+enum sk_action {
+	SK_ABORTED = 0,
+	SK_DROP,
+	SK_REDIRECT,
+};
 #define BPF_TAG_SIZE	8
 struct bpf_prog_info {

include/uapi/linux/btrfs.h+1−7

 #define BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL	(1ULL << 1)
 #define BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS	(1ULL << 2)
 #define BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO	(1ULL << 3)
-/*
+#define BTRFS_FEATURE_INCOMPAT_COMPRESS_ZSTD	(1ULL << 4)
- * some patches floated around with a second compression method
- * lets save that incompat here for when they do get in
- * Note we don't actually support it, we're just reserving the
- * number
- */
-#define BTRFS_FEATURE_INCOMPAT_COMPRESS_LZOv2	(1ULL << 4)
 /*
  * older kernels tried to do bigger metadata blocks, but the

include/uapi/linux/capability.h+19−3

@@ -60,9 +60,13 @@ typedef struct __user_cap_data_struct { · 59 unmodified lines
60	#define VFS_CAP_U32_2 2	60	#define VFS_CAP_U32_2 2
61	#define XATTR_CAPS_SZ_2 (sizeof(__le32)(1 + 2VFS_CAP_U32_2))	61	#define XATTR_CAPS_SZ_2 (sizeof(__le32)(1 + 2VFS_CAP_U32_2))
62		62
63	#define XATTR_CAPS_SZ XATTR_CAPS_SZ_2	63	#define VFS_CAP_REVISION_3 0x03000000
64	#define VFS_CAP_U32 VFS_CAP_U32_2	64	#define VFS_CAP_U32_3 2
65	#define VFS_CAP_REVISION VFS_CAP_REVISION_2	65	#define XATTR_CAPS_SZ_3 (sizeof(__le32)(2 + 2VFS_CAP_U32_3))
		66
		67	#define XATTR_CAPS_SZ XATTR_CAPS_SZ_3
		68	#define VFS_CAP_U32 VFS_CAP_U32_3
		69	#define VFS_CAP_REVISION VFS_CAP_REVISION_3
66		70
67	struct vfs_cap_data {	71	struct vfs_cap_data {
68	__le32 magic_etc; /* Little endian */	72	__le32 magic_etc; /* Little endian */
@@ -72,6 +76,18 @@ struct vfs_cap_data { · 3 unmodified lines
72	} data[VFS_CAP_U32];	76	} data[VFS_CAP_U32];
73	};	77	};
74		78
		79	/*
		80	* same as vfs_cap_data but with a rootid at the end
		81	*/
		82	struct vfs_ns_cap_data {
		83	__le32 magic_etc;
		84	struct {
		85	__le32 permitted; /* Little endian */
		86	__le32 inheritable; /* Little endian */
		87	} data[VFS_CAP_U32];
		88	__le32 rootid;
		89	};
		90
75	#ifndef __KERNEL__	91	#ifndef __KERNEL__
76		92
77	/*	93	/*

include/uapi/linux/devlink.h+18−0

@@ -226,4 +226,22 @@ enum devlink_dpipe_action_type { · 225 unmodified lines
226	DEVLINK_DPIPE_ACTION_TYPE_FIELD_MODIFY,	226	DEVLINK_DPIPE_ACTION_TYPE_FIELD_MODIFY,
227	};	227	};
228		228
		229	enum devlink_dpipe_field_ethernet_id {
		230	DEVLINK_DPIPE_FIELD_ETHERNET_DST_MAC,
		231	};
		232
		233	enum devlink_dpipe_field_ipv4_id {
		234	DEVLINK_DPIPE_FIELD_IPV4_DST_IP,
		235	};
		236
		237	enum devlink_dpipe_field_ipv6_id {
		238	DEVLINK_DPIPE_FIELD_IPV6_DST_IP,
		239	};
		240
		241	enum devlink_dpipe_header_id {
		242	DEVLINK_DPIPE_HEADER_ETHERNET,
		243	DEVLINK_DPIPE_HEADER_IPV4,
		244	DEVLINK_DPIPE_HEADER_IPV6,
		245	};
		246
229	#endif /* _UAPI_LINUX_DEVLINK_H_ */	247	#endif /* _UAPI_LINUX_DEVLINK_H_ */

include/uapi/linux/dlm_netlink.h+1−0

@@ -10,6 +10,7 @@ · 9 unmodified lines
10	#define _DLM_NETLINK_H	10	#define _DLM_NETLINK_H
11		11
12	#include <linux/types.h>	12	#include <linux/types.h>
		13	#include <linux/dlmconstants.h>
13		14
14	enum {	15	enum {
15	DLM_STATUS_WAITING = 1,	16	DLM_STATUS_WAITING = 1,

include/uapi/linux/errqueue.h+3−0

 #define SO_EE_ORIGIN_ICMP	2
 #define SO_EE_ORIGIN_ICMP6	3
 #define SO_EE_ORIGIN_TXSTATUS	4
+#define SO_EE_ORIGIN_ZEROCOPY	5
 #define SO_EE_ORIGIN_TIMESTAMPING SO_EE_ORIGIN_TXSTATUS
 #define SO_EE_OFFENDER(ee)	((struct sockaddr*)((ee)+1))
+#define SO_EE_CODE_ZEROCOPY_COPIED	1
 /**
  *	struct scm_timestamping - timestamps exposed through cmsg
  *

include/uapi/linux/ethtool.h+52−2

@@ -1238,6 +1238,47 @@ struct ethtool_per_queue_op { · 1237 unmodified lines
1238	char data[];	1238	char data[];
1239	};	1239	};
1240		1240
		1241	/**
		1242	* struct ethtool_fecparam - Ethernet forward error correction(fec) parameters
		1243	* @cmd: Command number = %ETHTOOL_GFECPARAM or %ETHTOOL_SFECPARAM
		1244	* @active_fec: FEC mode which is active on porte
		1245	* @fec: Bitmask of supported/configured FEC modes
		1246	* @rsvd: Reserved for future extensions. i.e FEC bypass feature.
		1247	*
		1248	* Drivers should reject a non-zero setting of @autoneg when
		1249	* autoneogotiation is disabled (or not supported) for the link.
		1250	*
		1251	*/
		1252	struct ethtool_fecparam {
		1253	__u32 cmd;
		1254	/* bitmask of FEC modes */
		1255	__u32 active_fec;
		1256	__u32 fec;
		1257	__u32 reserved;
		1258	};
		1259
		1260	/**
		1261	* enum ethtool_fec_config_bits - flags definition of ethtool_fec_configuration
		1262	* @ETHTOOL_FEC_NONE: FEC mode configuration is not supported
		1263	* @ETHTOOL_FEC_AUTO: Default/Best FEC mode provided by driver
		1264	* @ETHTOOL_FEC_OFF: No FEC Mode
		1265	* @ETHTOOL_FEC_RS: Reed-Solomon Forward Error Detection mode
		1266	* @ETHTOOL_FEC_BASER: Base-R/Reed-Solomon Forward Error Detection mode
		1267	*/
		1268	enum ethtool_fec_config_bits {
		1269	ETHTOOL_FEC_NONE_BIT,
		1270	ETHTOOL_FEC_AUTO_BIT,
		1271	ETHTOOL_FEC_OFF_BIT,
		1272	ETHTOOL_FEC_RS_BIT,
		1273	ETHTOOL_FEC_BASER_BIT,
		1274	};
		1275
		1276	#define ETHTOOL_FEC_NONE (1 << ETHTOOL_FEC_NONE_BIT)
		1277	#define ETHTOOL_FEC_AUTO (1 << ETHTOOL_FEC_AUTO_BIT)
		1278	#define ETHTOOL_FEC_OFF (1 << ETHTOOL_FEC_OFF_BIT)
		1279	#define ETHTOOL_FEC_RS (1 << ETHTOOL_FEC_RS_BIT)
		1280	#define ETHTOOL_FEC_BASER (1 << ETHTOOL_FEC_BASER_BIT)
		1281
1241	/* CMDs currently supported */	1282	/* CMDs currently supported */
1242	#define ETHTOOL_GSET 0x00000001 /* DEPRECATED, Get settings.	1283	#define ETHTOOL_GSET 0x00000001 /* DEPRECATED, Get settings.
1243	* Please use ETHTOOL_GLINKSETTINGS	1284	* Please use ETHTOOL_GLINKSETTINGS
@@ -1330,6 +1371,8 @@ struct ethtool_per_queue_op { · 86 unmodified lines
1330	#define ETHTOOL_SLINKSETTINGS 0x0000004d /* Set ethtool_link_settings */	1371	#define ETHTOOL_SLINKSETTINGS 0x0000004d /* Set ethtool_link_settings */
1331	#define ETHTOOL_PHY_GTUNABLE 0x0000004e /* Get PHY tunable configuration */	1372	#define ETHTOOL_PHY_GTUNABLE 0x0000004e /* Get PHY tunable configuration */
1332	#define ETHTOOL_PHY_STUNABLE 0x0000004f /* Set PHY tunable configuration */	1373	#define ETHTOOL_PHY_STUNABLE 0x0000004f /* Set PHY tunable configuration */
		1374	#define ETHTOOL_GFECPARAM 0x00000050 /* Get FEC settings */
		1375	#define ETHTOOL_SFECPARAM 0x00000051 /* Set FEC settings */
1333		1376
1334	/* compatibility with older code */	1377	/* compatibility with older code */
1335	#define SPARC_ETH_GSET ETHTOOL_GSET	1378	#define SPARC_ETH_GSET ETHTOOL_GSET
@@ -1387,6 +1430,9 @@ enum ethtool_link_mode_bit_indices { · 51 unmodified lines
1387	ETHTOOL_LINK_MODE_2500baseT_Full_BIT = 47,	1430	ETHTOOL_LINK_MODE_2500baseT_Full_BIT = 47,
1388	ETHTOOL_LINK_MODE_5000baseT_Full_BIT = 48,	1431	ETHTOOL_LINK_MODE_5000baseT_Full_BIT = 48,
1389		1432
		1433	ETHTOOL_LINK_MODE_FEC_NONE_BIT = 49,
		1434	ETHTOOL_LINK_MODE_FEC_RS_BIT = 50,
		1435	ETHTOOL_LINK_MODE_FEC_BASER_BIT = 51,
1390		1436
1391	/* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit	1437	/* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit
1392	* 31. Please do NOT define any SUPPORTED_* or ADVERTISED_*	1438	* 31. Please do NOT define any SUPPORTED_* or ADVERTISED_*
@@ -1395,7 +1441,7 @@ enum ethtool_link_mode_bit_indices { · 2 unmodified lines
1395	*/	1441	*/
1396		1442
1397	__ETHTOOL_LINK_MODE_LAST	1443	__ETHTOOL_LINK_MODE_LAST
1398	= ETHTOOL_LINK_MODE_5000baseT_Full_BIT,	1444	= ETHTOOL_LINK_MODE_FEC_BASER_BIT,
1399	};	1445	};
1400		1446
1401	#define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) \	1447	#define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) \
@@ -1707,6 +1753,8 @@ enum ethtool_reset_flags { · 305 unmodified lines
1707	* %ethtool_link_mode_bit_indices for the link modes, and other	1753	* %ethtool_link_mode_bit_indices for the link modes, and other
1708	* link features that the link partner advertised through	1754	* link features that the link partner advertised through
1709	* autonegotiation; 0 if unknown or not applicable. Read-only.	1755	* autonegotiation; 0 if unknown or not applicable. Read-only.
		1756	* @transceiver: Used to distinguish different possible PHY types,
		1757	* reported consistently by PHYLIB. Read-only.
1710	*	1758	*
1711	* If autonegotiation is disabled, the speed and @duplex represent the	1759	* If autonegotiation is disabled, the speed and @duplex represent the
1712	* fixed link mode and are writable if the driver supports multiple	1760	* fixed link mode and are writable if the driver supports multiple
@@ -1758,7 +1806,9 @@ struct ethtool_link_settings { · 45 unmodified lines
1758	__u8 eth_tp_mdix;	1806	__u8 eth_tp_mdix;
1759	__u8 eth_tp_mdix_ctrl;	1807	__u8 eth_tp_mdix_ctrl;
1760	__s8 link_mode_masks_nwords;	1808	__s8 link_mode_masks_nwords;
1761	__u32 reserved[8];	1809	__u8 transceiver;
		1810	__u8 reserved1[3];
		1811	__u32 reserved[7];
1762	__u32 link_mode_masks[0];	1812	__u32 link_mode_masks[0];
1763	/* layout of link_mode_masks fields:	1813	/* layout of link_mode_masks fields:
1764	* __u32 map_supported[link_mode_masks_nwords];	1814	* __u32 map_supported[link_mode_masks_nwords];

include/uapi/linux/fs.h+20−8

@@ -358,13 +358,25 @@ struct fscrypt_key { · 357 unmodified lines
358	#define SYNC_FILE_RANGE_WRITE 2	358	#define SYNC_FILE_RANGE_WRITE 2
359	#define SYNC_FILE_RANGE_WAIT_AFTER 4	359	#define SYNC_FILE_RANGE_WAIT_AFTER 4
360		360
361	/* flags for preadv2/pwritev2: */	361	/*
362	#define RWF_HIPRI 0x00000001 /* high priority request, poll if possible */	362	* Flags for preadv2/pwritev2:
363	#define RWF_DSYNC 0x00000002 /* per-IO O_DSYNC */	363	*/
364	#define RWF_SYNC 0x00000004 /* per-IO O_SYNC */	364
365	#define RWF_NOWAIT 0x00000008 /* per-IO, return -EAGAIN if operation would block */	365	typedef int __bitwise __kernel_rwf_t;
366		366
367	#define RWF_SUPPORTED (RWF_HIPRI \| RWF_DSYNC \| RWF_SYNC \|\	367	/* high priority request, poll if possible */
368	RWF_NOWAIT)	368	#define RWF_HIPRI ((__force __kernel_rwf_t)0x00000001)
		369
		370	/* per-IO O_DSYNC */
		371	#define RWF_DSYNC ((__force __kernel_rwf_t)0x00000002)
		372
		373	/* per-IO O_SYNC */
		374	#define RWF_SYNC ((__force __kernel_rwf_t)0x00000004)
		375
		376	/* per-IO, return -EAGAIN if operation would block */
		377	#define RWF_NOWAIT ((__force __kernel_rwf_t)0x00000008)
		378
		379	/* mask of flags supported by the kernel */
		380	#define RWF_SUPPORTED (RWF_HIPRI \| RWF_DSYNC \| RWF_SYNC \| RWF_NOWAIT)
369		381
370	#endif /* _UAPI_LINUX_FS_H */	382	#endif /* _UAPI_LINUX_FS_H */

include/uapi/linux/fsmap.h+1−1

@@ -96,7 +96,7 @@ fsmap_advance( · 95 unmodified lines
96	#define FMR_OF_EXTENT_MAP 0x4 /* segment = extent map */	96	#define FMR_OF_EXTENT_MAP 0x4 /* segment = extent map */
97	#define FMR_OF_SHARED 0x8 /* segment = shared with another file */	97	#define FMR_OF_SHARED 0x8 /* segment = shared with another file */
98	#define FMR_OF_SPECIAL_OWNER 0x10 /* owner is a special value */	98	#define FMR_OF_SPECIAL_OWNER 0x10 /* owner is a special value */
99	#define FMR_OF_LAST 0x20 /* segment is the last in the FS */	99	#define FMR_OF_LAST 0x20 /* segment is the last in the dataset */
100		100
101	/* Each FS gets to define its own special owner codes. */	101	/* Each FS gets to define its own special owner codes. */
102	#define FMR_OWNER(type, code) (((__u64)type << 32) \| \	102	#define FMR_OWNER(type, code) (((__u64)type << 32) \| \

include/uapi/linux/if_arp.h+1−0

@@ -59,6 +59,7 @@ · 58 unmodified lines
59	#define ARPHRD_LAPB 516 /* LAPB */	59	#define ARPHRD_LAPB 516 /* LAPB */
60	#define ARPHRD_DDCMP 517 /* Digital's DDCMP protocol */	60	#define ARPHRD_DDCMP 517 /* Digital's DDCMP protocol */
61	#define ARPHRD_RAWHDLC 518 /* Raw HDLC */	61	#define ARPHRD_RAWHDLC 518 /* Raw HDLC */
		62	#define ARPHRD_RAWIP 519 /* Raw IP */
62		63
63	#define ARPHRD_TUNNEL 768 /* IPIP tunnel */	64	#define ARPHRD_TUNNEL 768 /* IPIP tunnel */
64	#define ARPHRD_TUNNEL6 769 /* IP6IP6 tunnel */	65	#define ARPHRD_TUNNEL6 769 /* IP6IP6 tunnel */

include/uapi/linux/if_ether.h+6−0

 #define ETH_P_ATALK	0x809B		/* Appletalk DDP		*/
 #define ETH_P_AARP	0x80F3		/* Appletalk AARP		*/
 #define ETH_P_8021Q	0x8100          /* 802.1Q VLAN Extended Header  */
+#define ETH_P_ERSPAN	0x88BE		/* ERSPAN type II		*/
 #define ETH_P_IPX	0x8137		/* IPX over DIX			*/
 #define ETH_P_IPV6	0x86DD		/* IPv6 over bluebook		*/
 #define ETH_P_PAUSE	0x8808		/* IEEE Pause frames. See 802.3 31B */
 #define ETH_P_FIP	0x8914		/* FCoE Initialization Protocol */
 #define ETH_P_80221	0x8917		/* IEEE 802.21 Media Independent Handover Protocol */
 #define ETH_P_HSR	0x892F		/* IEC 62439-3 HSRv1	*/
+#define ETH_P_NSH	0x894F		/* Network Service Header */
 #define ETH_P_LOOPBACK	0x9000		/* Ethernet loopback packet, per IEEE 802.3 */
 #define ETH_P_QINQ1	0x9100		/* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_QINQ2	0x9200		/* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_QINQ3	0x9300		/* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_EDSA	0xDADA		/* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
+#define ETH_P_IFE	0xED3E		/* ForCES inter-FE LFB type */
 #define ETH_P_AF_IUCV   0xFBFB		/* IBM af_iucv [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_802_3_MIN	0x0600		/* If the value in the ethernet type is less than this value
 #define ETH_P_IEEE802154 0x00F6		/* IEEE802.15.4 frame		*/
 #define ETH_P_CAIF	0x00F7		/* ST-Ericsson CAIF protocol	*/
 #define ETH_P_XDSA	0x00F8		/* Multiplexed DSA protocol	*/
+#define ETH_P_MAP	0x00F9		/* Qualcomm multiplexing and
+					 * aggregation protocol
+					 */
 /*
  *	This is an Ethernet frame header.

include/uapi/linux/if_tunnel.h+1−0

@@ -134,6 +134,7 @@ enum { · 133 unmodified lines
134	IFLA_GRE_COLLECT_METADATA,	134	IFLA_GRE_COLLECT_METADATA,
135	IFLA_GRE_IGNORE_DF,	135	IFLA_GRE_IGNORE_DF,
136	IFLA_GRE_FWMARK,	136	IFLA_GRE_FWMARK,
		137	IFLA_GRE_ERSPAN_INDEX,
137	__IFLA_GRE_MAX,	138	__IFLA_GRE_MAX,
138	};	139	};
139		140

include/uapi/linux/inet_diag.h+2−0

@@ -142,6 +142,8 @@ enum { · 141 unmodified lines
142	INET_DIAG_PAD,	142	INET_DIAG_PAD,
143	INET_DIAG_MARK,	143	INET_DIAG_MARK,
144	INET_DIAG_BBRINFO,	144	INET_DIAG_BBRINFO,
		145	INET_DIAG_CLASS_ID,
		146	INET_DIAG_MD5SIG,
145	__INET_DIAG_MAX,	147	__INET_DIAG_MAX,
146	};	148	};
147		149

include/uapi/linux/kfd_ioctl.h+122−87

@@ -23,15 +23,15 @@ · 22 unmodified lines
23	#ifndef KFD_IOCTL_H_INCLUDED	23	#ifndef KFD_IOCTL_H_INCLUDED
24	#define KFD_IOCTL_H_INCLUDED	24	#define KFD_IOCTL_H_INCLUDED
25		25
26	#include <linux/types.h>	26	#include <drm/drm.h>
27	#include <linux/ioctl.h>	27	#include <linux/ioctl.h>
28		28
29	#define KFD_IOCTL_MAJOR_VERSION 1	29	#define KFD_IOCTL_MAJOR_VERSION 1
30	#define KFD_IOCTL_MINOR_VERSION 1	30	#define KFD_IOCTL_MINOR_VERSION 1
31		31
32	struct kfd_ioctl_get_version_args {	32	struct kfd_ioctl_get_version_args {
33	uint32_t major_version; /* from KFD */	33	__u32 major_version; /* from KFD */
34	uint32_t minor_version; /* from KFD */	34	__u32 minor_version; /* from KFD */
35	};	35	};
36		36
37	/* For kfd_ioctl_create_queue_args.queue_type. */	37	/* For kfd_ioctl_create_queue_args.queue_type. */
@@ -43,36 +43,36 @@ struct kfd_ioctl_get_version_args { · 5 unmodified lines
43	#define KFD_MAX_QUEUE_PRIORITY 15	43	#define KFD_MAX_QUEUE_PRIORITY 15
44		44
45	struct kfd_ioctl_create_queue_args {	45	struct kfd_ioctl_create_queue_args {
46	uint64_t ring_base_address; /* to KFD */	46	__u64 ring_base_address; /* to KFD */
47	uint64_t write_pointer_address; /* from KFD */	47	__u64 write_pointer_address; /* from KFD */
48	uint64_t read_pointer_address; /* from KFD */	48	__u64 read_pointer_address; /* from KFD */
49	uint64_t doorbell_offset; /* from KFD */	49	__u64 doorbell_offset; /* from KFD */
50		50
51	uint32_t ring_size; /* to KFD */	51	__u32 ring_size; /* to KFD */
52	uint32_t gpu_id; /* to KFD */	52	__u32 gpu_id; /* to KFD */
53	uint32_t queue_type; /* to KFD */	53	__u32 queue_type; /* to KFD */
54	uint32_t queue_percentage; /* to KFD */	54	__u32 queue_percentage; /* to KFD */
55	uint32_t queue_priority; /* to KFD */	55	__u32 queue_priority; /* to KFD */
56	uint32_t queue_id; /* from KFD */	56	__u32 queue_id; /* from KFD */
57		57
58	uint64_t eop_buffer_address; /* to KFD */	58	__u64 eop_buffer_address; /* to KFD */
59	uint64_t eop_buffer_size; /* to KFD */	59	__u64 eop_buffer_size; /* to KFD */
60	uint64_t ctx_save_restore_address; /* to KFD */	60	__u64 ctx_save_restore_address; /* to KFD */
61	uint64_t ctx_save_restore_size; /* to KFD */	61	__u64 ctx_save_restore_size; /* to KFD */
62	};	62	};
63		63
64	struct kfd_ioctl_destroy_queue_args {	64	struct kfd_ioctl_destroy_queue_args {
65	uint32_t queue_id; /* to KFD */	65	__u32 queue_id; /* to KFD */
66	uint32_t pad;	66	__u32 pad;
67	};	67	};
68		68
69	struct kfd_ioctl_update_queue_args {	69	struct kfd_ioctl_update_queue_args {
70	uint64_t ring_base_address; /* to KFD */	70	__u64 ring_base_address; /* to KFD */
71		71
72	uint32_t queue_id; /* to KFD */	72	__u32 queue_id; /* to KFD */
73	uint32_t ring_size; /* to KFD */	73	__u32 ring_size; /* to KFD */
74	uint32_t queue_percentage; /* to KFD */	74	__u32 queue_percentage; /* to KFD */
75	uint32_t queue_priority; /* to KFD */	75	__u32 queue_priority; /* to KFD */
76	};	76	};
77		77
78	/* For kfd_ioctl_set_memory_policy_args.default_policy and alternate_policy */	78	/* For kfd_ioctl_set_memory_policy_args.default_policy and alternate_policy */
@@ -80,13 +80,13 @@ struct kfd_ioctl_update_queue_args { · 1 unmodified line
80	#define KFD_IOC_CACHE_POLICY_NONCOHERENT 1	80	#define KFD_IOC_CACHE_POLICY_NONCOHERENT 1
81		81
82	struct kfd_ioctl_set_memory_policy_args {	82	struct kfd_ioctl_set_memory_policy_args {
83	uint64_t alternate_aperture_base; /* to KFD */	83	__u64 alternate_aperture_base; /* to KFD */
84	uint64_t alternate_aperture_size; /* to KFD */	84	__u64 alternate_aperture_size; /* to KFD */
85		85
86	uint32_t gpu_id; /* to KFD */	86	__u32 gpu_id; /* to KFD */
87	uint32_t default_policy; /* to KFD */	87	__u32 default_policy; /* to KFD */
88	uint32_t alternate_policy; /* to KFD */	88	__u32 alternate_policy; /* to KFD */
89	uint32_t pad;	89	__u32 pad;
90	};	90	};
91		91
92	/*	92	/*
@@ -97,26 +97,26 @@ struct kfd_ioctl_set_memory_policy_args { · 4 unmodified lines
97	*/	97	*/
98		98
99	struct kfd_ioctl_get_clock_counters_args {	99	struct kfd_ioctl_get_clock_counters_args {
100	uint64_t gpu_clock_counter; /* from KFD */	100	__u64 gpu_clock_counter; /* from KFD */
101	uint64_t cpu_clock_counter; /* from KFD */	101	__u64 cpu_clock_counter; /* from KFD */
102	uint64_t system_clock_counter; /* from KFD */	102	__u64 system_clock_counter; /* from KFD */
103	uint64_t system_clock_freq; /* from KFD */	103	__u64 system_clock_freq; /* from KFD */
104		104
105	uint32_t gpu_id; /* to KFD */	105	__u32 gpu_id; /* to KFD */
106	uint32_t pad;	106	__u32 pad;
107	};	107	};
108		108
109	#define NUM_OF_SUPPORTED_GPUS 7	109	#define NUM_OF_SUPPORTED_GPUS 7
110		110
111	struct kfd_process_device_apertures {	111	struct kfd_process_device_apertures {
112	uint64_t lds_base; /* from KFD */	112	__u64 lds_base; /* from KFD */
113	uint64_t lds_limit; /* from KFD */	113	__u64 lds_limit; /* from KFD */
114	uint64_t scratch_base; /* from KFD */	114	__u64 scratch_base; /* from KFD */
115	uint64_t scratch_limit; /* from KFD */	115	__u64 scratch_limit; /* from KFD */
116	uint64_t gpuvm_base; /* from KFD */	116	__u64 gpuvm_base; /* from KFD */
117	uint64_t gpuvm_limit; /* from KFD */	117	__u64 gpuvm_limit; /* from KFD */
118	uint32_t gpu_id; /* from KFD */	118	__u32 gpu_id; /* from KFD */
119	uint32_t pad;	119	__u32 pad;
120	};	120	};
121		121
122	struct kfd_ioctl_get_process_apertures_args {	122	struct kfd_ioctl_get_process_apertures_args {
@@ -124,8 +124,8 @@ struct kfd_ioctl_get_process_apertures_args { · 1 unmodified line
124	process_apertures[NUM_OF_SUPPORTED_GPUS];/* from KFD */	124	process_apertures[NUM_OF_SUPPORTED_GPUS];/* from KFD */
125		125
126	/* from KFD, should be in the range [1 - NUM_OF_SUPPORTED_GPUS] */	126	/* from KFD, should be in the range [1 - NUM_OF_SUPPORTED_GPUS] */
127	uint32_t num_of_nodes;	127	__u32 num_of_nodes;
128	uint32_t pad;	128	__u32 pad;
129	};	129	};
130		130
131	#define MAX_ALLOWED_NUM_POINTS 100	131	#define MAX_ALLOWED_NUM_POINTS 100
@@ -133,25 +133,25 @@ struct kfd_ioctl_get_process_apertures_args { · 1 unmodified line
133	#define MAX_ALLOWED_WAC_BUFF_SIZE 128	133	#define MAX_ALLOWED_WAC_BUFF_SIZE 128
134		134
135	struct kfd_ioctl_dbg_register_args {	135	struct kfd_ioctl_dbg_register_args {
136	uint32_t gpu_id; /* to KFD */	136	__u32 gpu_id; /* to KFD */
137	uint32_t pad;	137	__u32 pad;
138	};	138	};
139		139
140	struct kfd_ioctl_dbg_unregister_args {	140	struct kfd_ioctl_dbg_unregister_args {
141	uint32_t gpu_id; /* to KFD */	141	__u32 gpu_id; /* to KFD */
142	uint32_t pad;	142	__u32 pad;
143	};	143	};
144		144
145	struct kfd_ioctl_dbg_address_watch_args {	145	struct kfd_ioctl_dbg_address_watch_args {
146	uint64_t content_ptr; /* a pointer to the actual content */	146	__u64 content_ptr; /* a pointer to the actual content */
147	uint32_t gpu_id; /* to KFD */	147	__u32 gpu_id; /* to KFD */
148	uint32_t buf_size_in_bytes; /including gpu_id and buf_size /	148	__u32 buf_size_in_bytes; /including gpu_id and buf_size /
149	};	149	};
150		150
151	struct kfd_ioctl_dbg_wave_control_args {	151	struct kfd_ioctl_dbg_wave_control_args {
152	uint64_t content_ptr; /* a pointer to the actual content */	152	__u64 content_ptr; /* a pointer to the actual content */
153	uint32_t gpu_id; /* to KFD */	153	__u32 gpu_id; /* to KFD */
154	uint32_t buf_size_in_bytes; /including gpu_id and buf_size /	154	__u32 buf_size_in_bytes; /including gpu_id and buf_size /
155	};	155	};
156		156
157	/* Matching HSA_EVENTTYPE */	157	/* Matching HSA_EVENTTYPE */
@@ -172,44 +172,44 @@ struct kfd_ioctl_dbg_wave_control_args { · 14 unmodified lines
172	#define KFD_SIGNAL_EVENT_LIMIT 256	172	#define KFD_SIGNAL_EVENT_LIMIT 256
173		173
174	struct kfd_ioctl_create_event_args {	174	struct kfd_ioctl_create_event_args {
175	uint64_t event_page_offset; /* from KFD */	175	__u64 event_page_offset; /* from KFD */
176	uint32_t event_trigger_data; /* from KFD - signal events only */	176	__u32 event_trigger_data; /* from KFD - signal events only */
177	uint32_t event_type; /* to KFD */	177	__u32 event_type; /* to KFD */
178	uint32_t auto_reset; /* to KFD */	178	__u32 auto_reset; /* to KFD */
179	uint32_t node_id; /* to KFD - only valid for certain	179	__u32 node_id; /* to KFD - only valid for certain
180	event types */	180	event types */
181	uint32_t event_id; /* from KFD */	181	__u32 event_id; /* from KFD */
182	uint32_t event_slot_index; /* from KFD */	182	__u32 event_slot_index; /* from KFD */
183	};	183	};
184		184
185	struct kfd_ioctl_destroy_event_args {	185	struct kfd_ioctl_destroy_event_args {
186	uint32_t event_id; /* to KFD */	186	__u32 event_id; /* to KFD */
187	uint32_t pad;	187	__u32 pad;
188	};	188	};
189		189
190	struct kfd_ioctl_set_event_args {	190	struct kfd_ioctl_set_event_args {
191	uint32_t event_id; /* to KFD */	191	__u32 event_id; /* to KFD */
192	uint32_t pad;	192	__u32 pad;
193	};	193	};
194		194
195	struct kfd_ioctl_reset_event_args {	195	struct kfd_ioctl_reset_event_args {
196	uint32_t event_id; /* to KFD */	196	__u32 event_id; /* to KFD */
197	uint32_t pad;	197	__u32 pad;
198	};	198	};
199		199
200	struct kfd_memory_exception_failure {	200	struct kfd_memory_exception_failure {
201	uint32_t NotPresent; /* Page not present or supervisor privilege */	201	__u32 NotPresent; /* Page not present or supervisor privilege */
202	uint32_t ReadOnly; /* Write access to a read-only page */	202	__u32 ReadOnly; /* Write access to a read-only page */
203	uint32_t NoExecute; /* Execute access to a page marked NX */	203	__u32 NoExecute; /* Execute access to a page marked NX */
204	uint32_t pad;	204	__u32 pad;
205	};	205	};
206		206
207	/* memory exception data*/	207	/* memory exception data*/
208	struct kfd_hsa_memory_exception_data {	208	struct kfd_hsa_memory_exception_data {
209	struct kfd_memory_exception_failure failure;	209	struct kfd_memory_exception_failure failure;
210	uint64_t va;	210	__u64 va;
211	uint32_t gpu_id;	211	__u32 gpu_id;
212	uint32_t pad;	212	__u32 pad;
213	};	213	};
214		214
215	/* Event data*/	215	/* Event data*/
@@ -217,19 +217,48 @@ struct kfd_event_data { · 1 unmodified line
217	union {	217	union {
218	struct kfd_hsa_memory_exception_data memory_exception_data;	218	struct kfd_hsa_memory_exception_data memory_exception_data;
219	}; /* From KFD */	219	}; /* From KFD */
220	uint64_t kfd_event_data_ext; /* pointer to an extension structure	220	__u64 kfd_event_data_ext; /* pointer to an extension structure
221	for future exception types */	221	for future exception types */
222	uint32_t event_id; /* to KFD */	222	__u32 event_id; /* to KFD */
223	uint32_t pad;	223	__u32 pad;
224	};	224	};
225		225
226	struct kfd_ioctl_wait_events_args {	226	struct kfd_ioctl_wait_events_args {
227	uint64_t events_ptr; /* pointed to struct	227	__u64 events_ptr; /* pointed to struct
228	kfd_event_data array, to KFD */	228	kfd_event_data array, to KFD */
229	uint32_t num_events; /* to KFD */	229	__u32 num_events; /* to KFD */
230	uint32_t wait_for_all; /* to KFD */	230	__u32 wait_for_all; /* to KFD */
231	uint32_t timeout; /* to KFD */	231	__u32 timeout; /* to KFD */
232	uint32_t wait_result; /* from KFD */	232	__u32 wait_result; /* from KFD */
		233	};
		234
		235	struct kfd_ioctl_set_scratch_backing_va_args {
		236	uint64_t va_addr; /* to KFD */
		237	uint32_t gpu_id; /* to KFD */
		238	uint32_t pad;
		239	};
		240
		241	struct kfd_ioctl_get_tile_config_args {
		242	/* to KFD: pointer to tile array */
		243	uint64_t tile_config_ptr;
		244	/* to KFD: pointer to macro tile array */
		245	uint64_t macro_tile_config_ptr;
		246	/* to KFD: array size allocated by user mode
		247	* from KFD: array size filled by kernel
		248	*/
		249	uint32_t num_tile_configs;
		250	/* to KFD: array size allocated by user mode
		251	* from KFD: array size filled by kernel
		252	*/
		253	uint32_t num_macro_tile_configs;
		254
		255	uint32_t gpu_id; /* to KFD */
		256	uint32_t gb_addr_config; /* from KFD */
		257	uint32_t num_banks; /* from KFD */
		258	uint32_t num_ranks; /* from KFD */
		259	/* struct size can be extended later if needed
		260	* without breaking ABI compatibility
		261	*/
233	};	262	};
234		263
235	#define AMDKFD_IOCTL_BASE 'K'	264	#define AMDKFD_IOCTL_BASE 'K'
@@ -286,7 +315,13 @@ struct kfd_ioctl_wait_events_args { · 50 unmodified lines
286	#define AMDKFD_IOC_DBG_WAVE_CONTROL \	315	#define AMDKFD_IOC_DBG_WAVE_CONTROL \
287	AMDKFD_IOW(0x10, struct kfd_ioctl_dbg_wave_control_args)	316	AMDKFD_IOW(0x10, struct kfd_ioctl_dbg_wave_control_args)
288		317
		318	#define AMDKFD_IOC_SET_SCRATCH_BACKING_VA \
		319	AMDKFD_IOWR(0x11, struct kfd_ioctl_set_scratch_backing_va_args)
		320
		321	#define AMDKFD_IOC_GET_TILE_CONFIG \
		322	AMDKFD_IOWR(0x12, struct kfd_ioctl_get_tile_config_args)
		323
289	#define AMDKFD_COMMAND_START 0x01	324	#define AMDKFD_COMMAND_START 0x01
290	#define AMDKFD_COMMAND_END 0x11	325	#define AMDKFD_COMMAND_END 0x13
291		326
292	#endif	327	#endif

include/uapi/linux/kvm.h+2−1

@@ -711,7 +711,8 @@ struct kvm_ppc_one_seg_page_size { · 710 unmodified lines
711	struct kvm_ppc_smmu_info {	711	struct kvm_ppc_smmu_info {
712	__u64 flags;	712	__u64 flags;
713	__u32 slb_size;	713	__u32 slb_size;
714	__u32 pad;	714	__u16 data_keys; /* # storage keys supported for data */
		715	__u16 instr_keys; /* # storage keys supported for instructions */
715	struct kvm_ppc_one_seg_page_size sps[KVM_PPC_PAGE_SIZES_MAX_SZ];	716	struct kvm_ppc_one_seg_page_size sps[KVM_PPC_PAGE_SIZES_MAX_SZ];
716	};	717	};
717		718

include/uapi/linux/loop.h+1−3

 	LO_FLAGS_AUTOCLEAR	= 4,
 	LO_FLAGS_PARTSCAN	= 8,
 	LO_FLAGS_DIRECT_IO	= 16,
-	LO_FLAGS_BLOCKSIZE	= 32,
 };
 #include <asm/posix_types.h>	/* for __kernel_old_dev_t */
 	__u64		   lo_init[2];
 };
-#define LO_INFO_BLOCKSIZE(l) (l)->lo_init[0]
 /*
  * Loop filter types
  */
 #define LOOP_CHANGE_FD		0x4C06
 #define LOOP_SET_CAPACITY	0x4C07
 #define LOOP_SET_DIRECT_IO	0x4C08
+#define LOOP_SET_BLOCK_SIZE	0x4C09
 /* /dev/loop-control interface */
 #define LOOP_CTL_ADD		0x4C80

include/uapi/linux/lwtunnel.h+1−0

@@ -11,6 +11,7 @@ enum lwtunnel_encap_types { · 10 unmodified lines
11	LWTUNNEL_ENCAP_IP6,	11	LWTUNNEL_ENCAP_IP6,
12	LWTUNNEL_ENCAP_SEG6,	12	LWTUNNEL_ENCAP_SEG6,
13	LWTUNNEL_ENCAP_BPF,	13	LWTUNNEL_ENCAP_BPF,
		14	LWTUNNEL_ENCAP_SEG6_LOCAL,
14	__LWTUNNEL_ENCAP_MAX,	15	__LWTUNNEL_ENCAP_MAX,
15	};	16	};
16		17

include/uapi/linux/membarrier.h+21−2

@@ -40,14 +40,33 @@ · 39 unmodified lines
40	* (non-running threads are de facto in such a	40	* (non-running threads are de facto in such a
41	* state). This covers threads from all processes	41	* state). This covers threads from all processes
42	* running on the system. This command returns 0.	42	* running on the system. This command returns 0.
		43	* @MEMBARRIER_CMD_PRIVATE_EXPEDITED:
		44	* Execute a memory barrier on each running
		45	* thread belonging to the same process as the current
		46	* thread. Upon return from system call, the
		47	* caller thread is ensured that all its running
		48	* threads siblings have passed through a state
		49	* where all memory accesses to user-space
		50	* addresses match program order between entry
		51	* to and return from the system call
		52	* (non-running threads are de facto in such a
		53	* state). This only covers threads from the
		54	* same processes as the caller thread. This
		55	* command returns 0. The "expedited" commands
		56	* complete faster than the non-expedited ones,
		57	* they never block, but have the downside of
		58	* causing extra overhead.
43	*	59	*
44	* Command to be passed to the membarrier system call. The commands need to	60	* Command to be passed to the membarrier system call. The commands need to
45	* be a single bit each, except for MEMBARRIER_CMD_QUERY which is assigned to	61	* be a single bit each, except for MEMBARRIER_CMD_QUERY which is assigned to
46	* the value 0.	62	* the value 0.
47	*/	63	*/
48	enum membarrier_cmd {	64	enum membarrier_cmd {
49	MEMBARRIER_CMD_QUERY = 0,	65	MEMBARRIER_CMD_QUERY = 0,
50	MEMBARRIER_CMD_SHARED = (1 << 0),	66	MEMBARRIER_CMD_SHARED = (1 << 0),
		67	/* reserved for MEMBARRIER_CMD_SHARED_EXPEDITED (1 << 1) */
		68	/* reserved for MEMBARRIER_CMD_PRIVATE (1 << 2) */
		69	MEMBARRIER_CMD_PRIVATE_EXPEDITED = (1 << 3),
51	};	70	};
52		71
53	#endif /* _UAPI_LINUX_MEMBARRIER_H */	72	#endif /* _UAPI_LINUX_MEMBARRIER_H */

include/uapi/linux/memfd.h+24−0

@@ -1,8 +1,32 @@
1	#ifndef _UAPI_LINUX_MEMFD_H	1	#ifndef _UAPI_LINUX_MEMFD_H
2	#define _UAPI_LINUX_MEMFD_H	2	#define _UAPI_LINUX_MEMFD_H
3		3
		4	#include <asm-generic/hugetlb_encode.h>
		5
4	/* flags for memfd_create(2) (unsigned int) */	6	/* flags for memfd_create(2) (unsigned int) */
5	#define MFD_CLOEXEC 0x0001U	7	#define MFD_CLOEXEC 0x0001U
6	#define MFD_ALLOW_SEALING 0x0002U	8	#define MFD_ALLOW_SEALING 0x0002U
		9	#define MFD_HUGETLB 0x0004U
		10
		11	/*
		12	* Huge page size encoding when MFD_HUGETLB is specified, and a huge page
		13	* size other than the default is desired. See hugetlb_encode.h.
		14	* All known huge page size encodings are provided here. It is the
		15	* responsibility of the application to know which sizes are supported on
		16	* the running system. See mmap(2) man page for details.
		17	*/
		18	#define MFD_HUGE_SHIFT HUGETLB_FLAG_ENCODE_SHIFT
		19	#define MFD_HUGE_MASK HUGETLB_FLAG_ENCODE_MASK
		20
		21	#define MFD_HUGE_64KB HUGETLB_FLAG_ENCODE_64KB
		22	#define MFD_HUGE_512KB HUGETLB_FLAG_ENCODE_512KB
		23	#define MFD_HUGE_1MB HUGETLB_FLAG_ENCODE_1MB
		24	#define MFD_HUGE_2MB HUGETLB_FLAG_ENCODE_2MB
		25	#define MFD_HUGE_8MB HUGETLB_FLAG_ENCODE_8MB
		26	#define MFD_HUGE_16MB HUGETLB_FLAG_ENCODE_16MB
		27	#define MFD_HUGE_256MB HUGETLB_FLAG_ENCODE_256MB
		28	#define MFD_HUGE_1GB HUGETLB_FLAG_ENCODE_1GB
		29	#define MFD_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB
		30	#define MFD_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB
7		31
8	#endif /* _UAPI_LINUX_MEMFD_H */	32	#endif /* _UAPI_LINUX_MEMFD_H */

include/uapi/linux/mman.h+22−0

@@ -2,6 +2,7 @@ · 1 unmodified line
2	#define _UAPI_LINUX_MMAN_H	2	#define _UAPI_LINUX_MMAN_H
3		3
4	#include <asm/mman.h>	4	#include <asm/mman.h>
		5	#include <asm-generic/hugetlb_encode.h>
5		6
6	#define MREMAP_MAYMOVE 1	7	#define MREMAP_MAYMOVE 1
7	#define MREMAP_FIXED 2	8	#define MREMAP_FIXED 2
@@ -10,4 +11,25 @@ · 2 unmodified lines
10	#define OVERCOMMIT_ALWAYS 1	11	#define OVERCOMMIT_ALWAYS 1
11	#define OVERCOMMIT_NEVER 2	12	#define OVERCOMMIT_NEVER 2
12		13
		14	/*
		15	* Huge page size encoding when MAP_HUGETLB is specified, and a huge page
		16	* size other than the default is desired. See hugetlb_encode.h.
		17	* All known huge page size encodings are provided here. It is the
		18	* responsibility of the application to know which sizes are supported on
		19	* the running system. See mmap(2) man page for details.
		20	*/
		21	#define MAP_HUGE_SHIFT HUGETLB_FLAG_ENCODE_SHIFT
		22	#define MAP_HUGE_MASK HUGETLB_FLAG_ENCODE_MASK
		23
		24	#define MAP_HUGE_64KB HUGETLB_FLAG_ENCODE_64KB
		25	#define MAP_HUGE_512KB HUGETLB_FLAG_ENCODE_512KB
		26	#define MAP_HUGE_1MB HUGETLB_FLAG_ENCODE_1MB
		27	#define MAP_HUGE_2MB HUGETLB_FLAG_ENCODE_2MB
		28	#define MAP_HUGE_8MB HUGETLB_FLAG_ENCODE_8MB
		29	#define MAP_HUGE_16MB HUGETLB_FLAG_ENCODE_16MB
		30	#define MAP_HUGE_256MB HUGETLB_FLAG_ENCODE_256MB
		31	#define MAP_HUGE_1GB HUGETLB_FLAG_ENCODE_1GB
		32	#define MAP_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB
		33	#define MAP_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB
		34
13	#endif /* _UAPI_LINUX_MMAN_H */	35	#endif /* _UAPI_LINUX_MMAN_H */

include/uapi/linux/ndctl.h+0−37

@@ -145,43 +145,6 @@ struct nd_cmd_clear_error { · 144 unmodified lines
145	__u64 cleared;	145	__u64 cleared;
146	} __packed;	146	} __packed;
147		147
148	struct nd_cmd_trans_spa {
149	__u64 spa;
150	__u32 status;
151	__u8 flags;
152	__u8 _reserved[3];
153	__u64 trans_length;
154	__u32 num_nvdimms;
155	struct nd_nvdimm_device {
156	__u32 nfit_device_handle;
157	__u32 _reserved;
158	__u64 dpa;
159	} __packed devices[0];
160
161	} __packed;
162
163	struct nd_cmd_ars_err_inj {
164	__u64 err_inj_spa_range_base;
165	__u64 err_inj_spa_range_length;
166	__u8 err_inj_options;
167	__u32 status;
168	} __packed;
169
170	struct nd_cmd_ars_err_inj_clr {
171	__u64 err_inj_clr_spa_range_base;
172	__u64 err_inj_clr_spa_range_length;
173	__u32 status;
174	} __packed;
175
176	struct nd_cmd_ars_err_inj_stat {
177	__u32 status;
178	__u32 inj_err_rec_count;
179	struct nd_error_stat_query_record {
180	__u64 err_inj_stat_spa_range_base;
181	__u64 err_inj_stat_spa_range_length;
182	} __packed record[0];
183	} __packed;
184
185	enum {	148	enum {
186	ND_CMD_IMPLEMENTED = 0,	149	ND_CMD_IMPLEMENTED = 0,
187		150

include/uapi/linux/netfilter/nf_tables.h+14−6

 #ifndef _LINUX_NF_TABLES_H
 #define _LINUX_NF_TABLES_H
-#define NFT_TABLE_MAXNAMELEN	32
+#define NFT_NAME_MAXLEN		256
-#define NFT_CHAIN_MAXNAMELEN	32
+#define NFT_TABLE_MAXNAMELEN	NFT_NAME_MAXLEN
-#define NFT_SET_MAXNAMELEN	32
+#define NFT_CHAIN_MAXNAMELEN	NFT_NAME_MAXLEN
-#define NFT_OBJ_MAXNAMELEN	32
+#define NFT_SET_MAXNAMELEN	NFT_NAME_MAXLEN
+#define NFT_OBJ_MAXNAMELEN	NFT_NAME_MAXLEN
 #define NFT_USERDATA_MAXLEN	256
 /**
  * @NFTA_EXTHDR_OFFSET: extension header offset (NLA_U32)
  * @NFTA_EXTHDR_LEN: extension header length (NLA_U32)
  * @NFTA_EXTHDR_FLAGS: extension header flags (NLA_U32)
- * @NFTA_EXTHDR_OP: option match type (NLA_U8)
+ * @NFTA_EXTHDR_OP: option match type (NLA_U32)
+ * @NFTA_EXTHDR_SREG: option match type (NLA_U32)
  */
 enum nft_exthdr_attributes {
 	NFTA_EXTHDR_UNSPEC,
 	NFTA_EXTHDR_LEN,
 	NFTA_EXTHDR_FLAGS,
 	NFTA_EXTHDR_OP,
+	NFTA_EXTHDR_SREG,
 	__NFTA_EXTHDR_MAX
 };
 #define NFTA_EXTHDR_MAX		(__NFTA_EXTHDR_MAX - 1)
  * @NFT_RT_CLASSID: realm value of packet's route (skb->dst->tclassid)
  * @NFT_RT_NEXTHOP4: routing nexthop for IPv4
  * @NFT_RT_NEXTHOP6: routing nexthop for IPv6
+ * @NFT_RT_TCPMSS: fetch current path tcp mss
  */
 enum nft_rt_keys {
 	NFT_RT_CLASSID,
 	NFT_RT_NEXTHOP4,
 	NFT_RT_NEXTHOP6,
+	NFT_RT_TCPMSS,
 };
 /**
 enum nft_gen_attributes {
 	NFTA_GEN_UNSPEC,
 	NFTA_GEN_ID,
+	NFTA_GEN_PROC_PID,
+	NFTA_GEN_PROC_NAME,
 	__NFTA_GEN_MAX
 };
 #define NFTA_GEN_MAX		(__NFTA_GEN_MAX - 1)
 #define NFT_OBJECT_COUNTER	1
 #define NFT_OBJECT_QUOTA	2
 #define NFT_OBJECT_CT_HELPER	3
-#define __NFT_OBJECT_MAX	4
+#define NFT_OBJECT_LIMIT	4
+#define __NFT_OBJECT_MAX	5
 #define NFT_OBJECT_MAX		(__NFT_OBJECT_MAX - 1)
 /**

include/uapi/linux/netfilter/xt_hashlimit.h+30−6

@@ -19,12 +19,13 @@ · 18 unmodified lines
19	struct xt_hashlimit_htable;	19	struct xt_hashlimit_htable;
20		20
21	enum {	21	enum {
22	XT_HASHLIMIT_HASH_DIP = 1 << 0,	22	XT_HASHLIMIT_HASH_DIP = 1 << 0,
23	XT_HASHLIMIT_HASH_DPT = 1 << 1,	23	XT_HASHLIMIT_HASH_DPT = 1 << 1,
24	XT_HASHLIMIT_HASH_SIP = 1 << 2,	24	XT_HASHLIMIT_HASH_SIP = 1 << 2,
25	XT_HASHLIMIT_HASH_SPT = 1 << 3,	25	XT_HASHLIMIT_HASH_SPT = 1 << 3,
26	XT_HASHLIMIT_INVERT = 1 << 4,	26	XT_HASHLIMIT_INVERT = 1 << 4,
27	XT_HASHLIMIT_BYTES = 1 << 5,	27	XT_HASHLIMIT_BYTES = 1 << 5,
		28	XT_HASHLIMIT_RATE_MATCH = 1 << 6,
28	};	29	};
29		30
30	struct hashlimit_cfg {	31	struct hashlimit_cfg {
@@ -79,6 +80,21 @@ struct hashlimit_cfg2 { · 48 unmodified lines
79	__u8 srcmask, dstmask;	80	__u8 srcmask, dstmask;
80	};	81	};
81		82
		83	struct hashlimit_cfg3 {
		84	__u64 avg; /* Average secs between packets * scale */
		85	__u64 burst; /* Period multiplier for upper limit. */
		86	__u32 mode; /* bitmask of XT_HASHLIMIT_HASH_* */
		87
		88	/* user specified */
		89	__u32 size; /* how many buckets */
		90	__u32 max; /* max number of entries */
		91	__u32 gc_interval; /* gc interval */
		92	__u32 expire; /* when do entries expire? */
		93
		94	__u32 interval;
		95	__u8 srcmask, dstmask;
		96	};
		97
82	struct xt_hashlimit_mtinfo1 {	98	struct xt_hashlimit_mtinfo1 {
83	char name[IFNAMSIZ];	99	char name[IFNAMSIZ];
84	struct hashlimit_cfg1 cfg;	100	struct hashlimit_cfg1 cfg;
@@ -95,4 +111,12 @@ struct xt_hashlimit_mtinfo2 { · 10 unmodified lines
95	struct xt_hashlimit_htable *hinfo __attribute__((aligned(8)));	111	struct xt_hashlimit_htable *hinfo __attribute__((aligned(8)));
96	};	112	};
97		113
		114	struct xt_hashlimit_mtinfo3 {
		115	char name[NAME_MAX];
		116	struct hashlimit_cfg3 cfg;
		117
		118	/* Used internally by the kernel */
		119	struct xt_hashlimit_htable *hinfo __attribute__((aligned(8)));
		120	};
		121
98	#endif /* _UAPI_XT_HASHLIMIT_H */	122	#endif /* _UAPI_XT_HASHLIMIT_H */

include/uapi/linux/netlink.h+20−0

@@ -69,6 +69,9 @@ struct nlmsghdr { · 68 unmodified lines
69	#define NLM_F_CREATE 0x400 /* Create, if it does not exist */	69	#define NLM_F_CREATE 0x400 /* Create, if it does not exist */
70	#define NLM_F_APPEND 0x800 /* Add to end of list */	70	#define NLM_F_APPEND 0x800 /* Add to end of list */
71		71
		72	/* Modifiers to DELETE request */
		73	#define NLM_F_NONREC 0x100 /* Do not delete recursively */
		74
72	/* Flags for ACK message */	75	/* Flags for ACK message */
73	#define NLM_F_CAPPED 0x100 /* request was capped */	76	#define NLM_F_CAPPED 0x100 /* request was capped */
74	#define NLM_F_ACK_TLVS 0x200 /* extended ACK TVLs were included */	77	#define NLM_F_ACK_TLVS 0x200 /* extended ACK TVLs were included */
@@ -226,5 +229,22 @@ struct nlattr { · 151 unmodified lines
226	#define NLA_ALIGN(len) (((len) + NLA_ALIGNTO - 1) & ~(NLA_ALIGNTO - 1))	229	#define NLA_ALIGN(len) (((len) + NLA_ALIGNTO - 1) & ~(NLA_ALIGNTO - 1))
227	#define NLA_HDRLEN ((int) NLA_ALIGN(sizeof(struct nlattr)))	230	#define NLA_HDRLEN ((int) NLA_ALIGN(sizeof(struct nlattr)))
228		231
		232	/* Generic 32 bitflags attribute content sent to the kernel.
		233	*
		234	* The value is a bitmap that defines the values being set
		235	* The selector is a bitmask that defines which value is legit
		236	*
		237	* Examples:
		238	* value = 0x0, and selector = 0x1
		239	* implies we are selecting bit 1 and we want to set its value to 0.
		240	*
		241	* value = 0x2, and selector = 0x2
		242	* implies we are selecting bit 2 and we want to set its value to 1.
		243	*
		244	*/
		245	struct nla_bitfield32 {
		246	__u32 value;
		247	__u32 selector;
		248	};
229		249
230	#endif /* _UAPI__LINUX_NETLINK_H */	250	#endif /* _UAPI__LINUX_NETLINK_H */

include/uapi/linux/pci_regs.h+24−18

 #define  PCI_EXP_DEVSTA_URD	0x0008	/* Unsupported Request Detected */
 #define  PCI_EXP_DEVSTA_AUXPD	0x0010	/* AUX Power Detected */
 #define  PCI_EXP_DEVSTA_TRPND	0x0020	/* Transactions Pending */
+#define PCI_CAP_EXP_RC_ENDPOINT_SIZEOF_V1	12	/* v1 endpoints without link end here */
 #define PCI_EXP_LNKCAP		12	/* Link Capabilities */
 #define  PCI_EXP_LNKCAP_SLS	0x0000000f /* Supported Link Speeds */
 #define  PCI_EXP_LNKCAP_SLS_2_5GB 0x00000001 /* LNKCAP2 SLS Vector bit 0 */
 #define  PCI_EXP_LNKSTA_DLLLA	0x2000	/* Data Link Layer Link Active */
 #define  PCI_EXP_LNKSTA_LBMS	0x4000	/* Link Bandwidth Management Status */
 #define  PCI_EXP_LNKSTA_LABS	0x8000	/* Link Autonomous Bandwidth Status */
-#define PCI_CAP_EXP_ENDPOINT_SIZEOF_V1	20	/* v1 endpoints end here */
+#define PCI_CAP_EXP_ENDPOINT_SIZEOF_V1	20	/* v1 endpoints with link end here */
 #define PCI_EXP_SLTCAP		20	/* Slot Capabilities */
 #define  PCI_EXP_SLTCAP_ABP	0x00000001 /* Attention Button Present */
 #define  PCI_EXP_SLTCAP_PCP	0x00000002 /* Power Controller Present */
 #define  PCI_EXP_DEVCTL2_OBFF_MSGB_EN	0x4000	/* Enable OBFF Message type B */
 #define  PCI_EXP_DEVCTL2_OBFF_WAKE_EN	0x6000	/* OBFF using WAKE# signaling */
 #define PCI_EXP_DEVSTA2		42	/* Device Status 2 */
-#define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2	44	/* v2 endpoints end here */
+#define PCI_CAP_EXP_RC_ENDPOINT_SIZEOF_V2	44	/* v2 endpoints without link end here */
 #define PCI_EXP_LNKCAP2		44	/* Link Capabilities 2 */
 #define  PCI_EXP_LNKCAP2_SLS_2_5GB	0x00000002 /* Supported Speed 2.5GT/s */
 #define  PCI_EXP_LNKCAP2_SLS_5_0GB	0x00000004 /* Supported Speed 5.0GT/s */
 #define  PCI_EXP_LNKCAP2_CROSSLINK	0x00000100 /* Crosslink supported */
 #define PCI_EXP_LNKCTL2		48	/* Link Control 2 */
 #define PCI_EXP_LNKSTA2		50	/* Link Status 2 */
+#define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2	52	/* v2 endpoints with link end here */
 #define PCI_EXP_SLTCAP2		52	/* Slot Capabilities 2 */
 #define PCI_EXP_SLTCTL2		56	/* Slot Control 2 */
 #define PCI_EXP_SLTSTA2		58	/* Slot Status 2 */
 #define  PCI_ERR_CAP_ECRC_CHKE	0x00000100	/* ECRC Check Enable */
 #define PCI_ERR_HEADER_LOG	28	/* Header Log Register (16 bytes) */
 #define PCI_ERR_ROOT_COMMAND	44	/* Root Error Command */
-/* Correctable Err Reporting Enable */
+#define PCI_ERR_ROOT_CMD_COR_EN		0x00000001 /* Correctable Err Reporting Enable */
-#define PCI_ERR_ROOT_CMD_COR_EN		0x00000001
+#define PCI_ERR_ROOT_CMD_NONFATAL_EN	0x00000002 /* Non-Fatal Err Reporting Enable */
-/* Non-fatal Err Reporting Enable */
+#define PCI_ERR_ROOT_CMD_FATAL_EN	0x00000004 /* Fatal Err Reporting Enable */
-#define PCI_ERR_ROOT_CMD_NONFATAL_EN	0x00000002
-/* Fatal Err Reporting Enable */
-#define PCI_ERR_ROOT_CMD_FATAL_EN	0x00000004
 #define PCI_ERR_ROOT_STATUS	48
-#define PCI_ERR_ROOT_COR_RCV		0x00000001	/* ERR_COR Received */
+#define PCI_ERR_ROOT_COR_RCV		0x00000001 /* ERR_COR Received */
-/* Multi ERR_COR Received */
+#define PCI_ERR_ROOT_MULTI_COR_RCV	0x00000002 /* Multiple ERR_COR */
-#define PCI_ERR_ROOT_MULTI_COR_RCV	0x00000002
+#define PCI_ERR_ROOT_UNCOR_RCV		0x00000004 /* ERR_FATAL/NONFATAL */
-/* ERR_FATAL/NONFATAL Received */
+#define PCI_ERR_ROOT_MULTI_UNCOR_RCV	0x00000008 /* Multiple FATAL/NONFATAL */
-#define PCI_ERR_ROOT_UNCOR_RCV		0x00000004
+#define PCI_ERR_ROOT_FIRST_FATAL	0x00000010 /* First UNC is Fatal */
-/* Multi ERR_FATAL/NONFATAL Received */
+#define PCI_ERR_ROOT_NONFATAL_RCV	0x00000020 /* Non-Fatal Received */
-#define PCI_ERR_ROOT_MULTI_UNCOR_RCV	0x00000008
+#define PCI_ERR_ROOT_FATAL_RCV		0x00000040 /* Fatal Received */
-#define PCI_ERR_ROOT_FIRST_FATAL	0x00000010	/* First Fatal */
-#define PCI_ERR_ROOT_NONFATAL_RCV	0x00000020	/* Non-Fatal Received */
-#define PCI_ERR_ROOT_FATAL_RCV		0x00000040	/* Fatal Received */
 #define PCI_ERR_ROOT_ERR_SRC	52	/* Error Source Identification */
 /* Virtual Channel */
 #define  PCI_EXP_DPC_CAP_RP_EXT		0x20	/* Root Port Extensions for DPC */
 #define  PCI_EXP_DPC_CAP_POISONED_TLP	0x40	/* Poisoned TLP Egress Blocking Supported */
 #define  PCI_EXP_DPC_CAP_SW_TRIGGER	0x80	/* Software Triggering Supported */
+#define  PCI_EXP_DPC_RP_PIO_LOG_SIZE	0xF00	/* RP PIO log size */
 #define  PCI_EXP_DPC_CAP_DL_ACTIVE	0x1000	/* ERR_COR signal on DL_Active supported */
 #define PCI_EXP_DPC_CTL			6	/* DPC control */
 #define PCI_EXP_DPC_SOURCE_ID		10	/* DPC Source Identifier */
+#define PCI_EXP_DPC_RP_PIO_STATUS	 0x0C	/* RP PIO Status */
+#define PCI_EXP_DPC_RP_PIO_MASK		 0x10	/* RP PIO MASK */
+#define PCI_EXP_DPC_RP_PIO_SEVERITY	 0x14	/* RP PIO Severity */
+#define PCI_EXP_DPC_RP_PIO_SYSERROR	 0x18	/* RP PIO SysError */
+#define PCI_EXP_DPC_RP_PIO_EXCEPTION	 0x1C	/* RP PIO Exception */
+#define PCI_EXP_DPC_RP_PIO_HEADER_LOG	 0x20	/* RP PIO Header Log */
+#define PCI_EXP_DPC_RP_PIO_IMPSPEC_LOG	 0x30	/* RP PIO ImpSpec Log */
+#define PCI_EXP_DPC_RP_PIO_TLPPREFIX_LOG 0x34	/* RP PIO TLP Prefix Log */
 /* Precision Time Measurement */
 #define PCI_PTM_CAP			0x04	    /* PTM Capability */
 #define  PCI_PTM_CAP_REQ		0x00000001  /* Requester capable */

include/uapi/linux/perf_event.h+57−4

 	PERF_SAMPLE_IDENTIFIER			= 1U << 16,
 	PERF_SAMPLE_TRANSACTION			= 1U << 17,
 	PERF_SAMPLE_REGS_INTR			= 1U << 18,
+	PERF_SAMPLE_PHYS_ADDR			= 1U << 19,
-	PERF_SAMPLE_MAX = 1U << 19,		/* non-ABI */
+	PERF_SAMPLE_MAX = 1U << 20,		/* non-ABI */
 };
 /*
 	PERF_SAMPLE_BRANCH_NO_FLAGS_SHIFT	= 14, /* no flags */
 	PERF_SAMPLE_BRANCH_NO_CYCLES_SHIFT	= 15, /* no cycles */
+	PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT	= 16, /* save branch type */
 	PERF_SAMPLE_BRANCH_MAX_SHIFT		/* non-ABI */
 };
 	PERF_SAMPLE_BRANCH_NO_FLAGS	= 1U << PERF_SAMPLE_BRANCH_NO_FLAGS_SHIFT,
 	PERF_SAMPLE_BRANCH_NO_CYCLES	= 1U << PERF_SAMPLE_BRANCH_NO_CYCLES_SHIFT,
+	PERF_SAMPLE_BRANCH_TYPE_SAVE	=
+		1U << PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT,
 	PERF_SAMPLE_BRANCH_MAX		= 1U << PERF_SAMPLE_BRANCH_MAX_SHIFT,
 };
+/*
+ * Common flow change classification
+ */
+enum {
+	PERF_BR_UNKNOWN		= 0,	/* unknown */
+	PERF_BR_COND		= 1,	/* conditional */
+	PERF_BR_UNCOND		= 2,	/* unconditional  */
+	PERF_BR_IND		= 3,	/* indirect */
+	PERF_BR_CALL		= 4,	/* function call */
+	PERF_BR_IND_CALL	= 5,	/* indirect function call */
+	PERF_BR_RET		= 6,	/* function return */
+	PERF_BR_SYSCALL		= 7,	/* syscall */
+	PERF_BR_SYSRET		= 8,	/* syscall return */
+	PERF_BR_COND_CALL	= 9,	/* conditional function call */
+	PERF_BR_COND_RET	= 10,	/* conditional function return */
+	PERF_BR_MAX,
+};
 #define PERF_SAMPLE_BRANCH_PLM_ALL \
 	(PERF_SAMPLE_BRANCH_USER|\
 	 PERF_SAMPLE_BRANCH_KERNEL|\
 	 *	{ u64			transaction; } && PERF_SAMPLE_TRANSACTION
 	 *	{ u64			abi; # enum perf_sample_regs_abi
 	 *	  u64			regs[weight(mask)]; } && PERF_SAMPLE_REGS_INTR
+	 *	{ u64			phys_addr;} && PERF_SAMPLE_PHYS_ADDR
 	 * };
 	 */
 	PERF_RECORD_SAMPLE			= 9,
 			mem_snoop:5,	/* snoop mode */
 			mem_lock:2,	/* lock instr */
 			mem_dtlb:7,	/* tlb access */
-			mem_rsvd:31;
+			mem_lvl_num:4,	/* memory hierarchy level number */
+			mem_remote:1,   /* remote */
+			mem_snoopx:2,	/* snoop mode, ext */
+			mem_rsvd:24;
 	};
 };
 #elif defined(__BIG_ENDIAN_BITFIELD)
 union perf_mem_data_src {
 	__u64 val;
 	struct {
-		__u64	mem_rsvd:31,
+		__u64	mem_rsvd:24,
+			mem_snoopx:2,	/* snoop mode, ext */
+			mem_remote:1,   /* remote */
+			mem_lvl_num:4,	/* memory hierarchy level number */
 			mem_dtlb:7,	/* tlb access */
 			mem_lock:2,	/* lock instr */
 			mem_snoop:5,	/* snoop mode */
 #define PERF_MEM_LVL_UNC	0x2000 /* Uncached memory */
 #define PERF_MEM_LVL_SHIFT	5
+#define PERF_MEM_REMOTE_REMOTE	0x01  /* Remote */
+#define PERF_MEM_REMOTE_SHIFT	37
+#define PERF_MEM_LVLNUM_L1	0x01 /* L1 */
+#define PERF_MEM_LVLNUM_L2	0x02 /* L2 */
+#define PERF_MEM_LVLNUM_L3	0x03 /* L3 */
+#define PERF_MEM_LVLNUM_L4	0x04 /* L4 */
+/* 5-0xa available */
+#define PERF_MEM_LVLNUM_ANY_CACHE 0x0b /* Any cache */
+#define PERF_MEM_LVLNUM_LFB	0x0c /* LFB */
+#define PERF_MEM_LVLNUM_RAM	0x0d /* RAM */
+#define PERF_MEM_LVLNUM_PMEM	0x0e /* PMEM */
+#define PERF_MEM_LVLNUM_NA	0x0f /* N/A */
+#define PERF_MEM_LVLNUM_SHIFT	33
 /* snoop mode */
 #define PERF_MEM_SNOOP_NA	0x01 /* not available */
 #define PERF_MEM_SNOOP_NONE	0x02 /* no snoop */
 #define PERF_MEM_SNOOP_HITM	0x10 /* snoop hit modified */
 #define PERF_MEM_SNOOP_SHIFT	19
+#define PERF_MEM_SNOOPX_FWD	0x01 /* forward */
+/* 1 free */
+#define PERF_MEM_SNOOPX_SHIFT	37
 /* locked instruction */
 #define PERF_MEM_LOCK_NA	0x01 /* not available */
 #define PERF_MEM_LOCK_LOCKED	0x02 /* locked transaction */
  *     in_tx: running in a hardware transaction
  *     abort: aborting a hardware transaction
  *    cycles: cycles from last branch (or 0 if not supported)
+ *      type: branch type
  */
 struct perf_branch_entry {
 	__u64	from;
 		in_tx:1,    /* in transaction */
 		abort:1,    /* transaction abort */
 		cycles:16,  /* cycle count to last branch */
-		reserved:44;
+		type:4,     /* branch type */
+		reserved:40;
 };
 #endif /* _UAPI_LINUX_PERF_EVENT_H */

include/uapi/linux/pps.h+2−2

@@ -95,8 +95,8 @@ struct pps_kparams { · 94 unmodified lines
95	#define PPS_CAPTURECLEAR 0x02 /* capture clear events */	95	#define PPS_CAPTURECLEAR 0x02 /* capture clear events */
96	#define PPS_CAPTUREBOTH 0x03 /* capture assert and clear events */	96	#define PPS_CAPTUREBOTH 0x03 /* capture assert and clear events */
97		97
98	#define PPS_OFFSETASSERT 0x10 /* apply compensation for assert ev. */	98	#define PPS_OFFSETASSERT 0x10 /* apply compensation for assert event */
99	#define PPS_OFFSETCLEAR 0x20 /* apply compensation for clear ev. */	99	#define PPS_OFFSETCLEAR 0x20 /* apply compensation for clear event */
100		100
101	#define PPS_CANWAIT 0x100 /* can we wait for an event? */	101	#define PPS_CANWAIT 0x100 /* can we wait for an event? */
102	#define PPS_CANPOLL 0x200 /* bit reserved for future use */	102	#define PPS_CANPOLL 0x200 /* bit reserved for future use */

include/uapi/linux/quota.h+0−1

@@ -33,7 +33,6 @@ · 32 unmodified lines
33	#ifndef _UAPI_LINUX_QUOTA_	33	#ifndef _UAPI_LINUX_QUOTA_
34	#define _UAPI_LINUX_QUOTA_	34	#define _UAPI_LINUX_QUOTA_
35		35
36	#include <linux/errno.h>
37	#include <linux/types.h>	36	#include <linux/types.h>
38		37
39	#define __DQUOT_VERSION__ "dquot_6.6.0"	38	#define __DQUOT_VERSION__ "dquot_6.6.0"

include/uapi/linux/raid/md_p.h+3−1

 #define	MD_FEATURE_RECOVERY_BITMAP	128 /* recovery that is happening
 					     * is guided by bitmap.
 					     */
-#define MD_FEATURE_CLUSTERED		256 /* clustered MD */
+#define	MD_FEATURE_CLUSTERED		256 /* clustered MD */
 #define	MD_FEATURE_JOURNAL		512 /* support write cache */
 #define	MD_FEATURE_PPL			1024 /* support PPL */
+#define	MD_FEATURE_MULTIPLE_PPLS	2048 /* support for multiple PPLs */
 #define	MD_FEATURE_ALL			(MD_FEATURE_BITMAP_OFFSET	\
 					|MD_FEATURE_RECOVERY_OFFSET	\
 					|MD_FEATURE_RESHAPE_ACTIVE	\
 					|MD_FEATURE_CLUSTERED		\
 					|MD_FEATURE_JOURNAL		\
 					|MD_FEATURE_PPL			\
+					|MD_FEATURE_MULTIPLE_PPLS	\
 					)
 struct r5l_payload_header {

include/uapi/linux/rtnetlink.h+21−2

@@ -683,10 +683,29 @@ struct tcamsg { · 682 unmodified lines
683	unsigned char tca__pad1;	683	unsigned char tca__pad1;
684	unsigned short tca__pad2;	684	unsigned short tca__pad2;
685	};	685	};
		686
		687	enum {
		688	TCA_ROOT_UNSPEC,
		689	TCA_ROOT_TAB,
		690	#define TCA_ACT_TAB TCA_ROOT_TAB
		691	#define TCAA_MAX TCA_ROOT_TAB
		692	TCA_ROOT_FLAGS,
		693	TCA_ROOT_COUNT,
		694	TCA_ROOT_TIME_DELTA, /* in msecs */
		695	__TCA_ROOT_MAX,
		696	#define TCA_ROOT_MAX (__TCA_ROOT_MAX - 1)
		697	};
		698
686	#define TA_RTA(r) ((struct rtattr)(((char)(r)) + NLMSG_ALIGN(sizeof(struct tcamsg))))	699	#define TA_RTA(r) ((struct rtattr)(((char)(r)) + NLMSG_ALIGN(sizeof(struct tcamsg))))
687	#define TA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcamsg))	700	#define TA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcamsg))
688	#define TCA_ACT_TAB 1 /* attr type must be >=1 */	701	/* tcamsg flags stored in attribute TCA_ROOT_FLAGS
689	#define TCAA_MAX 1	702	*
		703	* TCA_FLAG_LARGE_DUMP_ON user->kernel to request for larger than TCA_ACT_MAX_PRIO
		704	* actions in a dump. All dump responses will contain the number of actions
		705	* being dumped stored in for user app's consumption in TCA_ROOT_COUNT
		706	*
		707	*/
		708	#define TCA_FLAG_LARGE_DUMP_ON (1 << 0)
690		709
691	/* New extended info filters for IFLA_EXT_MASK */	710	/* New extended info filters for IFLA_EXT_MASK */
692	#define RTEXT_FILTER_VF (1 << 0)	711	#define RTEXT_FILTER_VF (1 << 0)

include/uapi/linux/rxrpc.h+124−0

@@ -0,0 +1,124 @@
	1	/* Types and definitions for AF_RXRPC.
	2	*
	3	* Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
	4	* Written by David Howells (dhowells@redhat.com)
	5	*
	6	* This program is free software; you can redistribute it and/or
	7	* modify it under the terms of the GNU General Public Licence
	8	* as published by the Free Software Foundation; either version
	9	* 2 of the Licence, or (at your option) any later version.
	10	*/
	11
	12	#ifndef _UAPI_LINUX_RXRPC_H
	13	#define _UAPI_LINUX_RXRPC_H
	14
	15	#include <linux/types.h>
	16	#include <linux/in.h>
	17	#include <linux/in6.h>
	18
	19	/*
	20	* RxRPC socket address
	21	*/
	22	struct sockaddr_rxrpc {
	23	sa_family_t srx_family; /* address family */
	24	u16 srx_service; /* service desired */
	25	u16 transport_type; /* type of transport socket (SOCK_DGRAM) */
	26	u16 transport_len; /* length of transport address */
	27	union {
	28	sa_family_t family; /* transport address family */
	29	struct sockaddr_in sin; /* IPv4 transport address */
	30	struct sockaddr_in6 sin6; /* IPv6 transport address */
	31	} transport;
	32	};
	33
	34	/*
	35	* RxRPC socket options
	36	*/
	37	#define RXRPC_SECURITY_KEY 1 /* [clnt] set client security key */
	38	#define RXRPC_SECURITY_KEYRING 2 /* [srvr] set ring of server security keys */
	39	#define RXRPC_EXCLUSIVE_CONNECTION 3 /* Deprecated; use RXRPC_EXCLUSIVE_CALL instead */
	40	#define RXRPC_MIN_SECURITY_LEVEL 4 /* minimum security level */
	41	#define RXRPC_UPGRADEABLE_SERVICE 5 /* Upgrade service[0] -> service[1] */
	42	#define RXRPC_SUPPORTED_CMSG 6 /* Get highest supported control message type */
	43
	44	/*
	45	* RxRPC control messages
	46	* - If neither abort or accept are specified, the message is a data message.
	47	* - terminal messages mean that a user call ID tag can be recycled
	48	* - s/r/- indicate whether these are applicable to sendmsg() and/or recvmsg()
	49	*/
	50	enum rxrpc_cmsg_type {
	51	RXRPC_USER_CALL_ID = 1, /* sr: user call ID specifier */
	52	RXRPC_ABORT = 2, /* sr: abort request / notification [terminal] */
	53	RXRPC_ACK = 3, /* -r: [Service] RPC op final ACK received [terminal] */
	54	RXRPC_NET_ERROR = 5, /* -r: network error received [terminal] */
	55	RXRPC_BUSY = 6, /* -r: server busy received [terminal] */
	56	RXRPC_LOCAL_ERROR = 7, /* -r: local error generated [terminal] */
	57	RXRPC_NEW_CALL = 8, /* -r: [Service] new incoming call notification */
	58	RXRPC_ACCEPT = 9, /* s-: [Service] accept request */
	59	RXRPC_EXCLUSIVE_CALL = 10, /* s-: Call should be on exclusive connection */
	60	RXRPC_UPGRADE_SERVICE = 11, /* s-: Request service upgrade for client call */
	61	RXRPC_TX_LENGTH = 12, /* s-: Total length of Tx data */
	62	RXRPC__SUPPORTED
	63	};
	64
	65	/*
	66	* RxRPC security levels
	67	*/
	68	#define RXRPC_SECURITY_PLAIN 0 /* plain secure-checksummed packets only */
	69	#define RXRPC_SECURITY_AUTH 1 /* authenticated packets */
	70	#define RXRPC_SECURITY_ENCRYPT 2 /* encrypted packets */
	71
	72	/*
	73	* RxRPC security indices
	74	*/
	75	#define RXRPC_SECURITY_NONE 0 /* no security protocol */
	76	#define RXRPC_SECURITY_RXKAD 2 /* kaserver or kerberos 4 */
	77	#define RXRPC_SECURITY_RXGK 4 /* gssapi-based */
	78	#define RXRPC_SECURITY_RXK5 5 /* kerberos 5 */
	79
	80	/*
	81	* RxRPC-level abort codes
	82	*/
	83	#define RX_CALL_DEAD -1 /* call/conn has been inactive and is shut down */
	84	#define RX_INVALID_OPERATION -2 /* invalid operation requested / attempted */
	85	#define RX_CALL_TIMEOUT -3 /* call timeout exceeded */
	86	#define RX_EOF -4 /* unexpected end of data on read op */
	87	#define RX_PROTOCOL_ERROR -5 /* low-level protocol error */
	88	#define RX_USER_ABORT -6 /* generic user abort */
	89	#define RX_ADDRINUSE -7 /* UDP port in use */
	90	#define RX_DEBUGI_BADTYPE -8 /* bad debugging packet type */
	91
	92	/*
	93	* (un)marshalling abort codes (rxgen)
	94	*/
	95	#define RXGEN_CC_MARSHAL -450
	96	#define RXGEN_CC_UNMARSHAL -451
	97	#define RXGEN_SS_MARSHAL -452
	98	#define RXGEN_SS_UNMARSHAL -453
	99	#define RXGEN_DECODE -454
	100	#define RXGEN_OPCODE -455
	101	#define RXGEN_SS_XDRFREE -456
	102	#define RXGEN_CC_XDRFREE -457
	103
	104	/*
	105	* Rx kerberos security abort codes
	106	* - unfortunately we have no generalised security abort codes to say things
	107	* like "unsupported security", so we have to use these instead and hope the
	108	* other side understands
	109	*/
	110	#define RXKADINCONSISTENCY 19270400 /* security module structure inconsistent */
	111	#define RXKADPACKETSHORT 19270401 /* packet too short for security challenge */
	112	#define RXKADLEVELFAIL 19270402 /* security level negotiation failed */
	113	#define RXKADTICKETLEN 19270403 /* ticket length too short or too long */
	114	#define RXKADOUTOFSEQUENCE 19270404 /* packet had bad sequence number */
	115	#define RXKADNOAUTH 19270405 /* caller not authorised */
	116	#define RXKADBADKEY 19270406 /* illegal key: bad parity or weak */
	117	#define RXKADBADTICKET 19270407 /* security object was passed a bad ticket */
	118	#define RXKADUNKNOWNKEY 19270408 /* ticket contained unknown key version number */
	119	#define RXKADEXPIRED 19270409 /* authentication expired */
	120	#define RXKADSEALEDINCON 19270410 /* sealed data inconsistent */
	121	#define RXKADDATALEN 19270411 /* user data too long */
	122	#define RXKADILLEGALLEVEL 19270412 /* caller not authorised to use encrypted conns */
	123
	124	#endif /* _UAPI_LINUX_RXRPC_H */

include/uapi/linux/seccomp.h+15−8

 #define SECCOMP_MODE_FILTER	2 /* uses user-supplied filter. */
 /* Valid operations for seccomp syscall. */
-#define SECCOMP_SET_MODE_STRICT	0
+#define SECCOMP_SET_MODE_STRICT		0
-#define SECCOMP_SET_MODE_FILTER	1
+#define SECCOMP_SET_MODE_FILTER		1
+#define SECCOMP_GET_ACTION_AVAIL	2
 /* Valid flags for SECCOMP_SET_MODE_FILTER */
 #define SECCOMP_FILTER_FLAG_TSYNC	1
+#define SECCOMP_FILTER_FLAG_LOG		2
 /*
  * All BPF programs must return a 32-bit value.
  * The bottom 16-bits are for optional return data.
- * The upper 16-bits are ordered from least permissive values to most.
+ * The upper 16-bits are ordered from least permissive values to most,
+ * as a signed value (so 0x8000000 is negative).
  *
  * The ordering ensures that a min_t() over composed return values always
  * selects the least permissive choice.
  */
-#define SECCOMP_RET_KILL	0x00000000U /* kill the task immediately */
+#define SECCOMP_RET_KILL_PROCESS 0x80000000U /* kill the process */
-#define SECCOMP_RET_TRAP	0x00030000U /* disallow and force a SIGSYS */
+#define SECCOMP_RET_KILL_THREAD	 0x00000000U /* kill the thread */
-#define SECCOMP_RET_ERRNO	0x00050000U /* returns an errno */
+#define SECCOMP_RET_KILL	 SECCOMP_RET_KILL_THREAD
-#define SECCOMP_RET_TRACE	0x7ff00000U /* pass to a tracer or disallow */
+#define SECCOMP_RET_TRAP	 0x00030000U /* disallow and force a SIGSYS */
-#define SECCOMP_RET_ALLOW	0x7fff0000U /* allow */
+#define SECCOMP_RET_ERRNO	 0x00050000U /* returns an errno */
+#define SECCOMP_RET_TRACE	 0x7ff00000U /* pass to a tracer or disallow */
+#define SECCOMP_RET_LOG		 0x7ffc0000U /* allow after logging */
+#define SECCOMP_RET_ALLOW	 0x7fff0000U /* allow */
 /* Masks for the return value sections. */
+#define SECCOMP_RET_ACTION_FULL	0xffff0000U
 #define SECCOMP_RET_ACTION	0x7fff0000U
 #define SECCOMP_RET_DATA	0x0000ffffU

include/uapi/linux/seg6_iptunnel.h+14−4

 enum {
 	SEG6_IPTUN_MODE_INLINE,
 	SEG6_IPTUN_MODE_ENCAP,
+	SEG6_IPTUN_MODE_L2ENCAP,
 };
 #ifdef __KERNEL__
 static inline size_t seg6_lwt_headroom(struct seg6_iptunnel_encap *tuninfo)
 {
-	int encap = (tuninfo->mode == SEG6_IPTUN_MODE_ENCAP);
+	int head = 0;
-	return ((tuninfo->srh->hdrlen + 1) << 3) +
+	switch (tuninfo->mode) {
-	       (encap * sizeof(struct ipv6hdr));
+	case SEG6_IPTUN_MODE_INLINE:
+		break;
+	case SEG6_IPTUN_MODE_ENCAP:
+		head = sizeof(struct ipv6hdr);
+		break;
+	case SEG6_IPTUN_MODE_L2ENCAP:
+		return 0;
+	}
+	return ((tuninfo->srh->hdrlen + 1) << 3) + head;
 }
 #endif

include/uapi/linux/seg6_local.h+68−0

@@ -0,0 +1,68 @@
	1	/*
	2	* SR-IPv6 implementation
	3	*
	4	* Author:
	5	* David Lebrun <david.lebrun@uclouvain.be>
	6	*
	7	*
	8	* This program is free software; you can redistribute it and/or
	9	* modify it under the terms of the GNU General Public License
	10	* as published by the Free Software Foundation; either version
	11	* 2 of the License, or (at your option) any later version.
	12	*/
	13
	14	#ifndef _UAPI_LINUX_SEG6_LOCAL_H
	15	#define _UAPI_LINUX_SEG6_LOCAL_H
	16
	17	#include <linux/seg6.h>
	18
	19	enum {
	20	SEG6_LOCAL_UNSPEC,
	21	SEG6_LOCAL_ACTION,
	22	SEG6_LOCAL_SRH,
	23	SEG6_LOCAL_TABLE,
	24	SEG6_LOCAL_NH4,
	25	SEG6_LOCAL_NH6,
	26	SEG6_LOCAL_IIF,
	27	SEG6_LOCAL_OIF,
	28	__SEG6_LOCAL_MAX,
	29	};
	30	#define SEG6_LOCAL_MAX (__SEG6_LOCAL_MAX - 1)
	31
	32	enum {
	33	SEG6_LOCAL_ACTION_UNSPEC = 0,
	34	/* node segment */
	35	SEG6_LOCAL_ACTION_END = 1,
	36	/* adjacency segment (IPv6 cross-connect) */
	37	SEG6_LOCAL_ACTION_END_X = 2,
	38	/* lookup of next seg NH in table */
	39	SEG6_LOCAL_ACTION_END_T = 3,
	40	/* decap and L2 cross-connect */
	41	SEG6_LOCAL_ACTION_END_DX2 = 4,
	42	/* decap and IPv6 cross-connect */
	43	SEG6_LOCAL_ACTION_END_DX6 = 5,
	44	/* decap and IPv4 cross-connect */
	45	SEG6_LOCAL_ACTION_END_DX4 = 6,
	46	/* decap and lookup of DA in v6 table */
	47	SEG6_LOCAL_ACTION_END_DT6 = 7,
	48	/* decap and lookup of DA in v4 table */
	49	SEG6_LOCAL_ACTION_END_DT4 = 8,
	50	/* binding segment with insertion */
	51	SEG6_LOCAL_ACTION_END_B6 = 9,
	52	/* binding segment with encapsulation */
	53	SEG6_LOCAL_ACTION_END_B6_ENCAP = 10,
	54	/* binding segment with MPLS encap */
	55	SEG6_LOCAL_ACTION_END_BM = 11,
	56	/* lookup last seg in table */
	57	SEG6_LOCAL_ACTION_END_S = 12,
	58	/* forward to SR-unaware VNF with static proxy */
	59	SEG6_LOCAL_ACTION_END_AS = 13,
	60	/* forward to SR-unaware VNF with masquerading */
	61	SEG6_LOCAL_ACTION_END_AM = 14,
	62
	63	__SEG6_LOCAL_ACTION_MAX,
	64	};
	65
	66	#define SEG6_LOCAL_ACTION_MAX (__SEG6_LOCAL_ACTION_MAX - 1)
	67
	68	#endif

include/uapi/linux/serial_core.h+10−4

 #define PORT_ALTR_16550_F128 28 /* Altera 16550 UART with 128 FIFOs */
 #define PORT_RT2880	29	/* Ralink RT2880 internal UART */
 #define PORT_16550A_FSL64 30	/* Freescale 16550 UART with 64 FIFOs */
-#define PORT_DA830	31	/* TI DA8xx/66AK2x */
-#define PORT_MAX_8250	31	/* max port ID */
 /*
  * ARM specific type numbers.  These are not currently guaranteed
 #define PORT_CLPS711X	33
 #define PORT_SA1100	34
 #define PORT_UART00	35
+#define PORT_OWL	36
 #define PORT_21285	37
 /* Sparc type numbers.  */
 #define PORT_SUNZILOG	38
 #define PORT_SUNSAB	39
+/* Intel EG20 */
+#define PORT_PCH_8LINE	44
+#define PORT_PCH_2LINE	45
 /* DEC */
 #define PORT_DZ		46
 #define PORT_ZS		47
 /* MAX310X */
 #define PORT_MAX310X	94
-/* High Speed UART for Medfield */
+/* TI DA8xx/66AK2x */
-#define PORT_MFD	95
+#define PORT_DA830	95
 /* TI OMAP-UART */
 #define PORT_OMAP	96
 /* MPS2 UART */
 #define PORT_MPS2UART	116
+/* MediaTek BTIF */
+#define PORT_MTK_BTIF	117
 #endif /* _UAPILINUX_SERIAL_CORE_H */

include/uapi/linux/shm.h+29−2

@@ -3,6 +3,7 @@ · 2 unmodified lines
3		3
4	#include <linux/ipc.h>	4	#include <linux/ipc.h>
5	#include <linux/errno.h>	5	#include <linux/errno.h>
		6	#include <asm-generic/hugetlb_encode.h>
6	#ifndef __KERNEL__	7	#ifndef __KERNEL__
7	#include <unistd.h>	8	#include <unistd.h>
8	#endif	9	#endif
@@ -40,11 +41,37 @@ struct shmid_ds { · 31 unmodified lines
40	/* Include the definition of shmid64_ds and shminfo64 */	41	/* Include the definition of shmid64_ds and shminfo64 */
41	#include <asm/shmbuf.h>	42	#include <asm/shmbuf.h>
42		43
43	/* permission flag for shmget */	44	/*
		45	* shmget() shmflg values.
		46	*/
		47	/* The bottom nine bits are the same as open(2) mode flags */
44	#define SHM_R 0400 /* or S_IRUGO from <linux/stat.h> */	48	#define SHM_R 0400 /* or S_IRUGO from <linux/stat.h> */
45	#define SHM_W 0200 /* or S_IWUGO from <linux/stat.h> */	49	#define SHM_W 0200 /* or S_IWUGO from <linux/stat.h> */
		50	/* Bits 9 & 10 are IPC_CREAT and IPC_EXCL */
		51	#define SHM_HUGETLB 04000 /* segment will use huge TLB pages */
		52	#define SHM_NORESERVE 010000 /* don't check for reservations */
		53
		54	/*
		55	* Huge page size encoding when SHM_HUGETLB is specified, and a huge page
		56	* size other than the default is desired. See hugetlb_encode.h
		57	*/
		58	#define SHM_HUGE_SHIFT HUGETLB_FLAG_ENCODE_SHIFT
		59	#define SHM_HUGE_MASK HUGETLB_FLAG_ENCODE_MASK
		60
		61	#define SHM_HUGE_64KB HUGETLB_FLAG_ENCODE_64KB
		62	#define SHM_HUGE_512KB HUGETLB_FLAG_ENCODE_512KB
		63	#define SHM_HUGE_1MB HUGETLB_FLAG_ENCODE_1MB
		64	#define SHM_HUGE_2MB HUGETLB_FLAG_ENCODE_2MB
		65	#define SHM_HUGE_8MB HUGETLB_FLAG_ENCODE_8MB
		66	#define SHM_HUGE_16MB HUGETLB_FLAG_ENCODE_16MB
		67	#define SHM_HUGE_256MB HUGETLB_FLAG_ENCODE_256MB
		68	#define SHM_HUGE_1GB HUGETLB_FLAG_ENCODE_1GB
		69	#define SHM_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB
		70	#define SHM_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB
46		71
47	/* mode for attach */	72	/*
		73	* shmat() shmflg values
		74	*/
48	#define SHM_RDONLY 010000 /* read-only access */	75	#define SHM_RDONLY 010000 /* read-only access */
49	#define SHM_RND 020000 /* round attach address to SHMLBA boundary */	76	#define SHM_RND 020000 /* round attach address to SHMLBA boundary */
50	#define SHM_REMAP 040000 /* take-over region on attach */	77	#define SHM_REMAP 040000 /* take-over region on attach */

include/uapi/linux/snmp.h+0−7

 	LINUX_MIB_DELAYEDACKLOST,		/* DelayedACKLost */
 	LINUX_MIB_LISTENOVERFLOWS,		/* ListenOverflows */
 	LINUX_MIB_LISTENDROPS,			/* ListenDrops */
-	LINUX_MIB_TCPPREQUEUED,			/* TCPPrequeued */
-	LINUX_MIB_TCPDIRECTCOPYFROMBACKLOG,	/* TCPDirectCopyFromBacklog */
-	LINUX_MIB_TCPDIRECTCOPYFROMPREQUEUE,	/* TCPDirectCopyFromPrequeue */
-	LINUX_MIB_TCPPREQUEUEDROPPED,		/* TCPPrequeueDropped */
 	LINUX_MIB_TCPHPHITS,			/* TCPHPHits */
-	LINUX_MIB_TCPHPHITSTOUSER,		/* TCPHPHitsToUser */
 	LINUX_MIB_TCPPUREACKS,			/* TCPPureAcks */
 	LINUX_MIB_TCPHPACKS,			/* TCPHPAcks */
 	LINUX_MIB_TCPRENORECOVERY,		/* TCPRenoRecovery */
 	LINUX_MIB_TCPSACKFAILURES,		/* TCPSackFailures */
 	LINUX_MIB_TCPLOSSFAILURES,		/* TCPLossFailures */
 	LINUX_MIB_TCPFASTRETRANS,		/* TCPFastRetrans */
-	LINUX_MIB_TCPFORWARDRETRANS,		/* TCPForwardRetrans */
 	LINUX_MIB_TCPSLOWSTARTRETRANS,		/* TCPSlowStartRetrans */
 	LINUX_MIB_TCPTIMEOUTS,			/* TCPTimeouts */
 	LINUX_MIB_TCPLOSSPROBES,		/* TCPLossProbes */
 	LINUX_MIB_TCPLOSSPROBERECOVERY,		/* TCPLossProbeRecovery */
 	LINUX_MIB_TCPRENORECOVERYFAIL,		/* TCPRenoRecoveryFail */
 	LINUX_MIB_TCPSACKRECOVERYFAIL,		/* TCPSackRecoveryFail */
-	LINUX_MIB_TCPSCHEDULERFAILED,		/* TCPSchedulerFailed */
 	LINUX_MIB_TCPRCVCOLLAPSED,		/* TCPRcvCollapsed */
 	LINUX_MIB_TCPDSACKOLDSENT,		/* TCPDSACKOldSent */
 	LINUX_MIB_TCPDSACKOFOSENT,		/* TCPDSACKOfoSent */

include/uapi/linux/tcp.h+17−0

@@ -231,6 +231,14 @@ enum { · 230 unmodified lines
231	TCP_NLA_SNDBUF_LIMITED, /* Time (usec) limited by send buffer */	231	TCP_NLA_SNDBUF_LIMITED, /* Time (usec) limited by send buffer */
232	TCP_NLA_DATA_SEGS_OUT, /* Data pkts sent including retransmission */	232	TCP_NLA_DATA_SEGS_OUT, /* Data pkts sent including retransmission */
233	TCP_NLA_TOTAL_RETRANS, /* Data pkts retransmitted */	233	TCP_NLA_TOTAL_RETRANS, /* Data pkts retransmitted */
		234	TCP_NLA_PACING_RATE, /* Pacing rate in bytes per second */
		235	TCP_NLA_DELIVERY_RATE, /* Delivery rate in bytes per second */
		236	TCP_NLA_SND_CWND, /* Sending congestion window */
		237	TCP_NLA_REORDERING, /* Reordering metric */
		238	TCP_NLA_MIN_RTT, /* minimum RTT */
		239	TCP_NLA_RECUR_RETRANS, /* Recurring retransmits for the current pkt */
		240	TCP_NLA_DELIVERY_RATE_APP_LMT, /* delivery rate application limited ? */
		241
234	};	242	};
235		243
236	/* for TCP_MD5SIG socket option */	244	/* for TCP_MD5SIG socket option */
@@ -248,4 +256,13 @@ struct tcp_md5sig { · 11 unmodified lines
248	__u8 tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* key (binary) */	256	__u8 tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* key (binary) */
249	};	257	};
250		258
		259	/* INET_DIAG_MD5SIG */
		260	struct tcp_diag_md5sig {
		261	__u8 tcpm_family;
		262	__u8 tcpm_prefixlen;
		263	__u16 tcpm_keylen;
		264	__be32 tcpm_addr[4];
		265	__u8 tcpm_key[TCP_MD5SIG_MAXKEYLEN];
		266	};
		267
251	#endif /* _UAPI_LINUX_TCP_H */	268	#endif /* _UAPI_LINUX_TCP_H */

include/uapi/linux/tee.h+1−0

@@ -49,6 +49,7 @@ · 48 unmodified lines
49	#define TEE_MAX_ARG_SIZE 1024	49	#define TEE_MAX_ARG_SIZE 1024
50		50
51	#define TEE_GEN_CAP_GP (1 << 0)/* GlobalPlatform compliant TEE */	51	#define TEE_GEN_CAP_GP (1 << 0)/* GlobalPlatform compliant TEE */
		52	#define TEE_GEN_CAP_PRIVILEGED (1 << 1)/* Privileged device (for supplicant) */
52		53
53	/*	54	/*
54	* TEE Implementation ID	55	* TEE Implementation ID

include/uapi/linux/usb/charger.h+31−0

@@ -0,0 +1,31 @@
	1	/*
	2	* This file defines the USB charger type and state that are needed for
	3	* USB device APIs.
	4	*/
	5
	6	#ifndef _UAPI__LINUX_USB_CHARGER_H
	7	#define _UAPI__LINUX_USB_CHARGER_H
	8
	9	/*
	10	* USB charger type:
	11	* SDP (Standard Downstream Port)
	12	* DCP (Dedicated Charging Port)
	13	* CDP (Charging Downstream Port)
	14	* ACA (Accessory Charger Adapters)
	15	*/
	16	enum usb_charger_type {
	17	UNKNOWN_TYPE,
	18	SDP_TYPE,
	19	DCP_TYPE,
	20	CDP_TYPE,
	21	ACA_TYPE,
	22	};
	23
	24	/* USB charger state */
	25	enum usb_charger_state {
	26	USB_CHARGER_DEFAULT,
	27	USB_CHARGER_PRESENT,
	28	USB_CHARGER_ABSENT,
	29	};
	30
	31	#endif /* _UAPI__LINUX_USB_CHARGER_H */

include/uapi/linux/userfaultfd.h+15−1

 			   UFFD_FEATURE_EVENT_REMOVE |	\
 			   UFFD_FEATURE_EVENT_UNMAP |		\
 			   UFFD_FEATURE_MISSING_HUGETLBFS |	\
-			   UFFD_FEATURE_MISSING_SHMEM)
+			   UFFD_FEATURE_MISSING_SHMEM |		\
+			   UFFD_FEATURE_SIGBUS |		\
+			   UFFD_FEATURE_THREAD_ID)
 #define UFFD_API_IOCTLS				\
 	((__u64)1 << _UFFDIO_REGISTER |		\
 	 (__u64)1 << _UFFDIO_UNREGISTER |	\
 		struct {
 			__u64	flags;
 			__u64	address;
+			union {
+				__u32 ptid;
+			} feat;
 		} pagefault;
 		struct {
 	 * UFFD_FEATURE_MISSING_SHMEM works the same as
 	 * UFFD_FEATURE_MISSING_HUGETLBFS, but it applies to shmem
 	 * (i.e. tmpfs and other shmem based APIs).
+	 *
+	 * UFFD_FEATURE_SIGBUS feature means no page-fault
+	 * (UFFD_EVENT_PAGEFAULT) event will be delivered, instead
+	 * a SIGBUS signal will be sent to the faulting process.
+	 *
+	 * UFFD_FEATURE_THREAD_ID pid of the page faulted task_struct will
+	 * be returned, if feature is not requested 0 will be returned.
 	 */
 #define UFFD_FEATURE_PAGEFAULT_FLAG_WP		(1<<0)
 #define UFFD_FEATURE_EVENT_FORK			(1<<1)
 #define UFFD_FEATURE_MISSING_HUGETLBFS		(1<<4)
 #define UFFD_FEATURE_MISSING_SHMEM		(1<<5)
 #define UFFD_FEATURE_EVENT_UNMAP		(1<<6)
+#define UFFD_FEATURE_SIGBUS			(1<<7)
+#define UFFD_FEATURE_THREAD_ID			(1<<8)
 	__u64 features;
 	__u64 ioctls;

include/uapi/linux/virtio_ring.h+2−2

@@ -1,7 +1,7 @@
1	#ifndef _UAPI_LINUX_VIRTIO_RING_H	1	#ifndef _UAPI_LINUX_VIRTIO_RING_H
2	#define _UAPI_LINUX_VIRTIO_RING_H	2	#define _UAPI_LINUX_VIRTIO_RING_H
3	/* An interface for efficient virtio implementation, currently for use by KVM	3	/* An interface for efficient virtio implementation, currently for use by KVM,
4	* and lguest, but hopefully others soon. Do NOT change this since it will	4	* but hopefully others soon. Do NOT change this since it will
5	* break existing servers and clients.	5	* break existing servers and clients.
6	*	6	*
7	* This header is BSD licensed so anyone can use the definitions to implement	7	* This header is BSD licensed so anyone can use the definitions to implement

include/uapi/linux/xfrm.h+1−0

@@ -304,6 +304,7 @@ enum xfrm_attr_type_t { · 303 unmodified lines
304	XFRMA_ADDRESS_FILTER, /* struct xfrm_address_filter */	304	XFRMA_ADDRESS_FILTER, /* struct xfrm_address_filter */
305	XFRMA_PAD,	305	XFRMA_PAD,
306	XFRMA_OFFLOAD_DEV, /* struct xfrm_state_offload */	306	XFRMA_OFFLOAD_DEV, /* struct xfrm_state_offload */
		307	XFRMA_OUTPUT_MARK, /* __u32 */
307	__XFRMA_MAX	308	__XFRMA_MAX
308		309
309	#define XFRMA_MAX (__XFRMA_MAX - 1)	310	#define XFRMA_MAX (__XFRMA_MAX - 1)

include/uapi/rdma/ib_user_ioctl_verbs.h+84−0

@@ -0,0 +1,84 @@
	1	/*
	2	* Copyright (c) 2017, Mellanox Technologies inc. All rights reserved.
	3	*
	4	* This software is available to you under a choice of one of two
	5	* licenses. You may choose to be licensed under the terms of the GNU
	6	* General Public License (GPL) Version 2, available from the file
	7	* COPYING in the main directory of this source tree, or the
	8	* OpenIB.org BSD license below:
	9	*
	10	* Redistribution and use in source and binary forms, with or
	11	* without modification, are permitted provided that the following
	12	* conditions are met:
	13	*
	14	* - Redistributions of source code must retain the above
	15	* copyright notice, this list of conditions and the following
	16	* disclaimer.
	17	*
	18	* - Redistributions in binary form must reproduce the above
	19	* copyright notice, this list of conditions and the following
	20	* disclaimer in the documentation and/or other materials
	21	* provided with the distribution.
	22	*
	23	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	24	* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	25	* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
	26	* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
	27	* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
	28	* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
	29	* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
	30	* SOFTWARE.
	31	*/
	32
	33	#ifndef IB_USER_IOCTL_VERBS_H
	34	#define IB_USER_IOCTL_VERBS_H
	35
	36	#include <rdma/rdma_user_ioctl.h>
	37
	38	#define UVERBS_UDATA_DRIVER_DATA_NS 1
	39	#define UVERBS_UDATA_DRIVER_DATA_FLAG (1UL << UVERBS_ID_NS_SHIFT)
	40
	41	enum uverbs_default_objects {
	42	UVERBS_OBJECT_DEVICE, /* No instances of DEVICE are allowed */
	43	UVERBS_OBJECT_PD,
	44	UVERBS_OBJECT_COMP_CHANNEL,
	45	UVERBS_OBJECT_CQ,
	46	UVERBS_OBJECT_QP,
	47	UVERBS_OBJECT_SRQ,
	48	UVERBS_OBJECT_AH,
	49	UVERBS_OBJECT_MR,
	50	UVERBS_OBJECT_MW,
	51	UVERBS_OBJECT_FLOW,
	52	UVERBS_OBJECT_XRCD,
	53	UVERBS_OBJECT_RWQ_IND_TBL,
	54	UVERBS_OBJECT_WQ,
	55	UVERBS_OBJECT_LAST,
	56	};
	57
	58	enum {
	59	UVERBS_UHW_IN = UVERBS_UDATA_DRIVER_DATA_FLAG,
	60	UVERBS_UHW_OUT,
	61	};
	62
	63	enum uverbs_create_cq_cmd_attr_ids {
	64	CREATE_CQ_HANDLE,
	65	CREATE_CQ_CQE,
	66	CREATE_CQ_USER_HANDLE,
	67	CREATE_CQ_COMP_CHANNEL,
	68	CREATE_CQ_COMP_VECTOR,
	69	CREATE_CQ_FLAGS,
	70	CREATE_CQ_RESP_CQE,
	71	};
	72
	73	enum uverbs_destroy_cq_cmd_attr_ids {
	74	DESTROY_CQ_HANDLE,
	75	DESTROY_CQ_RESP,
	76	};
	77
	78	enum uverbs_actions_cq_ops {
	79	UVERBS_CQ_CREATE,
	80	UVERBS_CQ_DESTROY,
	81	};
	82
	83	#endif
	84

include/uapi/rdma/ib_user_verbs.h+17−2

 	__u32 reserved;
 };
+struct ib_uverbs_tm_caps {
+	/* Max size of rendezvous request message */
+	__u32 max_rndv_hdr_size;
+	/* Max number of entries in tag matching list */
+	__u32 max_num_tags;
+	/* TM flags */
+	__u32 flags;
+	/* Max number of outstanding list operations */
+	__u32 max_ops;
+	/* Max number of SGE in tag matching entry */
+	__u32 max_sge;
+	__u32 reserved;
+};
 struct ib_uverbs_ex_query_device_resp {
 	struct ib_uverbs_query_device_resp base;
 	__u32 comp_mask;
 	struct ib_uverbs_rss_caps rss_caps;
 	__u32  max_wq_type_rq;
 	__u32 raw_packet_caps;
+	struct ib_uverbs_tm_caps xrq_caps;
 };
 struct ib_uverbs_query_port {
 	__u32 comp_mask;
 	__u32 create_flags;
 	__u32 rwq_ind_tbl_handle;
-	__u32  reserved1;
+	__u32  source_qpn;
 };
 struct ib_uverbs_open_qp {
 	__u32 max_wr;
 	__u32 max_sge;
 	__u32 srq_limit;
-	__u32 reserved;
+	__u32 max_num_tags;
 	__u32 xrcd_handle;
 	__u32 cq_handle;
 	__u64 driver_data[0];

include/uapi/rdma/mlx4-abi.h+51−1

@@ -95,13 +95,63 @@ struct mlx4_ib_create_srq_resp { · 94 unmodified lines
95	__u32 reserved;	95	__u32 reserved;
96	};	96	};
97		97
		98	struct mlx4_ib_create_qp_rss {
		99	__u64 rx_hash_fields_mask;
		100	__u8 rx_hash_function;
		101	__u8 reserved[7];
		102	__u8 rx_hash_key[40];
		103	__u32 comp_mask;
		104	__u32 reserved1;
		105	};
		106
98	struct mlx4_ib_create_qp {	107	struct mlx4_ib_create_qp {
99	__u64 buf_addr;	108	__u64 buf_addr;
100	__u64 db_addr;	109	__u64 db_addr;
101	__u8 log_sq_bb_count;	110	__u8 log_sq_bb_count;
102	__u8 log_sq_stride;	111	__u8 log_sq_stride;
103	__u8 sq_no_prefetch;	112	__u8 sq_no_prefetch;
104	__u8 reserved[5];	113	__u8 reserved;
		114	__u32 inl_recv_sz;
		115	};
		116
		117	struct mlx4_ib_create_wq {
		118	__u64 buf_addr;
		119	__u64 db_addr;
		120	__u8 log_range_size;
		121	__u8 reserved[3];
		122	__u32 comp_mask;
		123	};
		124
		125	struct mlx4_ib_modify_wq {
		126	__u32 comp_mask;
		127	__u32 reserved;
		128	};
		129
		130	struct mlx4_ib_create_rwq_ind_tbl_resp {
		131	__u32 response_length;
		132	__u32 reserved;
		133	};
		134
		135	/* RX Hash function flags */
		136	enum mlx4_ib_rx_hash_function_flags {
		137	MLX4_IB_RX_HASH_FUNC_TOEPLITZ = 1 << 0,
		138	};
		139
		140	/*
		141	* RX Hash flags, these flags allows to set which incoming packet's field should
		142	* participates in RX Hash. Each flag represent certain packet's field,
		143	* when the flag is set the field that is represented by the flag will
		144	* participate in RX Hash calculation.
		145	*/
		146	enum mlx4_ib_rx_hash_fields {
		147	MLX4_IB_RX_HASH_SRC_IPV4 = 1 << 0,
		148	MLX4_IB_RX_HASH_DST_IPV4 = 1 << 1,
		149	MLX4_IB_RX_HASH_SRC_IPV6 = 1 << 2,
		150	MLX4_IB_RX_HASH_DST_IPV6 = 1 << 3,
		151	MLX4_IB_RX_HASH_SRC_PORT_TCP = 1 << 4,
		152	MLX4_IB_RX_HASH_DST_PORT_TCP = 1 << 5,
		153	MLX4_IB_RX_HASH_SRC_PORT_UDP = 1 << 6,
		154	MLX4_IB_RX_HASH_DST_PORT_UDP = 1 << 7
105	};	155	};
106		156
107	#endif /* MLX4_ABI_USER_H */	157	#endif /* MLX4_ABI_USER_H */

include/uapi/rdma/mlx5-abi.h+23−0

@@ -168,6 +168,28 @@ struct mlx5_packet_pacing_caps { · 167 unmodified lines
168	__u32 reserved;	168	__u32 reserved;
169	};	169	};
170		170
		171	enum mlx5_ib_mpw_caps {
		172	MPW_RESERVED = 1 << 0,
		173	MLX5_IB_ALLOW_MPW = 1 << 1,
		174	MLX5_IB_SUPPORT_EMPW = 1 << 2,
		175	};
		176
		177	enum mlx5_ib_sw_parsing_offloads {
		178	MLX5_IB_SW_PARSING = 1 << 0,
		179	MLX5_IB_SW_PARSING_CSUM = 1 << 1,
		180	MLX5_IB_SW_PARSING_LSO = 1 << 2,
		181	};
		182
		183	struct mlx5_ib_sw_parsing_caps {
		184	__u32 sw_parsing_offloads; /* enum mlx5_ib_sw_parsing_offloads */
		185
		186	/* Corresponding bit will be set if qp type from
		187	* 'enum ib_qp_type' is supported, e.g.
		188	* supported_qpts \|= 1 << IB_QPT_RAW_PACKET
		189	*/
		190	__u32 supported_qpts;
		191	};
		192
171	struct mlx5_ib_query_device_resp {	193	struct mlx5_ib_query_device_resp {
172	__u32 comp_mask;	194	__u32 comp_mask;
173	__u32 response_length;	195	__u32 response_length;
@@ -177,6 +199,7 @@ struct mlx5_ib_query_device_resp { · 3 unmodified lines
177	struct mlx5_packet_pacing_caps packet_pacing_caps;	199	struct mlx5_packet_pacing_caps packet_pacing_caps;
178	__u32 mlx5_ib_support_multi_pkt_send_wqes;	200	__u32 mlx5_ib_support_multi_pkt_send_wqes;
179	__u32 reserved;	201	__u32 reserved;
		202	struct mlx5_ib_sw_parsing_caps sw_parsing_caps;
180	};	203	};
181		204
182	struct mlx5_ib_create_cq {	205	struct mlx5_ib_create_cq {

include/uapi/rdma/qedr-abi.h+3−0

 	__u32 sges_per_recv_wr;
 	__u32 sges_per_srq_wr;
 	__u32 max_cqes;
+	__u8 dpm_enabled;
+	__u8 wids_enabled;
+	__u16 wid_count;
 };
 struct qedr_alloc_pd_ureq {

include/uapi/rdma/rdma_netlink.h+83−1

@@ -8,7 +8,7 @@ enum { · 7 unmodified lines
8	RDMA_NL_IWCM,	8	RDMA_NL_IWCM,
9	RDMA_NL_RSVD,	9	RDMA_NL_RSVD,
10	RDMA_NL_LS, /* RDMA Local Services */	10	RDMA_NL_LS, /* RDMA Local Services */
11	RDMA_NL_I40IW,	11	RDMA_NL_NLDEV, /* RDMA device interface */
12	RDMA_NL_NUM_CLIENTS	12	RDMA_NL_NUM_CLIENTS
13	};	13	};
14		14
@@ -222,4 +222,86 @@ struct rdma_nla_ls_gid { · 207 unmodified lines
222	__u8 gid[16];	222	__u8 gid[16];
223	};	223	};
224		224
		225	enum rdma_nldev_command {
		226	RDMA_NLDEV_CMD_UNSPEC,
		227
		228	RDMA_NLDEV_CMD_GET, /* can dump */
		229	RDMA_NLDEV_CMD_SET,
		230	RDMA_NLDEV_CMD_NEW,
		231	RDMA_NLDEV_CMD_DEL,
		232
		233	RDMA_NLDEV_CMD_PORT_GET, /* can dump */
		234	RDMA_NLDEV_CMD_PORT_SET,
		235	RDMA_NLDEV_CMD_PORT_NEW,
		236	RDMA_NLDEV_CMD_PORT_DEL,
		237
		238	RDMA_NLDEV_NUM_OPS
		239	};
		240
		241	enum rdma_nldev_attr {
		242	/* don't change the order or add anything between, this is ABI! */
		243	RDMA_NLDEV_ATTR_UNSPEC,
		244
		245	/* Identifier for ib_device */
		246	RDMA_NLDEV_ATTR_DEV_INDEX, /* u32 */
		247
		248	RDMA_NLDEV_ATTR_DEV_NAME, /* string */
		249	/*
		250	* Device index together with port index are identifiers
		251	* for port/link properties.
		252	*
		253	* For RDMA_NLDEV_CMD_GET commamnd, port index will return number
		254	* of available ports in ib_device, while for port specific operations,
		255	* it will be real port index as it appears in sysfs. Port index follows
		256	* sysfs notation and starts from 1 for the first port.
		257	*/
		258	RDMA_NLDEV_ATTR_PORT_INDEX, /* u32 */
		259
		260	/*
		261	* Device and port capabilities
		262	*/
		263	RDMA_NLDEV_ATTR_CAP_FLAGS, /* u64 */
		264
		265	/*
		266	* FW version
		267	*/
		268	RDMA_NLDEV_ATTR_FW_VERSION, /* string */
		269
		270	/*
		271	* Node GUID (in host byte order) associated with the RDMA device.
		272	*/
		273	RDMA_NLDEV_ATTR_NODE_GUID, /* u64 */
		274
		275	/*
		276	* System image GUID (in host byte order) associated with
		277	* this RDMA device and other devices which are part of a
		278	* single system.
		279	*/
		280	RDMA_NLDEV_ATTR_SYS_IMAGE_GUID, /* u64 */
		281
		282	/*
		283	* Subnet prefix (in host byte order)
		284	*/
		285	RDMA_NLDEV_ATTR_SUBNET_PREFIX, /* u64 */
		286
		287	/*
		288	* Local Identifier (LID),
		289	* According to IB specification, It is 16-bit address assigned
		290	* by the Subnet Manager. Extended to be 32-bit for OmniPath users.
		291	*/
		292	RDMA_NLDEV_ATTR_LID, /* u32 */
		293	RDMA_NLDEV_ATTR_SM_LID, /* u32 */
		294
		295	/*
		296	* LID mask control (LMC)
		297	*/
		298	RDMA_NLDEV_ATTR_LMC, /* u8 */
		299
		300	RDMA_NLDEV_ATTR_PORT_STATE, /* u8 */
		301	RDMA_NLDEV_ATTR_PORT_PHYS_STATE, /* u8 */
		302
		303	RDMA_NLDEV_ATTR_DEV_NODE_TYPE, /* u8 */
		304
		305	RDMA_NLDEV_ATTR_MAX
		306	};
225	#endif /* _UAPI_RDMA_NETLINK_H */	307	#endif /* _UAPI_RDMA_NETLINK_H */

include/uapi/rdma/rdma_user_ioctl.h+33−0

@@ -43,6 +43,39 @@ · 42 unmodified lines
43	/* Legacy name, for user space application which already use it */	43	/* Legacy name, for user space application which already use it */
44	#define IB_IOCTL_MAGIC RDMA_IOCTL_MAGIC	44	#define IB_IOCTL_MAGIC RDMA_IOCTL_MAGIC
45		45
		46	#define RDMA_VERBS_IOCTL \
		47	_IOWR(RDMA_IOCTL_MAGIC, 1, struct ib_uverbs_ioctl_hdr)
		48
		49	#define UVERBS_ID_NS_MASK 0xF000
		50	#define UVERBS_ID_NS_SHIFT 12
		51
		52	enum {
		53	/* User input */
		54	UVERBS_ATTR_F_MANDATORY = 1U << 0,
		55	/*
		56	* Valid output bit should be ignored and considered set in
		57	* mandatory fields. This bit is kernel output.
		58	*/
		59	UVERBS_ATTR_F_VALID_OUTPUT = 1U << 1,
		60	};
		61
		62	struct ib_uverbs_attr {
		63	__u16 attr_id; /* command specific type attribute */
		64	__u16 len; /* only for pointers */
		65	__u16 flags; /* combination of UVERBS_ATTR_F_XXXX */
		66	__u16 reserved;
		67	__u64 data; /* ptr to command, inline data or idr/fd */
		68	};
		69
		70	struct ib_uverbs_ioctl_hdr {
		71	__u16 length;
		72	__u16 object_id;
		73	__u16 method_id;
		74	__u16 num_attrs;
		75	__u64 reserved;
		76	struct ib_uverbs_attr attrs[0];
		77	};
		78
46	/*	79	/*
47	* General blocks assignments	80	* General blocks assignments
48	* It is closed on purpose do not expose it it user space	81	* It is closed on purpose do not expose it it user space

include/uapi/rdma/vmw_pvrdma-abi.h+4−2

 	PVRDMA_WC_IP_CSUM_OK		= 1 << 3,
 	PVRDMA_WC_WITH_SMAC		= 1 << 4,
 	PVRDMA_WC_WITH_VLAN		= 1 << 5,
-	PVRDMA_WC_FLAGS_MAX		= PVRDMA_WC_WITH_VLAN,
+	PVRDMA_WC_WITH_NETWORK_HDR_TYPE	= 1 << 6,
+	PVRDMA_WC_FLAGS_MAX		= PVRDMA_WC_WITH_NETWORK_HDR_TYPE,
 };
 struct pvrdma_alloc_ucontext_resp {
 	__u8 dlid_path_bits;
 	__u8 port_num;
 	__u8 smac[6];
-	__u8 reserved2[7]; /* Pad to next power of 2 (64). */
+	__u8 network_hdr_type;
+	__u8 reserved2[6]; /* Pad to next power of 2 (64). */
 };
 #endif /* __VMW_PVRDMA_ABI_H__ */

include/uapi/sound/snd_sst_tokens.h+91−1

@@ -163,8 +163,71 @@ · 162 unmodified lines
163	*	163	*
164	* %SKL_TKN_U32_DMA_BUF_SIZE: DMA buffer size in millisec	164	* %SKL_TKN_U32_DMA_BUF_SIZE: DMA buffer size in millisec
165	*	165	*
		166	* %SKL_TKN_U32_PIPE_DIR: Specifies pipe direction. Can be
		167	* playback/capture.
		168	*
		169	* %SKL_TKN_U32_NUM_CONFIGS: Number of pipe configs
		170	*
		171	* %SKL_TKN_U32_PATH_MEM_PGS: Size of memory (in pages) required for pipeline
		172	* and its data
		173	*
		174	* %SKL_TKN_U32_PIPE_CONFIG_ID: Config id for the modules in the pipe
		175	* and PCM params supported by that pipe
		176	* config. This is used as index to fill
		177	* up the pipe config and module config
		178	* structure.
		179	*
		180	* %SKL_TKN_U32_CFG_FREQ:
		181	* %SKL_TKN_U8_CFG_CHAN:
		182	* %SKL_TKN_U8_CFG_BPS: PCM params (freq, channels, bits per sample)
		183	* supported for each of the pipe configs.
		184	*
		185	* %SKL_TKN_CFG_MOD_RES_ID: Module's resource index for each of the
		186	* pipe config
		187	*
		188	* %SKL_TKN_CFG_MOD_FMT_ID: Module's interface index for each of the
		189	* pipe config
		190	*
		191	* %SKL_TKN_U8_NUM_MOD: Number of modules in the manifest
		192	*
		193	* %SKL_TKN_MM_U8_MOD_IDX: Current index of the module in the manifest
		194	*
		195	* %SKL_TKN_MM_U8_NUM_RES: Number of resources for the module
		196	*
		197	* %SKL_TKN_MM_U8_NUM_INTF: Number of interfaces for the module
		198	*
		199	* %SKL_TKN_MM_U32_RES_ID: Resource index for the resource info to
		200	* be filled into.
		201	* A module can support multiple resource
		202	* configuration and is represnted as a
		203	* resource table. This index is used to
		204	* fill information into appropriate index.
		205	*
		206	* %SKL_TKN_MM_U32_CPS: DSP cycles per second
		207	*
		208	* %SKL_TKN_MM_U32_DMA_SIZE: Allocated buffer size for gateway DMA
		209	*
		210	* %SKL_TKN_MM_U32_CPC: DSP cycles allocated per frame
		211	*
		212	* %SKL_TKN_MM_U32_RES_PIN_ID: Resource pin index in the module
		213	*
		214	* %SKL_TKN_MM_U32_INTF_PIN_ID: Interface index in the module
		215	*
		216	* %SKL_TKN_MM_U32_PIN_BUF: Buffer size of the module pin
		217	*
		218	* %SKL_TKN_MM_U32_FMT_ID: Format index for each of the interface/
		219	* format information to be filled into.
		220	*
		221	* %SKL_TKN_MM_U32_NUM_IN_FMT: Number of input formats
		222	* %SKL_TKN_MM_U32_NUM_OUT_FMT: Number of output formats
		223	*
166	* module_id and loadable flags dont have tokens as these values will be	224	* module_id and loadable flags dont have tokens as these values will be
167	* read from the DSP FW manifest	225	* read from the DSP FW manifest
		226	*
		227	* Tokens defined can be used either in the manifest or widget private data.
		228	*
		229	* SKL_TKN_MM is used as a suffix for all tokens that represent
		230	* module data in the manifest.
168	*/	231	*/
169	enum SKL_TKNS {	232	enum SKL_TKNS {
170	SKL_TKN_UUID = 1,	233	SKL_TKN_UUID = 1,
@@ -218,7 +281,34 @@ enum SKL_TKNS { · 47 unmodified lines
218	SKL_TKL_U32_D0I3_CAPS, /* Typo added at v4.10 */	281	SKL_TKL_U32_D0I3_CAPS, /* Typo added at v4.10 */
219	SKL_TKN_U32_D0I3_CAPS = SKL_TKL_U32_D0I3_CAPS,	282	SKL_TKN_U32_D0I3_CAPS = SKL_TKL_U32_D0I3_CAPS,
220	SKL_TKN_U32_DMA_BUF_SIZE,	283	SKL_TKN_U32_DMA_BUF_SIZE,
221	SKL_TKN_MAX = SKL_TKN_U32_DMA_BUF_SIZE,	284
		285	SKL_TKN_U32_PIPE_DIRECTION,
		286	SKL_TKN_U32_PIPE_CONFIG_ID,
		287	SKL_TKN_U32_NUM_CONFIGS,
		288	SKL_TKN_U32_PATH_MEM_PGS,
		289
		290	SKL_TKN_U32_CFG_FREQ,
		291	SKL_TKN_U8_CFG_CHAN,
		292	SKL_TKN_U8_CFG_BPS,
		293	SKL_TKN_CFG_MOD_RES_ID,
		294	SKL_TKN_CFG_MOD_FMT_ID,
		295	SKL_TKN_U8_NUM_MOD,
		296
		297	SKL_TKN_MM_U8_MOD_IDX,
		298	SKL_TKN_MM_U8_NUM_RES,
		299	SKL_TKN_MM_U8_NUM_INTF,
		300	SKL_TKN_MM_U32_RES_ID,
		301	SKL_TKN_MM_U32_CPS,
		302	SKL_TKN_MM_U32_DMA_SIZE,
		303	SKL_TKN_MM_U32_CPC,
		304	SKL_TKN_MM_U32_RES_PIN_ID,
		305	SKL_TKN_MM_U32_INTF_PIN_ID,
		306	SKL_TKN_MM_U32_PIN_BUF,
		307	SKL_TKN_MM_U32_FMT_ID,
		308	SKL_TKN_MM_U32_NUM_IN_FMT,
		309	SKL_TKN_MM_U32_NUM_OUT_FMT,
		310
		311	SKL_TKN_MAX = SKL_TKN_MM_U32_NUM_OUT_FMT,
222	};	312	};
223		313
224	#endif	314	#endif

Merge tag 'v4.14-rc2' into patchwork

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code