lael-labs/linux

include/uapi/linux/Kbuild+9−0

 header-y += auxvec.h
 header-y += ax25.h
 header-y += b1lli.h
+header-y += batman_adv.h
 header-y += baycom.h
 header-y += bcm933xx_hcs.h
 header-y += bfs_fs.h
 header-y += dlm_plock.h
 header-y += dm-ioctl.h
 header-y += dm-log-userspace.h
+header-y += dma-buf.h
 header-y += dn.h
 header-y += dqblk_xfs.h
 header-y += edd.h
 header-y += if_tunnel.h
 header-y += if_vlan.h
 header-y += if_x25.h
+header-y += ife.h
 header-y += igmp.h
 header-y += ila.h
 header-y += in6.h
 header-y += net_namespace.h
 header-y += net_tstamp.h
 header-y += nfc.h
+header-y += psample.h
 header-y += nfs2.h
 header-y += nfs3.h
 header-y += nfs4.h
 header-y += sdla.h
 header-y += seccomp.h
 header-y += securebits.h
+header-y += seg6_genl.h
+header-y += seg6.h
+header-y += seg6_hmac.h
+header-y += seg6_iptunnel.h
 header-y += selinux_netlink.h
 header-y += sem.h
 header-y += serial_core.h
 header-y += virtio_gpu.h
 header-y += virtio_ids.h
 header-y += virtio_input.h
+header-y += virtio_mmio.h
 header-y += virtio_net.h
 header-y += virtio_pci.h
 header-y += virtio_ring.h

include/uapi/linux/android/binder.h+101−3

@@ -33,6 +33,8 @@ enum { · 32 unmodified lines
33	BINDER_TYPE_HANDLE = B_PACK_CHARS('s', 'h', '*', B_TYPE_LARGE),	33	BINDER_TYPE_HANDLE = B_PACK_CHARS('s', 'h', '*', B_TYPE_LARGE),
34	BINDER_TYPE_WEAK_HANDLE = B_PACK_CHARS('w', 'h', '*', B_TYPE_LARGE),	34	BINDER_TYPE_WEAK_HANDLE = B_PACK_CHARS('w', 'h', '*', B_TYPE_LARGE),
35	BINDER_TYPE_FD = B_PACK_CHARS('f', 'd', '*', B_TYPE_LARGE),	35	BINDER_TYPE_FD = B_PACK_CHARS('f', 'd', '*', B_TYPE_LARGE),
		36	BINDER_TYPE_FDA = B_PACK_CHARS('f', 'd', 'a', B_TYPE_LARGE),
		37	BINDER_TYPE_PTR = B_PACK_CHARS('p', 't', '*', B_TYPE_LARGE),
36	};	38	};
37		39
38	enum {	40	enum {
@@ -48,6 +50,14 @@ typedef __u64 binder_size_t; · 9 unmodified lines
48	typedef __u64 binder_uintptr_t;	50	typedef __u64 binder_uintptr_t;
49	#endif	51	#endif
50		52
		53	/**
		54	* struct binder_object_header - header shared by all binder metadata objects.
		55	* @type: type of the object
		56	*/
		57	struct binder_object_header {
		58	__u32 type;
		59	};
		60
51	/*	61	/*
52	* This is the flattened representation of a Binder object for transfer	62	* This is the flattened representation of a Binder object for transfer
53	* between processes. The 'offsets' supplied as part of a binder transaction	63	* between processes. The 'offsets' supplied as part of a binder transaction
@@ -56,9 +66,8 @@ typedef __u64 binder_uintptr_t; · 2 unmodified lines
56	* between processes.	66	* between processes.
57	*/	67	*/
58	struct flat_binder_object {	68	struct flat_binder_object {
59	/* 8 bytes for large_flat_header. */	69	struct binder_object_header hdr;
60	__u32 type;	70	__u32 flags;
61	__u32 flags;
62		71
63	/* 8 bytes of data. */	72	/* 8 bytes of data. */
64	union {	73	union {
@@ -70,6 +79,84 @@ struct flat_binder_object { · 5 unmodified lines
70	binder_uintptr_t cookie;	79	binder_uintptr_t cookie;
71	};	80	};
72		81
		82	/**
		83	* struct binder_fd_object - describes a filedescriptor to be fixed up.
		84	* @hdr: common header structure
		85	* @pad_flags: padding to remain compatible with old userspace code
		86	* @pad_binder: padding to remain compatible with old userspace code
		87	* @fd: file descriptor
		88	* @cookie: opaque data, used by user-space
		89	*/
		90	struct binder_fd_object {
		91	struct binder_object_header hdr;
		92	__u32 pad_flags;
		93	union {
		94	binder_uintptr_t pad_binder;
		95	__u32 fd;
		96	};
		97
		98	binder_uintptr_t cookie;
		99	};
		100
		101	/* struct binder_buffer_object - object describing a userspace buffer
		102	* @hdr: common header structure
		103	* @flags: one or more BINDER_BUFFER_* flags
		104	* @buffer: address of the buffer
		105	* @length: length of the buffer
		106	* @parent: index in offset array pointing to parent buffer
		107	* @parent_offset: offset in @parent pointing to this buffer
		108	*
		109	* A binder_buffer object represents an object that the
		110	* binder kernel driver can copy verbatim to the target
		111	* address space. A buffer itself may be pointed to from
		112	* within another buffer, meaning that the pointer inside
		113	* that other buffer needs to be fixed up as well. This
		114	* can be done by setting the BINDER_BUFFER_FLAG_HAS_PARENT
		115	* flag in @flags, by setting @parent buffer to the index
		116	* in the offset array pointing to the parent binder_buffer_object,
		117	* and by setting @parent_offset to the offset in the parent buffer
		118	* at which the pointer to this buffer is located.
		119	*/
		120	struct binder_buffer_object {
		121	struct binder_object_header hdr;
		122	__u32 flags;
		123	binder_uintptr_t buffer;
		124	binder_size_t length;
		125	binder_size_t parent;
		126	binder_size_t parent_offset;
		127	};
		128
		129	enum {
		130	BINDER_BUFFER_FLAG_HAS_PARENT = 0x01,
		131	};
		132
		133	/* struct binder_fd_array_object - object describing an array of fds in a buffer
		134	* @hdr: common header structure
		135	* @num_fds: number of file descriptors in the buffer
		136	* @parent: index in offset array to buffer holding the fd array
		137	* @parent_offset: start offset of fd array in the buffer
		138	*
		139	* A binder_fd_array object represents an array of file
		140	* descriptors embedded in a binder_buffer_object. It is
		141	* different from a regular binder_buffer_object because it
		142	* describes a list of file descriptors to fix up, not an opaque
		143	* blob of memory, and hence the kernel needs to treat it differently.
		144	*
		145	* An example of how this would be used is with Android's
		146	* native_handle_t object, which is a struct with a list of integers
		147	* and a list of file descriptors. The native_handle_t struct itself
		148	* will be represented by a struct binder_buffer_objct, whereas the
		149	* embedded list of file descriptors is represented by a
		150	* struct binder_fd_array_object with that binder_buffer_object as
		151	* a parent.
		152	*/
		153	struct binder_fd_array_object {
		154	struct binder_object_header hdr;
		155	binder_size_t num_fds;
		156	binder_size_t parent;
		157	binder_size_t parent_offset;
		158	};
		159
73	/*	160	/*
74	* On 64-bit platforms where user code may run in 32-bits the driver must	161	* On 64-bit platforms where user code may run in 32-bits the driver must
75	* translate the buffer (and local binder) addresses appropriately.	162	* translate the buffer (and local binder) addresses appropriately.
@@ -162,6 +249,11 @@ struct binder_transaction_data { · 86 unmodified lines
162	} data;	249	} data;
163	};	250	};
164		251
		252	struct binder_transaction_data_sg {
		253	struct binder_transaction_data transaction_data;
		254	binder_size_t buffers_size;
		255	};
		256
165	struct binder_ptr_cookie {	257	struct binder_ptr_cookie {
166	binder_uintptr_t ptr;	258	binder_uintptr_t ptr;
167	binder_uintptr_t cookie;	259	binder_uintptr_t cookie;
@@ -346,6 +438,12 @@ enum binder_driver_command_protocol { · 178 unmodified lines
346	/*	438	/*
347	* void *: cookie	439	* void *: cookie
348	*/	440	*/
		441
		442	BC_TRANSACTION_SG = _IOW('c', 17, struct binder_transaction_data_sg),
		443	BC_REPLY_SG = _IOW('c', 18, struct binder_transaction_data_sg),
		444	/*
		445	* binder_transaction_data_sg: the sent command.
		446	*/
349	};	447	};
350		448
351	#endif /* _UAPI_LINUX_BINDER_H */	449	#endif /* _UAPI_LINUX_BINDER_H */

include/uapi/linux/auto_dev-ioctl.h+2−8

 static inline void init_autofs_dev_ioctl(struct autofs_dev_ioctl *in)
 {
-	memset(in, 0, sizeof(struct autofs_dev_ioctl));
+	memset(in, 0, AUTOFS_DEV_IOCTL_SIZE);
 	in->ver_major = AUTOFS_DEV_IOCTL_VERSION_MAJOR;
 	in->ver_minor = AUTOFS_DEV_IOCTL_VERSION_MINOR;
-	in->size = sizeof(struct autofs_dev_ioctl);
+	in->size = AUTOFS_DEV_IOCTL_SIZE;
 	in->ioctlfd = -1;
 }
-/*
- * If you change this make sure you make the corresponding change
- * to autofs-dev-ioctl.c:lookup_ioctl()
- */
 enum {
 	/* Get various version info */
 	AUTOFS_DEV_IOCTL_VERSION_CMD = 0x71,
 	AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD,
 };
-#define AUTOFS_IOCTL 0x93
 #define AUTOFS_DEV_IOCTL_VERSION \
 	_IOWR(AUTOFS_IOCTL, \
 	      AUTOFS_DEV_IOCTL_VERSION_CMD, struct autofs_dev_ioctl)

include/uapi/linux/auto_fs.h+18−7

@@ -61,12 +61,23 @@ struct autofs_packet_expire { · 60 unmodified lines
61	char name[NAME_MAX+1];	61	char name[NAME_MAX+1];
62	};	62	};
63		63
64	#define AUTOFS_IOC_READY _IO(0x93, 0x60)	64	#define AUTOFS_IOCTL 0x93
65	#define AUTOFS_IOC_FAIL _IO(0x93, 0x61)	65
66	#define AUTOFS_IOC_CATATONIC _IO(0x93, 0x62)	66	enum {
67	#define AUTOFS_IOC_PROTOVER _IOR(0x93, 0x63, int)	67	AUTOFS_IOC_READY_CMD = 0x60,
68	#define AUTOFS_IOC_SETTIMEOUT32 _IOWR(0x93, 0x64, compat_ulong_t)	68	AUTOFS_IOC_FAIL_CMD,
69	#define AUTOFS_IOC_SETTIMEOUT _IOWR(0x93, 0x64, unsigned long)	69	AUTOFS_IOC_CATATONIC_CMD,
70	#define AUTOFS_IOC_EXPIRE _IOR(0x93, 0x65, struct autofs_packet_expire)	70	AUTOFS_IOC_PROTOVER_CMD,
		71	AUTOFS_IOC_SETTIMEOUT_CMD,
		72	AUTOFS_IOC_EXPIRE_CMD,
		73	};
		74
		75	#define AUTOFS_IOC_READY _IO(AUTOFS_IOCTL, AUTOFS_IOC_READY_CMD)
		76	#define AUTOFS_IOC_FAIL _IO(AUTOFS_IOCTL, AUTOFS_IOC_FAIL_CMD)
		77	#define AUTOFS_IOC_CATATONIC _IO(AUTOFS_IOCTL, AUTOFS_IOC_CATATONIC_CMD)
		78	#define AUTOFS_IOC_PROTOVER _IOR(AUTOFS_IOCTL, AUTOFS_IOC_PROTOVER_CMD, int)
		79	#define AUTOFS_IOC_SETTIMEOUT32 _IOWR(AUTOFS_IOCTL, AUTOFS_IOC_SETTIMEOUT_CMD, compat_ulong_t)
		80	#define AUTOFS_IOC_SETTIMEOUT _IOWR(AUTOFS_IOCTL, AUTOFS_IOC_SETTIMEOUT_CMD, unsigned long)
		81	#define AUTOFS_IOC_EXPIRE _IOR(AUTOFS_IOCTL, AUTOFS_IOC_EXPIRE_CMD, struct autofs_packet_expire)
71		82
72	#endif /* _UAPI_LINUX_AUTO_FS_H */	83	#endif /* _UAPI_LINUX_AUTO_FS_H */

include/uapi/linux/auto_fs4.h+11−5

 	autofs_packet_expire_direct_t expire_direct;
 };
-#define AUTOFS_IOC_EXPIRE_MULTI		_IOW(0x93, 0x66, int)
+enum {
-#define AUTOFS_IOC_EXPIRE_INDIRECT	AUTOFS_IOC_EXPIRE_MULTI
+	AUTOFS_IOC_EXPIRE_MULTI_CMD = 0x66, /* AUTOFS_IOC_EXPIRE_CMD + 1 */
-#define AUTOFS_IOC_EXPIRE_DIRECT	AUTOFS_IOC_EXPIRE_MULTI
+	AUTOFS_IOC_PROTOSUBVER_CMD,
-#define AUTOFS_IOC_PROTOSUBVER		_IOR(0x93, 0x67, int)
+	AUTOFS_IOC_ASKUMOUNT_CMD = 0x70, /* AUTOFS_DEV_IOCTL_VERSION_CMD - 1 */
-#define AUTOFS_IOC_ASKUMOUNT		_IOR(0x93, 0x70, int)
+};
+#define AUTOFS_IOC_EXPIRE_MULTI    _IOW(AUTOFS_IOCTL, AUTOFS_IOC_EXPIRE_MULTI_CMD, int)
+#define AUTOFS_IOC_EXPIRE_INDIRECT AUTOFS_IOC_EXPIRE_MULTI
+#define AUTOFS_IOC_EXPIRE_DIRECT   AUTOFS_IOC_EXPIRE_MULTI
+#define AUTOFS_IOC_PROTOSUBVER     _IOR(AUTOFS_IOCTL, AUTOFS_IOC_PROTOSUBVER_CMD, int)
+#define AUTOFS_IOC_ASKUMOUNT       _IOR(AUTOFS_IOCTL, AUTOFS_IOC_ASKUMOUNT_CMD, int)
 #endif /* _LINUX_AUTO_FS4_H */

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

@@ -1,4 +1,4 @@
1	/* Copyright (C) 2016 B.A.T.M.A.N. contributors:	1	/* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors:
2	*	2	*
3	* Matthias Schiffer	3	* Matthias Schiffer
4	*	4	*

include/uapi/linux/bpf.h+22−1

 	__s32	imm;		/* signed immediate constant */
 };
+/* Key of an a BPF_MAP_TYPE_LPM_TRIE entry */
+struct bpf_lpm_trie_key {
+	__u32	prefixlen;	/* up to 32 for AF_INET, 128 for AF_INET6 */
+	__u8	data[0];	/* Arbitrary size */
+};
 /* BPF syscall commands, see bpf(2) man-page for details. */
 enum bpf_cmd {
 	BPF_MAP_CREATE,
 	BPF_MAP_TYPE_CGROUP_ARRAY,
 	BPF_MAP_TYPE_LRU_HASH,
 	BPF_MAP_TYPE_LRU_PERCPU_HASH,
+	BPF_MAP_TYPE_LPM_TRIE,
 };
 enum bpf_prog_type {
  *     @xdp_md: pointer to xdp_md
  *     @delta: An positive/negative integer to be added to xdp_md.data
  *     Return: 0 on success or negative on error
+ *
+ * int bpf_probe_read_str(void *dst, int size, const void *unsafe_ptr)
+ *     Copy a NUL terminated string from unsafe address. In case the string
+ *     length is smaller than size, the target is not padded with further NUL
+ *     bytes. In case the string length is larger than size, just count-1
+ *     bytes are copied and the last byte is set to NUL.
+ *     @dst: destination address
+ *     @size: maximum number of bytes to copy, including the trailing NUL
+ *     @unsafe_ptr: unsafe address
+ *     Return:
+ *       > 0 length of the string including the trailing NUL on success
+ *       < 0 error
  */
 #define __BPF_FUNC_MAPPER(FN)		\
 	FN(unspec),			\
 	FN(set_hash_invalid),		\
 	FN(get_numa_node_id),		\
 	FN(skb_change_head),		\
-	FN(xdp_adjust_head),
+	FN(xdp_adjust_head),		\
+	FN(probe_read_str),
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper
  * function eBPF program intends to call
 /* BPF_FUNC_l4_csum_replace flags. */
 #define BPF_F_PSEUDO_HDR		(1ULL << 4)
 #define BPF_F_MARK_MANGLED_0		(1ULL << 5)
+#define BPF_F_MARK_ENFORCE		(1ULL << 6)
 /* BPF_FUNC_clone_redirect and BPF_FUNC_redirect flags. */
 #define BPF_F_INGRESS			(1ULL << 0)

include/uapi/linux/can/netlink.h+7−0

 	IFLA_CAN_BERR_COUNTER,
 	IFLA_CAN_DATA_BITTIMING,
 	IFLA_CAN_DATA_BITTIMING_CONST,
+	IFLA_CAN_TERMINATION,
+	IFLA_CAN_TERMINATION_CONST,
+	IFLA_CAN_BITRATE_CONST,
+	IFLA_CAN_DATA_BITRATE_CONST,
 	__IFLA_CAN_MAX
 };
 #define IFLA_CAN_MAX	(__IFLA_CAN_MAX - 1)
+/* u16 termination range: 1..65535 Ohms */
+#define CAN_TERMINATION_DISABLED 0
 #endif /* !_UAPI_CAN_NETLINK_H */

include/uapi/linux/devlink.h+8−2

 	DEVLINK_CMD_SB_OCC_SNAPSHOT,
 	DEVLINK_CMD_SB_OCC_MAX_CLEAR,
-	DEVLINK_CMD_ESWITCH_MODE_GET,
+	DEVLINK_CMD_ESWITCH_GET,
-	DEVLINK_CMD_ESWITCH_MODE_SET,
+#define DEVLINK_CMD_ESWITCH_MODE_GET /* obsolete, never use this! */ \
+	DEVLINK_CMD_ESWITCH_GET
+	DEVLINK_CMD_ESWITCH_SET,
+#define DEVLINK_CMD_ESWITCH_MODE_SET /* obsolete, never use this! */ \
+	DEVLINK_CMD_ESWITCH_SET
 	/* add new commands above here */
 	__DEVLINK_CMD_MAX,

include/uapi/linux/fcntl.h+5−0

@@ -63,5 +63,10 @@ · 62 unmodified lines
63	#define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount traversal */	63	#define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount traversal */
64	#define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname */	64	#define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname */
65		65
		66	#define AT_STATX_SYNC_TYPE 0x6000 /* Type of synchronisation required from statx() */
		67	#define AT_STATX_SYNC_AS_STAT 0x0000 /* - Do whatever stat() does */
		68	#define AT_STATX_FORCE_SYNC 0x2000 /* - Force the attributes to be sync'd with the server */
		69	#define AT_STATX_DONT_SYNC 0x4000 /* - Don't sync attributes with the server */
		70
66		71
67	#endif /* _UAPI_LINUX_FCNTL_H */	72	#endif /* _UAPI_LINUX_FCNTL_H */

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

@@ -132,6 +132,7 @@ struct inodes_stat_t { · 131 unmodified lines
132	#define MS_LAZYTIME (1<<25) /* Update the on-disk [acm]times lazily */	132	#define MS_LAZYTIME (1<<25) /* Update the on-disk [acm]times lazily */
133		133
134	/* These sb flags are internal to the kernel */	134	/* These sb flags are internal to the kernel */
		135	#define MS_SUBMOUNT (1<<26)
135	#define MS_NOREMOTELOCK (1<<27)	136	#define MS_NOREMOTELOCK (1<<27)
136	#define MS_NOSEC (1<<28)	137	#define MS_NOSEC (1<<28)
137	#define MS_BORN (1<<29)	138	#define MS_BORN (1<<29)

include/uapi/linux/if.h+4−0

 #include <linux/socket.h>		/* for "struct sockaddr" et al	*/
 #include <linux/compiler.h>		/* for "__user" et al           */
+#ifndef __KERNEL__
+#include <sys/socket.h>			/* for struct sockaddr.		*/
+#endif
 #if __UAPI_DEF_IF_IFNAMSIZ
 #define	IFNAMSIZ	16
 #endif /* __UAPI_DEF_IF_IFNAMSIZ */

include/uapi/linux/if_bridge.h+11−0

 	IFLA_BRIDGE_FLAGS,
 	IFLA_BRIDGE_MODE,
 	IFLA_BRIDGE_VLAN_INFO,
+	IFLA_BRIDGE_VLAN_TUNNEL_INFO,
 	__IFLA_BRIDGE_MAX,
 };
 #define IFLA_BRIDGE_MAX (__IFLA_BRIDGE_MAX - 1)
 	__u16 vid;
 };
+enum {
+	IFLA_BRIDGE_VLAN_TUNNEL_UNSPEC,
+	IFLA_BRIDGE_VLAN_TUNNEL_ID,
+	IFLA_BRIDGE_VLAN_TUNNEL_VID,
+	IFLA_BRIDGE_VLAN_TUNNEL_FLAGS,
+	__IFLA_BRIDGE_VLAN_TUNNEL_MAX,
+};
+#define IFLA_BRIDGE_VLAN_TUNNEL_MAX (__IFLA_BRIDGE_VLAN_TUNNEL_MAX - 1)
 struct bridge_vlan_xstats {
 	__u64 rx_bytes;
 	__u64 rx_packets;

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

@@ -93,6 +93,7 @@ · 92 unmodified lines
93	#define ETH_P_NCSI 0x88F8 /* NCSI protocol */	93	#define ETH_P_NCSI 0x88F8 /* NCSI protocol */
94	#define ETH_P_PRP 0x88FB /* IEC 62439-3 PRP/HSRv0 */	94	#define ETH_P_PRP 0x88FB /* IEC 62439-3 PRP/HSRv0 */
95	#define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */	95	#define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */
		96	#define ETH_P_IBOE 0x8915 /* Infiniband over Ethernet */
96	#define ETH_P_TDLS 0x890D /* TDLS */	97	#define ETH_P_TDLS 0x890D /* TDLS */
97	#define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */	98	#define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */
98	#define ETH_P_80221 0x8917 /* IEEE 802.21 Media Independent Handover Protocol */	99	#define ETH_P_80221 0x8917 /* IEEE 802.21 Media Independent Handover Protocol */

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

 	IFLA_BRPORT_MULTICAST_ROUTER,
 	IFLA_BRPORT_PAD,
 	IFLA_BRPORT_MCAST_FLOOD,
+	IFLA_BRPORT_MCAST_TO_UCAST,
+	IFLA_BRPORT_VLAN_TUNNEL,
 	__IFLA_BRPORT_MAX
 };
 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
 	IFLA_STATS_LINK_XSTATS,
 	IFLA_STATS_LINK_XSTATS_SLAVE,
 	IFLA_STATS_LINK_OFFLOAD_XSTATS,
+	IFLA_STATS_AF_SPEC,
 	__IFLA_STATS_MAX,
 };

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

@@ -0,0 +1,18 @@
	1	#ifndef __UAPI_IFE_H
	2	#define __UAPI_IFE_H
	3
	4	#define IFE_METAHDRLEN 2
	5
	6	enum {
	7	IFE_META_SKBMARK = 1,
	8	IFE_META_HASHID,
	9	IFE_META_PRIO,
	10	IFE_META_QMAP,
	11	IFE_META_TCINDEX,
	12	__IFE_META_MAX
	13	};
	14
	15	/Can be overridden at runtime by module option/
	16	#define IFE_META_MAX (__IFE_META_MAX - 1)
	17
	18	#endif

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

@@ -53,7 +53,7 @@ struct igmpv3_grec { · 52 unmodified lines
53	struct igmpv3_report {	53	struct igmpv3_report {
54	__u8 type;	54	__u8 type;
55	__u8 resv1;	55	__u8 resv1;
56	__be16 csum;	56	__sum16 csum;
57	__be16 resv2;	57	__be16 resv2;
58	__be16 ngrec;	58	__be16 ngrec;
59	struct igmpv3_grec grec[0];	59	struct igmpv3_grec grec[0];
@@ -62,7 +62,7 @@ struct igmpv3_report { · 2 unmodified lines
62	struct igmpv3_query {	62	struct igmpv3_query {
63	__u8 type;	63	__u8 type;
64	__u8 code;	64	__u8 code;
65	__be16 csum;	65	__sum16 csum;
66	__be32 group;	66	__be32 group;
67	#if defined(__LITTLE_ENDIAN_BITFIELD)	67	#if defined(__LITTLE_ENDIAN_BITFIELD)
68	__u8 qrv:3,	68	__u8 qrv:3,

include/uapi/linux/iio/types.h+1−0

@@ -42,6 +42,7 @@ enum iio_chan_type { · 41 unmodified lines
42	IIO_ELECTRICALCONDUCTIVITY,	42	IIO_ELECTRICALCONDUCTIVITY,
43	IIO_COUNT,	43	IIO_COUNT,
44	IIO_INDEX,	44	IIO_INDEX,
		45	IIO_GRAVITY,
45	};	46	};
46		47
47	enum iio_modifier {	48	enum iio_modifier {

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

@@ -2,6 +2,8 @@ · 1 unmodified line
2	#define _IP6_TUNNEL_H	2	#define _IP6_TUNNEL_H
3		3
4	#include <linux/types.h>	4	#include <linux/types.h>
		5	#include <linux/if.h> /* For IFNAMSIZ. */
		6	#include <linux/in6.h> /* For struct in6_addr. */
5		7
6	#define IPV6_TLV_TNL_ENCAP_LIMIT 4	8	#define IPV6_TLV_TNL_ENCAP_LIMIT 4
7	#define IPV6_DEFAULT_TNL_ENCAP_LIMIT 4	9	#define IPV6_DEFAULT_TNL_ENCAP_LIMIT 4

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

@@ -182,6 +182,7 @@ enum { · 181 unmodified lines
182	DEVCONF_SEG6_ENABLED,	182	DEVCONF_SEG6_ENABLED,
183	DEVCONF_SEG6_REQUIRE_HMAC,	183	DEVCONF_SEG6_REQUIRE_HMAC,
184	DEVCONF_ENHANCED_DAD,	184	DEVCONF_ENHANCED_DAD,
		185	DEVCONF_ADDR_GEN_MODE,
185	DEVCONF_MAX	186	DEVCONF_MAX
186	};	187	};
187		188

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

@@ -14,6 +14,7 @@ · 13 unmodified lines
14	#define _UAPI_LINUX_IPV6_ROUTE_H	14	#define _UAPI_LINUX_IPV6_ROUTE_H
15		15
16	#include <linux/types.h>	16	#include <linux/types.h>
		17	#include <linux/in6.h> /* For struct in6_addr. */
17		18
18	#define RTF_DEFAULT 0x00010000 /* default - learned via ND */	19	#define RTF_DEFAULT 0x00010000 /* default - learned via ND */
19	#define RTF_ALLONLINK 0x00020000 /* (deprecated and will be removed)	20	#define RTF_ALLONLINK 0x00020000 /* (deprecated and will be removed)

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

 struct kvm_run {
 	/* in */
 	__u8 request_interrupt_window;
-	__u8 padding1[7];
+	__u8 immediate_exit;
+	__u8 padding1[6];
 	/* out */
 	__u32 exit_reason;
 	struct kvm_ppc_one_seg_page_size sps[KVM_PPC_PAGE_SIZES_MAX_SZ];
 };
+/* for KVM_PPC_RESIZE_HPT_{PREPARE,COMMIT} */
+struct kvm_ppc_resize_hpt {
+	__u64 flags;
+	__u32 shift;
+	__u32 pad;
+};
 #define KVMIO 0xAE
 /* machine type bits, to be used as argument to KVM_CREATE_VM */
 #define KVM_CAP_S390_USER_INSTR0 130
 #define KVM_CAP_MSI_DEVID 131
 #define KVM_CAP_PPC_HTM 132
+#define KVM_CAP_SPAPR_RESIZE_HPT 133
+#define KVM_CAP_PPC_MMU_RADIX 134
+#define KVM_CAP_PPC_MMU_HASH_V3 135
+#define KVM_CAP_IMMEDIATE_EXIT 136
 #ifdef KVM_CAP_IRQ_ROUTING
 #define KVM_ARM_SET_DEVICE_ADDR	  _IOW(KVMIO,  0xab, struct kvm_arm_device_addr)
 /* Available with KVM_CAP_PPC_RTAS */
 #define KVM_PPC_RTAS_DEFINE_TOKEN _IOW(KVMIO,  0xac, struct kvm_rtas_token_args)
+/* Available with KVM_CAP_SPAPR_RESIZE_HPT */
+#define KVM_PPC_RESIZE_HPT_PREPARE _IOR(KVMIO, 0xad, struct kvm_ppc_resize_hpt)
+#define KVM_PPC_RESIZE_HPT_COMMIT  _IOR(KVMIO, 0xae, struct kvm_ppc_resize_hpt)
+/* Available with KVM_CAP_PPC_RADIX_MMU or KVM_CAP_PPC_HASH_MMU_V3 */
+#define KVM_PPC_CONFIGURE_V3_MMU  _IOW(KVMIO,  0xaf, struct kvm_ppc_mmuv3_cfg)
+/* Available with KVM_CAP_PPC_RADIX_MMU */
+#define KVM_PPC_GET_RMMU_INFO	  _IOW(KVMIO,  0xb0, struct kvm_ppc_rmmu_info)
 /* ioctl for vm fd */
 #define KVM_CREATE_DEVICE	  _IOWR(KVMIO,  0xe0, struct kvm_create_device)

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

 #define KVM_EFAULT		EFAULT
 #define KVM_E2BIG		E2BIG
 #define KVM_EPERM		EPERM
+#define KVM_EOPNOTSUPP		95
 #define KVM_HC_VAPIC_POLL_IRQ		1
 #define KVM_HC_MMU_OP			2
 #define KVM_HC_MIPS_GET_CLOCK_FREQ	6
 #define KVM_HC_MIPS_EXIT_VM		7
 #define KVM_HC_MIPS_CONSOLE_OUTPUT	8
+#define KVM_HC_CLOCK_PAIRING		9
 /*
  * hypercalls use architecture specific

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

@@ -14,6 +14,7 @@ · 13 unmodified lines
14	#define _UAPI__LINUX_LLC_H	14	#define _UAPI__LINUX_LLC_H
15		15
16	#include <linux/socket.h>	16	#include <linux/socket.h>
		17	#include <linux/if.h> /* For IFHWADDRLEN. */
17		18
18	#define __LLC_SOCK_SIZE__ 16 /* sizeof(sockaddr_llc), word align. */	19	#define __LLC_SOCK_SIZE__ 16 /* sizeof(sockaddr_llc), word align. */
19	struct sockaddr_llc {	20	struct sockaddr_llc {

include/uapi/linux/mpls.h+30−0

@@ -43,4 +43,34 @@ struct mpls_label { · 42 unmodified lines
43		43
44	#define MPLS_LABEL_FIRST_UNRESERVED 16 /* RFC3032 */	44	#define MPLS_LABEL_FIRST_UNRESERVED 16 /* RFC3032 */
45		45
		46	/* These are embedded into IFLA_STATS_AF_SPEC:
		47	* [IFLA_STATS_AF_SPEC]
		48	* -> [AF_MPLS]
		49	* -> [MPLS_STATS_xxx]
		50	*
		51	* Attributes:
		52	* [MPLS_STATS_LINK] = {
		53	* struct mpls_link_stats
		54	* }
		55	*/
		56	enum {
		57	MPLS_STATS_UNSPEC, /* also used as 64bit pad attribute */
		58	MPLS_STATS_LINK,
		59	__MPLS_STATS_MAX,
		60	};
		61
		62	#define MPLS_STATS_MAX (__MPLS_STATS_MAX - 1)
		63
		64	struct mpls_link_stats {
		65	__u64 rx_packets; /* total packets received */
		66	__u64 tx_packets; /* total packets transmitted */
		67	__u64 rx_bytes; /* total bytes received */
		68	__u64 tx_bytes; /* total bytes transmitted */
		69	__u64 rx_errors; /* bad packets received */
		70	__u64 tx_errors; /* packet transmit problems */
		71	__u64 rx_dropped; /* packet dropped on receive */
		72	__u64 tx_dropped; /* packet dropped on transmit */
		73	__u64 rx_noroute; /* no route for packet dest */
		74	};
		75
46	#endif /* _UAPI_MPLS_H */	76	#endif /* _UAPI_MPLS_H */

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

@@ -18,6 +18,8 @@ · 17 unmodified lines
18	#ifndef _LINUX_MQUEUE_H	18	#ifndef _LINUX_MQUEUE_H
19	#define _LINUX_MQUEUE_H	19	#define _LINUX_MQUEUE_H
20		20
		21	#include <linux/types.h>
		22
21	#define MQ_PRIO_MAX 32768	23	#define MQ_PRIO_MAX 32768
22	/* per-uid limit of kernel memory used by mqueue, in bytes */	24	/* per-uid limit of kernel memory used by mqueue, in bytes */
23	#define MQ_BYTES_MAX 819200	25	#define MQ_BYTES_MAX 819200

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

@@ -3,6 +3,7 @@ · 2 unmodified lines
3		3
4	#include <linux/sockios.h>	4	#include <linux/sockios.h>
5	#include <linux/types.h>	5	#include <linux/types.h>
		6	#include <linux/in.h> /* For struct in_addr. */
6		7
7	/* Based on the MROUTING 3.5 defines primarily to keep	8	/* Based on the MROUTING 3.5 defines primarily to keep
8	* source compatibility with BSD.	9	* source compatibility with BSD.

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

@@ -4,6 +4,7 @@ · 3 unmodified lines
4	#include <linux/kernel.h>	4	#include <linux/kernel.h>
5	#include <linux/types.h>	5	#include <linux/types.h>
6	#include <linux/sockios.h>	6	#include <linux/sockios.h>
		7	#include <linux/in6.h> /* For struct sockaddr_in6. */
7		8
8	/*	9	/*
9	* Based on the MROUTING 3.5 defines primarily to keep	10	* Based on the MROUTING 3.5 defines primarily to keep

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

@@ -26,6 +26,7 @@ enum { · 25 unmodified lines
26	NDA_IFINDEX,	26	NDA_IFINDEX,
27	NDA_MASTER,	27	NDA_MASTER,
28	NDA_LINK_NETNSID,	28	NDA_LINK_NETNSID,
		29	NDA_SRC_VNI,
29	__NDA_MAX	30	__NDA_MAX
30	};	31	};
31		32

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

@@ -16,6 +16,7 @@ enum { · 15 unmodified lines
16	NETCONFA_MC_FORWARDING,	16	NETCONFA_MC_FORWARDING,
17	NETCONFA_PROXY_NEIGH,	17	NETCONFA_PROXY_NEIGH,
18	NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN,	18	NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN,
		19	NETCONFA_INPUT,
19	__NETCONFA_MAX	20	__NETCONFA_MAX
20	};	21	};
21	#define NETCONFA_MAX (__NETCONFA_MAX - 1)	22	#define NETCONFA_MAX (__NETCONFA_MAX - 1)

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

@@ -3,7 +3,6 @@ · 2 unmodified lines
3		3
4	#include <linux/types.h>	4	#include <linux/types.h>
5	#include <linux/compiler.h>	5	#include <linux/compiler.h>
6	#include <linux/sysctl.h>
7	#include <linux/in.h>	6	#include <linux/in.h>
8	#include <linux/in6.h>	7	#include <linux/in6.h>
9		8

include/uapi/linux/netfilter/nf_conntrack_common.h+4−0

 	IPS_DYING_BIT = 9,
 	IPS_DYING = (1 << IPS_DYING_BIT),
+	/* Bits that cannot be altered from userland. */
+	IPS_UNCHANGEABLE_MASK = (IPS_NAT_DONE_MASK | IPS_NAT_MASK |
+				 IPS_EXPECTED | IPS_CONFIRMED | IPS_DYING),
 	/* Connection has fixed timeout. */
 	IPS_FIXED_TIMEOUT_BIT = 10,
 	IPS_FIXED_TIMEOUT = (1 << IPS_FIXED_TIMEOUT_BIT),

include/uapi/linux/netfilter/nf_tables.h+31−1

  * @NFTA_RULE_COMPAT: compatibility specifications of the rule (NLA_NESTED: nft_rule_compat_attributes)
  * @NFTA_RULE_POSITION: numeric handle of the previous rule (NLA_U64)
  * @NFTA_RULE_USERDATA: user data (NLA_BINARY, NFT_USERDATA_MAXLEN)
+ * @NFTA_RULE_ID: uniquely identifies a rule in a transaction (NLA_U32)
  */
 enum nft_rule_attributes {
 	NFTA_RULE_UNSPEC,
 	NFTA_RULE_POSITION,
 	NFTA_RULE_USERDATA,
 	NFTA_RULE_PAD,
+	NFTA_RULE_ID,
 	__NFTA_RULE_MAX
 };
 #define NFTA_RULE_MAX		(__NFTA_RULE_MAX - 1)
 };
 #define NFTA_PAYLOAD_MAX	(__NFTA_PAYLOAD_MAX - 1)
+enum nft_exthdr_flags {
+	NFT_EXTHDR_F_PRESENT = (1 << 0),
+};
+/**
+ * enum nft_exthdr_op - nf_tables match options
+ *
+ * @NFT_EXTHDR_OP_IPV6: match against ipv6 extension headers
+ * @NFT_EXTHDR_OP_TCP: match against tcp options
+ */
+enum nft_exthdr_op {
+	NFT_EXTHDR_OP_IPV6,
+	NFT_EXTHDR_OP_TCPOPT,
+	__NFT_EXTHDR_OP_MAX
+};
+#define NFT_EXTHDR_OP_MAX	(__NFT_EXTHDR_OP_MAX - 1)
 /**
- * enum nft_exthdr_attributes - nf_tables IPv6 extension header expression netlink attributes
+ * enum nft_exthdr_attributes - nf_tables extension header expression netlink attributes
  *
  * @NFTA_EXTHDR_DREG: destination register (NLA_U32: nft_registers)
  * @NFTA_EXTHDR_TYPE: extension header type (NLA_U8)
  * @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)
  */
 enum nft_exthdr_attributes {
 	NFTA_EXTHDR_UNSPEC,
 	NFTA_EXTHDR_TYPE,
 	NFTA_EXTHDR_OFFSET,
 	NFTA_EXTHDR_LEN,
+	NFTA_EXTHDR_FLAGS,
+	NFTA_EXTHDR_OP,
 	__NFTA_EXTHDR_MAX
 };
 #define NFTA_EXTHDR_MAX		(__NFTA_EXTHDR_MAX - 1)
  * @NFT_CT_PROTOCOL: conntrack layer 4 protocol
  * @NFT_CT_PROTO_SRC: conntrack layer 4 protocol source
  * @NFT_CT_PROTO_DST: conntrack layer 4 protocol destination
+ * @NFT_CT_LABELS: conntrack labels
+ * @NFT_CT_PKTS: conntrack packets
+ * @NFT_CT_BYTES: conntrack bytes
+ * @NFT_CT_AVGPKT: conntrack average bytes per packet
+ * @NFT_CT_ZONE: conntrack zone
  */
 enum nft_ct_keys {
 	NFT_CT_STATE,
 	NFT_CT_LABELS,
 	NFT_CT_PKTS,
 	NFT_CT_BYTES,
+	NFT_CT_AVGPKT,
+	NFT_CT_ZONE,
 };
 /**

include/uapi/linux/netfilter/nfnetlink.h+12−0

@@ -65,4 +65,16 @@ struct nfgenmsg { · 64 unmodified lines
65	#define NFNL_MSG_BATCH_BEGIN NLMSG_MIN_TYPE	65	#define NFNL_MSG_BATCH_BEGIN NLMSG_MIN_TYPE
66	#define NFNL_MSG_BATCH_END NLMSG_MIN_TYPE+1	66	#define NFNL_MSG_BATCH_END NLMSG_MIN_TYPE+1
67		67
		68	/**
		69	* enum nfnl_batch_attributes - nfnetlink batch netlink attributes
		70	*
		71	* @NFNL_BATCH_GENID: generation ID for this changeset (NLA_U32)
		72	*/
		73	enum nfnl_batch_attributes {
		74	NFNL_BATCH_UNSPEC,
		75	NFNL_BATCH_GENID,
		76	__NFNL_BATCH_MAX
		77	};
		78	#define NFNL_BATCH_MAX (__NFNL_BATCH_MAX - 1)
		79
68	#endif /* _UAPI_NFNETLINK_H */	80	#endif /* _UAPI_NFNETLINK_H */

include/uapi/linux/netfilter/nfnetlink_queue.h+1−1

@@ -36,7 +36,7 @@ enum nfqnl_vlan_attr { · 35 unmodified lines
36	NFQA_VLAN_TCI, /* __be16 skb htons(vlan_tci) */	36	NFQA_VLAN_TCI, /* __be16 skb htons(vlan_tci) */
37	__NFQA_VLAN_MAX,	37	__NFQA_VLAN_MAX,
38	};	38	};
39	#define NFQA_VLAN_MAX (__NFQA_VLAN_MAX + 1)	39	#define NFQA_VLAN_MAX (__NFQA_VLAN_MAX - 1)
40		40
41	enum nfqnl_attr_type {	41	enum nfqnl_attr_type {
42	NFQA_UNSPEC,	42	NFQA_UNSPEC,

include/uapi/linux/netfilter/xt_hashlimit.h+1−0

@@ -2,6 +2,7 @@ · 1 unmodified line
2	#define _UAPI_XT_HASHLIMIT_H	2	#define _UAPI_XT_HASHLIMIT_H
3		3
4	#include <linux/types.h>	4	#include <linux/types.h>
		5	#include <linux/limits.h>
5	#include <linux/if.h>	6	#include <linux/if.h>
6		7
7	/* timings are in milliseconds. */	8	/* timings are in milliseconds. */

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

@@ -27,6 +27,7 @@ · 26 unmodified lines
27	#define NETLINK_ECRYPTFS 19	27	#define NETLINK_ECRYPTFS 19
28	#define NETLINK_RDMA 20	28	#define NETLINK_RDMA 20
29	#define NETLINK_CRYPTO 21 /* Crypto layer */	29	#define NETLINK_CRYPTO 21 /* Crypto layer */
		30	#define NETLINK_SMC 22 /* SMC monitoring */
30		31
31	#define NETLINK_INET_DIAG NETLINK_SOCK_DIAG	32	#define NETLINK_INET_DIAG NETLINK_SOCK_DIAG
32		33

include/uapi/linux/nfsd/export.h+3−2

 #define NFSEXP_ASYNC		0x0010
 #define NFSEXP_GATHERED_WRITES	0x0020
 #define NFSEXP_NOREADDIRPLUS    0x0040
-/* 80 100 currently unused */
+#define NFSEXP_SECURITY_LABEL	0x0080
+/* 0x100 currently unused */
 #define NFSEXP_NOHIDE		0x0200
 #define NFSEXP_NOSUBTREECHECK	0x0400
 #define	NFSEXP_NOAUTHNLM	0x0800		/* Don't authenticate NLM requests - just trust */
 #define NFSEXP_PNFS		0x20000
 /* All flags that we claim to support.  (Note we don't support NOACL.) */
-#define NFSEXP_ALLFLAGS		0x3FE7F
+#define NFSEXP_ALLFLAGS		0x3FEFF
 /* The flags that may vary depending on security flavor: */
 #define NFSEXP_SECINFO_FLAGS	(NFSEXP_READONLY | NFSEXP_ROOTSQUASH \

include/uapi/linux/nl80211.h+91−33

  * Copyright 2008, 2009 Luis R. Rodriguez <lrodriguez@atheros.com>
  * Copyright 2008 Jouni Malinen <jouni.malinen@atheros.com>
  * Copyright 2008 Colin McCabe <colin@cozybit.com>
- * Copyright 2015	Intel Deutschland GmbH
+ * Copyright 2015-2017	Intel Deutschland GmbH
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *	cfg80211_scan_done().
  *
  * @NL80211_CMD_START_NAN: Start NAN operation, identified by its
- *	%NL80211_ATTR_WDEV interface. This interface must have been previously
+ *	%NL80211_ATTR_WDEV interface. This interface must have been
- *	created with %NL80211_CMD_NEW_INTERFACE. After it has been started, the
+ *	previously created with %NL80211_CMD_NEW_INTERFACE. After it
- *	NAN interface will create or join a cluster. This command must have a
+ *	has been started, the NAN interface will create or join a
- *	valid %NL80211_ATTR_NAN_MASTER_PREF attribute and optional
+ *	cluster. This command must have a valid
- *	%NL80211_ATTR_NAN_DUAL attributes.
+ *	%NL80211_ATTR_NAN_MASTER_PREF attribute and optional
- *	After this command NAN functions can be added.
+ *	%NL80211_ATTR_BANDS attributes.  If %NL80211_ATTR_BANDS is
+ *	omitted or set to 0, it means don't-care and the device will
+ *	decide what to use.  After this command NAN functions can be
+ *	added.
  * @NL80211_CMD_STOP_NAN: Stop the NAN operation, identified by
  *	its %NL80211_ATTR_WDEV interface.
  * @NL80211_CMD_ADD_NAN_FUNCTION: Add a NAN function. The function is defined
  *	This command is also used as a notification sent when a NAN function is
  *	terminated. This will contain a %NL80211_ATTR_NAN_FUNC_INST_ID
  *	and %NL80211_ATTR_COOKIE attributes.
- * @NL80211_CMD_CHANGE_NAN_CONFIG: Change current NAN configuration. NAN
+ * @NL80211_CMD_CHANGE_NAN_CONFIG: Change current NAN
- *	must be operational (%NL80211_CMD_START_NAN was executed).
+ *	configuration. NAN must be operational (%NL80211_CMD_START_NAN
- *	It must contain at least one of the following attributes:
+ *	was executed).  It must contain at least one of the following
- *	%NL80211_ATTR_NAN_MASTER_PREF, %NL80211_ATTR_NAN_DUAL.
+ *	attributes: %NL80211_ATTR_NAN_MASTER_PREF,
+ *	%NL80211_ATTR_BANDS.  If %NL80211_ATTR_BANDS is omitted, the
+ *	current configuration is not changed.  If it is present but
+ *	set to zero, the configuration is changed to don't-care
+ *	(i.e. the device can decide what to do).
  * @NL80211_CMD_NAN_FUNC_MATCH: Notification sent when a match is reported.
  *	This will contain a %NL80211_ATTR_NAN_MATCH nested attribute and
  *	%NL80211_ATTR_COOKIE.
  *	and remove functions. NAN notifications will be sent in unicast to that
  *	socket. Without this attribute, any socket can add functions and the
  *	notifications will be sent to the %NL80211_MCGRP_NAN multicast group.
+ *	If set during %NL80211_CMD_ASSOCIATE or %NL80211_CMD_CONNECT the
+ *	station will deauthenticate when the socket is closed.
  *
  * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is
  *	the TDLS link initiator.
  *	%NL80211_CMD_CHANGE_NAN_CONFIG. Its type is u8 and it can't be 0.
  *	Also, values 1 and 255 are reserved for certification purposes and
  *	should not be used during a normal device operation.
- * @NL80211_ATTR_NAN_DUAL: NAN dual band operation config (see
+ * @NL80211_ATTR_BANDS: operating bands configuration.  This is a u32
- *	&enum nl80211_nan_dual_band_conf). This attribute is used with
+ *	bitmask of BIT(NL80211_BAND_*) as described in %enum
- *	%NL80211_CMD_START_NAN and optionally with
+ *	nl80211_band.  For instance, for NL80211_BAND_2GHZ, bit 0
- *	%NL80211_CMD_CHANGE_NAN_CONFIG.
+ *	would be set.  This attribute is used with
+ *	%NL80211_CMD_START_NAN and %NL80211_CMD_CHANGE_NAN_CONFIG, and
+ *	it is optional.  If no bands are set, it means don't-care and
+ *	the device will decide what to use.
  * @NL80211_ATTR_NAN_FUNC: a function that can be added to NAN. See
  *	&enum nl80211_nan_func_attributes for description of this nested
  *	attribute.
  * @NL80211_ATTR_BSSID: The BSSID of the AP. Note that %NL80211_ATTR_MAC is also
  *	used in various commands/events for specifying the BSSID.
  *
+ * @NL80211_ATTR_SCHED_SCAN_RELATIVE_RSSI: Relative RSSI threshold by which
+ *	other BSSs has to be better or slightly worse than the current
+ *	connected BSS so that they get reported to user space.
+ *	This will give an opportunity to userspace to consider connecting to
+ *	other matching BSSs which have better or slightly worse RSSI than
+ *	the current connected BSS by using an offloaded operation to avoid
+ *	unnecessary wakeups.
+ *
+ * @NL80211_ATTR_SCHED_SCAN_RSSI_ADJUST: When present the RSSI level for BSSs in
+ *	the specified band is to be adjusted before doing
+ *	%NL80211_ATTR_SCHED_SCAN_RELATIVE_RSSI based comparision to figure out
+ *	better BSSs. The attribute value is a packed structure
+ *	value as specified by &struct nl80211_bss_select_rssi_adjust.
+ *
+ * @NL80211_ATTR_TIMEOUT_REASON: The reason for which an operation timed out.
+ *	u32 attribute with an &enum nl80211_timeout_reason value. This is used,
+ *	e.g., with %NL80211_CMD_CONNECT event.
+ *
  * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
 	NL80211_ATTR_MESH_PEER_AID,
 	NL80211_ATTR_NAN_MASTER_PREF,
-	NL80211_ATTR_NAN_DUAL,
+	NL80211_ATTR_BANDS,
 	NL80211_ATTR_NAN_FUNC,
 	NL80211_ATTR_NAN_MATCH,
 	NL80211_ATTR_BSSID,
+	NL80211_ATTR_SCHED_SCAN_RELATIVE_RSSI,
+	NL80211_ATTR_SCHED_SCAN_RSSI_ADJUST,
+	NL80211_ATTR_TIMEOUT_REASON,
 	/* add attributes here, update the policy in nl80211.c */
 	__NL80211_ATTR_AFTER_LAST,
  *	how this API was implemented in the past. Also, due to the same problem,
  *	the only way to create a matchset with only an RSSI filter (with this
  *	attribute) is if there's only a single matchset with the RSSI attribute.
+ * @NL80211_SCHED_SCAN_MATCH_ATTR_RELATIVE_RSSI: Flag indicating whether
+ *	%NL80211_SCHED_SCAN_MATCH_ATTR_RSSI to be used as absolute RSSI or
+ *	relative to current bss's RSSI.
+ * @NL80211_SCHED_SCAN_MATCH_ATTR_RSSI_ADJUST: When present the RSSI level for
+ *	BSS-es in the specified band is to be adjusted before doing
+ *	RSSI-based BSS selection. The attribute value is a packed structure
+ *	value as specified by &struct nl80211_bss_select_rssi_adjust.
  * @NL80211_SCHED_SCAN_MATCH_ATTR_MAX: highest scheduled scan filter
  *	attribute number currently defined
  * @__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST: internal use
 	NL80211_SCHED_SCAN_MATCH_ATTR_SSID,
 	NL80211_SCHED_SCAN_MATCH_ATTR_RSSI,
+	NL80211_SCHED_SCAN_MATCH_ATTR_RELATIVE_RSSI,
+	NL80211_SCHED_SCAN_MATCH_ATTR_RSSI_ADJUST,
 	/* keep last */
 	__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST,
  *	%NL80211_CMD_NOTIFY_CQM. Set to 0 to turn off TX error reporting.
  * @NL80211_ATTR_CQM_BEACON_LOSS_EVENT: flag attribute that's set in a beacon
  *	loss event
+ * @NL80211_ATTR_CQM_RSSI_LEVEL: the RSSI value in dBm that triggered the
+ *	RSSI threshold event.
  * @__NL80211_ATTR_CQM_AFTER_LAST: internal
  * @NL80211_ATTR_CQM_MAX: highest key attribute
  */
 	NL80211_ATTR_CQM_TXE_PKTS,
 	NL80211_ATTR_CQM_TXE_INTVL,
 	NL80211_ATTR_CQM_BEACON_LOSS_EVENT,
+	NL80211_ATTR_CQM_RSSI_LEVEL,
 	/* keep last */
 	__NL80211_ATTR_CQM_AFTER_LAST,
  *	configuration (AP/mesh) with VHT rates.
  * @NL80211_EXT_FEATURE_FILS_STA: This driver supports Fast Initial Link Setup
  *	with user space SME (NL80211_CMD_AUTHENTICATE) in station mode.
+ * @NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA: This driver supports randomized TA
+ *	in @NL80211_CMD_FRAME while not associated.
+ * @NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA_CONNECTED: This driver supports
+ *	randomized TA in @NL80211_CMD_FRAME while associated.
+ * @NL80211_EXT_FEATURE_SCHED_SCAN_RELATIVE_RSSI: The driver supports sched_scan
+ *	for reporting BSSs with better RSSI than the current connected BSS
+ *	(%NL80211_ATTR_SCHED_SCAN_RELATIVE_RSSI).
  *
  * @NUM_NL80211_EXT_FEATURES: number of extended features.
  * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
 	NL80211_EXT_FEATURE_BEACON_RATE_HT,
 	NL80211_EXT_FEATURE_BEACON_RATE_VHT,
 	NL80211_EXT_FEATURE_FILS_STA,
+	NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA,
+	NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA_CONNECTED,
+	NL80211_EXT_FEATURE_SCHED_SCAN_RELATIVE_RSSI,
 	/* add new features before the definition below */
 	NUM_NL80211_EXT_FEATURES,
 	NL80211_CONN_FAIL_BLOCKED_CLIENT,
 };
+/**
+ * enum nl80211_timeout_reason - timeout reasons
+ *
+ * @NL80211_TIMEOUT_UNSPECIFIED: Timeout reason unspecified.
+ * @NL80211_TIMEOUT_SCAN: Scan (AP discovery) timed out.
+ * @NL80211_TIMEOUT_AUTH: Authentication timed out.
+ * @NL80211_TIMEOUT_ASSOC: Association timed out.
+ */
+enum nl80211_timeout_reason {
+	NL80211_TIMEOUT_UNSPECIFIED,
+	NL80211_TIMEOUT_SCAN,
+	NL80211_TIMEOUT_AUTH,
+	NL80211_TIMEOUT_ASSOC,
+};
 /**
  * enum nl80211_scan_flags -  scan request control flags
  *
 /**
  * struct nl80211_bss_select_rssi_adjust - RSSI adjustment parameters.
  *
- * @band: band of BSS that must match for RSSI value adjustment.
+ * @band: band of BSS that must match for RSSI value adjustment. The value
- * @delta: value used to adjust the RSSI value of matching BSS.
+ *	of this field is according to &enum nl80211_band.
+ * @delta: value used to adjust the RSSI value of matching BSS in dB.
  */
 struct nl80211_bss_select_rssi_adjust {
 	__u8 band;
 	NL80211_BSS_SELECT_ATTR_MAX = __NL80211_BSS_SELECT_ATTR_AFTER_LAST - 1
 };
-/**
- * enum nl80211_nan_dual_band_conf - NAN dual band configuration
- *
- * Defines the NAN dual band mode of operation
- *
- * @NL80211_NAN_BAND_DEFAULT: device default mode
- * @NL80211_NAN_BAND_2GHZ: 2.4GHz mode
- * @NL80211_NAN_BAND_5GHZ: 5GHz mode
-  */
-enum nl80211_nan_dual_band_conf {
-	NL80211_NAN_BAND_DEFAULT	= 1 << 0,
-	NL80211_NAN_BAND_2GHZ		= 1 << 1,
-	NL80211_NAN_BAND_5GHZ		= 1 << 2,
-};
 /**
  * enum nl80211_nan_function_type - NAN function type
  *

include/uapi/linux/nsfs.h+7−2

 #define NSIO	0xb7
 /* Returns a file descriptor that refers to an owning user namespace */
-#define NS_GET_USERNS	_IO(NSIO, 0x1)
+#define NS_GET_USERNS		_IO(NSIO, 0x1)
 /* Returns a file descriptor that refers to a parent namespace */
-#define NS_GET_PARENT	_IO(NSIO, 0x2)
+#define NS_GET_PARENT		_IO(NSIO, 0x2)
+/* Returns the type of namespace (CLONE_NEW* value) referred to by
+   file descriptor */
+#define NS_GET_NSTYPE		_IO(NSIO, 0x3)
+/* Get owner UID (in the caller's user namespace) for a user namespace */
+#define NS_GET_OWNER_UID	_IO(NSIO, 0x4)
 #endif /* __LINUX_NSFS_H */

include/uapi/linux/openvswitch.h+30−3

 /*
- * Copyright (c) 2007-2013 Nicira, Inc.
+ * Copyright (c) 2007-2017 Nicira, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
 	OVS_KEY_ATTR_CT_ZONE,	/* u16 connection tracking zone. */
 	OVS_KEY_ATTR_CT_MARK,	/* u32 connection tracking mark */
 	OVS_KEY_ATTR_CT_LABELS,	/* 16-octet connection tracking label */
+	OVS_KEY_ATTR_CT_ORIG_TUPLE_IPV4,   /* struct ovs_key_ct_tuple_ipv4 */
+	OVS_KEY_ATTR_CT_ORIG_TUPLE_IPV6,   /* struct ovs_key_ct_tuple_ipv6 */
 #ifdef __KERNEL__
 	OVS_KEY_ATTR_TUNNEL_INFO,  /* struct ip_tunnel_info */
 	__u8	nd_tll[ETH_ALEN];
 };
-#define OVS_CT_LABELS_LEN	16
+#define OVS_CT_LABELS_LEN_32	4
+#define OVS_CT_LABELS_LEN	(OVS_CT_LABELS_LEN_32 * sizeof(__u32))
 struct ovs_key_ct_labels {
-	__u8	ct_labels[OVS_CT_LABELS_LEN];
+	union {
+		__u8	ct_labels[OVS_CT_LABELS_LEN];
+		__u32	ct_labels_32[OVS_CT_LABELS_LEN_32];
+	};
 };
 /* OVS_KEY_ATTR_CT_STATE flags */
 #define OVS_CS_F_NAT_MASK (OVS_CS_F_SRC_NAT | OVS_CS_F_DST_NAT)
+struct ovs_key_ct_tuple_ipv4 {
+	__be32 ipv4_src;
+	__be32 ipv4_dst;
+	__be16 src_port;
+	__be16 dst_port;
+	__u8   ipv4_proto;
+};
+struct ovs_key_ct_tuple_ipv6 {
+	__be32 ipv6_src[4];
+	__be32 ipv6_dst[4];
+	__be16 src_port;
+	__be16 dst_port;
+	__u8   ipv6_proto;
+};
 /**
  * enum ovs_flow_attr - attributes for %OVS_FLOW_* commands.
  * @OVS_FLOW_ATTR_KEY: Nested %OVS_KEY_ATTR_* attributes specifying the flow
  * @OVS_CT_ATTR_HELPER: variable length string defining conntrack ALG.
  * @OVS_CT_ATTR_NAT: Nested OVS_NAT_ATTR_* for performing L3 network address
  * translation (NAT) on the packet.
+ * @OVS_CT_ATTR_FORCE_COMMIT: Like %OVS_CT_ATTR_COMMIT, but instead of doing
+ * nothing if the connection is already committed will check that the current
+ * packet is in conntrack entry's original direction.  If directionality does
+ * not match, will delete the existing conntrack entry and commit a new one.
  */
 enum ovs_ct_attr {
 	OVS_CT_ATTR_UNSPEC,
 	OVS_CT_ATTR_HELPER,     /* netlink helper to assist detection of
 				   related connections. */
 	OVS_CT_ATTR_NAT,        /* Nested OVS_NAT_ATTR_* */
+	OVS_CT_ATTR_FORCE_COMMIT,  /* No argument */
 	__OVS_CT_ATTR_MAX
 };

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

@@ -64,7 +64,7 @@ struct packet_diag_mclist { · 63 unmodified lines
64	__u32 pdmc_count;	64	__u32 pdmc_count;
65	__u16 pdmc_type;	65	__u16 pdmc_type;
66	__u16 pdmc_alen;	66	__u16 pdmc_alen;
67	__u8 pdmc_addr[MAX_ADDR_LEN];	67	__u8 pdmc_addr[32]; /* MAX_ADDR_LEN */
68	};	68	};
69		69
70	struct packet_diag_ring {	70	struct packet_diag_ring {

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

@@ -682,6 +682,7 @@ · 681 unmodified lines
682	#define PCI_EXT_CAP_ID_PMUX 0x1A /* Protocol Multiplexing */	682	#define PCI_EXT_CAP_ID_PMUX 0x1A /* Protocol Multiplexing */
683	#define PCI_EXT_CAP_ID_PASID 0x1B /* Process Address Space ID */	683	#define PCI_EXT_CAP_ID_PASID 0x1B /* Process Address Space ID */
684	#define PCI_EXT_CAP_ID_DPC 0x1D /* Downstream Port Containment */	684	#define PCI_EXT_CAP_ID_DPC 0x1D /* Downstream Port Containment */
		685	#define PCI_EXT_CAP_ID_L1SS 0x1E /* L1 PM Substates */
685	#define PCI_EXT_CAP_ID_PTM 0x1F /* Precision Time Measurement */	686	#define PCI_EXT_CAP_ID_PTM 0x1F /* Precision Time Measurement */
686	#define PCI_EXT_CAP_ID_MAX PCI_EXT_CAP_ID_PTM	687	#define PCI_EXT_CAP_ID_MAX PCI_EXT_CAP_ID_PTM
687		688
@@ -973,6 +974,7 @@ · 285 unmodified lines
973	#define PCI_EXP_DPC_STATUS 8 /* DPC Status */	974	#define PCI_EXP_DPC_STATUS 8 /* DPC Status */
974	#define PCI_EXP_DPC_STATUS_TRIGGER 0x01 /* Trigger Status */	975	#define PCI_EXP_DPC_STATUS_TRIGGER 0x01 /* Trigger Status */
975	#define PCI_EXP_DPC_STATUS_INTERRUPT 0x08 /* Interrupt Status */	976	#define PCI_EXP_DPC_STATUS_INTERRUPT 0x08 /* Interrupt Status */
		977	#define PCI_EXP_DPC_RP_BUSY 0x10 /* Root Port Busy */
976		978
977	#define PCI_EXP_DPC_SOURCE_ID 10 /* DPC Source Identifier */	979	#define PCI_EXP_DPC_SOURCE_ID 10 /* DPC Source Identifier */
978		980
@@ -985,4 +987,19 @@ · 6 unmodified lines
985	#define PCI_PTM_CTRL_ENABLE 0x00000001 /* PTM enable */	987	#define PCI_PTM_CTRL_ENABLE 0x00000001 /* PTM enable */
986	#define PCI_PTM_CTRL_ROOT 0x00000002 /* Root select */	988	#define PCI_PTM_CTRL_ROOT 0x00000002 /* Root select */
987		989
		990	/* L1 PM Substates */
		991	#define PCI_L1SS_CAP 4 /* capability register */
		992	#define PCI_L1SS_CAP_PCIPM_L1_2 1 /* PCI PM L1.2 Support */
		993	#define PCI_L1SS_CAP_PCIPM_L1_1 2 /* PCI PM L1.1 Support */
		994	#define PCI_L1SS_CAP_ASPM_L1_2 4 /* ASPM L1.2 Support */
		995	#define PCI_L1SS_CAP_ASPM_L1_1 8 /* ASPM L1.1 Support */
		996	#define PCI_L1SS_CAP_L1_PM_SS 16 /* L1 PM Substates Support */
		997	#define PCI_L1SS_CTL1 8 /* Control Register 1 */
		998	#define PCI_L1SS_CTL1_PCIPM_L1_2 1 /* PCI PM L1.2 Enable */
		999	#define PCI_L1SS_CTL1_PCIPM_L1_1 2 /* PCI PM L1.1 Support */
		1000	#define PCI_L1SS_CTL1_ASPM_L1_2 4 /* ASPM L1.2 Support */
		1001	#define PCI_L1SS_CTL1_ASPM_L1_1 8 /* ASPM L1.1 Support */
		1002	#define PCI_L1SS_CTL1_L1SS_MASK 0x0000000F
		1003	#define PCI_L1SS_CTL2 0xC /* Control Register 2 */
		1004
988	#endif /* LINUX_PCI_REGS_H */	1005	#endif /* LINUX_PCI_REGS_H */

include/uapi/linux/pkt_cls.h+17−56

@@ -4,60 +4,7 @@ · 3 unmodified lines
4	#include <linux/types.h>	4	#include <linux/types.h>
5	#include <linux/pkt_sched.h>	5	#include <linux/pkt_sched.h>
6		6
7	#ifdef __KERNEL__	7	#define TC_COOKIE_MAX_SIZE 16
8	/* I think i could have done better macros ; for now this is stolen from
9	* some arch/mips code - jhs
10	*/
11	#define _TC_MAKE32(x) ((x))
12
13	#define _TC_MAKEMASK1(n) (_TC_MAKE32(1) << _TC_MAKE32(n))
14	#define _TC_MAKEMASK(v,n) (_TC_MAKE32((_TC_MAKE32(1)<<(v))-1) << _TC_MAKE32(n))
15	#define _TC_MAKEVALUE(v,n) (_TC_MAKE32(v) << _TC_MAKE32(n))
16	#define _TC_GETVALUE(v,n,m) ((_TC_MAKE32(v) & _TC_MAKE32(m)) >> _TC_MAKE32(n))
17
18	/* verdict bit breakdown
19	*
20	bit 0: when set -> this packet has been munged already
21
22	bit 1: when set -> It is ok to munge this packet
23
24	bit 2,3,4,5: Reclassify counter - sort of reverse TTL - if exceeded
25	assume loop
26
27	bit 6,7: Where this packet was last seen
28	0: Above the transmit example at the socket level
29	1: on the Ingress
30	2: on the Egress
31
32	bit 8: when set --> Request not to classify on ingress.
33
34	bits 9,10,11: redirect counter - redirect TTL. Loop avoidance
35
36	*
37	* */
38
39	#define S_TC_FROM _TC_MAKE32(6)
40	#define M_TC_FROM _TC_MAKEMASK(2,S_TC_FROM)
41	#define G_TC_FROM(x) _TC_GETVALUE(x,S_TC_FROM,M_TC_FROM)
42	#define V_TC_FROM(x) _TC_MAKEVALUE(x,S_TC_FROM)
43	#define SET_TC_FROM(v,n) ((V_TC_FROM(n)) \| (v & ~M_TC_FROM))
44	#define AT_STACK 0x0
45	#define AT_INGRESS 0x1
46	#define AT_EGRESS 0x2
47
48	#define TC_NCLS _TC_MAKEMASK1(8)
49	#define SET_TC_NCLS(v) ( TC_NCLS \| (v & ~TC_NCLS))
50	#define CLR_TC_NCLS(v) ( v & ~TC_NCLS)
51
52	#define S_TC_AT _TC_MAKE32(12)
53	#define M_TC_AT _TC_MAKEMASK(2,S_TC_AT)
54	#define G_TC_AT(x) _TC_GETVALUE(x,S_TC_AT,M_TC_AT)
55	#define V_TC_AT(x) _TC_MAKEVALUE(x,S_TC_AT)
56	#define SET_TC_AT(v,n) ((V_TC_AT(n)) \| (v & ~M_TC_AT))
57
58	#define MAX_REC_LOOP 4
59	#define MAX_RED_LOOP 4
60	#endif
61		8
62	/* Action attributes */	9	/* Action attributes */
63	enum {	10	enum {
@@ -67,6 +14,7 @@ enum { · 3 unmodified lines
67	TCA_ACT_INDEX,	14	TCA_ACT_INDEX,
68	TCA_ACT_STATS,	15	TCA_ACT_STATS,
69	TCA_ACT_PAD,	16	TCA_ACT_PAD,
		17	TCA_ACT_COOKIE,
70	__TCA_ACT_MAX	18	__TCA_ACT_MAX
71	};	19	};
72		20
@@ -155,8 +103,10 @@ enum { · 82 unmodified lines
155	#define TCA_POLICE_MAX (__TCA_POLICE_MAX - 1)	103	#define TCA_POLICE_MAX (__TCA_POLICE_MAX - 1)
156		104
157	/* tca flags definitions */	105	/* tca flags definitions */
158	#define TCA_CLS_FLAGS_SKIP_HW (1 << 0)	106	#define TCA_CLS_FLAGS_SKIP_HW (1 << 0) /* don't offload filter to HW */
159	#define TCA_CLS_FLAGS_SKIP_SW (1 << 1)	107	#define TCA_CLS_FLAGS_SKIP_SW (1 << 1) /* don't use filter in SW */
		108	#define TCA_CLS_FLAGS_IN_HW (1 << 2) /* filter is offloaded to HW */
		109	#define TCA_CLS_FLAGS_NOT_IN_HW (1 << 3) /* filter isn't offloaded to HW */
160		110
161	/* U32 filters */	111	/* U32 filters */
162		112
@@ -471,6 +421,17 @@ enum { · 308 unmodified lines
471	TCA_FLOWER_KEY_ICMPV6_TYPE, /* u8 */	421	TCA_FLOWER_KEY_ICMPV6_TYPE, /* u8 */
472	TCA_FLOWER_KEY_ICMPV6_TYPE_MASK,/* u8 */	422	TCA_FLOWER_KEY_ICMPV6_TYPE_MASK,/* u8 */
473		423
		424	TCA_FLOWER_KEY_ARP_SIP, /* be32 */
		425	TCA_FLOWER_KEY_ARP_SIP_MASK, /* be32 */
		426	TCA_FLOWER_KEY_ARP_TIP, /* be32 */
		427	TCA_FLOWER_KEY_ARP_TIP_MASK, /* be32 */
		428	TCA_FLOWER_KEY_ARP_OP, /* u8 */
		429	TCA_FLOWER_KEY_ARP_OP_MASK, /* u8 */
		430	TCA_FLOWER_KEY_ARP_SHA, /* ETH_ALEN */
		431	TCA_FLOWER_KEY_ARP_SHA_MASK, /* ETH_ALEN */
		432	TCA_FLOWER_KEY_ARP_THA, /* ETH_ALEN */
		433	TCA_FLOWER_KEY_ARP_THA_MASK, /* ETH_ALEN */
		434
474	__TCA_FLOWER_MAX,	435	__TCA_FLOWER_MAX,
475	};	436	};
476		437

include/uapi/linux/psample.h+35−0

@@ -0,0 +1,35 @@
	1	#ifndef __UAPI_PSAMPLE_H
	2	#define __UAPI_PSAMPLE_H
	3
	4	enum {
	5	/* sampled packet metadata */
	6	PSAMPLE_ATTR_IIFINDEX,
	7	PSAMPLE_ATTR_OIFINDEX,
	8	PSAMPLE_ATTR_ORIGSIZE,
	9	PSAMPLE_ATTR_SAMPLE_GROUP,
	10	PSAMPLE_ATTR_GROUP_SEQ,
	11	PSAMPLE_ATTR_SAMPLE_RATE,
	12	PSAMPLE_ATTR_DATA,
	13
	14	/* commands attributes */
	15	PSAMPLE_ATTR_GROUP_REFCOUNT,
	16
	17	__PSAMPLE_ATTR_MAX
	18	};
	19
	20	enum psample_command {
	21	PSAMPLE_CMD_SAMPLE,
	22	PSAMPLE_CMD_GET_GROUP,
	23	PSAMPLE_CMD_NEW_GROUP,
	24	PSAMPLE_CMD_DEL_GROUP,
	25	};
	26
	27	/* Can be overridden at runtime by module option */
	28	#define PSAMPLE_ATTR_MAX (__PSAMPLE_ATTR_MAX - 1)
	29
	30	#define PSAMPLE_NL_MCGRP_CONFIG_NAME "config"
	31	#define PSAMPLE_NL_MCGRP_SAMPLE_NAME "packets"
	32	#define PSAMPLE_GENL_NAME "psample"
	33	#define PSAMPLE_GENL_VERSION 1
	34
	35	#endif

include/uapi/linux/rds.h+87−53

 #define _LINUX_RDS_H
 #include <linux/types.h>
+#include <linux/socket.h>		/* For __kernel_sockaddr_storage. */
 #define RDS_IB_ABI_VERSION		0x301
 #define RDS_GET_MR_FOR_DEST		7
 #define SO_RDS_TRANSPORT		8
+/* Socket option to tap receive path latency
+ *	SO_RDS: SO_RDS_MSG_RXPATH_LATENCY
+ *	Format used struct rds_rx_trace_so
+ */
+#define SO_RDS_MSG_RXPATH_LATENCY	10
 /* supported values for SO_RDS_TRANSPORT */
 #define	RDS_TRANS_IB	0
 #define	RDS_TRANS_IWARP	1
  *	the same as for the GET_MR setsockopt.
  * RDS_CMSG_RDMA_STATUS (recvmsg)
  *	Returns the status of a completed RDMA operation.
+ * RDS_CMSG_RXPATH_LATENCY(recvmsg)
+ *	Returns rds message latencies in various stages of receive
+ *	path in nS. Its set per socket using SO_RDS_MSG_RXPATH_LATENCY
+ *	socket option. Legitimate points are defined in
+ *	enum rds_message_rxpath_latency. More points can be added in
+ *	future. CSMG format is struct rds_cmsg_rx_trace.
  */
 #define RDS_CMSG_RDMA_ARGS		1
 #define RDS_CMSG_RDMA_DEST		2
 #define RDS_CMSG_ATOMIC_CSWP		7
 #define RDS_CMSG_MASKED_ATOMIC_FADD	8
 #define RDS_CMSG_MASKED_ATOMIC_CSWP	9
+#define RDS_CMSG_RXPATH_LATENCY		11
 #define RDS_INFO_FIRST			10000
 #define RDS_INFO_COUNTERS		10000
 #define RDS_INFO_LAST			10010
 struct rds_info_counter {
-	uint8_t	name[32];
+	__u8	name[32];
-	uint64_t	value;
+	__u64	value;
 } __attribute__((packed));
 #define RDS_INFO_CONNECTION_FLAG_SENDING	0x01
 #define TRANSNAMSIZ	16
 struct rds_info_connection {
-	uint64_t	next_tx_seq;
+	__u64		next_tx_seq;
-	uint64_t	next_rx_seq;
+	__u64		next_rx_seq;
 	__be32		laddr;
 	__be32		faddr;
-	uint8_t	transport[TRANSNAMSIZ];		/* null term ascii */
+	__u8		transport[TRANSNAMSIZ];		/* null term ascii */
-	uint8_t	flags;
+	__u8		flags;
 } __attribute__((packed));
 #define RDS_INFO_MESSAGE_FLAG_ACK               0x01
 #define RDS_INFO_MESSAGE_FLAG_FAST_ACK          0x02
 struct rds_info_message {
-	uint64_t	seq;
+	__u64		seq;
-	uint32_t	len;
+	__u32		len;
 	__be32		laddr;
 	__be32		faddr;
 	__be16		lport;
 	__be16		fport;
-	uint8_t	flags;
+	__u8		flags;
 } __attribute__((packed));
 struct rds_info_socket {
-	uint32_t	sndbuf;
+	__u32		sndbuf;
 	__be32		bound_addr;
 	__be32		connected_addr;
 	__be16		bound_port;
 	__be16		connected_port;
-	uint32_t	rcvbuf;
+	__u32		rcvbuf;
-	uint64_t	inum;
+	__u64		inum;
 } __attribute__((packed));
 struct rds_info_tcp_socket {
 	__be16          local_port;
 	__be32          peer_addr;
 	__be16          peer_port;
-	uint64_t       hdr_rem;
+	__u64           hdr_rem;
-	uint64_t       data_rem;
+	__u64           data_rem;
-	uint32_t       last_sent_nxt;
+	__u32           last_sent_nxt;
-	uint32_t       last_expected_una;
+	__u32           last_expected_una;
-	uint32_t       last_seen_una;
+	__u32           last_seen_una;
 } __attribute__((packed));
 #define RDS_IB_GID_LEN	16
 struct rds_info_rdma_connection {
 	__be32		src_addr;
 	__be32		dst_addr;
-	uint8_t		src_gid[RDS_IB_GID_LEN];
+	__u8		src_gid[RDS_IB_GID_LEN];
-	uint8_t		dst_gid[RDS_IB_GID_LEN];
+	__u8		dst_gid[RDS_IB_GID_LEN];
-	uint32_t	max_send_wr;
+	__u32		max_send_wr;
-	uint32_t	max_recv_wr;
+	__u32		max_recv_wr;
-	uint32_t	max_send_sge;
+	__u32		max_send_sge;
-	uint32_t	rdma_mr_max;
+	__u32		rdma_mr_max;
-	uint32_t	rdma_mr_size;
+	__u32		rdma_mr_size;
+};
+/* RDS message Receive Path Latency points */
+enum rds_message_rxpath_latency {
+	RDS_MSG_RX_HDR_TO_DGRAM_START = 0,
+	RDS_MSG_RX_DGRAM_REASSEMBLE,
+	RDS_MSG_RX_DGRAM_DELIVERED,
+	RDS_MSG_RX_DGRAM_TRACE_MAX
+};
+struct rds_rx_trace_so {
+	__u8 rx_traces;
+	__u8 rx_trace_pos[RDS_MSG_RX_DGRAM_TRACE_MAX];
+};
+struct rds_cmsg_rx_trace {
+	__u8 rx_traces;
+	__u8 rx_trace_pos[RDS_MSG_RX_DGRAM_TRACE_MAX];
+	__u64 rx_trace[RDS_MSG_RX_DGRAM_TRACE_MAX];
 };
 /*
  * (so that the application does not have to worry about
  * alignment).
  */
-typedef uint64_t	rds_rdma_cookie_t;
+typedef __u64		rds_rdma_cookie_t;
 struct rds_iovec {
-	uint64_t	addr;
+	__u64		addr;
-	uint64_t	bytes;
+	__u64		bytes;
 };
 struct rds_get_mr_args {
 	struct rds_iovec vec;
-	uint64_t	cookie_addr;
+	__u64		cookie_addr;
-	uint64_t	flags;
+	__u64		flags;
 };
 struct rds_get_mr_for_dest_args {
-	struct sockaddr_storage	dest_addr;
+	struct __kernel_sockaddr_storage dest_addr;
 	struct rds_iovec 	vec;
-	uint64_t		cookie_addr;
+	__u64			cookie_addr;
-	uint64_t		flags;
+	__u64			flags;
 };
 struct rds_free_mr_args {
 	rds_rdma_cookie_t cookie;
-	uint64_t	flags;
+	__u64		flags;
 };
 struct rds_rdma_args {
 	rds_rdma_cookie_t cookie;
 	struct rds_iovec remote_vec;
-	uint64_t	local_vec_addr;
+	__u64		local_vec_addr;
-	uint64_t	nr_local;
+	__u64		nr_local;
-	uint64_t	flags;
+	__u64		flags;
-	uint64_t	user_token;
+	__u64		user_token;
 };
 struct rds_atomic_args {
 	rds_rdma_cookie_t cookie;
-	uint64_t 	local_addr;
+	__u64		local_addr;
-	uint64_t 	remote_addr;
+	__u64		remote_addr;
 	union {
 		struct {
-			uint64_t	compare;
+			__u64		compare;
-			uint64_t	swap;
+			__u64		swap;
 		} cswp;
 		struct {
-			uint64_t	add;
+			__u64		add;
 		} fadd;
 		struct {
-			uint64_t	compare;
+			__u64		compare;
-			uint64_t	swap;
+			__u64		swap;
-			uint64_t	compare_mask;
+			__u64		compare_mask;
-			uint64_t	swap_mask;
+			__u64		swap_mask;
 		} m_cswp;
 		struct {
-			uint64_t	add;
+			__u64		add;
-			uint64_t	nocarry_mask;
+			__u64		nocarry_mask;
 		} m_fadd;
 	};
-	uint64_t	flags;
+	__u64		flags;
-	uint64_t	user_token;
+	__u64		user_token;
 };
 struct rds_rdma_notify {
-	uint64_t	user_token;
+	__u64		user_token;
-	int32_t		status;
+	__s32		status;
 };
 #define RDS_RDMA_SUCCESS	0

include/uapi/linux/rpmsg.h+35−0

@@ -0,0 +1,35 @@
	1	/*
	2	* Copyright (c) 2016, Linaro Ltd.
	3	*
	4	* This program is free software; you can redistribute it and/or modify
	5	* it under the terms of the GNU General Public License version 2 and
	6	* only version 2 as published by the Free Software Foundation.
	7	*
	8	* This program is distributed in the hope that it will be useful,
	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	11	* GNU General Public License for more details.
	12	*/
	13
	14	#ifndef _UAPI_RPMSG_H_
	15	#define _UAPI_RPMSG_H_
	16
	17	#include <linux/ioctl.h>
	18	#include <linux/types.h>
	19
	20	/**
	21	* struct rpmsg_endpoint_info - endpoint info representation
	22	* @name: name of service
	23	* @src: local address
	24	* @dst: destination address
	25	*/
	26	struct rpmsg_endpoint_info {
	27	char name[32];
	28	__u32 src;
	29	__u32 dst;
	30	};
	31
	32	#define RPMSG_CREATE_EPT_IOCTL _IOW(0xb5, 0x1, struct rpmsg_endpoint_info)
	33	#define RPMSG_DESTROY_EPT_IOCTL _IO(0xb5, 0x2)
	34
	35	#endif

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

 #define RTNH_F_ONLINK		4	/* Gateway is forced on link	*/
 #define RTNH_F_OFFLOAD		8	/* offloaded route */
 #define RTNH_F_LINKDOWN		16	/* carrier-down on nexthop */
+#define RTNH_F_UNRESOLVED	32	/* The entry is unresolved (ipmr) */
 #define RTNH_COMPARE_MASK	(RTNH_F_DEAD | RTNH_F_LINKDOWN | RTNH_F_OFFLOAD)
 #define RTNLGRP_MPLS_ROUTE	RTNLGRP_MPLS_ROUTE
 	RTNLGRP_NSID,
 #define RTNLGRP_NSID		RTNLGRP_NSID
+	RTNLGRP_MPLS_NETCONF,
+#define RTNLGRP_MPLS_NETCONF	RTNLGRP_MPLS_NETCONF
 	__RTNLGRP_MAX
 };
 #define RTNLGRP_MAX	(__RTNLGRP_MAX - 1)

include/uapi/linux/sched/types.h+74−0

@@ -0,0 +1,74 @@
	1	#ifndef _UAPI_LINUX_SCHED_TYPES_H
	2	#define _UAPI_LINUX_SCHED_TYPES_H
	3
	4	#include <linux/types.h>
	5
	6	struct sched_param {
	7	int sched_priority;
	8	};
	9
	10	#define SCHED_ATTR_SIZE_VER0 48 /* sizeof first published struct */
	11
	12	/*
	13	* Extended scheduling parameters data structure.
	14	*
	15	* This is needed because the original struct sched_param can not be
	16	* altered without introducing ABI issues with legacy applications
	17	* (e.g., in sched_getparam()).
	18	*
	19	* However, the possibility of specifying more than just a priority for
	20	* the tasks may be useful for a wide variety of application fields, e.g.,
	21	* multimedia, streaming, automation and control, and many others.
	22	*
	23	* This variant (sched_attr) is meant at describing a so-called
	24	* sporadic time-constrained task. In such model a task is specified by:
	25	* - the activation period or minimum instance inter-arrival time;
	26	* - the maximum (or average, depending on the actual scheduling
	27	* discipline) computation time of all instances, a.k.a. runtime;
	28	* - the deadline (relative to the actual activation time) of each
	29	* instance.
	30	* Very briefly, a periodic (sporadic) task asks for the execution of
	31	* some specific computation --which is typically called an instance--
	32	* (at most) every period. Moreover, each instance typically lasts no more
	33	* than the runtime and must be completed by time instant t equal to
	34	* the instance activation time + the deadline.
	35	*
	36	* This is reflected by the actual fields of the sched_attr structure:
	37	*
	38	* @size size of the structure, for fwd/bwd compat.
	39	*
	40	* @sched_policy task's scheduling policy
	41	* @sched_flags for customizing the scheduler behaviour
	42	* @sched_nice task's nice value (SCHED_NORMAL/BATCH)
	43	* @sched_priority task's static priority (SCHED_FIFO/RR)
	44	* @sched_deadline representative of the task's deadline
	45	* @sched_runtime representative of the task's runtime
	46	* @sched_period representative of the task's period
	47	*
	48	* Given this task model, there are a multiplicity of scheduling algorithms
	49	* and policies, that can be used to ensure all the tasks will make their
	50	* timing constraints.
	51	*
	52	* As of now, the SCHED_DEADLINE policy (sched_dl scheduling class) is the
	53	* only user of this new interface. More information about the algorithm
	54	* available in the scheduling class file or in Documentation/.
	55	*/
	56	struct sched_attr {
	57	u32 size;
	58
	59	u32 sched_policy;
	60	u64 sched_flags;
	61
	62	/* SCHED_NORMAL, SCHED_BATCH */
	63	s32 sched_nice;
	64
	65	/* SCHED_FIFO, SCHED_RR */
	66	u32 sched_priority;
	67
	68	/* SCHED_DEADLINE */
	69	u64 sched_runtime;
	70	u64 sched_deadline;
	71	u64 sched_period;
	72	};
	73
	74	#endif /* _UAPI_LINUX_SCHED_TYPES_H */

include/uapi/linux/sctp.h+42−0

@@ -115,6 +115,10 @@ typedef __s32 sctp_assoc_t; · 114 unmodified lines
115	#define SCTP_PR_SUPPORTED 113	115	#define SCTP_PR_SUPPORTED 113
116	#define SCTP_DEFAULT_PRINFO 114	116	#define SCTP_DEFAULT_PRINFO 114
117	#define SCTP_PR_ASSOC_STATUS 115	117	#define SCTP_PR_ASSOC_STATUS 115
		118	#define SCTP_ENABLE_STREAM_RESET 118
		119	#define SCTP_RESET_STREAMS 119
		120	#define SCTP_RESET_ASSOC 120
		121	#define SCTP_ADD_STREAMS 121
118		122
119	/* PR-SCTP policies */	123	/* PR-SCTP policies */
120	#define SCTP_PR_SCTP_NONE 0x0000	124	#define SCTP_PR_SCTP_NONE 0x0000
@@ -138,6 +142,15 @@ typedef __s32 sctp_assoc_t; · 17 unmodified lines
138	#define SCTP_PR_RTX_ENABLED(x) (SCTP_PR_POLICY(x) == SCTP_PR_SCTP_RTX)	142	#define SCTP_PR_RTX_ENABLED(x) (SCTP_PR_POLICY(x) == SCTP_PR_SCTP_RTX)
139	#define SCTP_PR_PRIO_ENABLED(x) (SCTP_PR_POLICY(x) == SCTP_PR_SCTP_PRIO)	143	#define SCTP_PR_PRIO_ENABLED(x) (SCTP_PR_POLICY(x) == SCTP_PR_SCTP_PRIO)
140		144
		145	/* For enable stream reset */
		146	#define SCTP_ENABLE_RESET_STREAM_REQ 0x01
		147	#define SCTP_ENABLE_RESET_ASSOC_REQ 0x02
		148	#define SCTP_ENABLE_CHANGE_ASSOC_REQ 0x04
		149	#define SCTP_ENABLE_STRRESET_MASK 0x07
		150
		151	#define SCTP_STREAM_RESET_INCOMING 0x01
		152	#define SCTP_STREAM_RESET_OUTGOING 0x02
		153
141	/* These are bit fields for msghdr->msg_flags. See section 5.1. */	154	/* These are bit fields for msghdr->msg_flags. See section 5.1. */
142	/* On user space Linux, these live in <bits/socket.h> as an enum. */	155	/* On user space Linux, these live in <bits/socket.h> as an enum. */
143	enum sctp_msg_flags {	156	enum sctp_msg_flags {
@@ -477,6 +490,18 @@ struct sctp_sender_dry_event { · 333 unmodified lines
477	sctp_assoc_t sender_dry_assoc_id;	490	sctp_assoc_t sender_dry_assoc_id;
478	};	491	};
479		492
		493	#define SCTP_STREAM_RESET_INCOMING_SSN 0x0001
		494	#define SCTP_STREAM_RESET_OUTGOING_SSN 0x0002
		495	#define SCTP_STREAM_RESET_DENIED 0x0004
		496	#define SCTP_STREAM_RESET_FAILED 0x0008
		497	struct sctp_stream_reset_event {
		498	__u16 strreset_type;
		499	__u16 strreset_flags;
		500	__u32 strreset_length;
		501	sctp_assoc_t strreset_assoc_id;
		502	__u16 strreset_stream_list[];
		503	};
		504
480	/*	505	/*
481	* Described in Section 7.3	506	* Described in Section 7.3
482	* Ancillary Data and Notification Interest Options	507	* Ancillary Data and Notification Interest Options
@@ -492,6 +517,7 @@ struct sctp_event_subscribe { · 9 unmodified lines
492	__u8 sctp_adaptation_layer_event;	517	__u8 sctp_adaptation_layer_event;
493	__u8 sctp_authentication_event;	518	__u8 sctp_authentication_event;
494	__u8 sctp_sender_dry_event;	519	__u8 sctp_sender_dry_event;
		520	__u8 sctp_stream_reset_event;
495	};	521	};
496		522
497	/*	523	/*
@@ -516,6 +542,7 @@ union sctp_notification { · 18 unmodified lines
516	struct sctp_pdapi_event sn_pdapi_event;	542	struct sctp_pdapi_event sn_pdapi_event;
517	struct sctp_authkey_event sn_authkey_event;	543	struct sctp_authkey_event sn_authkey_event;
518	struct sctp_sender_dry_event sn_sender_dry_event;	544	struct sctp_sender_dry_event sn_sender_dry_event;
		545	struct sctp_stream_reset_event sn_strreset_event;
519	};	546	};
520		547
521	/* Section 5.3.1	548	/* Section 5.3.1
@@ -543,6 +570,8 @@ enum sctp_sn_type { · 21 unmodified lines
543	#define SCTP_AUTHENTICATION_INDICATION SCTP_AUTHENTICATION_EVENT	570	#define SCTP_AUTHENTICATION_INDICATION SCTP_AUTHENTICATION_EVENT
544	SCTP_SENDER_DRY_EVENT,	571	SCTP_SENDER_DRY_EVENT,
545	#define SCTP_SENDER_DRY_EVENT SCTP_SENDER_DRY_EVENT	572	#define SCTP_SENDER_DRY_EVENT SCTP_SENDER_DRY_EVENT
		573	SCTP_STREAM_RESET_EVENT,
		574	#define SCTP_STREAM_RESET_EVENT SCTP_STREAM_RESET_EVENT
546	};	575	};
547		576
548	/* Notification error codes used to fill up the error fields in some	577	/* Notification error codes used to fill up the error fields in some
@@ -1008,4 +1037,17 @@ struct sctp_info { · 459 unmodified lines
1008	__u32 __reserved3;	1037	__u32 __reserved3;
1009	};	1038	};
1010		1039
		1040	struct sctp_reset_streams {
		1041	sctp_assoc_t srs_assoc_id;
		1042	uint16_t srs_flags;
		1043	uint16_t srs_number_streams; /* 0 == ALL */
		1044	uint16_t srs_stream_list[]; /* list if srs_num_streams is not 0 */
		1045	};
		1046
		1047	struct sctp_add_streams {
		1048	sctp_assoc_t sas_assoc_id;
		1049	uint16_t sas_instrms;
		1050	uint16_t sas_outstrms;
		1051	};
		1052
1011	#endif /* _UAPI_SCTP_H */	1053	#endif /* _UAPI_SCTP_H */

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

@@ -14,6 +14,9 @@ · 13 unmodified lines
14	#ifndef _UAPI_LINUX_SEG6_H	14	#ifndef _UAPI_LINUX_SEG6_H
15	#define _UAPI_LINUX_SEG6_H	15	#define _UAPI_LINUX_SEG6_H
16		16
		17	#include <linux/types.h>
		18	#include <linux/in6.h> /* For struct in6_addr. */
		19
17	/*	20	/*
18	* SRH	21	* SRH
19	*/	22	*/

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

@@ -1,6 +1,7 @@
1	#ifndef _UAPI_LINUX_SEG6_HMAC_H	1	#ifndef _UAPI_LINUX_SEG6_HMAC_H
2	#define _UAPI_LINUX_SEG6_HMAC_H	2	#define _UAPI_LINUX_SEG6_HMAC_H
3		3
		4	#include <linux/types.h>
4	#include <linux/seg6.h>	5	#include <linux/seg6.h>
5		6
6	#define SEG6_HMAC_SECRET_LEN 64	7	#define SEG6_HMAC_SECRET_LEN 64

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

 #ifndef _UAPI_LINUX_SEG6_IPTUNNEL_H
 #define _UAPI_LINUX_SEG6_IPTUNNEL_H
+#include <linux/seg6.h>		/* For struct ipv6_sr_hdr. */
 enum {
 	SEG6_IPTUNNEL_UNSPEC,
 	SEG6_IPTUNNEL_SRH,
 	SEG6_IPTUN_MODE_ENCAP,
 };
+#ifdef __KERNEL__
 static inline size_t seg6_lwt_headroom(struct seg6_iptunnel_encap *tuninfo)
 {
 	int encap = (tuninfo->mode == SEG6_IPTUN_MODE_ENCAP);
 }
 #endif
+#endif

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

@@ -56,7 +56,8 @@ · 55 unmodified lines
56	#define PORT_ALTR_16550_F128 28 /* Altera 16550 UART with 128 FIFOs */	56	#define PORT_ALTR_16550_F128 28 /* Altera 16550 UART with 128 FIFOs */
57	#define PORT_RT2880 29 /* Ralink RT2880 internal UART */	57	#define PORT_RT2880 29 /* Ralink RT2880 internal UART */
58	#define PORT_16550A_FSL64 30 /* Freescale 16550 UART with 64 FIFOs */	58	#define PORT_16550A_FSL64 30 /* Freescale 16550 UART with 64 FIFOs */
59	#define PORT_MAX_8250 30 /* max port ID */	59	#define PORT_DA830 31 /* TI DA8xx/66AK2x */
		60	#define PORT_MAX_8250 31 /* max port ID */
60		61
61	/*	62	/*
62	* ARM specific type numbers. These are not currently guaranteed	63	* ARM specific type numbers. These are not currently guaranteed

include/uapi/linux/serial_reg.h+8−18

 #define SERIAL_RSA_BAUD_BASE (921600)
 #define SERIAL_RSA_BAUD_BASE_LO (SERIAL_RSA_BAUD_BASE / 8)
+/* Extra registers for TI DA8xx/66AK2x */
+#define UART_DA830_PWREMU_MGMT	12
+/* PWREMU_MGMT register bits */
+#define UART_DA830_PWREMU_MGMT_FREE	(1 << 0)  /* Free-running mode */
+#define UART_DA830_PWREMU_MGMT_URRST	(1 << 13) /* Receiver reset/enable */
+#define UART_DA830_PWREMU_MGMT_UTRST	(1 << 14) /* Transmitter reset/enable */
 /*
  * Extra serial register definitions for the internal UARTs
  * in TI OMAP processors.
 #define UART_OMAP_MDR1_CIR_MODE		0x06	/* CIR mode */
 #define UART_OMAP_MDR1_DISABLE		0x07	/* Disable (default state) */
-/*
- * These are definitions for the Exar XR17V35X and XR17(C|D)15X
- */
-#define UART_EXAR_8XMODE	0x88	/* 8X sampling rate select */
-#define UART_EXAR_SLEEP		0x8b	/* Sleep mode */
-#define UART_EXAR_DVID		0x8d	/* Device identification */
-#define UART_EXAR_FCTR		0x08	/* Feature Control Register */
-#define UART_FCTR_EXAR_IRDA	0x08	/* IrDa data encode select */
-#define UART_FCTR_EXAR_485	0x10	/* Auto 485 half duplex dir ctl */
-#define UART_FCTR_EXAR_TRGA	0x00	/* FIFO trigger table A */
-#define UART_FCTR_EXAR_TRGB	0x60	/* FIFO trigger table B */
-#define UART_FCTR_EXAR_TRGC	0x80	/* FIFO trigger table C */
-#define UART_FCTR_EXAR_TRGD	0xc0	/* FIFO trigger table D programmable */
-#define UART_EXAR_TXTRG		0x0a	/* Tx FIFO trigger level write-only */
-#define UART_EXAR_RXTRG		0x0b	/* Rx FIFO trigger level write-only */
 /*
  * These are definitions for the Altera ALTR_16550_F32/F64/F128
  * Normalized from 0x100 to 0x40 because of shift by 2 (32 bit regs).

include/uapi/linux/serio.h+4−3

 /*
  * bit masks for use in "interrupt" flags (3rd argument)
  */
-#define SERIO_TIMEOUT	1
+#define SERIO_TIMEOUT	BIT(0)
-#define SERIO_PARITY	2
+#define SERIO_PARITY	BIT(1)
-#define SERIO_FRAME	4
+#define SERIO_FRAME	BIT(2)
+#define SERIO_OOB_DATA	BIT(3)
 /*
  * Serio types

include/uapi/linux/smc.h+35−0

@@ -0,0 +1,35 @@
	1	/*
	2	* Shared Memory Communications over RDMA (SMC-R) and RoCE
	3	*
	4	* Definitions for generic netlink based configuration of an SMC-R PNET table
	5	*
	6	* Copyright IBM Corp. 2016
	7	*
	8	* Author(s): Thomas Richter <tmricht@linux.vnet.ibm.com>
	9	*/
	10
	11	#ifndef _UAPI_LINUX_SMC_H_
	12	#define _UAPI_LINUX_SMC_H_
	13
	14	/* Netlink SMC_PNETID attributes */
	15	enum {
	16	SMC_PNETID_UNSPEC,
	17	SMC_PNETID_NAME,
	18	SMC_PNETID_ETHNAME,
	19	SMC_PNETID_IBNAME,
	20	SMC_PNETID_IBPORT,
	21	__SMC_PNETID_MAX,
	22	SMC_PNETID_MAX = __SMC_PNETID_MAX - 1
	23	};
	24
	25	enum { /* SMC PNET Table commands */
	26	SMC_PNETID_GET = 1,
	27	SMC_PNETID_ADD,
	28	SMC_PNETID_DEL,
	29	SMC_PNETID_FLUSH
	30	};
	31
	32	#define SMCR_GENL_FAMILY_NAME "SMC_PNETID"
	33	#define SMCR_GENL_FAMILY_VERSION 1
	34
	35	#endif /* _UAPI_LINUX_SMC_H */

include/uapi/linux/smc_diag.h+85−0

@@ -0,0 +1,85 @@
	1	#ifndef _UAPI_SMC_DIAG_H_
	2	#define _UAPI_SMC_DIAG_H_
	3
	4	#include <linux/types.h>
	5	#include <linux/inet_diag.h>
	6	#include <rdma/ib_verbs.h>
	7
	8	/* Request structure */
	9	struct smc_diag_req {
	10	__u8 diag_family;
	11	__u8 pad[2];
	12	__u8 diag_ext; /* Query extended information */
	13	struct inet_diag_sockid id;
	14	};
	15
	16	/* Base info structure. It contains socket identity (addrs/ports/cookie) based
	17	* on the internal clcsock, and more SMC-related socket data
	18	*/
	19	struct smc_diag_msg {
	20	__u8 diag_family;
	21	__u8 diag_state;
	22	__u8 diag_fallback;
	23	__u8 diag_shutdown;
	24	struct inet_diag_sockid id;
	25
	26	__u32 diag_uid;
	27	__u64 diag_inode;
	28	};
	29
	30	/* Extensions */
	31
	32	enum {
	33	SMC_DIAG_NONE,
	34	SMC_DIAG_CONNINFO,
	35	SMC_DIAG_LGRINFO,
	36	SMC_DIAG_SHUTDOWN,
	37	__SMC_DIAG_MAX,
	38	};
	39
	40	#define SMC_DIAG_MAX (__SMC_DIAG_MAX - 1)
	41
	42	/* SMC_DIAG_CONNINFO */
	43
	44	struct smc_diag_cursor {
	45	__u16 reserved;
	46	__u16 wrap;
	47	__u32 count;
	48	};
	49
	50	struct smc_diag_conninfo {
	51	__u32 token; /* unique connection id */
	52	__u32 sndbuf_size; /* size of send buffer */
	53	__u32 rmbe_size; /* size of RMB element */
	54	__u32 peer_rmbe_size; /* size of peer RMB element */
	55	/* local RMB element cursors */
	56	struct smc_diag_cursor rx_prod; /* received producer cursor */
	57	struct smc_diag_cursor rx_cons; /* received consumer cursor */
	58	/* peer RMB element cursors */
	59	struct smc_diag_cursor tx_prod; /* sent producer cursor */
	60	struct smc_diag_cursor tx_cons; /* sent consumer cursor */
	61	__u8 rx_prod_flags; /* received producer flags */
	62	__u8 rx_conn_state_flags; /* recvd connection flags*/
	63	__u8 tx_prod_flags; /* sent producer flags */
	64	__u8 tx_conn_state_flags; /* sent connection flags*/
	65	/* send buffer cursors */
	66	struct smc_diag_cursor tx_prep; /* prepared to be sent cursor */
	67	struct smc_diag_cursor tx_sent; /* sent cursor */
	68	struct smc_diag_cursor tx_fin; /* confirmed sent cursor */
	69	};
	70
	71	/* SMC_DIAG_LINKINFO */
	72
	73	struct smc_diag_linkinfo {
	74	__u8 link_id; /* link identifier */
	75	__u8 ibname[IB_DEVICE_NAME_MAX]; /* name of the RDMA device */
	76	__u8 ibport; /* RDMA device port number */
	77	__u8 gid[40]; /* local GID */
	78	__u8 peer_gid[40]; /* peer GID */
	79	};
	80
	81	struct smc_diag_lgrinfo {
	82	struct smc_diag_linkinfo lnk[1];
	83	__u8 role;
	84	};
	85	#endif /* _UAPI_SMC_DIAG_H_ */

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

@@ -240,6 +240,7 @@ enum · 239 unmodified lines
240	LINUX_MIB_SACKMERGED,	240	LINUX_MIB_SACKMERGED,
241	LINUX_MIB_SACKSHIFTFALLBACK,	241	LINUX_MIB_SACKSHIFTFALLBACK,
242	LINUX_MIB_TCPBACKLOGDROP,	242	LINUX_MIB_TCPBACKLOGDROP,
		243	LINUX_MIB_PFMEMALLOCDROP,
243	LINUX_MIB_TCPMINTTLDROP, /* RFC 5082 */	244	LINUX_MIB_TCPMINTTLDROP, /* RFC 5082 */
244	LINUX_MIB_TCPDEFERACCEPTDROP,	245	LINUX_MIB_TCPDEFERACCEPTDROP,
245	LINUX_MIB_IPRPFILTER, /* IP Reverse Path Filter (rp_filter) */	246	LINUX_MIB_IPRPFILTER, /* IP Reverse Path Filter (rp_filter) */

include/uapi/linux/stat.h+131−0

@@ -1,6 +1,7 @@
1	#ifndef _UAPI_LINUX_STAT_H	1	#ifndef _UAPI_LINUX_STAT_H
2	#define _UAPI_LINUX_STAT_H	2	#define _UAPI_LINUX_STAT_H
3		3
		4	#include <linux/types.h>
4		5
5	#if defined(__KERNEL__) \|\| !defined(__GLIBC__) \|\| (__GLIBC__ < 2)	6	#if defined(__KERNEL__) \|\| !defined(__GLIBC__) \|\| (__GLIBC__ < 2)
6		7
@@ -41,5 +42,135 @@ · 34 unmodified lines
41		42
42	#endif	43	#endif
43		44
		45	/*
		46	* Timestamp structure for the timestamps in struct statx.
		47	*
		48	* tv_sec holds the number of seconds before (negative) or after (positive)
		49	* 00:00:00 1st January 1970 UTC.
		50	*
		51	* tv_nsec holds a number of nanoseconds before (0..-999,999,999 if tv_sec is
		52	* negative) or after (0..999,999,999 if tv_sec is positive) the tv_sec time.
		53	*
		54	* Note that if both tv_sec and tv_nsec are non-zero, then the two values must
		55	* either be both positive or both negative.
		56	*
		57	* __reserved is held in case we need a yet finer resolution.
		58	*/
		59	struct statx_timestamp {
		60	__s64 tv_sec;
		61	__s32 tv_nsec;
		62	__s32 __reserved;
		63	};
		64
		65	/*
		66	* Structures for the extended file attribute retrieval system call
		67	* (statx()).
		68	*
		69	* The caller passes a mask of what they're specifically interested in as a
		70	* parameter to statx(). What statx() actually got will be indicated in
		71	* st_mask upon return.
		72	*
		73	* For each bit in the mask argument:
		74	*
		75	* - if the datum is not supported:
		76	*
		77	* - the bit will be cleared, and
		78	*
		79	* - the datum will be set to an appropriate fabricated value if one is
		80	* available (eg. CIFS can take a default uid and gid), otherwise
		81	*
		82	* - the field will be cleared;
		83	*
		84	* - otherwise, if explicitly requested:
		85	*
		86	* - the datum will be synchronised to the server if AT_STATX_FORCE_SYNC is
		87	* set or if the datum is considered out of date, and
		88	*
		89	* - the field will be filled in and the bit will be set;
		90	*
		91	* - otherwise, if not requested, but available in approximate form without any
		92	* effort, it will be filled in anyway, and the bit will be set upon return
		93	* (it might not be up to date, however, and no attempt will be made to
		94	* synchronise the internal state first);
		95	*
		96	* - otherwise the field and the bit will be cleared before returning.
		97	*
		98	* Items in STATX_BASIC_STATS may be marked unavailable on return, but they
		99	* will have values installed for compatibility purposes so that stat() and
		100	* co. can be emulated in userspace.
		101	*/
		102	struct statx {
		103	/* 0x00 */
		104	__u32 stx_mask; /* What results were written [uncond] */
		105	__u32 stx_blksize; /* Preferred general I/O size [uncond] */
		106	__u64 stx_attributes; /* Flags conveying information about the file [uncond] */
		107	/* 0x10 */
		108	__u32 stx_nlink; /* Number of hard links */
		109	__u32 stx_uid; /* User ID of owner */
		110	__u32 stx_gid; /* Group ID of owner */
		111	__u16 stx_mode; /* File mode */
		112	__u16 __spare0[1];
		113	/* 0x20 */
		114	__u64 stx_ino; /* Inode number */
		115	__u64 stx_size; /* File size */
		116	__u64 stx_blocks; /* Number of 512-byte blocks allocated */
		117	__u64 __spare1[1];
		118	/* 0x40 */
		119	struct statx_timestamp stx_atime; /* Last access time */
		120	struct statx_timestamp stx_btime; /* File creation time */
		121	struct statx_timestamp stx_ctime; /* Last attribute change time */
		122	struct statx_timestamp stx_mtime; /* Last data modification time */
		123	/* 0x80 */
		124	__u32 stx_rdev_major; /* Device ID of special file [if bdev/cdev] */
		125	__u32 stx_rdev_minor;
		126	__u32 stx_dev_major; /* ID of device containing file [uncond] */
		127	__u32 stx_dev_minor;
		128	/* 0x90 */
		129	__u64 __spare2[14]; /* Spare space for future expansion */
		130	/* 0x100 */
		131	};
		132
		133	/*
		134	* Flags to be stx_mask
		135	*
		136	* Query request/result mask for statx() and struct statx::stx_mask.
		137	*
		138	* These bits should be set in the mask argument of statx() to request
		139	* particular items when calling statx().
		140	*/
		141	#define STATX_TYPE 0x00000001U /* Want/got stx_mode & S_IFMT */
		142	#define STATX_MODE 0x00000002U /* Want/got stx_mode & ~S_IFMT */
		143	#define STATX_NLINK 0x00000004U /* Want/got stx_nlink */
		144	#define STATX_UID 0x00000008U /* Want/got stx_uid */
		145	#define STATX_GID 0x00000010U /* Want/got stx_gid */
		146	#define STATX_ATIME 0x00000020U /* Want/got stx_atime */
		147	#define STATX_MTIME 0x00000040U /* Want/got stx_mtime */
		148	#define STATX_CTIME 0x00000080U /* Want/got stx_ctime */
		149	#define STATX_INO 0x00000100U /* Want/got stx_ino */
		150	#define STATX_SIZE 0x00000200U /* Want/got stx_size */
		151	#define STATX_BLOCKS 0x00000400U /* Want/got stx_blocks */
		152	#define STATX_BASIC_STATS 0x000007ffU /* The stuff in the normal stat struct */
		153	#define STATX_BTIME 0x00000800U /* Want/got stx_btime */
		154	#define STATX_ALL 0x00000fffU /* All currently supported flags */
		155
		156	/*
		157	* Attributes to be found in stx_attributes
		158	*
		159	* These give information about the features or the state of a file that might
		160	* be of use to ordinary userspace programs such as GUIs or ls rather than
		161	* specialised tools.
		162	*
		163	* Note that the flags marked [I] correspond to generic FS_IOC_FLAGS
		164	* semantically. Where possible, the numerical value is picked to correspond
		165	* also.
		166	*/
		167	#define STATX_ATTR_COMPRESSED 0x00000004 /* [I] File is compressed by the fs */
		168	#define STATX_ATTR_IMMUTABLE 0x00000010 /* [I] File is marked immutable */
		169	#define STATX_ATTR_APPEND 0x00000020 /* [I] File is append-only */
		170	#define STATX_ATTR_NODUMP 0x00000040 /* [I] File is not to be dumped */
		171	#define STATX_ATTR_ENCRYPTED 0x00000800 /* [I] File requires key to decrypt in fs */
		172
		173	#define STATX_ATTR_AUTOMOUNT 0x00001000 /* Dir: Automount trigger */
		174
44		175
45	#endif /* _UAPI_LINUX_STAT_H */	176	#endif /* _UAPI_LINUX_STAT_H */

include/uapi/linux/target_core_user.h+11−11

@@ -105,26 +105,26 @@ struct tcmu_cmd_entry { · 104 unmodified lines
105		105
106	union {	106	union {
107	struct {	107	struct {
108	uint32_t iov_cnt;	108	__u32 iov_cnt;
109	uint32_t iov_bidi_cnt;	109	__u32 iov_bidi_cnt;
110	uint32_t iov_dif_cnt;	110	__u32 iov_dif_cnt;
111	uint64_t cdb_off;	111	__u64 cdb_off;
112	uint64_t __pad1;	112	__u64 __pad1;
113	uint64_t __pad2;	113	__u64 __pad2;
114	struct iovec iov[0];	114	struct iovec iov[0];
115	} req;	115	} req;
116	struct {	116	struct {
117	uint8_t scsi_status;	117	__u8 scsi_status;
118	uint8_t __pad1;	118	__u8 __pad1;
119	uint16_t __pad2;	119	__u16 __pad2;
120	uint32_t __pad3;	120	__u32 __pad3;
121	char sense_buffer[TCMU_SENSE_BUFFERSIZE];	121	char sense_buffer[TCMU_SENSE_BUFFERSIZE];
122	} rsp;	122	} rsp;
123	};	123	};
124		124
125	} __packed;	125	} __packed;
126		126
127	#define TCMU_OP_ALIGN_SIZE sizeof(uint64_t)	127	#define TCMU_OP_ALIGN_SIZE sizeof(__u64)
128		128
129	enum tcmu_genl_cmd {	129	enum tcmu_genl_cmd {
130	TCMU_CMD_UNSPEC,	130	TCMU_CMD_UNSPEC,

include/uapi/linux/tc_act/Kbuild+1−0

@@ -4,6 +4,7 @@ header-y += tc_defact.h · 3 unmodified lines
4	header-y += tc_gact.h	4	header-y += tc_gact.h
5	header-y += tc_ipt.h	5	header-y += tc_ipt.h
6	header-y += tc_mirred.h	6	header-y += tc_mirred.h
		7	header-y += tc_sample.h
7	header-y += tc_nat.h	8	header-y += tc_nat.h
8	header-y += tc_pedit.h	9	header-y += tc_pedit.h
9	header-y += tc_skbedit.h	10	header-y += tc_skbedit.h

include/uapi/linux/tc_act/tc_csum.h+2−1

@@ -21,7 +21,8 @@ enum { · 20 unmodified lines
21	TCA_CSUM_UPDATE_FLAG_IGMP = 4,	21	TCA_CSUM_UPDATE_FLAG_IGMP = 4,
22	TCA_CSUM_UPDATE_FLAG_TCP = 8,	22	TCA_CSUM_UPDATE_FLAG_TCP = 8,
23	TCA_CSUM_UPDATE_FLAG_UDP = 16,	23	TCA_CSUM_UPDATE_FLAG_UDP = 16,
24	TCA_CSUM_UPDATE_FLAG_UDPLITE = 32	24	TCA_CSUM_UPDATE_FLAG_UDPLITE = 32,
		25	TCA_CSUM_UPDATE_FLAG_SCTP = 64,
25	};	26	};
26		27
27	struct tc_csum {	28	struct tc_csum {

include/uapi/linux/tc_act/tc_ife.h+1−9

 #include <linux/types.h>
 #include <linux/pkt_cls.h>
+#include <linux/ife.h>
 #define TCA_ACT_IFE 25
 /* Flag bits for now just encoding/decoding; mutually exclusive */
 };
 #define TCA_IFE_MAX (__TCA_IFE_MAX - 1)
-#define IFE_META_SKBMARK 1
-#define IFE_META_HASHID 2
-#define	IFE_META_PRIO 3
-#define	IFE_META_QMAP 4
-#define	IFE_META_TCINDEX 5
-/*Can be overridden at runtime by module option*/
-#define	__IFE_META_MAX 6
-#define IFE_META_MAX (__IFE_META_MAX - 1)
 #endif

include/uapi/linux/tc_act/tc_pedit.h+31−0

@@ -11,10 +11,41 @@ enum { · 10 unmodified lines
11	TCA_PEDIT_TM,	11	TCA_PEDIT_TM,
12	TCA_PEDIT_PARMS,	12	TCA_PEDIT_PARMS,
13	TCA_PEDIT_PAD,	13	TCA_PEDIT_PAD,
		14	TCA_PEDIT_PARMS_EX,
		15	TCA_PEDIT_KEYS_EX,
		16	TCA_PEDIT_KEY_EX,
14	__TCA_PEDIT_MAX	17	__TCA_PEDIT_MAX
15	};	18	};
16	#define TCA_PEDIT_MAX (__TCA_PEDIT_MAX - 1)	19	#define TCA_PEDIT_MAX (__TCA_PEDIT_MAX - 1)
17		20
		21	enum {
		22	TCA_PEDIT_KEY_EX_HTYPE = 1,
		23	TCA_PEDIT_KEY_EX_CMD = 2,
		24	__TCA_PEDIT_KEY_EX_MAX
		25	};
		26	#define TCA_PEDIT_KEY_EX_MAX (__TCA_PEDIT_KEY_EX_MAX - 1)
		27
		28	/* TCA_PEDIT_KEY_EX_HDR_TYPE_NETWROK is a special case for legacy users. It
		29	* means no specific header type - offset is relative to the network layer
		30	*/
		31	enum pedit_header_type {
		32	TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK = 0,
		33	TCA_PEDIT_KEY_EX_HDR_TYPE_ETH = 1,
		34	TCA_PEDIT_KEY_EX_HDR_TYPE_IP4 = 2,
		35	TCA_PEDIT_KEY_EX_HDR_TYPE_IP6 = 3,
		36	TCA_PEDIT_KEY_EX_HDR_TYPE_TCP = 4,
		37	TCA_PEDIT_KEY_EX_HDR_TYPE_UDP = 5,
		38	__PEDIT_HDR_TYPE_MAX,
		39	};
		40	#define TCA_PEDIT_HDR_TYPE_MAX (__PEDIT_HDR_TYPE_MAX - 1)
		41
		42	enum pedit_cmd {
		43	TCA_PEDIT_KEY_EX_CMD_SET = 0,
		44	TCA_PEDIT_KEY_EX_CMD_ADD = 1,
		45	__PEDIT_CMD_MAX,
		46	};
		47	#define TCA_PEDIT_CMD_MAX (__PEDIT_CMD_MAX - 1)
		48
18	struct tc_pedit_key {	49	struct tc_pedit_key {
19	__u32 mask; /* AND */	50	__u32 mask; /* AND */
20	__u32 val; /XOR /	51	__u32 val; /XOR /

include/uapi/linux/tc_act/tc_sample.h+26−0

@@ -0,0 +1,26 @@
	1	#ifndef __LINUX_TC_SAMPLE_H
	2	#define __LINUX_TC_SAMPLE_H
	3
	4	#include <linux/types.h>
	5	#include <linux/pkt_cls.h>
	6	#include <linux/if_ether.h>
	7
	8	#define TCA_ACT_SAMPLE 26
	9
	10	struct tc_sample {
	11	tc_gen;
	12	};
	13
	14	enum {
	15	TCA_SAMPLE_UNSPEC,
	16	TCA_SAMPLE_TM,
	17	TCA_SAMPLE_PARMS,
	18	TCA_SAMPLE_RATE,
	19	TCA_SAMPLE_TRUNC_SIZE,
	20	TCA_SAMPLE_PSAMPLE_GROUP,
	21	TCA_SAMPLE_PAD,
	22	__TCA_SAMPLE_MAX
	23	};
	24	#define TCA_SAMPLE_MAX (__TCA_SAMPLE_MAX - 1)
	25
	26	#endif

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

 #define TCP_SAVE_SYN		27	/* Record SYN headers for new connections */
 #define TCP_SAVED_SYN		28	/* Get SYN headers recorded for connection */
 #define TCP_REPAIR_WINDOW	29	/* Get/set window parameters */
+#define TCP_FASTOPEN_CONNECT	30	/* Attempt FastOpen with connect */
 struct tcp_repair_opt {
 	__u32	opt_code;
 	TCP_NLA_BUSY,		/* Time (usec) busy sending data */
 	TCP_NLA_RWND_LIMITED,	/* Time (usec) limited by receive window */
 	TCP_NLA_SNDBUF_LIMITED,	/* Time (usec) limited by send buffer */
+	TCP_NLA_DATA_SEGS_OUT,	/* Data pkts sent including retransmission */
+	TCP_NLA_TOTAL_RETRANS,	/* Data pkts retransmitted */
 };
 /* for TCP_MD5SIG socket option */

include/uapi/linux/tipc.h+4−2

 /*
  * include/uapi/linux/tipc.h: Header for TIPC socket interface
  *
- * Copyright (c) 2003-2006, Ericsson AB
+ * Copyright (c) 2003-2006, 2015-2016 Ericsson AB
  * Copyright (c) 2005, 2010-2011, Wind River Systems
  * All rights reserved.
  *
 #define TIPC_DESTNAME	3	/* destination name */
 /*
- * TIPC-specific socket option values
+ * TIPC-specific socket option names
  */
 #define TIPC_IMPORTANCE		127	/* Default: TIPC_LOW_IMPORTANCE */
 #define TIPC_CONN_TIMEOUT	130	/* Default: 8000 (ms)  */
 #define TIPC_NODE_RECVQ_DEPTH	131	/* Default: none (read only) */
 #define TIPC_SOCK_RECVQ_DEPTH	132	/* Default: none (read only) */
+#define TIPC_MCAST_BROADCAST    133     /* Default: TIPC selects. No arg */
+#define TIPC_MCAST_REPLICAST    134     /* Default: TIPC selects. No arg */
 /*
  * Maximum sizes of TIPC bearer-related names (including terminating NULL)

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

@@ -10,4 +10,6 @@ struct sockaddr_un { · 9 unmodified lines
10	char sun_path[UNIX_PATH_MAX]; /* pathname */	10	char sun_path[UNIX_PATH_MAX]; /* pathname */
11	};	11	};
12		12
		13	#define SIOCUNIXFILE (SIOCPROTOPRIVATE + 0) /* open a socket file with O_PATH */
		14
13	#endif /* _LINUX_UN_H */	15	#endif /* _LINUX_UN_H */

include/uapi/linux/userfaultfd.h+61−9

@@ -11,13 +11,19 @@ · 10 unmodified lines
11		11
12	#include <linux/types.h>	12	#include <linux/types.h>
13		13
14	#define UFFD_API ((__u64)0xAA)
15	/*	14	/*
16	* After implementing the respective features it will become:	15	* If the UFFDIO_API is upgraded someday, the UFFDIO_UNREGISTER and
17	* #define UFFD_API_FEATURES (UFFD_FEATURE_PAGEFAULT_FLAG_WP \| \	16	* UFFDIO_WAKE ioctls should be defined as _IOW and not as _IOR. In
18	* UFFD_FEATURE_EVENT_FORK)	17	* userfaultfd.h we assumed the kernel was reading (instead _IOC_READ
		18	* means the userland is reading).
19	*/	19	*/
20	#define UFFD_API_FEATURES (0)	20	#define UFFD_API ((__u64)0xAA)
		21	#define UFFD_API_FEATURES (UFFD_FEATURE_EVENT_FORK \| \
		22	UFFD_FEATURE_EVENT_REMAP \| \
		23	UFFD_FEATURE_EVENT_REMOVE \| \
		24	UFFD_FEATURE_EVENT_UNMAP \| \
		25	UFFD_FEATURE_MISSING_HUGETLBFS \| \
		26	UFFD_FEATURE_MISSING_SHMEM)
21	#define UFFD_API_IOCTLS \	27	#define UFFD_API_IOCTLS \
22	((__u64)1 << _UFFDIO_REGISTER \| \	28	((__u64)1 << _UFFDIO_REGISTER \| \
23	(__u64)1 << _UFFDIO_UNREGISTER \| \	29	(__u64)1 << _UFFDIO_UNREGISTER \| \
@@ -26,6 +32,9 @@ · 2 unmodified lines
26	((__u64)1 << _UFFDIO_WAKE \| \	32	((__u64)1 << _UFFDIO_WAKE \| \
27	(__u64)1 << _UFFDIO_COPY \| \	33	(__u64)1 << _UFFDIO_COPY \| \
28	(__u64)1 << _UFFDIO_ZEROPAGE)	34	(__u64)1 << _UFFDIO_ZEROPAGE)
		35	#define UFFD_API_RANGE_IOCTLS_BASIC \
		36	((__u64)1 << _UFFDIO_WAKE \| \
		37	(__u64)1 << _UFFDIO_COPY)
29		38
30	/*	39	/*
31	* Valid ioctl command number range with this API is from 0x00 to	40	* Valid ioctl command number range with this API is from 0x00 to
@@ -71,6 +80,21 @@ struct uffd_msg { · 39 unmodified lines
71	__u64 address;	80	__u64 address;
72	} pagefault;	81	} pagefault;
73		82
		83	struct {
		84	__u32 ufd;
		85	} fork;
		86
		87	struct {
		88	__u64 from;
		89	__u64 to;
		90	__u64 len;
		91	} remap;
		92
		93	struct {
		94	__u64 start;
		95	__u64 end;
		96	} remove;
		97
74	struct {	98	struct {
75	/* unused reserved fields */	99	/* unused reserved fields */
76	__u64 reserved1;	100	__u64 reserved1;
@@ -84,9 +108,10 @@ struct uffd_msg { · 7 unmodified lines
84	* Start at 0x12 and not at 0 to be more strict against bugs.	108	* Start at 0x12 and not at 0 to be more strict against bugs.
85	*/	109	*/
86	#define UFFD_EVENT_PAGEFAULT 0x12	110	#define UFFD_EVENT_PAGEFAULT 0x12
87	#if 0 /* not available yet */
88	#define UFFD_EVENT_FORK 0x13	111	#define UFFD_EVENT_FORK 0x13
89	#endif	112	#define UFFD_EVENT_REMAP 0x14
		113	#define UFFD_EVENT_REMOVE 0x15
		114	#define UFFD_EVENT_UNMAP 0x16
90		115
91	/* flags for UFFD_EVENT_PAGEFAULT */	116	/* flags for UFFD_EVENT_PAGEFAULT */
92	#define UFFD_PAGEFAULT_FLAG_WRITE (1<<0) /* If this was a write fault */	117	#define UFFD_PAGEFAULT_FLAG_WRITE (1<<0) /* If this was a write fault */
@@ -104,11 +129,38 @@ struct uffdio_api { · 11 unmodified lines
104	* Note: UFFD_EVENT_PAGEFAULT and UFFD_PAGEFAULT_FLAG_WRITE	129	* Note: UFFD_EVENT_PAGEFAULT and UFFD_PAGEFAULT_FLAG_WRITE
105	* are to be considered implicitly always enabled in all kernels as	130	* are to be considered implicitly always enabled in all kernels as
106	* long as the uffdio_api.api requested matches UFFD_API.	131	* long as the uffdio_api.api requested matches UFFD_API.
		132	*
		133	* UFFD_FEATURE_MISSING_HUGETLBFS means an UFFDIO_REGISTER
		134	* with UFFDIO_REGISTER_MODE_MISSING mode will succeed on
		135	* hugetlbfs virtual memory ranges. Adding or not adding
		136	* UFFD_FEATURE_MISSING_HUGETLBFS to uffdio_api.features has
		137	* no real functional effect after UFFDIO_API returns, but
		138	* it's only useful for an initial feature set probe at
		139	* UFFDIO_API time. There are two ways to use it:
		140	*
		141	* 1) by adding UFFD_FEATURE_MISSING_HUGETLBFS to the
		142	* uffdio_api.features before calling UFFDIO_API, an error
		143	* will be returned by UFFDIO_API on a kernel without
		144	* hugetlbfs missing support
		145	*
		146	* 2) the UFFD_FEATURE_MISSING_HUGETLBFS can not be added in
		147	* uffdio_api.features and instead it will be set by the
		148	* kernel in the uffdio_api.features if the kernel supports
		149	* it, so userland can later check if the feature flag is
		150	* present in uffdio_api.features after UFFDIO_API
		151	* succeeded.
		152	*
		153	* UFFD_FEATURE_MISSING_SHMEM works the same as
		154	* UFFD_FEATURE_MISSING_HUGETLBFS, but it applies to shmem
		155	* (i.e. tmpfs and other shmem based APIs).
107	*/	156	*/
108	#if 0 /* not available yet */
109	#define UFFD_FEATURE_PAGEFAULT_FLAG_WP (1<<0)	157	#define UFFD_FEATURE_PAGEFAULT_FLAG_WP (1<<0)
110	#define UFFD_FEATURE_EVENT_FORK (1<<1)	158	#define UFFD_FEATURE_EVENT_FORK (1<<1)
111	#endif	159	#define UFFD_FEATURE_EVENT_REMAP (1<<2)
		160	#define UFFD_FEATURE_EVENT_REMOVE (1<<3)
		161	#define UFFD_FEATURE_MISSING_HUGETLBFS (1<<4)
		162	#define UFFD_FEATURE_MISSING_SHMEM (1<<5)
		163	#define UFFD_FEATURE_EVENT_UNMAP (1<<6)
112	__u64 features;	164	__u64 features;
113		165
114	__u64 ioctls;	166	__u64 ioctls;

include/uapi/linux/virtio_mmio.h+141−0

@@ -0,0 +1,141 @@
	1	/*
	2	* Virtio platform device driver
	3	*
	4	* Copyright 2011, ARM Ltd.
	5	*
	6	* Based on Virtio PCI driver by Anthony Liguori, copyright IBM Corp. 2007
	7	*
	8	* This header is BSD licensed so anyone can use the definitions to implement
	9	* compatible drivers/servers.
	10	*
	11	* Redistribution and use in source and binary forms, with or without
	12	* modification, are permitted provided that the following conditions
	13	* are met:
	14	* 1. Redistributions of source code must retain the above copyright
	15	* notice, this list of conditions and the following disclaimer.
	16	* 2. Redistributions in binary form must reproduce the above copyright
	17	* notice, this list of conditions and the following disclaimer in the
	18	* documentation and/or other materials provided with the distribution.
	19	* 3. Neither the name of IBM nor the names of its contributors
	20	* may be used to endorse or promote products derived from this software
	21	* without specific prior written permission.
	22	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
	23	* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	24	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	25	* ARE DISCLAIMED. IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
	26	* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	27	* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	28	* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	29	* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	30	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	31	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	32	* SUCH DAMAGE.
	33	*/
	34
	35	#ifndef _LINUX_VIRTIO_MMIO_H
	36	#define _LINUX_VIRTIO_MMIO_H
	37
	38	/*
	39	* Control registers
	40	*/
	41
	42	/* Magic value ("virt" string) - Read Only */
	43	#define VIRTIO_MMIO_MAGIC_VALUE 0x000
	44
	45	/* Virtio device version - Read Only */
	46	#define VIRTIO_MMIO_VERSION 0x004
	47
	48	/* Virtio device ID - Read Only */
	49	#define VIRTIO_MMIO_DEVICE_ID 0x008
	50
	51	/* Virtio vendor ID - Read Only */
	52	#define VIRTIO_MMIO_VENDOR_ID 0x00c
	53
	54	/* Bitmask of the features supported by the device (host)
	55	* (32 bits per set) - Read Only */
	56	#define VIRTIO_MMIO_DEVICE_FEATURES 0x010
	57
	58	/* Device (host) features set selector - Write Only */
	59	#define VIRTIO_MMIO_DEVICE_FEATURES_SEL 0x014
	60
	61	/* Bitmask of features activated by the driver (guest)
	62	* (32 bits per set) - Write Only */
	63	#define VIRTIO_MMIO_DRIVER_FEATURES 0x020
	64
	65	/* Activated features set selector - Write Only */
	66	#define VIRTIO_MMIO_DRIVER_FEATURES_SEL 0x024
	67
	68
	69	#ifndef VIRTIO_MMIO_NO_LEGACY /* LEGACY DEVICES ONLY! */
	70
	71	/* Guest's memory page size in bytes - Write Only */
	72	#define VIRTIO_MMIO_GUEST_PAGE_SIZE 0x028
	73
	74	#endif
	75
	76
	77	/* Queue selector - Write Only */
	78	#define VIRTIO_MMIO_QUEUE_SEL 0x030
	79
	80	/* Maximum size of the currently selected queue - Read Only */
	81	#define VIRTIO_MMIO_QUEUE_NUM_MAX 0x034
	82
	83	/* Queue size for the currently selected queue - Write Only */
	84	#define VIRTIO_MMIO_QUEUE_NUM 0x038
	85
	86
	87	#ifndef VIRTIO_MMIO_NO_LEGACY /* LEGACY DEVICES ONLY! */
	88
	89	/* Used Ring alignment for the currently selected queue - Write Only */
	90	#define VIRTIO_MMIO_QUEUE_ALIGN 0x03c
	91
	92	/* Guest's PFN for the currently selected queue - Read Write */
	93	#define VIRTIO_MMIO_QUEUE_PFN 0x040
	94
	95	#endif
	96
	97
	98	/* Ready bit for the currently selected queue - Read Write */
	99	#define VIRTIO_MMIO_QUEUE_READY 0x044
	100
	101	/* Queue notifier - Write Only */
	102	#define VIRTIO_MMIO_QUEUE_NOTIFY 0x050
	103
	104	/* Interrupt status - Read Only */
	105	#define VIRTIO_MMIO_INTERRUPT_STATUS 0x060
	106
	107	/* Interrupt acknowledge - Write Only */
	108	#define VIRTIO_MMIO_INTERRUPT_ACK 0x064
	109
	110	/* Device status register - Read Write */
	111	#define VIRTIO_MMIO_STATUS 0x070
	112
	113	/* Selected queue's Descriptor Table address, 64 bits in two halves */
	114	#define VIRTIO_MMIO_QUEUE_DESC_LOW 0x080
	115	#define VIRTIO_MMIO_QUEUE_DESC_HIGH 0x084
	116
	117	/* Selected queue's Available Ring address, 64 bits in two halves */
	118	#define VIRTIO_MMIO_QUEUE_AVAIL_LOW 0x090
	119	#define VIRTIO_MMIO_QUEUE_AVAIL_HIGH 0x094
	120
	121	/* Selected queue's Used Ring address, 64 bits in two halves */
	122	#define VIRTIO_MMIO_QUEUE_USED_LOW 0x0a0
	123	#define VIRTIO_MMIO_QUEUE_USED_HIGH 0x0a4
	124
	125	/* Configuration atomicity value */
	126	#define VIRTIO_MMIO_CONFIG_GENERATION 0x0fc
	127
	128	/* The config space is defined by each driver as
	129	* the per-driver configuration space - Read Write */
	130	#define VIRTIO_MMIO_CONFIG 0x100
	131
	132
	133
	134	/*
	135	* Interrupt flags (re: interrupt status & acknowledge registers)
	136	*/
	137
	138	#define VIRTIO_MMIO_INT_VRING (1 << 0)
	139	#define VIRTIO_MMIO_INT_CONFIG (1 << 1)
	140
	141	#endif

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

@@ -79,7 +79,7 @@ · 78 unmodified lines
79	* configuration space */	79	* configuration space */
80	#define VIRTIO_PCI_CONFIG_OFF(msix_enabled) ((msix_enabled) ? 24 : 20)	80	#define VIRTIO_PCI_CONFIG_OFF(msix_enabled) ((msix_enabled) ? 24 : 20)
81	/* Deprecated: please use VIRTIO_PCI_CONFIG_OFF instead */	81	/* Deprecated: please use VIRTIO_PCI_CONFIG_OFF instead */
82	#define VIRTIO_PCI_CONFIG(dev) VIRTIO_PCI_CONFIG_OFF((dev)->msix_enabled)	82	#define VIRTIO_PCI_CONFIG(dev) VIRTIO_PCI_CONFIG_OFF((dev)->pci_dev->msix_enabled)
83		83
84	/* Virtio ABI version, this must match exactly */	84	/* Virtio ABI version, this must match exactly */
85	#define VIRTIO_PCI_ABI_VERSION 0	85	#define VIRTIO_PCI_ABI_VERSION 0

Merge branch 'for-4.12/asus' into for-linus

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code