lael-labs/linux

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

 typedef __kernel_long_t	__kernel_off_t;
 typedef long long	__kernel_loff_t;
 typedef __kernel_long_t	__kernel_old_time_t;
+#ifndef __KERNEL__
 typedef __kernel_long_t	__kernel_time_t;
+#endif
 typedef long long __kernel_time64_t;
 typedef __kernel_long_t	__kernel_clock_t;
 typedef int		__kernel_timer_t;

include/uapi/drm/amdgpu_drm.h+3−2

 /* Flag that BO sharing will be explicitly synchronized */
 #define AMDGPU_GEM_CREATE_EXPLICIT_SYNC		(1 << 7)
 /* Flag that indicates allocating MQD gart on GFX9, where the mtype
- * for the second page onward should be set to NC.
+ * for the second page onward should be set to NC. It should never
+ * be used by user space applications.
  */
-#define AMDGPU_GEM_CREATE_MQD_GFX9		(1 << 8)
+#define AMDGPU_GEM_CREATE_CP_MQD_GFX9		(1 << 8)
 /* Flag that BO may contain sensitive data that must be wiped before
  * releasing the memory
  */

include/uapi/drm/vmwgfx_drm.h+11−5

  *
  * DRM_VMW_PARAM_SM4_1
  * SM4_1 support is enabled.
+ *
+ * DRM_VMW_PARAM_SM5
+ * SM5 support is enabled.
  */
 #define DRM_VMW_PARAM_NUM_STREAMS      0
 #define DRM_VMW_PARAM_DX               12
 #define DRM_VMW_PARAM_HW_CAPS2         13
 #define DRM_VMW_PARAM_SM4_1            14
+#define DRM_VMW_PARAM_SM5              15
 /**
  * enum drm_vmw_handle_type - handle type for ref ioctls
  * svga3d surface flags split into 2, upper half and lower half.
  */
 enum drm_vmw_surface_version {
-	drm_vmw_gb_surface_v1
+	drm_vmw_gb_surface_v1,
 };
 /**
  * @svga3d_flags_upper_32_bits: Upper 32 bits of svga3d flags.
  * @multisample_pattern: Multisampling pattern when msaa is supported.
  * @quality_level: Precision settings for each sample.
+ * @buffer_byte_stride: Buffer byte stride.
  * @must_be_zero: Reserved for future usage.
  *
  * Input argument to the  DRM_VMW_GB_SURFACE_CREATE_EXT Ioctl.
 struct drm_vmw_gb_surface_create_ext_req {
 	struct drm_vmw_gb_surface_create_req base;
 	enum drm_vmw_surface_version version;
-	uint32_t svga3d_flags_upper_32_bits;
+	__u32 svga3d_flags_upper_32_bits;
-	SVGA3dMSPattern multisample_pattern;
+	__u32 multisample_pattern;
-	SVGA3dMSQualityLevel quality_level;
+	__u32 quality_level;
-	uint64_t must_be_zero;
+	__u32 buffer_byte_stride;
+	__u32 must_be_zero;
 };
 /**

include/uapi/linux/bpf.h+263−77

 /* 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 */
+	__u8	data[];	/* Arbitrary size */
 };
 struct bpf_cgroup_storage_key {
 	BPF_MAP_LOOKUP_AND_DELETE_BATCH,
 	BPF_MAP_UPDATE_BATCH,
 	BPF_MAP_DELETE_BATCH,
+	BPF_LINK_CREATE,
+	BPF_LINK_UPDATE,
 };
 enum bpf_map_type {
 	BPF_PROG_TYPE_TRACING,
 	BPF_PROG_TYPE_STRUCT_OPS,
 	BPF_PROG_TYPE_EXT,
+	BPF_PROG_TYPE_LSM,
 };
 enum bpf_attach_type {
 	BPF_TRACE_RAW_TP,
 	BPF_TRACE_FENTRY,
 	BPF_TRACE_FEXIT,
+	BPF_MODIFY_RETURN,
+	BPF_LSM_MAC,
 	__MAX_BPF_ATTACH_TYPE
 };
 #define BPF_PSEUDO_CALL		1
 /* flags for BPF_MAP_UPDATE_ELEM command */
-#define BPF_ANY		0 /* create new element or update existing */
+enum {
-#define BPF_NOEXIST	1 /* create new element if it didn't exist */
+	BPF_ANY		= 0, /* create new element or update existing */
-#define BPF_EXIST	2 /* update existing element */
+	BPF_NOEXIST	= 1, /* create new element if it didn't exist */
-#define BPF_F_LOCK	4 /* spin_lock-ed map_lookup/map_update */
+	BPF_EXIST	= 2, /* update existing element */
+	BPF_F_LOCK	= 4, /* spin_lock-ed map_lookup/map_update */
+};
 /* flags for BPF_MAP_CREATE command */
-#define BPF_F_NO_PREALLOC	(1U << 0)
+enum {
+	BPF_F_NO_PREALLOC	= (1U << 0),
 /* Instead of having one common LRU list in the
  * BPF_MAP_TYPE_LRU_[PERCPU_]HASH map, use a percpu LRU list
  * which can scale and perform better.
  * Note, the LRU nodes (including free nodes) cannot be moved
  * across different LRU lists.
  */
-#define BPF_F_NO_COMMON_LRU	(1U << 1)
+	BPF_F_NO_COMMON_LRU	= (1U << 1),
 /* Specify numa node during map creation */
-#define BPF_F_NUMA_NODE		(1U << 2)
+	BPF_F_NUMA_NODE		= (1U << 2),
-#define BPF_OBJ_NAME_LEN 16U
 /* Flags for accessing BPF object from syscall side. */
-#define BPF_F_RDONLY		(1U << 3)
+	BPF_F_RDONLY		= (1U << 3),
-#define BPF_F_WRONLY		(1U << 4)
+	BPF_F_WRONLY		= (1U << 4),
 /* Flag for stack_map, store build_id+offset instead of pointer */
-#define BPF_F_STACK_BUILD_ID	(1U << 5)
+	BPF_F_STACK_BUILD_ID	= (1U << 5),
 /* Zero-initialize hash function seed. This should only be used for testing. */
-#define BPF_F_ZERO_SEED		(1U << 6)
+	BPF_F_ZERO_SEED		= (1U << 6),
 /* Flags for accessing BPF object from program side. */
-#define BPF_F_RDONLY_PROG	(1U << 7)
+	BPF_F_RDONLY_PROG	= (1U << 7),
-#define BPF_F_WRONLY_PROG	(1U << 8)
+	BPF_F_WRONLY_PROG	= (1U << 8),
 /* Clone map from listener for newly accepted socket */
-#define BPF_F_CLONE		(1U << 9)
+	BPF_F_CLONE		= (1U << 9),
 /* Enable memory-mapping BPF map */
-#define BPF_F_MMAPABLE		(1U << 10)
+	BPF_F_MMAPABLE		= (1U << 10),
+};
 /* Flags for BPF_PROG_QUERY. */
 	};
 };
+#define BPF_OBJ_NAME_LEN 16U
 union bpf_attr {
 	struct { /* anonymous struct used by BPF_MAP_CREATE command */
 		__u32	map_type;	/* one of enum bpf_map_type */
 		__u32		prog_cnt;
 	} query;
-	struct {
+	struct { /* anonymous struct used by BPF_RAW_TRACEPOINT_OPEN command */
 		__u64 name;
 		__u32 prog_fd;
 	} raw_tracepoint;
 		__u64		probe_offset;	/* output: probe_offset */
 		__u64		probe_addr;	/* output: probe_addr */
 	} task_fd_query;
+	struct { /* struct used by BPF_LINK_CREATE command */
+		__u32		prog_fd;	/* eBPF program to attach */
+		__u32		target_fd;	/* object to attach to */
+		__u32		attach_type;	/* attach type */
+		__u32		flags;		/* extra flags */
+	} link_create;
+	struct { /* struct used by BPF_LINK_UPDATE command */
+		__u32		link_fd;	/* link fd */
+		/* new program fd to update link with */
+		__u32		new_prog_fd;
+		__u32		flags;		/* extra flags */
+		/* expected link's program fd; is specified only if
+		 * BPF_F_REPLACE flag is set in flags */
+		__u32		old_prog_fd;
+	} link_update;
 } __attribute__((aligned(8)));
 /* The description below is an attempt at providing documentation to eBPF
  * 		supports redirection to the egress interface, and accepts no
  * 		flag at all.
  *
- * 		The same effect can be attained with the more generic
+ * 		The same effect can also be attained with the more generic
- * 		**bpf_redirect_map**\ (), which requires specific maps to be
+ * 		**bpf_redirect_map**\ (), which uses a BPF map to store the
- * 		used but offers better performance.
+ * 		redirect target instead of providing it directly to the helper.
  * 	Return
  * 		For XDP, the helper returns **XDP_REDIRECT** on success or
  * 		**XDP_ABORTED** on error. For other program types, the values
  * 		the caller. Any higher bits in the *flags* argument must be
  * 		unset.
  *
- * 		When used to redirect packets to net devices, this helper
+ * 		See also bpf_redirect(), which only supports redirecting to an
- * 		provides a high performance increase over **bpf_redirect**\ ().
+ * 		ifindex, but doesn't require a map to do so.
- * 		This is due to various implementation details of the underlying
- * 		mechanisms, one of which is the fact that **bpf_redirect_map**\
- * 		() tries to send packet as a "bulk" to the device.
  * 	Return
- * 		**XDP_REDIRECT** on success, or **XDP_ABORTED** on error.
+ * 		**XDP_REDIRECT** on success, or the value of the two lower bits
+ * 		of the **flags* argument on error.
  *
  * int bpf_sk_redirect_map(struct sk_buff *skb, struct bpf_map *map, u32 key, u64 flags)
  * 	Description
  *		Obtain the 64bit jiffies
  *	Return
  *		The 64 bit jiffies
+ *
+ * int bpf_read_branch_records(struct bpf_perf_event_data *ctx, void *buf, u32 size, u64 flags)
+ *	Description
+ *		For an eBPF program attached to a perf event, retrieve the
+ *		branch records (struct perf_branch_entry) associated to *ctx*
+ *		and store it in	the buffer pointed by *buf* up to size
+ *		*size* bytes.
+ *	Return
+ *		On success, number of bytes written to *buf*. On error, a
+ *		negative value.
+ *
+ *		The *flags* can be set to **BPF_F_GET_BRANCH_RECORDS_SIZE** to
+ *		instead	return the number of bytes required to store all the
+ *		branch entries. If this flag is set, *buf* may be NULL.
+ *
+ *		**-EINVAL** if arguments invalid or **size** not a multiple
+ *		of sizeof(struct perf_branch_entry).
+ *
+ *		**-ENOENT** if architecture does not support branch records.
+ *
+ * int bpf_get_ns_current_pid_tgid(u64 dev, u64 ino, struct bpf_pidns_info *nsdata, u32 size)
+ *	Description
+ *		Returns 0 on success, values for *pid* and *tgid* as seen from the current
+ *		*namespace* will be returned in *nsdata*.
+ *
+ *		On failure, the returned value is one of the following:
+ *
+ *		**-EINVAL** if dev and inum supplied don't match dev_t and inode number
+ *              with nsfs of current task, or if dev conversion to dev_t lost high bits.
+ *
+ *		**-ENOENT** if pidns does not exists for the current task.
+ *
+ * int bpf_xdp_output(void *ctx, struct bpf_map *map, u64 flags, void *data, u64 size)
+ *	Description
+ *		Write raw *data* blob into a special BPF perf event held by
+ *		*map* of type **BPF_MAP_TYPE_PERF_EVENT_ARRAY**. This perf
+ *		event must have the following attributes: **PERF_SAMPLE_RAW**
+ *		as **sample_type**, **PERF_TYPE_SOFTWARE** as **type**, and
+ *		**PERF_COUNT_SW_BPF_OUTPUT** as **config**.
+ *
+ *		The *flags* are used to indicate the index in *map* for which
+ *		the value must be put, masked with **BPF_F_INDEX_MASK**.
+ *		Alternatively, *flags* can be set to **BPF_F_CURRENT_CPU**
+ *		to indicate that the index of the current CPU core should be
+ *		used.
+ *
+ *		The value to write, of *size*, is passed through eBPF stack and
+ *		pointed by *data*.
+ *
+ *		*ctx* is a pointer to in-kernel struct xdp_buff.
+ *
+ *		This helper is similar to **bpf_perf_eventoutput**\ () but
+ *		restricted to raw_tracepoint bpf programs.
+ *	Return
+ *		0 on success, or a negative error in case of failure.
+ *
+ * u64 bpf_get_netns_cookie(void *ctx)
+ * 	Description
+ * 		Retrieve the cookie (generated by the kernel) of the network
+ * 		namespace the input *ctx* is associated with. The network
+ * 		namespace cookie remains stable for its lifetime and provides
+ * 		a global identifier that can be assumed unique. If *ctx* is
+ * 		NULL, then the helper returns the cookie for the initial
+ * 		network namespace. The cookie itself is very similar to that
+ * 		of bpf_get_socket_cookie() helper, but for network namespaces
+ * 		instead of sockets.
+ * 	Return
+ * 		A 8-byte long opaque number.
+ *
+ * u64 bpf_get_current_ancestor_cgroup_id(int ancestor_level)
+ * 	Description
+ * 		Return id of cgroup v2 that is ancestor of the cgroup associated
+ * 		with the current task at the *ancestor_level*. The root cgroup
+ * 		is at *ancestor_level* zero and each step down the hierarchy
+ * 		increments the level. If *ancestor_level* == level of cgroup
+ * 		associated with the current task, then return value will be the
+ * 		same as that of **bpf_get_current_cgroup_id**\ ().
+ *
+ * 		The helper is useful to implement policies based on cgroups
+ * 		that are upper in hierarchy than immediate cgroup associated
+ * 		with the current task.
+ *
+ * 		The format of returned id and helper limitations are same as in
+ * 		**bpf_get_current_cgroup_id**\ ().
+ * 	Return
+ * 		The id is returned or 0 in case the id could not be retrieved.
+ *
+ * int bpf_sk_assign(struct sk_buff *skb, struct bpf_sock *sk, u64 flags)
+ *	Description
+ *		Assign the *sk* to the *skb*. When combined with appropriate
+ *		routing configuration to receive the packet towards the socket,
+ *		will cause *skb* to be delivered to the specified socket.
+ *		Subsequent redirection of *skb* via  **bpf_redirect**\ (),
+ *		**bpf_clone_redirect**\ () or other methods outside of BPF may
+ *		interfere with successful delivery to the socket.
+ *
+ *		This operation is only valid from TC ingress path.
+ *
+ *		The *flags* argument must be zero.
+ *	Return
+ *		0 on success, or a negative errno in case of failure.
+ *
+ *		* **-EINVAL**		Unsupported flags specified.
+ *		* **-ENOENT**		Socket is unavailable for assignment.
+ *		* **-ENETUNREACH**	Socket is unreachable (wrong netns).
+ *		* **-EOPNOTSUPP**	Unsupported operation, for example a
+ *					call from outside of TC ingress.
+ *		* **-ESOCKTNOSUPPORT**	Socket type not supported (reuseport).
  */
 #define __BPF_FUNC_MAPPER(FN)		\
 	FN(unspec),			\
 	FN(probe_read_kernel_str),	\
 	FN(tcp_send_ack),		\
 	FN(send_signal_thread),		\
-	FN(jiffies64),
+	FN(jiffies64),			\
+	FN(read_branch_records),	\
+	FN(get_ns_current_pid_tgid),	\
+	FN(xdp_output),			\
+	FN(get_netns_cookie),		\
+	FN(get_current_ancestor_cgroup_id),	\
+	FN(sk_assign),
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper
  * function eBPF program intends to call
 /* All flags used by eBPF helper functions, placed here. */
 /* BPF_FUNC_skb_store_bytes flags. */
-#define BPF_F_RECOMPUTE_CSUM		(1ULL << 0)
+enum {
-#define BPF_F_INVALIDATE_HASH		(1ULL << 1)
+	BPF_F_RECOMPUTE_CSUM		= (1ULL << 0),
+	BPF_F_INVALIDATE_HASH		= (1ULL << 1),
+};
 /* BPF_FUNC_l3_csum_replace and BPF_FUNC_l4_csum_replace flags.
  * First 4 bits are for passing the header field size.
  */
-#define BPF_F_HDR_FIELD_MASK		0xfULL
+enum {
+	BPF_F_HDR_FIELD_MASK		= 0xfULL,
+};
 /* BPF_FUNC_l4_csum_replace flags. */
-#define BPF_F_PSEUDO_HDR		(1ULL << 4)
+enum {
-#define BPF_F_MARK_MANGLED_0		(1ULL << 5)
+	BPF_F_PSEUDO_HDR		= (1ULL << 4),
-#define BPF_F_MARK_ENFORCE		(1ULL << 6)
+	BPF_F_MARK_MANGLED_0		= (1ULL << 5),
+	BPF_F_MARK_ENFORCE		= (1ULL << 6),
+};
 /* BPF_FUNC_clone_redirect and BPF_FUNC_redirect flags. */
-#define BPF_F_INGRESS			(1ULL << 0)
+enum {
+	BPF_F_INGRESS			= (1ULL << 0),
+};
 /* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */
-#define BPF_F_TUNINFO_IPV6		(1ULL << 0)
+enum {
+	BPF_F_TUNINFO_IPV6		= (1ULL << 0),
+};
 /* flags for both BPF_FUNC_get_stackid and BPF_FUNC_get_stack. */
-#define BPF_F_SKIP_FIELD_MASK		0xffULL
+enum {
-#define BPF_F_USER_STACK		(1ULL << 8)
+	BPF_F_SKIP_FIELD_MASK		= 0xffULL,
+	BPF_F_USER_STACK		= (1ULL << 8),
 /* flags used by BPF_FUNC_get_stackid only. */
-#define BPF_F_FAST_STACK_CMP		(1ULL << 9)
+	BPF_F_FAST_STACK_CMP		= (1ULL << 9),
-#define BPF_F_REUSE_STACKID		(1ULL << 10)
+	BPF_F_REUSE_STACKID		= (1ULL << 10),
 /* flags used by BPF_FUNC_get_stack only. */
-#define BPF_F_USER_BUILD_ID		(1ULL << 11)
+	BPF_F_USER_BUILD_ID		= (1ULL << 11),
+};
 /* BPF_FUNC_skb_set_tunnel_key flags. */
-#define BPF_F_ZERO_CSUM_TX		(1ULL << 1)
+enum {
-#define BPF_F_DONT_FRAGMENT		(1ULL << 2)
+	BPF_F_ZERO_CSUM_TX		= (1ULL << 1),
-#define BPF_F_SEQ_NUMBER		(1ULL << 3)
+	BPF_F_DONT_FRAGMENT		= (1ULL << 2),
+	BPF_F_SEQ_NUMBER		= (1ULL << 3),
+};
 /* BPF_FUNC_perf_event_output, BPF_FUNC_perf_event_read and
  * BPF_FUNC_perf_event_read_value flags.
  */
-#define BPF_F_INDEX_MASK		0xffffffffULL
+enum {
-#define BPF_F_CURRENT_CPU		BPF_F_INDEX_MASK
+	BPF_F_INDEX_MASK		= 0xffffffffULL,
+	BPF_F_CURRENT_CPU		= BPF_F_INDEX_MASK,
 /* BPF_FUNC_perf_event_output for sk_buff input context. */
-#define BPF_F_CTXLEN_MASK		(0xfffffULL << 32)
+	BPF_F_CTXLEN_MASK		= (0xfffffULL << 32),
+};
 /* Current network namespace */
-#define BPF_F_CURRENT_NETNS		(-1L)
+enum {
+	BPF_F_CURRENT_NETNS		= (-1L),
+};
 /* BPF_FUNC_skb_adjust_room flags. */
-#define BPF_F_ADJ_ROOM_FIXED_GSO	(1ULL << 0)
+enum {
+	BPF_F_ADJ_ROOM_FIXED_GSO	= (1ULL << 0),
+	BPF_F_ADJ_ROOM_ENCAP_L3_IPV4	= (1ULL << 1),
+	BPF_F_ADJ_ROOM_ENCAP_L3_IPV6	= (1ULL << 2),
+	BPF_F_ADJ_ROOM_ENCAP_L4_GRE	= (1ULL << 3),
+	BPF_F_ADJ_ROOM_ENCAP_L4_UDP	= (1ULL << 4),
+};
-#define BPF_ADJ_ROOM_ENCAP_L2_MASK	0xff
+enum {
-#define BPF_ADJ_ROOM_ENCAP_L2_SHIFT	56
+	BPF_ADJ_ROOM_ENCAP_L2_MASK	= 0xff,
+	BPF_ADJ_ROOM_ENCAP_L2_SHIFT	= 56,
+};
-#define BPF_F_ADJ_ROOM_ENCAP_L3_IPV4	(1ULL << 1)
-#define BPF_F_ADJ_ROOM_ENCAP_L3_IPV6	(1ULL << 2)
-#define BPF_F_ADJ_ROOM_ENCAP_L4_GRE	(1ULL << 3)
-#define BPF_F_ADJ_ROOM_ENCAP_L4_UDP	(1ULL << 4)
 #define BPF_F_ADJ_ROOM_ENCAP_L2(len)	(((__u64)len & \
 					  BPF_ADJ_ROOM_ENCAP_L2_MASK) \
 					 << BPF_ADJ_ROOM_ENCAP_L2_SHIFT)
 /* BPF_FUNC_sysctl_get_name flags. */
-#define BPF_F_SYSCTL_BASE_NAME		(1ULL << 0)
+enum {
+	BPF_F_SYSCTL_BASE_NAME		= (1ULL << 0),
+};
 /* BPF_FUNC_sk_storage_get flags */
-#define BPF_SK_STORAGE_GET_F_CREATE	(1ULL << 0)
+enum {
+	BPF_SK_STORAGE_GET_F_CREATE	= (1ULL << 0),
+};
+/* BPF_FUNC_read_branch_records flags. */
+enum {
+	BPF_F_GET_BRANCH_RECORDS_SIZE	= (1ULL << 0),
+};
 /* Mode for BPF_FUNC_skb_adjust_room helper. */
 enum bpf_adj_room_mode {
 	__u32 wire_len;
 	__u32 gso_segs;
 	__bpf_md_ptr(struct bpf_sock *, sk);
+	__u32 gso_size;
 };
 struct bpf_tunnel_key {
 };
 /* Definitions for bpf_sock_ops_cb_flags */
-#define BPF_SOCK_OPS_RTO_CB_FLAG	(1<<0)
+enum {
-#define BPF_SOCK_OPS_RETRANS_CB_FLAG	(1<<1)
+	BPF_SOCK_OPS_RTO_CB_FLAG	= (1<<0),
-#define BPF_SOCK_OPS_STATE_CB_FLAG	(1<<2)
+	BPF_SOCK_OPS_RETRANS_CB_FLAG	= (1<<1),
-#define BPF_SOCK_OPS_RTT_CB_FLAG	(1<<3)
+	BPF_SOCK_OPS_STATE_CB_FLAG	= (1<<2),
-#define BPF_SOCK_OPS_ALL_CB_FLAGS       0xF		/* Mask of all currently
+	BPF_SOCK_OPS_RTT_CB_FLAG	= (1<<3),
-							 * supported cb flags
+/* Mask of all currently supported cb flags */
-							 */
+	BPF_SOCK_OPS_ALL_CB_FLAGS       = 0xF,
+};
 /* List of known BPF sock_ops operators.
  * New entries can only be added at the end
 	BPF_TCP_MAX_STATES	/* Leave at the end! */
 };
-#define TCP_BPF_IW		1001	/* Set TCP initial congestion window */
+enum {
-#define TCP_BPF_SNDCWND_CLAMP	1002	/* Set sndcwnd_clamp */
+	TCP_BPF_IW		= 1001,	/* Set TCP initial congestion window */
+	TCP_BPF_SNDCWND_CLAMP	= 1002,	/* Set sndcwnd_clamp */
+};
 struct bpf_perf_event_value {
 	__u64 counter;
 	__u64 running;
 };
-#define BPF_DEVCG_ACC_MKNOD	(1ULL << 0)
+enum {
-#define BPF_DEVCG_ACC_READ	(1ULL << 1)
+	BPF_DEVCG_ACC_MKNOD	= (1ULL << 0),
-#define BPF_DEVCG_ACC_WRITE	(1ULL << 2)
+	BPF_DEVCG_ACC_READ	= (1ULL << 1),
+	BPF_DEVCG_ACC_WRITE	= (1ULL << 2),
+};
-#define BPF_DEVCG_DEV_BLOCK	(1ULL << 0)
+enum {
-#define BPF_DEVCG_DEV_CHAR	(1ULL << 1)
+	BPF_DEVCG_DEV_BLOCK	= (1ULL << 0),
+	BPF_DEVCG_DEV_CHAR	= (1ULL << 1),
+};
 struct bpf_cgroup_dev_ctx {
 	/* access_type encoded as (BPF_DEVCG_ACC_* << 16) | BPF_DEVCG_DEV_* */
 /* DIRECT:  Skip the FIB rules and go to FIB table associated with device
  * OUTPUT:  Do lookup from egress perspective; default is ingress
  */
-#define BPF_FIB_LOOKUP_DIRECT  (1U << 0)
+enum {
-#define BPF_FIB_LOOKUP_OUTPUT  (1U << 1)
+	BPF_FIB_LOOKUP_DIRECT  = (1U << 0),
+	BPF_FIB_LOOKUP_OUTPUT  = (1U << 1),
+};
 enum {
 	BPF_FIB_LKUP_RET_SUCCESS,      /* lookup successful */
 	BPF_FD_TYPE_URETPROBE,		/* filename + offset */
 };
-#define BPF_FLOW_DISSECTOR_F_PARSE_1ST_FRAG		(1U << 0)
+enum {
-#define BPF_FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL		(1U << 1)
+	BPF_FLOW_DISSECTOR_F_PARSE_1ST_FRAG		= (1U << 0),
-#define BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP		(1U << 2)
+	BPF_FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL		= (1U << 1),
+	BPF_FLOW_DISSECTOR_F_STOP_AT_ENCAP		= (1U << 2),
+};
 struct bpf_flow_keys {
 	__u16	nhoff;
 	__s32	retval;
 };
+struct bpf_pidns_info {
+	__u32 pid;
+	__u32 tgid;
+};
 #endif /* _UAPI__LINUX_BPF_H__ */

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

 #define BTRFS_DEVICE_PATH_NAME_MAX	1024
 #define BTRFS_SUBVOL_NAME_MAX 		4039
-#define BTRFS_SUBVOL_CREATE_ASYNC	(1ULL << 0)
+/*
+ * Deprecated since 5.7:
+ *
+ * BTRFS_SUBVOL_CREATE_ASYNC	(1ULL << 0)
+ */
 #define BTRFS_SUBVOL_RDONLY		(1ULL << 1)
 #define BTRFS_SUBVOL_QGROUP_INHERIT	(1ULL << 2)
 #define BTRFS_DEVICE_SPEC_BY_ID		(1ULL << 3)
+#define BTRFS_SUBVOL_SPEC_BY_ID	(1ULL << 4)
 #define BTRFS_VOL_ARG_V2_FLAGS_SUPPORTED		\
-			(BTRFS_SUBVOL_CREATE_ASYNC |	\
+			(BTRFS_SUBVOL_RDONLY |		\
-			BTRFS_SUBVOL_RDONLY |		\
 			BTRFS_SUBVOL_QGROUP_INHERIT |	\
-			BTRFS_DEVICE_SPEC_BY_ID)
+			BTRFS_DEVICE_SPEC_BY_ID |	\
+			BTRFS_SUBVOL_SPEC_BY_ID)
 #define BTRFS_FSID_SIZE 16
 #define BTRFS_UUID_SIZE 16
 };
 /*
- * flags for subvolumes
+ * Arguments for specification of subvolumes or devices, supporting by-name or
+ * by-id and flags
  *
- * Used by:
+ * The set of supported flags depends on the ioctl
- * struct btrfs_ioctl_vol_args_v2.flags
  *
  * BTRFS_SUBVOL_RDONLY is also provided/consumed by the following ioctls:
  * - BTRFS_IOC_SUBVOL_GETFLAGS
  * - BTRFS_IOC_SUBVOL_SETFLAGS
  */
+/* Supported flags for BTRFS_IOC_RM_DEV_V2 */
+#define BTRFS_DEVICE_REMOVE_ARGS_MASK					\
+	(BTRFS_DEVICE_SPEC_BY_ID)
+/* Supported flags for BTRFS_IOC_SNAP_CREATE_V2 and BTRFS_IOC_SUBVOL_CREATE_V2 */
+#define BTRFS_SUBVOL_CREATE_ARGS_MASK					\
+	 (BTRFS_SUBVOL_RDONLY |						\
+	 BTRFS_SUBVOL_QGROUP_INHERIT)
+/* Supported flags for BTRFS_IOC_SNAP_DESTROY_V2 */
+#define BTRFS_SUBVOL_DELETE_ARGS_MASK					\
+	(BTRFS_SUBVOL_SPEC_BY_ID)
 struct btrfs_ioctl_vol_args_v2 {
 	__s64 fd;
 	__u64 transid;
 	union {
 		char name[BTRFS_SUBVOL_NAME_MAX + 1];
 		__u64 devid;
+		__u64 subvolid;
 	};
 };
 				struct btrfs_ioctl_get_subvol_rootref_args)
 #define BTRFS_IOC_INO_LOOKUP_USER _IOWR(BTRFS_IOCTL_MAGIC, 62, \
 				struct btrfs_ioctl_ino_lookup_user_args)
+#define BTRFS_IOC_SNAP_DESTROY_V2 _IOW(BTRFS_IOCTL_MAGIC, 63, \
+				struct btrfs_ioctl_vol_args_v2)
 #endif /* _UAPI_LINUX_BTRFS_H */

include/uapi/linux/coresight-stm.h+4−2

@@ -2,8 +2,10 @@ · 1 unmodified line
2	#ifndef __UAPI_CORESIGHT_STM_H_	2	#ifndef __UAPI_CORESIGHT_STM_H_
3	#define __UAPI_CORESIGHT_STM_H_	3	#define __UAPI_CORESIGHT_STM_H_
4		4
5	#define STM_FLAG_TIMESTAMPED BIT(3)	5	#include <linux/const.h>
6	#define STM_FLAG_GUARANTEED BIT(7)	6
		7	#define STM_FLAG_TIMESTAMPED _BITUL(3)
		8	#define STM_FLAG_GUARANTEED _BITUL(7)
7		9
8	/*	10	/*
9	* The CoreSight STM supports guaranteed and invariant timing	11	* The CoreSight STM supports guaranteed and invariant timing

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

 	DEVLINK_CMD_TRAP_GROUP_NEW,
 	DEVLINK_CMD_TRAP_GROUP_DEL,
+	DEVLINK_CMD_TRAP_POLICER_GET,	/* can dump */
+	DEVLINK_CMD_TRAP_POLICER_SET,
+	DEVLINK_CMD_TRAP_POLICER_NEW,
+	DEVLINK_CMD_TRAP_POLICER_DEL,
 	/* add new commands above here */
 	__DEVLINK_CMD_MAX,
 	DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
 				      * for the PCI VF. It is an internal
 				      * port that faces the PCI VF.
 				      */
+	DEVLINK_PORT_FLAVOUR_VIRTUAL, /* Any virtual port facing the user. */
 };
 enum devlink_param_cmode {
 enum {
 	DEVLINK_ATTR_STATS_RX_PACKETS,		/* u64 */
 	DEVLINK_ATTR_STATS_RX_BYTES,		/* u64 */
+	DEVLINK_ATTR_STATS_RX_DROPPED,		/* u64 */
 	__DEVLINK_ATTR_STATS_MAX,
 	DEVLINK_ATTR_STATS_MAX = __DEVLINK_ATTR_STATS_MAX - 1
 enum {
 	/* Trap can report input port as metadata */
 	DEVLINK_ATTR_TRAP_METADATA_TYPE_IN_PORT,
+	/* Trap can report flow action cookie as metadata */
+	DEVLINK_ATTR_TRAP_METADATA_TYPE_FA_COOKIE,
 };
 enum devlink_attr {
 	DEVLINK_ATTR_NETNS_FD,			/* u32 */
 	DEVLINK_ATTR_NETNS_PID,			/* u32 */
 	DEVLINK_ATTR_NETNS_ID,			/* u32 */
+	DEVLINK_ATTR_HEALTH_REPORTER_AUTO_DUMP,	/* u8 */
+	DEVLINK_ATTR_TRAP_POLICER_ID,			/* u32 */
+	DEVLINK_ATTR_TRAP_POLICER_RATE,			/* u64 */
+	DEVLINK_ATTR_TRAP_POLICER_BURST,		/* u64 */
 	/* add new attributes above here, update the policy in devlink.c */
 	__DEVLINK_ATTR_MAX,

include/uapi/linux/dm-ioctl.h+2−2

@@ -272,9 +272,9 @@ enum { · 271 unmodified lines
272	#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)	272	#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
273		273
274	#define DM_VERSION_MAJOR 4	274	#define DM_VERSION_MAJOR 4
275	#define DM_VERSION_MINOR 41	275	#define DM_VERSION_MINOR 42
276	#define DM_VERSION_PATCHLEVEL 0	276	#define DM_VERSION_PATCHLEVEL 0
277	#define DM_VERSION_EXTRA "-ioctl (2019-09-16)"	277	#define DM_VERSION_EXTRA "-ioctl (2020-02-27)"
278		278
279	/* Status bits */	279	/* Status bits */
280	#define DM_READONLY_FLAG (1 << 0) /* In/Out */	280	#define DM_READONLY_FLAG (1 << 0) /* In/Out */

include/uapi/linux/ethtool.h+9−1

@@ -596,6 +596,9 @@ struct ethtool_pauseparam { · 595 unmodified lines
596	* @ETH_SS_LINK_MODES: link mode names	596	* @ETH_SS_LINK_MODES: link mode names
597	* @ETH_SS_MSG_CLASSES: debug message class names	597	* @ETH_SS_MSG_CLASSES: debug message class names
598	* @ETH_SS_WOL_MODES: wake-on-lan modes	598	* @ETH_SS_WOL_MODES: wake-on-lan modes
		599	* @ETH_SS_SOF_TIMESTAMPING: SOF_TIMESTAMPING_* flags
		600	* @ETH_SS_TS_TX_TYPES: timestamping Tx types
		601	* @ETH_SS_TS_RX_FILTERS: timestamping Rx filters
599	*/	602	*/
600	enum ethtool_stringset {	603	enum ethtool_stringset {
601	ETH_SS_TEST = 0,	604	ETH_SS_TEST = 0,
@@ -610,6 +613,9 @@ enum ethtool_stringset { · 8 unmodified lines
610	ETH_SS_LINK_MODES,	613	ETH_SS_LINK_MODES,
611	ETH_SS_MSG_CLASSES,	614	ETH_SS_MSG_CLASSES,
612	ETH_SS_WOL_MODES,	615	ETH_SS_WOL_MODES,
		616	ETH_SS_SOF_TIMESTAMPING,
		617	ETH_SS_TS_TX_TYPES,
		618	ETH_SS_TS_RX_FILTERS,
613		619
614	/* add new constants above here */	620	/* add new constants above here */
615	ETH_SS_COUNT	621	ETH_SS_COUNT
@@ -1330,6 +1336,7 @@ enum ethtool_fec_config_bits { · 714 unmodified lines
1330	ETHTOOL_FEC_OFF_BIT,	1336	ETHTOOL_FEC_OFF_BIT,
1331	ETHTOOL_FEC_RS_BIT,	1337	ETHTOOL_FEC_RS_BIT,
1332	ETHTOOL_FEC_BASER_BIT,	1338	ETHTOOL_FEC_BASER_BIT,
		1339	ETHTOOL_FEC_LLRS_BIT,
1333	};	1340	};
1334		1341
1335	#define ETHTOOL_FEC_NONE (1 << ETHTOOL_FEC_NONE_BIT)	1342	#define ETHTOOL_FEC_NONE (1 << ETHTOOL_FEC_NONE_BIT)
@@ -1337,6 +1344,7 @@ enum ethtool_fec_config_bits { · 1 unmodified line
1337	#define ETHTOOL_FEC_OFF (1 << ETHTOOL_FEC_OFF_BIT)	1344	#define ETHTOOL_FEC_OFF (1 << ETHTOOL_FEC_OFF_BIT)
1338	#define ETHTOOL_FEC_RS (1 << ETHTOOL_FEC_RS_BIT)	1345	#define ETHTOOL_FEC_RS (1 << ETHTOOL_FEC_RS_BIT)
1339	#define ETHTOOL_FEC_BASER (1 << ETHTOOL_FEC_BASER_BIT)	1346	#define ETHTOOL_FEC_BASER (1 << ETHTOOL_FEC_BASER_BIT)
		1347	#define ETHTOOL_FEC_LLRS (1 << ETHTOOL_FEC_LLRS_BIT)
1340		1348
1341	/* CMDs currently supported */	1349	/* CMDs currently supported */
1342	#define ETHTOOL_GSET 0x00000001 /* DEPRECATED, Get settings.	1350	#define ETHTOOL_GSET 0x00000001 /* DEPRECATED, Get settings.
@@ -1521,7 +1529,7 @@ enum ethtool_link_mode_bit_indices { · 178 unmodified lines
1521	ETHTOOL_LINK_MODE_400000baseLR8_ER8_FR8_Full_BIT = 71,	1529	ETHTOOL_LINK_MODE_400000baseLR8_ER8_FR8_Full_BIT = 71,
1522	ETHTOOL_LINK_MODE_400000baseDR8_Full_BIT = 72,	1530	ETHTOOL_LINK_MODE_400000baseDR8_Full_BIT = 72,
1523	ETHTOOL_LINK_MODE_400000baseCR8_Full_BIT = 73,	1531	ETHTOOL_LINK_MODE_400000baseCR8_Full_BIT = 73,
1524		1532	ETHTOOL_LINK_MODE_FEC_LLRS_BIT = 74,
1525	/* must be last entry */	1533	/* must be last entry */
1526	__ETHTOOL_LINK_MODE_MASK_NBITS	1534	__ETHTOOL_LINK_MODE_MASK_NBITS
1527	};	1535	};

include/uapi/linux/ethtool_netlink.h+175−0

@@ -24,6 +24,21 @@ enum { · 23 unmodified lines
24	ETHTOOL_MSG_DEBUG_SET,	24	ETHTOOL_MSG_DEBUG_SET,
25	ETHTOOL_MSG_WOL_GET,	25	ETHTOOL_MSG_WOL_GET,
26	ETHTOOL_MSG_WOL_SET,	26	ETHTOOL_MSG_WOL_SET,
		27	ETHTOOL_MSG_FEATURES_GET,
		28	ETHTOOL_MSG_FEATURES_SET,
		29	ETHTOOL_MSG_PRIVFLAGS_GET,
		30	ETHTOOL_MSG_PRIVFLAGS_SET,
		31	ETHTOOL_MSG_RINGS_GET,
		32	ETHTOOL_MSG_RINGS_SET,
		33	ETHTOOL_MSG_CHANNELS_GET,
		34	ETHTOOL_MSG_CHANNELS_SET,
		35	ETHTOOL_MSG_COALESCE_GET,
		36	ETHTOOL_MSG_COALESCE_SET,
		37	ETHTOOL_MSG_PAUSE_GET,
		38	ETHTOOL_MSG_PAUSE_SET,
		39	ETHTOOL_MSG_EEE_GET,
		40	ETHTOOL_MSG_EEE_SET,
		41	ETHTOOL_MSG_TSINFO_GET,
27		42
28	/* add new constants above here */	43	/* add new constants above here */
29	__ETHTOOL_MSG_USER_CNT,	44	__ETHTOOL_MSG_USER_CNT,
@@ -43,6 +58,22 @@ enum { · 13 unmodified lines
43	ETHTOOL_MSG_DEBUG_NTF,	58	ETHTOOL_MSG_DEBUG_NTF,
44	ETHTOOL_MSG_WOL_GET_REPLY,	59	ETHTOOL_MSG_WOL_GET_REPLY,
45	ETHTOOL_MSG_WOL_NTF,	60	ETHTOOL_MSG_WOL_NTF,
		61	ETHTOOL_MSG_FEATURES_GET_REPLY,
		62	ETHTOOL_MSG_FEATURES_SET_REPLY,
		63	ETHTOOL_MSG_FEATURES_NTF,
		64	ETHTOOL_MSG_PRIVFLAGS_GET_REPLY,
		65	ETHTOOL_MSG_PRIVFLAGS_NTF,
		66	ETHTOOL_MSG_RINGS_GET_REPLY,
		67	ETHTOOL_MSG_RINGS_NTF,
		68	ETHTOOL_MSG_CHANNELS_GET_REPLY,
		69	ETHTOOL_MSG_CHANNELS_NTF,
		70	ETHTOOL_MSG_COALESCE_GET_REPLY,
		71	ETHTOOL_MSG_COALESCE_NTF,
		72	ETHTOOL_MSG_PAUSE_GET_REPLY,
		73	ETHTOOL_MSG_PAUSE_NTF,
		74	ETHTOOL_MSG_EEE_GET_REPLY,
		75	ETHTOOL_MSG_EEE_NTF,
		76	ETHTOOL_MSG_TSINFO_GET_REPLY,
46		77
47	/* add new constants above here */	78	/* add new constants above here */
48	__ETHTOOL_MSG_KERNEL_CNT,	79	__ETHTOOL_MSG_KERNEL_CNT,
@@ -228,6 +259,150 @@ enum { · 179 unmodified lines
228	ETHTOOL_A_WOL_MAX = __ETHTOOL_A_WOL_CNT - 1	259	ETHTOOL_A_WOL_MAX = __ETHTOOL_A_WOL_CNT - 1
229	};	260	};
230		261
		262	/* FEATURES */
		263
		264	enum {
		265	ETHTOOL_A_FEATURES_UNSPEC,
		266	ETHTOOL_A_FEATURES_HEADER, /* nest - _A_HEADER_* */
		267	ETHTOOL_A_FEATURES_HW, /* bitset */
		268	ETHTOOL_A_FEATURES_WANTED, /* bitset */
		269	ETHTOOL_A_FEATURES_ACTIVE, /* bitset */
		270	ETHTOOL_A_FEATURES_NOCHANGE, /* bitset */
		271
		272	/* add new constants above here */
		273	__ETHTOOL_A_FEATURES_CNT,
		274	ETHTOOL_A_FEATURES_MAX = __ETHTOOL_A_FEATURES_CNT - 1
		275	};
		276
		277	/* PRIVFLAGS */
		278
		279	enum {
		280	ETHTOOL_A_PRIVFLAGS_UNSPEC,
		281	ETHTOOL_A_PRIVFLAGS_HEADER, /* nest - _A_HEADER_* */
		282	ETHTOOL_A_PRIVFLAGS_FLAGS, /* bitset */
		283
		284	/* add new constants above here */
		285	__ETHTOOL_A_PRIVFLAGS_CNT,
		286	ETHTOOL_A_PRIVFLAGS_MAX = __ETHTOOL_A_PRIVFLAGS_CNT - 1
		287	};
		288
		289	/* RINGS */
		290
		291	enum {
		292	ETHTOOL_A_RINGS_UNSPEC,
		293	ETHTOOL_A_RINGS_HEADER, /* nest - _A_HEADER_* */
		294	ETHTOOL_A_RINGS_RX_MAX, /* u32 */
		295	ETHTOOL_A_RINGS_RX_MINI_MAX, /* u32 */
		296	ETHTOOL_A_RINGS_RX_JUMBO_MAX, /* u32 */
		297	ETHTOOL_A_RINGS_TX_MAX, /* u32 */
		298	ETHTOOL_A_RINGS_RX, /* u32 */
		299	ETHTOOL_A_RINGS_RX_MINI, /* u32 */
		300	ETHTOOL_A_RINGS_RX_JUMBO, /* u32 */
		301	ETHTOOL_A_RINGS_TX, /* u32 */
		302
		303	/* add new constants above here */
		304	__ETHTOOL_A_RINGS_CNT,
		305	ETHTOOL_A_RINGS_MAX = (__ETHTOOL_A_RINGS_CNT - 1)
		306	};
		307
		308	/* CHANNELS */
		309
		310	enum {
		311	ETHTOOL_A_CHANNELS_UNSPEC,
		312	ETHTOOL_A_CHANNELS_HEADER, /* nest - _A_HEADER_* */
		313	ETHTOOL_A_CHANNELS_RX_MAX, /* u32 */
		314	ETHTOOL_A_CHANNELS_TX_MAX, /* u32 */
		315	ETHTOOL_A_CHANNELS_OTHER_MAX, /* u32 */
		316	ETHTOOL_A_CHANNELS_COMBINED_MAX, /* u32 */
		317	ETHTOOL_A_CHANNELS_RX_COUNT, /* u32 */
		318	ETHTOOL_A_CHANNELS_TX_COUNT, /* u32 */
		319	ETHTOOL_A_CHANNELS_OTHER_COUNT, /* u32 */
		320	ETHTOOL_A_CHANNELS_COMBINED_COUNT, /* u32 */
		321
		322	/* add new constants above here */
		323	__ETHTOOL_A_CHANNELS_CNT,
		324	ETHTOOL_A_CHANNELS_MAX = (__ETHTOOL_A_CHANNELS_CNT - 1)
		325	};
		326
		327	/* COALESCE */
		328
		329	enum {
		330	ETHTOOL_A_COALESCE_UNSPEC,
		331	ETHTOOL_A_COALESCE_HEADER, /* nest - _A_HEADER_* */
		332	ETHTOOL_A_COALESCE_RX_USECS, /* u32 */
		333	ETHTOOL_A_COALESCE_RX_MAX_FRAMES, /* u32 */
		334	ETHTOOL_A_COALESCE_RX_USECS_IRQ, /* u32 */
		335	ETHTOOL_A_COALESCE_RX_MAX_FRAMES_IRQ, /* u32 */
		336	ETHTOOL_A_COALESCE_TX_USECS, /* u32 */
		337	ETHTOOL_A_COALESCE_TX_MAX_FRAMES, /* u32 */
		338	ETHTOOL_A_COALESCE_TX_USECS_IRQ, /* u32 */
		339	ETHTOOL_A_COALESCE_TX_MAX_FRAMES_IRQ, /* u32 */
		340	ETHTOOL_A_COALESCE_STATS_BLOCK_USECS, /* u32 */
		341	ETHTOOL_A_COALESCE_USE_ADAPTIVE_RX, /* u8 */
		342	ETHTOOL_A_COALESCE_USE_ADAPTIVE_TX, /* u8 */
		343	ETHTOOL_A_COALESCE_PKT_RATE_LOW, /* u32 */
		344	ETHTOOL_A_COALESCE_RX_USECS_LOW, /* u32 */
		345	ETHTOOL_A_COALESCE_RX_MAX_FRAMES_LOW, /* u32 */
		346	ETHTOOL_A_COALESCE_TX_USECS_LOW, /* u32 */
		347	ETHTOOL_A_COALESCE_TX_MAX_FRAMES_LOW, /* u32 */
		348	ETHTOOL_A_COALESCE_PKT_RATE_HIGH, /* u32 */
		349	ETHTOOL_A_COALESCE_RX_USECS_HIGH, /* u32 */
		350	ETHTOOL_A_COALESCE_RX_MAX_FRAMES_HIGH, /* u32 */
		351	ETHTOOL_A_COALESCE_TX_USECS_HIGH, /* u32 */
		352	ETHTOOL_A_COALESCE_TX_MAX_FRAMES_HIGH, /* u32 */
		353	ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL, /* u32 */
		354
		355	/* add new constants above here */
		356	__ETHTOOL_A_COALESCE_CNT,
		357	ETHTOOL_A_COALESCE_MAX = (__ETHTOOL_A_COALESCE_CNT - 1)
		358	};
		359
		360	/* PAUSE */
		361
		362	enum {
		363	ETHTOOL_A_PAUSE_UNSPEC,
		364	ETHTOOL_A_PAUSE_HEADER, /* nest - _A_HEADER_* */
		365	ETHTOOL_A_PAUSE_AUTONEG, /* u8 */
		366	ETHTOOL_A_PAUSE_RX, /* u8 */
		367	ETHTOOL_A_PAUSE_TX, /* u8 */
		368
		369	/* add new constants above here */
		370	__ETHTOOL_A_PAUSE_CNT,
		371	ETHTOOL_A_PAUSE_MAX = (__ETHTOOL_A_PAUSE_CNT - 1)
		372	};
		373
		374	/* EEE */
		375
		376	enum {
		377	ETHTOOL_A_EEE_UNSPEC,
		378	ETHTOOL_A_EEE_HEADER, /* nest - _A_HEADER_* */
		379	ETHTOOL_A_EEE_MODES_OURS, /* bitset */
		380	ETHTOOL_A_EEE_MODES_PEER, /* bitset */
		381	ETHTOOL_A_EEE_ACTIVE, /* u8 */
		382	ETHTOOL_A_EEE_ENABLED, /* u8 */
		383	ETHTOOL_A_EEE_TX_LPI_ENABLED, /* u8 */
		384	ETHTOOL_A_EEE_TX_LPI_TIMER, /* u32 */
		385
		386	/* add new constants above here */
		387	__ETHTOOL_A_EEE_CNT,
		388	ETHTOOL_A_EEE_MAX = (__ETHTOOL_A_EEE_CNT - 1)
		389	};
		390
		391	/* TSINFO */
		392
		393	enum {
		394	ETHTOOL_A_TSINFO_UNSPEC,
		395	ETHTOOL_A_TSINFO_HEADER, /* nest - _A_HEADER_* */
		396	ETHTOOL_A_TSINFO_TIMESTAMPING, /* bitset */
		397	ETHTOOL_A_TSINFO_TX_TYPES, /* bitset */
		398	ETHTOOL_A_TSINFO_RX_FILTERS, /* bitset */
		399	ETHTOOL_A_TSINFO_PHC_INDEX, /* u32 */
		400
		401	/* add new constants above here */
		402	__ETHTOOL_A_TSINFO_CNT,
		403	ETHTOOL_A_TSINFO_MAX = (__ETHTOOL_A_TSINFO_CNT - 1)
		404	};
		405
231	/* generic netlink info */	406	/* generic netlink info */
232	#define ETHTOOL_GENL_NAME "ethtool"	407	#define ETHTOOL_GENL_NAME "ethtool"
233	#define ETHTOOL_GENL_VERSION 1	408	#define ETHTOOL_GENL_VERSION 1

include/uapi/linux/fanotify.h+10−3

 #define FAN_OPEN_PERM		0x00010000	/* File open in perm check */
 #define FAN_ACCESS_PERM		0x00020000	/* File accessed in perm check */
 #define FAN_OPEN_EXEC_PERM	0x00040000	/* File open/exec in perm check */
+#define FAN_DIR_MODIFY		0x00080000	/* Directory entry was modified */
-#define FAN_ONDIR		0x40000000	/* event occurred against dir */
+#define FAN_EVENT_ON_CHILD	0x08000000	/* Interested in child events */
-#define FAN_EVENT_ON_CHILD	0x08000000	/* interested in child events */
+#define FAN_ONDIR		0x40000000	/* Event occurred against dir */
 /* helper events */
 #define FAN_CLOSE		(FAN_CLOSE_WRITE | FAN_CLOSE_NOWRITE) /* close */
 };
 #define FAN_EVENT_INFO_TYPE_FID		1
+#define FAN_EVENT_INFO_TYPE_DFID_NAME	2
 /* Variable length info record following event metadata */
 struct fanotify_event_info_header {
 	__u16 len;
 };
-/* Unique file identifier info record */
+/*
+ * Unique file identifier info record. This is used both for
+ * FAN_EVENT_INFO_TYPE_FID records and for FAN_EVENT_INFO_TYPE_DFID_NAME
+ * records. For FAN_EVENT_INFO_TYPE_DFID_NAME there is additionally a null
+ * terminated name immediately after the file handle.
+ */
 struct fanotify_event_info_fid {
 	struct fanotify_event_info_header hdr;
 	__kernel_fsid_t fsid;

include/uapi/linux/fdreg.h+5−13

  * Handbook", Sanches and Canton.
  */
-#ifdef FDPATCHES
-#define FD_IOPORT fdc_state[fdc].address
-#else
-/* It would be a lot saner just to force fdc_state[fdc].address to always
-   be set ! FIXME */
-#define FD_IOPORT 0x3f0
-#endif
 /* Fd controller regs. S&C, about page 340 */
-#define FD_STATUS	(4 + FD_IOPORT )
+#define FD_STATUS	4
-#define FD_DATA		(5 + FD_IOPORT )
+#define FD_DATA		5
 /* Digital Output Register */
-#define FD_DOR		(2 + FD_IOPORT )
+#define FD_DOR		2
 /* Digital Input Register (read) */
-#define FD_DIR		(7 + FD_IOPORT )
+#define FD_DIR		7
 /* Diskette Control Register (write)*/
-#define FD_DCR		(7 + FD_IOPORT )
+#define FD_DCR		7
 /* Bits of main status register */
 #define STATUS_BUSYMASK	0x0F		/* drive busy mask */

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

@@ -163,6 +163,7 @@ struct fscrypt_get_key_status_arg { · 162 unmodified lines
163	#define FS_IOC_REMOVE_ENCRYPTION_KEY _IOWR('f', 24, struct fscrypt_remove_key_arg)	163	#define FS_IOC_REMOVE_ENCRYPTION_KEY _IOWR('f', 24, struct fscrypt_remove_key_arg)
164	#define FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS _IOWR('f', 25, struct fscrypt_remove_key_arg)	164	#define FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS _IOWR('f', 25, struct fscrypt_remove_key_arg)
165	#define FS_IOC_GET_ENCRYPTION_KEY_STATUS _IOWR('f', 26, struct fscrypt_get_key_status_arg)	165	#define FS_IOC_GET_ENCRYPTION_KEY_STATUS _IOWR('f', 26, struct fscrypt_get_key_status_arg)
		166	#define FS_IOC_GET_ENCRYPTION_NONCE _IOR('f', 27, __u8[16])
166		167
167	/**********************************************************************/	168	/**********************************************************************/
168		169

include/uapi/linux/gpio.h+34−4

@@ -18,7 +18,7 @@ · 17 unmodified lines
18	* struct gpiochip_info - Information about a certain GPIO chip	18	* struct gpiochip_info - Information about a certain GPIO chip
19	* @name: the Linux kernel name of this GPIO chip	19	* @name: the Linux kernel name of this GPIO chip
20	* @label: a functional name for this GPIO chip, such as a product	20	* @label: a functional name for this GPIO chip, such as a product
21	* number, may be NULL	21	* number, may be empty
22	* @lines: number of GPIO lines on this chip	22	* @lines: number of GPIO lines on this chip
23	*/	23	*/
24	struct gpiochip_info {	24	struct gpiochip_info {
@@ -44,10 +44,10 @@ struct gpiochip_info { · 19 unmodified lines
44	* @flags: various flags for this line	44	* @flags: various flags for this line
45	* @name: the name of this GPIO line, such as the output pin of the line on the	45	* @name: the name of this GPIO line, such as the output pin of the line on the
46	* chip, a rail or a pin header name on a board, as specified by the gpio	46	* chip, a rail or a pin header name on a board, as specified by the gpio
47	* chip, may be NULL	47	* chip, may be empty
48	* @consumer: a functional name for the consumer of this GPIO line as set by	48	* @consumer: a functional name for the consumer of this GPIO line as set by
49	* whatever is using it, will be NULL if there is no current user but may	49	* whatever is using it, will be empty if there is no current user but may
50	* also be NULL if the consumer doesn't set this up	50	* also be empty if the consumer doesn't set this up
51	*/	51	*/
52	struct gpioline_info {	52	struct gpioline_info {
53	__u32 line_offset;	53	__u32 line_offset;
@@ -59,6 +59,34 @@ struct gpioline_info { · 5 unmodified lines
59	/* Maximum number of requested handles */	59	/* Maximum number of requested handles */
60	#define GPIOHANDLES_MAX 64	60	#define GPIOHANDLES_MAX 64
61		61
		62	/* Possible line status change events */
		63	enum {
		64	GPIOLINE_CHANGED_REQUESTED = 1,
		65	GPIOLINE_CHANGED_RELEASED,
		66	GPIOLINE_CHANGED_CONFIG,
		67	};
		68
		69	/**
		70	* struct gpioline_info_changed - Information about a change in status
		71	* of a GPIO line
		72	* @info: updated line information
		73	* @timestamp: estimate of time of status change occurrence, in nanoseconds
		74	* and GPIOLINE_CHANGED_CONFIG
		75	* @event_type: one of GPIOLINE_CHANGED_REQUESTED, GPIOLINE_CHANGED_RELEASED
		76	*
		77	* Note: struct gpioline_info embedded here has 32-bit alignment on its own,
		78	* but it works fine with 64-bit alignment too. With its 72 byte size, we can
		79	* guarantee there are no implicit holes between it and subsequent members.
		80	* The 20-byte padding at the end makes sure we don't add any implicit padding
		81	* at the end of the structure on 64-bit architectures.
		82	*/
		83	struct gpioline_info_changed {
		84	struct gpioline_info info;
		85	__u64 timestamp;
		86	__u32 event_type;
		87	__u32 padding[5]; /* for future use */
		88	};
		89
62	/* Linerequest flags */	90	/* Linerequest flags */
63	#define GPIOHANDLE_REQUEST_INPUT (1UL << 0)	91	#define GPIOHANDLE_REQUEST_INPUT (1UL << 0)
64	#define GPIOHANDLE_REQUEST_OUTPUT (1UL << 1)	92	#define GPIOHANDLE_REQUEST_OUTPUT (1UL << 1)
@@ -176,6 +204,8 @@ struct gpioevent_data { · 111 unmodified lines
176		204
177	#define GPIO_GET_CHIPINFO_IOCTL _IOR(0xB4, 0x01, struct gpiochip_info)	205	#define GPIO_GET_CHIPINFO_IOCTL _IOR(0xB4, 0x01, struct gpiochip_info)
178	#define GPIO_GET_LINEINFO_IOCTL _IOWR(0xB4, 0x02, struct gpioline_info)	206	#define GPIO_GET_LINEINFO_IOCTL _IOWR(0xB4, 0x02, struct gpioline_info)
		207	#define GPIO_GET_LINEINFO_WATCH_IOCTL _IOWR(0xB4, 0x0b, struct gpioline_info)
		208	#define GPIO_GET_LINEINFO_UNWATCH_IOCTL _IOWR(0xB4, 0x0c, __u32)
179	#define GPIO_GET_LINEHANDLE_IOCTL _IOWR(0xB4, 0x03, struct gpiohandle_request)	209	#define GPIO_GET_LINEHANDLE_IOCTL _IOWR(0xB4, 0x03, struct gpiohandle_request)
180	#define GPIO_GET_LINEEVENT_IOCTL _IOWR(0xB4, 0x04, struct gpioevent_request)	210	#define GPIO_GET_LINEEVENT_IOCTL _IOWR(0xB4, 0x04, struct gpioevent_request)
181		211

include/uapi/linux/idxd.h+5−16

 #define DSA_COMP_STATUS_MASK		0x7f
 #define DSA_COMP_STATUS_WRITE		0x80
-struct dsa_batch_desc {
-	uint32_t	pasid:20;
-	uint32_t	rsvd:11;
-	uint32_t	priv:1;
-	uint32_t	flags:24;
-	uint32_t	opcode:8;
-	uint64_t	completion_addr;
-	uint64_t	desc_list_addr;
-	uint64_t	rsvd1;
-	uint32_t	desc_count;
-	uint16_t	interrupt_handle;
-	uint16_t	rsvd2;
-	uint8_t		rsvd3[24];
-} __attribute__((packed));
 struct dsa_hw_desc {
 	uint32_t	pasid:20;
 	uint32_t	rsvd:11;
 		uint64_t	src_addr;
 		uint64_t	rdback_addr;
 		uint64_t	pattern;
+		uint64_t	desc_list_addr;
 	};
 	union {
 		uint64_t	dst_addr;
 		uint64_t	src2_addr;
 		uint64_t	comp_pattern;
 	};
-	uint32_t	xfer_size;
+	union {
+		uint32_t	xfer_size;
+		uint32_t	desc_count;
+	};
 	uint16_t	int_handle;
 	uint16_t	rsvd1;
 	union {

include/uapi/linux/if_arcnet.h+3−3

@@ -60,7 +60,7 @@ struct arc_rfc1201 { · 59 unmodified lines
60	__u8 proto; /* protocol ID field - varies */	60	__u8 proto; /* protocol ID field - varies */
61	__u8 split_flag; /* for use with split packets */	61	__u8 split_flag; /* for use with split packets */
62	__be16 sequence; /* sequence number */	62	__be16 sequence; /* sequence number */
63	__u8 payload[0]; /* space remaining in packet (504 bytes)*/	63	__u8 payload[]; /* space remaining in packet (504 bytes)*/
64	};	64	};
65	#define RFC1201_HDR_SIZE 4	65	#define RFC1201_HDR_SIZE 4
66		66
@@ -69,7 +69,7 @@ struct arc_rfc1201 { · 2 unmodified lines
69	*/	69	*/
70	struct arc_rfc1051 {	70	struct arc_rfc1051 {
71	__u8 proto; /* ARC_P_RFC1051_ARP/RFC1051_IP */	71	__u8 proto; /* ARC_P_RFC1051_ARP/RFC1051_IP */
72	__u8 payload[0]; /* 507 bytes */	72	__u8 payload[]; /* 507 bytes */
73	};	73	};
74	#define RFC1051_HDR_SIZE 1	74	#define RFC1051_HDR_SIZE 1
75		75
@@ -80,7 +80,7 @@ struct arc_rfc1051 { · 4 unmodified lines
80	struct arc_eth_encap {	80	struct arc_eth_encap {
81	__u8 proto; /* Always ARC_P_ETHER */	81	__u8 proto; /* Always ARC_P_ETHER */
82	struct ethhdr eth; /* standard ethernet header (yuck!) */	82	struct ethhdr eth; /* standard ethernet header (yuck!) */
83	__u8 payload[0]; /* 493 bytes */	83	__u8 payload[]; /* 493 bytes */
84	};	84	};
85	#define ETH_ENCAP_HDR_SIZE 14	85	#define ETH_ENCAP_HDR_SIZE 14
86		86

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

@@ -174,6 +174,16 @@ struct br_vlan_msg { · 173 unmodified lines
174	__u32 ifindex;	174	__u32 ifindex;
175	};	175	};
176		176
		177	enum {
		178	BRIDGE_VLANDB_DUMP_UNSPEC,
		179	BRIDGE_VLANDB_DUMP_FLAGS,
		180	__BRIDGE_VLANDB_DUMP_MAX,
		181	};
		182	#define BRIDGE_VLANDB_DUMP_MAX (__BRIDGE_VLANDB_DUMP_MAX - 1)
		183
		184	/* flags used in BRIDGE_VLANDB_DUMP_FLAGS attribute to affect dumps */
		185	#define BRIDGE_VLANDB_DUMPF_STATS (1 << 0) /* Include stats in the dump */
		186
177	/* Bridge vlan RTM attributes	187	/* Bridge vlan RTM attributes
178	* [BRIDGE_VLANDB_ENTRY] = {	188	* [BRIDGE_VLANDB_ENTRY] = {
179	* [BRIDGE_VLANDB_ENTRY_INFO]	189	* [BRIDGE_VLANDB_ENTRY_INFO]
@@ -192,10 +202,46 @@ enum { · 12 unmodified lines
192	BRIDGE_VLANDB_ENTRY_INFO,	202	BRIDGE_VLANDB_ENTRY_INFO,
193	BRIDGE_VLANDB_ENTRY_RANGE,	203	BRIDGE_VLANDB_ENTRY_RANGE,
194	BRIDGE_VLANDB_ENTRY_STATE,	204	BRIDGE_VLANDB_ENTRY_STATE,
		205	BRIDGE_VLANDB_ENTRY_TUNNEL_INFO,
		206	BRIDGE_VLANDB_ENTRY_STATS,
195	__BRIDGE_VLANDB_ENTRY_MAX,	207	__BRIDGE_VLANDB_ENTRY_MAX,
196	};	208	};
197	#define BRIDGE_VLANDB_ENTRY_MAX (__BRIDGE_VLANDB_ENTRY_MAX - 1)	209	#define BRIDGE_VLANDB_ENTRY_MAX (__BRIDGE_VLANDB_ENTRY_MAX - 1)
198		210
		211	/* [BRIDGE_VLANDB_ENTRY] = {
		212	* [BRIDGE_VLANDB_ENTRY_TUNNEL_INFO] = {
		213	* [BRIDGE_VLANDB_TINFO_ID]
		214	* ...
		215	* }
		216	* }
		217	*/
		218	enum {
		219	BRIDGE_VLANDB_TINFO_UNSPEC,
		220	BRIDGE_VLANDB_TINFO_ID,
		221	BRIDGE_VLANDB_TINFO_CMD,
		222	__BRIDGE_VLANDB_TINFO_MAX,
		223	};
		224	#define BRIDGE_VLANDB_TINFO_MAX (__BRIDGE_VLANDB_TINFO_MAX - 1)
		225
		226	/* [BRIDGE_VLANDB_ENTRY] = {
		227	* [BRIDGE_VLANDB_ENTRY_STATS] = {
		228	* [BRIDGE_VLANDB_STATS_RX_BYTES]
		229	* ...
		230	* }
		231	* ...
		232	* }
		233	*/
		234	enum {
		235	BRIDGE_VLANDB_STATS_UNSPEC,
		236	BRIDGE_VLANDB_STATS_RX_BYTES,
		237	BRIDGE_VLANDB_STATS_RX_PACKETS,
		238	BRIDGE_VLANDB_STATS_TX_BYTES,
		239	BRIDGE_VLANDB_STATS_TX_PACKETS,
		240	BRIDGE_VLANDB_STATS_PAD,
		241	__BRIDGE_VLANDB_STATS_MAX,
		242	};
		243	#define BRIDGE_VLANDB_STATS_MAX (__BRIDGE_VLANDB_STATS_MAX - 1)
		244
199	/* Bridge multicast database attributes	245	/* Bridge multicast database attributes
200	* [MDBA_MDB] = {	246	* [MDBA_MDB] = {
201	* [MDBA_MDB_ENTRY] = {	247	* [MDBA_MDB_ENTRY] = {

include/uapi/linux/if_link.h+17−1

 	IFLA_MACSEC_REPLAY_PROTECT,
 	IFLA_MACSEC_VALIDATION,
 	IFLA_MACSEC_PAD,
+	IFLA_MACSEC_OFFLOAD,
 	__IFLA_MACSEC_MAX,
 };
 enum macsec_offload {
 	MACSEC_OFFLOAD_OFF = 0,
 	MACSEC_OFFLOAD_PHY = 1,
+	MACSEC_OFFLOAD_MAC = 2,
 	__MACSEC_OFFLOAD_END,
 	MACSEC_OFFLOAD_MAX = __MACSEC_OFFLOAD_END - 1,
 };
 	GENEVE_DF_MAX = __GENEVE_DF_END - 1,
 };
+/* Bareudp section  */
+enum {
+	IFLA_BAREUDP_UNSPEC,
+	IFLA_BAREUDP_PORT,
+	IFLA_BAREUDP_ETHERTYPE,
+	IFLA_BAREUDP_SRCPORT_MIN,
+	IFLA_BAREUDP_MULTIPROTO_MODE,
+	__IFLA_BAREUDP_MAX
+};
+#define IFLA_BAREUDP_MAX (__IFLA_BAREUDP_MAX - 1)
 /* PPP section */
 enum {
 	IFLA_PPP_UNSPEC,
 #define XDP_FLAGS_SKB_MODE		(1U << 1)
 #define XDP_FLAGS_DRV_MODE		(1U << 2)
 #define XDP_FLAGS_HW_MODE		(1U << 3)
+#define XDP_FLAGS_REPLACE		(1U << 4)
 #define XDP_FLAGS_MODES			(XDP_FLAGS_SKB_MODE | \
 					 XDP_FLAGS_DRV_MODE | \
 					 XDP_FLAGS_HW_MODE)
 #define XDP_FLAGS_MASK			(XDP_FLAGS_UPDATE_IF_NOEXIST | \
-					 XDP_FLAGS_MODES)
+					 XDP_FLAGS_MODES | XDP_FLAGS_REPLACE)
 /* These are stored into IFLA_XDP_ATTACHED on dump. */
 enum {
 	IFLA_XDP_DRV_PROG_ID,
 	IFLA_XDP_SKB_PROG_ID,
 	IFLA_XDP_HW_PROG_ID,
+	IFLA_XDP_EXPECTED_FD,
 	__IFLA_XDP_MAX,
 };

include/uapi/linux/if_macsec.h+6−2

 #define MACSEC_KEYID_LEN 16
-/* cipher IDs as per IEEE802.1AEbn-2011 */
+/* cipher IDs as per IEEE802.1AE-2018 (Table 14-1) */
 #define MACSEC_CIPHER_ID_GCM_AES_128 0x0080C20001000001ULL
 #define MACSEC_CIPHER_ID_GCM_AES_256 0x0080C20001000002ULL
+#define MACSEC_CIPHER_ID_GCM_AES_XPN_128 0x0080C20001000003ULL
+#define MACSEC_CIPHER_ID_GCM_AES_XPN_256 0x0080C20001000004ULL
 /* deprecated cipher ID for GCM-AES-128 */
 #define MACSEC_DEFAULT_CIPHER_ID     0x0080020001000001ULL
 	MACSEC_SA_ATTR_UNSPEC,
 	MACSEC_SA_ATTR_AN,     /* config/dump, u8 0..3 */
 	MACSEC_SA_ATTR_ACTIVE, /* config/dump, u8 0..1 */
-	MACSEC_SA_ATTR_PN,     /* config/dump, u32 */
+	MACSEC_SA_ATTR_PN,     /* config/dump, u32/u64 (u64 if XPN) */
 	MACSEC_SA_ATTR_KEY,    /* config, data */
 	MACSEC_SA_ATTR_KEYID,  /* config/dump, 128-bit */
 	MACSEC_SA_ATTR_STATS,  /* dump, nested, macsec_sa_stats_attr */
 	MACSEC_SA_ATTR_PAD,
+	MACSEC_SA_ATTR_SSCI,   /* config/dump, u32 - XPN only */
+	MACSEC_SA_ATTR_SALT,   /* config, 96-bit - XPN only */
 	__MACSEC_SA_ATTR_END,
 	NUM_MACSEC_SA_ATTR = __MACSEC_SA_ATTR_END,
 	MACSEC_SA_ATTR_MAX = __MACSEC_SA_ATTR_END - 1,

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

 #define IPPROTO_UDPLITE		IPPROTO_UDPLITE
   IPPROTO_MPLS = 137,		/* MPLS in IP (RFC 4023)		*/
 #define IPPROTO_MPLS		IPPROTO_MPLS
+  IPPROTO_ETHERNET = 143,	/* Ethernet-within-IPv6 Encapsulation	*/
+#define IPPROTO_ETHERNET	IPPROTO_ETHERNET
   IPPROTO_RAW = 255,		/* Raw IP packets			*/
 #define IPPROTO_RAW		IPPROTO_RAW
   IPPROTO_MPTCP = 262,		/* Multipath TCP connection		*/

include/uapi/linux/inet_diag.h+5−1

 enum {
 	INET_DIAG_REQ_NONE,
 	INET_DIAG_REQ_BYTECODE,
+	INET_DIAG_REQ_SK_BPF_STORAGES,
+	__INET_DIAG_REQ_MAX,
 };
-#define INET_DIAG_REQ_MAX INET_DIAG_REQ_BYTECODE
+#define INET_DIAG_REQ_MAX (__INET_DIAG_REQ_MAX - 1)
 /* Bytecode is sequence of 4 byte commands followed by variable arguments.
  * All the commands identified by "code" are conditional jumps forward:
 	INET_DIAG_CLASS_ID,	/* request as INET_DIAG_TCLASS */
 	INET_DIAG_MD5SIG,
 	INET_DIAG_ULP_INFO,
+	INET_DIAG_SK_BPF_STORAGES,
 	__INET_DIAG_MAX,
 };
 	INET_ULP_INFO_UNSPEC,
 	INET_ULP_INFO_NAME,
 	INET_ULP_INFO_TLS,
+	INET_ULP_INFO_MPTCP,
 	__INET_ULP_INFO_MAX,
 };
 #define INET_ULP_INFO_MAX (__INET_ULP_INFO_MAX - 1)

include/uapi/linux/input-event-codes.h+4−1

-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
  * Input event codes
  *
 /* Electronic privacy screen control */
 #define KEY_PRIVACY_SCREEN_TOGGLE	0x279
+/* Select an area of screen to be copied */
+#define KEY_SELECTIVE_SCREENSHOT	0x27a
 /*
  * Some keyboards have keys which do not have a defined meaning, these keys
  * are intended to be programmed / bound to macros by the user. For most

include/uapi/linux/io_uring.h+38−4

-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR MIT */
 /*
  * Header file for the io_uring interface.
  *
 		__u64	off;	/* offset into file */
 		__u64	addr2;
 	};
-	__u64	addr;		/* pointer to buffer or iovecs */
+	union {
+		__u64	addr;	/* pointer to buffer or iovecs */
+		__u64	splice_off_in;
+	};
 	__u32	len;		/* buffer size or number of iovecs */
 	union {
 		__kernel_rwf_t	rw_flags;
 		__u32		open_flags;
 		__u32		statx_flags;
 		__u32		fadvise_advice;
+		__u32		splice_flags;
 	};
 	__u64	user_data;	/* data to be passed back at completion time */
 	union {
 		struct {
-			/* index into fixed buffers, if used */
+			/* pack this to avoid bogus arm OABI complaints */
-			__u16	buf_index;
+			union {
+				/* index into fixed buffers, if used */
+				__u16	buf_index;
+				/* for grouped buffer selection */
+				__u16	buf_group;
+			} __attribute__((packed));
 			/* personality to use, if used */
 			__u16	personality;
+			__s32	splice_fd_in;
 		};
 		__u64	__pad2[3];
 	};
 	IOSQE_IO_LINK_BIT,
 	IOSQE_IO_HARDLINK_BIT,
 	IOSQE_ASYNC_BIT,
+	IOSQE_BUFFER_SELECT_BIT,
 };
 /*
 #define IOSQE_IO_HARDLINK	(1U << IOSQE_IO_HARDLINK_BIT)
 /* always go async */
 #define IOSQE_ASYNC		(1U << IOSQE_ASYNC_BIT)
+/* select buffer from sqe->buf_group */
+#define IOSQE_BUFFER_SELECT	(1U << IOSQE_BUFFER_SELECT_BIT)
 /*
  * io_uring_setup() flags
 	IORING_OP_RECV,
 	IORING_OP_OPENAT2,
 	IORING_OP_EPOLL_CTL,
+	IORING_OP_SPLICE,
+	IORING_OP_PROVIDE_BUFFERS,
+	IORING_OP_REMOVE_BUFFERS,
 	/* this goes last, obviously */
 	IORING_OP_LAST,
  */
 #define IORING_TIMEOUT_ABS	(1U << 0)
+/*
+ * sqe->splice_flags
+ * extends splice(2) flags
+ */
+#define SPLICE_F_FD_IN_FIXED	(1U << 31) /* the last bit of __u32 */
 /*
  * IO completion data structure (Completion Queue Entry)
  */
 	__u32	flags;
 };
+/*
+ * cqe->flags
+ *
+ * IORING_CQE_F_BUFFER	If set, the upper 16 bits are the buffer ID
+ */
+#define IORING_CQE_F_BUFFER		(1U << 0)
+enum {
+	IORING_CQE_BUFFER_SHIFT		= 16,
+};
 /*
  * Magic offsets for the application to mmap the data it needs
  */
 #define IORING_FEAT_SUBMIT_STABLE	(1U << 2)
 #define IORING_FEAT_RW_CUR_POS		(1U << 3)
 #define IORING_FEAT_CUR_PERSONALITY	(1U << 4)
+#define IORING_FEAT_FAST_POLL		(1U << 5)
 /*
  * io_uring_register(2) opcodes and arguments

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

 #define IPV6_SRCRT_STRICT	0x01	/* Deprecated; will be removed */
 #define IPV6_SRCRT_TYPE_0	0	/* Deprecated; will be removed */
 #define IPV6_SRCRT_TYPE_2	2	/* IPv6 type 2 Routing Header	*/
+#define IPV6_SRCRT_TYPE_3	3	/* RPL Segment Routing with IPv6 */
 #define IPV6_SRCRT_TYPE_4	4	/* Segment Routing with IPv6 */
 /*
 	DEVCONF_DISABLE_POLICY,
 	DEVCONF_ACCEPT_RA_RT_INFO_MIN_PLEN,
 	DEVCONF_NDISC_TCLASS,
+	DEVCONF_RPL_SEG_ENABLED,
 	DEVCONF_MAX
 };

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

@@ -474,12 +474,17 @@ struct kvm_s390_mem_op { · 473 unmodified lines
474	__u32 size; /* amount of bytes */	474	__u32 size; /* amount of bytes */
475	__u32 op; /* type of operation */	475	__u32 op; /* type of operation */
476	__u64 buf; /* buffer in userspace */	476	__u64 buf; /* buffer in userspace */
477	__u8 ar; /* the access register number */	477	union {
478	__u8 reserved[31]; /* should be set to 0 */	478	__u8 ar; /* the access register number */
		479	__u32 sida_offset; /* offset into the sida */
		480	__u8 reserved[32]; /* should be set to 0 */
		481	};
479	};	482	};
480	/* types for kvm_s390_mem_op->op */	483	/* types for kvm_s390_mem_op->op */
481	#define KVM_S390_MEMOP_LOGICAL_READ 0	484	#define KVM_S390_MEMOP_LOGICAL_READ 0
482	#define KVM_S390_MEMOP_LOGICAL_WRITE 1	485	#define KVM_S390_MEMOP_LOGICAL_WRITE 1
		486	#define KVM_S390_MEMOP_SIDA_READ 2
		487	#define KVM_S390_MEMOP_SIDA_WRITE 3
483	/* flags for kvm_s390_mem_op->flags */	488	/* flags for kvm_s390_mem_op->flags */
484	#define KVM_S390_MEMOP_F_CHECK_ONLY (1ULL << 0)	489	#define KVM_S390_MEMOP_F_CHECK_ONLY (1ULL << 0)
485	#define KVM_S390_MEMOP_F_INJECT_EXCEPTION (1ULL << 1)	490	#define KVM_S390_MEMOP_F_INJECT_EXCEPTION (1ULL << 1)
@@ -1010,6 +1015,8 @@ struct kvm_ppc_resize_hpt { · 524 unmodified lines
1010	#define KVM_CAP_ARM_NISV_TO_USER 177	1015	#define KVM_CAP_ARM_NISV_TO_USER 177
1011	#define KVM_CAP_ARM_INJECT_EXT_DABT 178	1016	#define KVM_CAP_ARM_INJECT_EXT_DABT 178
1012	#define KVM_CAP_S390_VCPU_RESETS 179	1017	#define KVM_CAP_S390_VCPU_RESETS 179
		1018	#define KVM_CAP_S390_PROTECTED 180
		1019	#define KVM_CAP_PPC_SECURE_GUEST 181
1013		1020
1014	#ifdef KVM_CAP_IRQ_ROUTING	1021	#ifdef KVM_CAP_IRQ_ROUTING
1015		1022
@@ -1478,6 +1485,39 @@ struct kvm_enc_region { · 462 unmodified lines
1478	#define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3)	1485	#define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3)
1479	#define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4)	1486	#define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4)
1480		1487
		1488	struct kvm_s390_pv_sec_parm {
		1489	__u64 origin;
		1490	__u64 length;
		1491	};
		1492
		1493	struct kvm_s390_pv_unp {
		1494	__u64 addr;
		1495	__u64 size;
		1496	__u64 tweak;
		1497	};
		1498
		1499	enum pv_cmd_id {
		1500	KVM_PV_ENABLE,
		1501	KVM_PV_DISABLE,
		1502	KVM_PV_SET_SEC_PARMS,
		1503	KVM_PV_UNPACK,
		1504	KVM_PV_VERIFY,
		1505	KVM_PV_PREP_RESET,
		1506	KVM_PV_UNSHARE_ALL,
		1507	};
		1508
		1509	struct kvm_pv_cmd {
		1510	__u32 cmd; /* Command to be executed */
		1511	__u16 rc; /* Ultravisor return code */
		1512	__u16 rrc; /* Ultravisor return reason code */
		1513	__u64 data; /* Data or address */
		1514	__u32 flags; /* flags for future extensions. Must be 0 for now */
		1515	__u32 reserved[3];
		1516	};
		1517
		1518	/* Available with KVM_CAP_S390_PROTECTED */
		1519	#define KVM_S390_PV_COMMAND _IOWR(KVMIO, 0xc5, struct kvm_pv_cmd)
		1520
1481	/* Secure Encrypted Virtualization command */	1521	/* Secure Encrypted Virtualization command */
1482	enum sev_cmd_id {	1522	enum sev_cmd_id {
1483	/* Guest initialization commands */	1523	/* Guest initialization commands */
@@ -1628,4 +1668,7 @@ struct kvm_hyperv_eventfd { · 144 unmodified lines
1628	#define KVM_HYPERV_CONN_ID_MASK 0x00ffffff	1668	#define KVM_HYPERV_CONN_ID_MASK 0x00ffffff
1629	#define KVM_HYPERV_EVENTFD_DEASSIGN (1 << 0)	1669	#define KVM_HYPERV_EVENTFD_DEASSIGN (1 << 0)
1630		1670
		1671	#define KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE (1 << 0)
		1672	#define KVM_DIRTY_LOG_INITIALLY_SET (1 << 1)
		1673
1631	#endif /* __LINUX_KVM_H */	1674	#endif /* __LINUX_KVM_H */

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

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

include/uapi/linux/media-bus-format.h+2−1

 #define MEDIA_BUS_FMT_RGB121212_1X36		0x1019
 #define MEDIA_BUS_FMT_RGB161616_1X48		0x101a
-/* YUV (including grey) - next is	0x202d */
+/* YUV (including grey) - next is	0x202e */
 #define MEDIA_BUS_FMT_Y8_1X8			0x2001
 #define MEDIA_BUS_FMT_UV8_1X8			0x2015
 #define MEDIA_BUS_FMT_UYVY8_1_5X8		0x2002
 #define MEDIA_BUS_FMT_VYUY12_2X12		0x201d
 #define MEDIA_BUS_FMT_YUYV12_2X12		0x201e
 #define MEDIA_BUS_FMT_YVYU12_2X12		0x201f
+#define MEDIA_BUS_FMT_Y14_1X14			0x202d
 #define MEDIA_BUS_FMT_UYVY8_1X16		0x200f
 #define MEDIA_BUS_FMT_VYUY8_1X16		0x2010
 #define MEDIA_BUS_FMT_YUYV8_1X16		0x2011

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

 /* MAC and PHY tx_config_Reg[15:0] for SGMII in-band auto-negotiation.*/
 #define ADVERTISE_SGMII		0x0001	/* MAC can do SGMII            */
 #define LPA_SGMII		0x0001	/* PHY can do SGMII            */
+#define LPA_SGMII_SPD_MASK	0x0c00	/* SGMII speed mask            */
+#define LPA_SGMII_FULL_DUPLEX	0x1000	/* SGMII full duplex           */
 #define LPA_SGMII_DPX_SPD_MASK	0x1C00	/* SGMII duplex and speed bits */
+#define LPA_SGMII_10		0x0000	/* 10Mbps                      */
 #define LPA_SGMII_10HALF	0x0000	/* Can do 10mbps half-duplex   */
 #define LPA_SGMII_10FULL	0x1000	/* Can do 10mbps full-duplex   */
+#define LPA_SGMII_100		0x0400	/* 100Mbps                     */
 #define LPA_SGMII_100HALF	0x0400	/* Can do 100mbps half-duplex  */
 #define LPA_SGMII_100FULL	0x1400	/* Can do 100mbps full-duplex  */
+#define LPA_SGMII_1000		0x0800	/* 1000Mbps                    */
 #define LPA_SGMII_1000HALF	0x0800	/* Can do 1000mbps half-duplex */
 #define LPA_SGMII_1000FULL	0x1800	/* Can do 1000mbps full-duplex */
 #define LPA_SGMII_LINK		0x8000	/* PHY link with copper-side partner */

include/uapi/linux/mman.h+3−2

@@ -5,8 +5,9 @@ · 4 unmodified lines
5	#include <asm/mman.h>	5	#include <asm/mman.h>
6	#include <asm-generic/hugetlb_encode.h>	6	#include <asm-generic/hugetlb_encode.h>
7		7
8	#define MREMAP_MAYMOVE 1	8	#define MREMAP_MAYMOVE 1
9	#define MREMAP_FIXED 2	9	#define MREMAP_FIXED 2
		10	#define MREMAP_DONTUNMAP 4
10		11
11	#define OVERCOMMIT_GUESS 0	12	#define OVERCOMMIT_GUESS 0
12	#define OVERCOMMIT_ALWAYS 1	13	#define OVERCOMMIT_ALWAYS 1

include/uapi/linux/mmc/ioctl.h+1−1

@@ -57,7 +57,7 @@ struct mmc_ioc_cmd { · 56 unmodified lines
57	*/	57	*/
58	struct mmc_ioc_multi_cmd {	58	struct mmc_ioc_multi_cmd {
59	__u64 num_of_cmds;	59	__u64 num_of_cmds;
60	struct mmc_ioc_cmd cmds[0];	60	struct mmc_ioc_cmd cmds[];
61	};	61	};
62		62
63	#define MMC_IOC_CMD _IOWR(MMC_BLOCK_MAJOR, 0, struct mmc_ioc_cmd)	63	#define MMC_IOC_CMD _IOWR(MMC_BLOCK_MAJOR, 0, struct mmc_ioc_cmd)

include/uapi/linux/mptcp.h+89−0

@@ -0,0 +1,89 @@
	1	/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
	2	#ifndef _UAPI_MPTCP_H
	3	#define _UAPI_MPTCP_H
	4
	5	#include <linux/const.h>
	6	#include <linux/types.h>
	7
	8	#define MPTCP_SUBFLOW_FLAG_MCAP_REM _BITUL(0)
	9	#define MPTCP_SUBFLOW_FLAG_MCAP_LOC _BITUL(1)
	10	#define MPTCP_SUBFLOW_FLAG_JOIN_REM _BITUL(2)
	11	#define MPTCP_SUBFLOW_FLAG_JOIN_LOC _BITUL(3)
	12	#define MPTCP_SUBFLOW_FLAG_BKUP_REM _BITUL(4)
	13	#define MPTCP_SUBFLOW_FLAG_BKUP_LOC _BITUL(5)
	14	#define MPTCP_SUBFLOW_FLAG_FULLY_ESTABLISHED _BITUL(6)
	15	#define MPTCP_SUBFLOW_FLAG_CONNECTED _BITUL(7)
	16	#define MPTCP_SUBFLOW_FLAG_MAPVALID _BITUL(8)
	17
	18	enum {
	19	MPTCP_SUBFLOW_ATTR_UNSPEC,
	20	MPTCP_SUBFLOW_ATTR_TOKEN_REM,
	21	MPTCP_SUBFLOW_ATTR_TOKEN_LOC,
	22	MPTCP_SUBFLOW_ATTR_RELWRITE_SEQ,
	23	MPTCP_SUBFLOW_ATTR_MAP_SEQ,
	24	MPTCP_SUBFLOW_ATTR_MAP_SFSEQ,
	25	MPTCP_SUBFLOW_ATTR_SSN_OFFSET,
	26	MPTCP_SUBFLOW_ATTR_MAP_DATALEN,
	27	MPTCP_SUBFLOW_ATTR_FLAGS,
	28	MPTCP_SUBFLOW_ATTR_ID_REM,
	29	MPTCP_SUBFLOW_ATTR_ID_LOC,
	30	MPTCP_SUBFLOW_ATTR_PAD,
	31	__MPTCP_SUBFLOW_ATTR_MAX
	32	};
	33
	34	#define MPTCP_SUBFLOW_ATTR_MAX (__MPTCP_SUBFLOW_ATTR_MAX - 1)
	35
	36	/* netlink interface */
	37	#define MPTCP_PM_NAME "mptcp_pm"
	38	#define MPTCP_PM_CMD_GRP_NAME "mptcp_pm_cmds"
	39	#define MPTCP_PM_VER 0x1
	40
	41	/*
	42	* ATTR types defined for MPTCP
	43	*/
	44	enum {
	45	MPTCP_PM_ATTR_UNSPEC,
	46
	47	MPTCP_PM_ATTR_ADDR, /* nested address */
	48	MPTCP_PM_ATTR_RCV_ADD_ADDRS, /* u32 */
	49	MPTCP_PM_ATTR_SUBFLOWS, /* u32 */
	50
	51	__MPTCP_PM_ATTR_MAX
	52	};
	53
	54	#define MPTCP_PM_ATTR_MAX (__MPTCP_PM_ATTR_MAX - 1)
	55
	56	enum {
	57	MPTCP_PM_ADDR_ATTR_UNSPEC,
	58
	59	MPTCP_PM_ADDR_ATTR_FAMILY, /* u16 */
	60	MPTCP_PM_ADDR_ATTR_ID, /* u8 */
	61	MPTCP_PM_ADDR_ATTR_ADDR4, /* struct in_addr */
	62	MPTCP_PM_ADDR_ATTR_ADDR6, /* struct in6_addr */
	63	MPTCP_PM_ADDR_ATTR_PORT, /* u16 */
	64	MPTCP_PM_ADDR_ATTR_FLAGS, /* u32 */
	65	MPTCP_PM_ADDR_ATTR_IF_IDX, /* s32 */
	66
	67	__MPTCP_PM_ADDR_ATTR_MAX
	68	};
	69
	70	#define MPTCP_PM_ADDR_ATTR_MAX (__MPTCP_PM_ADDR_ATTR_MAX - 1)
	71
	72	#define MPTCP_PM_ADDR_FLAG_SIGNAL (1 << 0)
	73	#define MPTCP_PM_ADDR_FLAG_SUBFLOW (1 << 1)
	74	#define MPTCP_PM_ADDR_FLAG_BACKUP (1 << 2)
	75
	76	enum {
	77	MPTCP_PM_CMD_UNSPEC,
	78
	79	MPTCP_PM_CMD_ADD_ADDR,
	80	MPTCP_PM_CMD_DEL_ADDR,
	81	MPTCP_PM_CMD_GET_ADDR,
	82	MPTCP_PM_CMD_FLUSH_ADDRS,
	83	MPTCP_PM_CMD_SET_LIMITS,
	84	MPTCP_PM_CMD_GET_LIMITS,
	85
	86	__MPTCP_PM_CMD_AFTER_LAST
	87	};
	88
	89	#endif /* _UAPI_MPTCP_H */

include/uapi/linux/net_dropmon.h+3−2

 struct net_dm_config_msg {
 	__u32 entries;
-	struct net_dm_config_entry options[0];
+	struct net_dm_config_entry options[];
 };
 struct net_dm_alert_msg {
 	__u32 entries;
-	struct net_dm_drop_point points[0];
+	struct net_dm_drop_point points[];
 };
 struct net_dm_user_msg {
 	NET_DM_ATTR_HW_TRAP_COUNT,		/* u32 */
 	NET_DM_ATTR_SW_DROPS,			/* flag */
 	NET_DM_ATTR_HW_DROPS,			/* flag */
+	NET_DM_ATTR_FLOW_ACTION_COOKIE,		/* binary */
 	__NET_DM_ATTR_MAX,
 	NET_DM_ATTR_MAX = __NET_DM_ATTR_MAX - 1

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

 	 * receive a time stamp via the socket error queue.
 	 */
 	HWTSTAMP_TX_ONESTEP_P2P,
+	/* add new constants above here */
+	__HWTSTAMP_TX_CNT
 };
 /* possible values for hwtstamp_config->rx_filter */
 	/* NTP, UDP, all versions and packet modes */
 	HWTSTAMP_FILTER_NTP_ALL,
+	/* add new constants above here */
+	__HWTSTAMP_FILTER_CNT
 };
 /* SCM_TIMESTAMPING_PKTINFO control message */

include/uapi/linux/netfilter/nf_conntrack_common.h+11−1

 	IPS_UNTRACKED_BIT = 12,
 	IPS_UNTRACKED = (1 << IPS_UNTRACKED_BIT),
+#ifdef __KERNEL__
+	/* Re-purposed for in-kernel use:
+	 * Tags a conntrack entry that clashed with an existing entry
+	 * on insert.
+	 */
+	IPS_NAT_CLASH_BIT = IPS_UNTRACKED_BIT,
+	IPS_NAT_CLASH = IPS_UNTRACKED,
+#endif
 	/* Conntrack got a helper explicitly attached via CT target. */
 	IPS_HELPER_BIT = 13,
 	IPS_HELPER = (1 << IPS_HELPER_BIT),
 	 */
 	IPS_UNCHANGEABLE_MASK = (IPS_NAT_DONE_MASK | IPS_NAT_MASK |
 				 IPS_EXPECTED | IPS_CONFIRMED | IPS_DYING |
-				 IPS_SEQ_ADJUST | IPS_TEMPLATE | IPS_OFFLOAD),
+				 IPS_SEQ_ADJUST | IPS_TEMPLATE | IPS_UNTRACKED |
+				 IPS_OFFLOAD),
 	__IPS_MAX_BIT = 15,
 };

include/uapi/linux/netfilter/nf_tables.h+25−0

  * @NFTA_SET_USERDATA: user data (NLA_BINARY)
  * @NFTA_SET_OBJ_TYPE: stateful object type (NLA_U32: NFT_OBJECT_*)
  * @NFTA_SET_HANDLE: set handle (NLA_U64)
+ * @NFTA_SET_EXPR: set expression (NLA_NESTED: nft_expr_attributes)
  */
 enum nft_set_attributes {
 	NFTA_SET_UNSPEC,
 	NFTA_SET_PAD,
 	NFTA_SET_OBJ_TYPE,
 	NFTA_SET_HANDLE,
+	NFTA_SET_EXPR,
 	__NFTA_SET_MAX
 };
 #define NFTA_SET_MAX		(__NFTA_SET_MAX - 1)
 };
 #define NFTA_OBJ_MAX		(__NFTA_OBJ_MAX - 1)
+/**
+ * enum nft_flowtable_flags - nf_tables flowtable flags
+ *
+ * @NFT_FLOWTABLE_HW_OFFLOAD: flowtable hardware offload is enabled
+ * @NFT_FLOWTABLE_COUNTER: enable flow counters
+ */
+enum nft_flowtable_flags {
+	NFT_FLOWTABLE_HW_OFFLOAD	= 0x1,
+	NFT_FLOWTABLE_COUNTER		= 0x2,
+	NFT_FLOWTABLE_MASK		= (NFT_FLOWTABLE_HW_OFFLOAD |
+					   NFT_FLOWTABLE_COUNTER)
+};
 /**
  * enum nft_flowtable_attributes - nf_tables flow table netlink attributes
  *
 	NFTA_TUNNEL_KEY_OPTS_UNSPEC,
 	NFTA_TUNNEL_KEY_OPTS_VXLAN,
 	NFTA_TUNNEL_KEY_OPTS_ERSPAN,
+	NFTA_TUNNEL_KEY_OPTS_GENEVE,
 	__NFTA_TUNNEL_KEY_OPTS_MAX
 };
 #define NFTA_TUNNEL_KEY_OPTS_MAX	(__NFTA_TUNNEL_KEY_OPTS_MAX - 1)
 };
 #define NFTA_TUNNEL_KEY_ERSPAN_MAX	(__NFTA_TUNNEL_KEY_ERSPAN_MAX - 1)
+enum nft_tunnel_opts_geneve_attributes {
+	NFTA_TUNNEL_KEY_GENEVE_UNSPEC,
+	NFTA_TUNNEL_KEY_GENEVE_CLASS,
+	NFTA_TUNNEL_KEY_GENEVE_TYPE,
+	NFTA_TUNNEL_KEY_GENEVE_DATA,
+	__NFTA_TUNNEL_KEY_GENEVE_MAX
+};
+#define NFTA_TUNNEL_KEY_GENEVE_MAX	(__NFTA_TUNNEL_KEY_GENEVE_MAX - 1)
 enum nft_tunnel_flags {
 	NFT_TUNNEL_F_ZERO_CSUM_TX	= (1 << 0),
 	NFT_TUNNEL_F_DONT_FRAGMENT	= (1 << 1),

include/uapi/linux/netfilter/xt_IDLETIMER.h+11−1

-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * linux/include/linux/netfilter/xt_IDLETIMER.h
  *
 #include <linux/types.h>
 #define MAX_IDLETIMER_LABEL_SIZE 28
+#define XT_IDLETIMER_ALARM 0x01
 struct idletimer_tg_info {
 	__u32 timeout;
 	struct idletimer_tg *timer __attribute__((aligned(8)));
 };
+struct idletimer_tg_info_v1 {
+	__u32 timeout;
+	char label[MAX_IDLETIMER_LABEL_SIZE];
+	__u8 timer_type;
+	/* for kernel module internal use only */
+	struct idletimer_tg *timer __attribute__((aligned(8)));
+};
 #endif

include/uapi/linux/netfilter_bridge/ebt_among.h+1−1

@@ -40,7 +40,7 @@ struct ebt_mac_wormhash_tuple { · 39 unmodified lines
40	struct ebt_mac_wormhash {	40	struct ebt_mac_wormhash {
41	int table[257];	41	int table[257];
42	int poolsize;	42	int poolsize;
43	struct ebt_mac_wormhash_tuple pool[0];	43	struct ebt_mac_wormhash_tuple pool[];
44	};	44	};
45		45
46	#define ebt_mac_wormhash_size(x) ((x) ? sizeof(struct ebt_mac_wormhash) \	46	#define ebt_mac_wormhash_size(x) ((x) ? sizeof(struct ebt_mac_wormhash) \

include/uapi/linux/nl80211.h+239−2

@@ -11,7 +11,7 @@ · 10 unmodified lines
11	* Copyright 2008 Jouni Malinen <jouni.malinen@atheros.com>	11	* Copyright 2008 Jouni Malinen <jouni.malinen@atheros.com>
12	* Copyright 2008 Colin McCabe <colin@cozybit.com>	12	* Copyright 2008 Colin McCabe <colin@cozybit.com>
13	* Copyright 2015-2017 Intel Deutschland GmbH	13	* Copyright 2015-2017 Intel Deutschland GmbH
14	* Copyright (C) 2018-2019 Intel Corporation	14	* Copyright (C) 2018-2020 Intel Corporation
15	*	15	*
16	* Permission to use, copy, modify, and/or distribute this software for any	16	* Permission to use, copy, modify, and/or distribute this software for any
17	* purpose with or without fee is hereby granted, provided that the above	17	* purpose with or without fee is hereby granted, provided that the above
@@ -264,6 +264,29 @@ · 246 unmodified lines
264	* %NL80211_ATTR_VLAN_ID.	264	* %NL80211_ATTR_VLAN_ID.
265	*/	265	*/
266		266
		267	/**
		268	* DOC: TID configuration
		269	*
		270	* TID config support can be checked in the %NL80211_ATTR_TID_CONFIG
		271	* attribute given in wiphy capabilities.
		272	*
		273	* The necessary configuration parameters are mentioned in
		274	* &enum nl80211_tid_config_attr and it will be passed to the
		275	* %NL80211_CMD_SET_TID_CONFIG command in %NL80211_ATTR_TID_CONFIG.
		276	*
		277	* If the configuration needs to be applied for specific peer then the MAC
		278	* address of the peer needs to be passed in %NL80211_ATTR_MAC, otherwise the
		279	* configuration will be applied for all the connected peers in the vif except
		280	* any peers that have peer specific configuration for the TID by default; if
		281	* the %NL80211_TID_CONFIG_ATTR_OVERRIDE flag is set, peer specific values
		282	* will be overwritten.
		283	*
		284	* All this configuration is valid only for STA's current connection
		285	* i.e. the configuration will be reset to default when the STA connects back
		286	* after disconnection/roaming, and this configuration will be cleared when
		287	* the interface goes down.
		288	*/
		289
267	/**	290	/**
268	* enum nl80211_commands - supported nl80211 commands	291	* enum nl80211_commands - supported nl80211 commands
269	*	292	*
@@ -1125,6 +1148,9 @@ · 855 unmodified lines
1125	* peer MAC address and %NL80211_ATTR_FRAME is used to specify the frame	1148	* peer MAC address and %NL80211_ATTR_FRAME is used to specify the frame
1126	* content. The frame is ethernet data.	1149	* content. The frame is ethernet data.
1127	*	1150	*
		1151	* @NL80211_CMD_SET_TID_CONFIG: Data frame TID specific configuration
		1152	* is passed using %NL80211_ATTR_TID_CONFIG attribute.
		1153	*
1128	* @NL80211_CMD_MAX: highest used command number	1154	* @NL80211_CMD_MAX: highest used command number
1129	* @__NL80211_CMD_AFTER_LAST: internal use	1155	* @__NL80211_CMD_AFTER_LAST: internal use
1130	*/	1156	*/
@@ -1349,6 +1375,8 @@ enum nl80211_commands { · 218 unmodified lines
1349		1375
1350	NL80211_CMD_PROBE_MESH_LINK,	1376	NL80211_CMD_PROBE_MESH_LINK,
1351		1377
		1378	NL80211_CMD_SET_TID_CONFIG,
		1379
1352	/* add new commands above here */	1380	/* add new commands above here */
1353		1381
1354	/* used to define NL80211_CMD_MAX below */	1382	/* used to define NL80211_CMD_MAX below */
@@ -1604,7 +1632,8 @@ enum nl80211_commands { · 249 unmodified lines
1604	* flag is included, then control port frames are sent over NL80211 instead	1632	* flag is included, then control port frames are sent over NL80211 instead
1605	* using %CMD_CONTROL_PORT_FRAME. If control port routing over NL80211 is	1633	* using %CMD_CONTROL_PORT_FRAME. If control port routing over NL80211 is
1606	* to be used then userspace must also use the %NL80211_ATTR_SOCKET_OWNER	1634	* to be used then userspace must also use the %NL80211_ATTR_SOCKET_OWNER
1607	* flag.	1635	* flag. When used with %NL80211_ATTR_CONTROL_PORT_NO_PREAUTH, pre-auth
		1636	* frames are not forwared over the control port.
1608	*	1637	*
1609	* @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver.	1638	* @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver.
1610	* We recommend using nested, driver-specific attributes within this.	1639	* We recommend using nested, driver-specific attributes within this.
@@ -2400,6 +2429,47 @@ enum nl80211_commands { · 789 unmodified lines
2400	* @NL80211_ATTR_VLAN_ID: VLAN ID (1..4094) for the station and VLAN group key	2429	* @NL80211_ATTR_VLAN_ID: VLAN ID (1..4094) for the station and VLAN group key
2401	* (u16).	2430	* (u16).
2402	*	2431	*
		2432	* @NL80211_ATTR_HE_BSS_COLOR: nested attribute for BSS Color Settings.
		2433	*
		2434	* @NL80211_ATTR_IFTYPE_AKM_SUITES: nested array attribute, with each entry
		2435	* using attributes from &enum nl80211_iftype_akm_attributes. This
		2436	* attribute is sent in a response to %NL80211_CMD_GET_WIPHY indicating
		2437	* supported AKM suites capability per interface. AKMs advertised in
		2438	* %NL80211_ATTR_AKM_SUITES are default capabilities if AKM suites not
		2439	* advertised for a specific interface type.
		2440	*
		2441	* @NL80211_ATTR_TID_CONFIG: TID specific configuration in a
		2442	* nested attribute with &enum nl80211_tid_config_attr sub-attributes;
		2443	* on output (in wiphy attributes) it contains only the feature sub-
		2444	* attributes.
		2445	*
		2446	* @NL80211_ATTR_CONTROL_PORT_NO_PREAUTH: disable preauth frame rx on control
		2447	* port in order to forward/receive them as ordinary data frames.
		2448	*
		2449	* @NL80211_ATTR_PMK_LIFETIME: Maximum lifetime for PMKSA in seconds (u32,
		2450	* dot11RSNAConfigPMKReauthThreshold; 0 is not a valid value).
		2451	* An optional parameter configured through %NL80211_CMD_SET_PMKSA.
		2452	* Drivers that trigger roaming need to know the lifetime of the
		2453	* configured PMKSA for triggering the full vs. PMKSA caching based
		2454	* authentication. This timeout helps authentication methods like SAE,
		2455	* where PMK gets updated only by going through a full (new SAE)
		2456	* authentication instead of getting updated during an association for EAP
		2457	* authentication. No new full authentication within the PMK expiry shall
		2458	* result in a disassociation at the end of the lifetime.
		2459	*
		2460	* @NL80211_ATTR_PMK_REAUTH_THRESHOLD: Reauthentication threshold time, in
		2461	* terms of percentage of %NL80211_ATTR_PMK_LIFETIME
		2462	* (u8, dot11RSNAConfigPMKReauthThreshold, 1..100). This is an optional
		2463	* parameter configured through %NL80211_CMD_SET_PMKSA. Requests the
		2464	* driver to trigger a full authentication roam (without PMKSA caching)
		2465	* after the reauthentication threshold time, but before the PMK lifetime
		2466	* has expired.
		2467	*
		2468	* Authentication methods like SAE need to be able to generate a new PMKSA
		2469	* entry without having to force a disconnection after the PMK timeout. If
		2470	* no roaming occurs between the reauth threshold and PMK expiration,
		2471	* disassociation is still forced.
		2472	*
2403	* @NUM_NL80211_ATTR: total number of nl80211_attrs available	2473	* @NUM_NL80211_ATTR: total number of nl80211_attrs available
2404	* @NL80211_ATTR_MAX: highest attribute number currently defined	2474	* @NL80211_ATTR_MAX: highest attribute number currently defined
2405	* @__NL80211_ATTR_AFTER_LAST: internal use	2475	* @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2864,6 +2934,17 @@ enum nl80211_attrs { · 458 unmodified lines
2864		2934
2865	NL80211_ATTR_VLAN_ID,	2935	NL80211_ATTR_VLAN_ID,
2866		2936
		2937	NL80211_ATTR_HE_BSS_COLOR,
		2938
		2939	NL80211_ATTR_IFTYPE_AKM_SUITES,
		2940
		2941	NL80211_ATTR_TID_CONFIG,
		2942
		2943	NL80211_ATTR_CONTROL_PORT_NO_PREAUTH,
		2944
		2945	NL80211_ATTR_PMK_LIFETIME,
		2946	NL80211_ATTR_PMK_REAUTH_THRESHOLD,
		2947
2867	/* add attributes here, update the policy in nl80211.c */	2948	/* add attributes here, update the policy in nl80211.c */
2868		2949
2869	__NL80211_ATTR_AFTER_LAST,	2950	__NL80211_ATTR_AFTER_LAST,
@@ -3583,6 +3664,8 @@ enum nl80211_wmm_rule { · 713 unmodified lines
3583	* @NL80211_FREQUENCY_ATTR_WMM: this channel has wmm limitations.	3664	* @NL80211_FREQUENCY_ATTR_WMM: this channel has wmm limitations.
3584	* This is a nested attribute that contains the wmm limitation per AC.	3665	* This is a nested attribute that contains the wmm limitation per AC.
3585	* (see &enum nl80211_wmm_rule)	3666	* (see &enum nl80211_wmm_rule)
		3667	* @NL80211_FREQUENCY_ATTR_NO_HE: HE operation is not allowed on this channel
		3668	* in current regulatory domain.
3586	* @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number	3669	* @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
3587	* currently defined	3670	* currently defined
3588	* @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use	3671	* @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
@@ -3612,6 +3695,7 @@ enum nl80211_frequency_attr { · 23 unmodified lines
3612	NL80211_FREQUENCY_ATTR_NO_20MHZ,	3695	NL80211_FREQUENCY_ATTR_NO_20MHZ,
3613	NL80211_FREQUENCY_ATTR_NO_10MHZ,	3696	NL80211_FREQUENCY_ATTR_NO_10MHZ,
3614	NL80211_FREQUENCY_ATTR_WMM,	3697	NL80211_FREQUENCY_ATTR_WMM,
		3698	NL80211_FREQUENCY_ATTR_NO_HE,
3615		3699
3616	/* keep last */	3700	/* keep last */
3617	__NL80211_FREQUENCY_ATTR_AFTER_LAST,	3701	__NL80211_FREQUENCY_ATTR_AFTER_LAST,
@@ -3809,6 +3893,7 @@ enum nl80211_sched_scan_match_attr { · 191 unmodified lines
3809	* @NL80211_RRF_NO_HT40PLUS: channels can't be used in HT40+ operation	3893	* @NL80211_RRF_NO_HT40PLUS: channels can't be used in HT40+ operation
3810	* @NL80211_RRF_NO_80MHZ: 80MHz operation not allowed	3894	* @NL80211_RRF_NO_80MHZ: 80MHz operation not allowed
3811	* @NL80211_RRF_NO_160MHZ: 160MHz operation not allowed	3895	* @NL80211_RRF_NO_160MHZ: 160MHz operation not allowed
		3896	* @NL80211_RRF_NO_HE: HE operation not allowed
3812	*/	3897	*/
3813	enum nl80211_reg_rule_flags {	3898	enum nl80211_reg_rule_flags {
3814	NL80211_RRF_NO_OFDM = 1<<0,	3899	NL80211_RRF_NO_OFDM = 1<<0,
@@ -3826,6 +3911,7 @@ enum nl80211_reg_rule_flags { · 11 unmodified lines
3826	NL80211_RRF_NO_HT40PLUS = 1<<14,	3911	NL80211_RRF_NO_HT40PLUS = 1<<14,
3827	NL80211_RRF_NO_80MHZ = 1<<15,	3912	NL80211_RRF_NO_80MHZ = 1<<15,
3828	NL80211_RRF_NO_160MHZ = 1<<16,	3913	NL80211_RRF_NO_160MHZ = 1<<16,
		3914	NL80211_RRF_NO_HE = 1<<17,
3829	};	3915	};
3830		3916
3831	#define NL80211_RRF_PASSIVE_SCAN NL80211_RRF_NO_IR	3917	#define NL80211_RRF_PASSIVE_SCAN NL80211_RRF_NO_IR
@@ -4532,6 +4618,7 @@ enum nl80211_key_default_types { · 700 unmodified lines
4532	* See &enum nl80211_key_default_types.	4618	* See &enum nl80211_key_default_types.
4533	* @NL80211_KEY_MODE: the mode from enum nl80211_key_mode.	4619	* @NL80211_KEY_MODE: the mode from enum nl80211_key_mode.
4534	* Defaults to @NL80211_KEY_RX_TX.	4620	* Defaults to @NL80211_KEY_RX_TX.
		4621	* @NL80211_KEY_DEFAULT_BEACON: flag indicating default Beacon frame key
4535	*	4622	*
4536	* @__NL80211_KEY_AFTER_LAST: internal	4623	* @__NL80211_KEY_AFTER_LAST: internal
4537	* @NL80211_KEY_MAX: highest key attribute	4624	* @NL80211_KEY_MAX: highest key attribute
@@ -4547,6 +4634,7 @@ enum nl80211_key_attributes { · 9 unmodified lines
4547	NL80211_KEY_TYPE,	4634	NL80211_KEY_TYPE,
4548	NL80211_KEY_DEFAULT_TYPES,	4635	NL80211_KEY_DEFAULT_TYPES,
4549	NL80211_KEY_MODE,	4636	NL80211_KEY_MODE,
		4637	NL80211_KEY_DEFAULT_BEACON,
4550		4638
4551	/* keep last */	4639	/* keep last */
4552	__NL80211_KEY_AFTER_LAST,	4640	__NL80211_KEY_AFTER_LAST,
@@ -4702,6 +4790,69 @@ enum nl80211_tx_power_setting { · 149 unmodified lines
4702	NL80211_TX_POWER_FIXED,	4790	NL80211_TX_POWER_FIXED,
4703	};	4791	};
4704		4792
		4793	/**
		4794	* enum nl80211_tid_config - TID config state
		4795	* @NL80211_TID_CONFIG_ENABLE: Enable config for the TID
		4796	* @NL80211_TID_CONFIG_DISABLE: Disable config for the TID
		4797	*/
		4798	enum nl80211_tid_config {
		4799	NL80211_TID_CONFIG_ENABLE,
		4800	NL80211_TID_CONFIG_DISABLE,
		4801	};
		4802
		4803	/* enum nl80211_tid_config_attr - TID specific configuration.
		4804	* @NL80211_TID_CONFIG_ATTR_PAD: pad attribute for 64-bit values
		4805	* @NL80211_TID_CONFIG_ATTR_VIF_SUPP: a bitmap (u64) of attributes supported
		4806	* for per-vif configuration; doesn't list the ones that are generic
		4807	* (%NL80211_TID_CONFIG_ATTR_TIDS, %NL80211_TID_CONFIG_ATTR_OVERRIDE).
		4808	* @NL80211_TID_CONFIG_ATTR_PEER_SUPP: same as the previous per-vif one, but
		4809	* per peer instead.
		4810	* @NL80211_TID_CONFIG_ATTR_OVERRIDE: flag attribue, if no peer
		4811	* is selected, if set indicates that the new configuration overrides
		4812	* all previous peer configurations, otherwise previous peer specific
		4813	* configurations should be left untouched. If peer is selected then
		4814	* it will reset particular TID configuration of that peer and it will
		4815	* not accept other TID config attributes along with peer.
		4816	* @NL80211_TID_CONFIG_ATTR_TIDS: a bitmask value of TIDs (bit 0 to 7)
		4817	* Its type is u16.
		4818	* @NL80211_TID_CONFIG_ATTR_NOACK: Configure ack policy for the TID.
		4819	* specified in %NL80211_TID_CONFIG_ATTR_TID. see %enum nl80211_tid_config.
		4820	* Its type is u8.
		4821	* @NL80211_TID_CONFIG_ATTR_RETRY_SHORT: Number of retries used with data frame
		4822	* transmission, user-space sets this configuration in
		4823	* &NL80211_CMD_SET_TID_CONFIG. It is u8 type, min value is 1 and
		4824	* the max value is advertised by the driver in this attribute on
		4825	* output in wiphy capabilities.
		4826	* @NL80211_TID_CONFIG_ATTR_RETRY_LONG: Number of retries used with data frame
		4827	* transmission, user-space sets this configuration in
		4828	* &NL80211_CMD_SET_TID_CONFIG. Its type is u8, min value is 1 and
		4829	* the max value is advertised by the driver in this attribute on
		4830	* output in wiphy capabilities.
		4831	* @NL80211_TID_CONFIG_ATTR_AMPDU_CTRL: Enable/Disable aggregation for the TIDs
		4832	* specified in %NL80211_TID_CONFIG_ATTR_TIDS. Its type is u8, using
		4833	* the values from &nl80211_tid_config.
		4834	* @NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL: Enable/Disable RTS_CTS for the TIDs
		4835	* specified in %NL80211_TID_CONFIG_ATTR_TIDS. It is u8 type, using
		4836	* the values from &nl80211_tid_config.
		4837	*/
		4838	enum nl80211_tid_config_attr {
		4839	__NL80211_TID_CONFIG_ATTR_INVALID,
		4840	NL80211_TID_CONFIG_ATTR_PAD,
		4841	NL80211_TID_CONFIG_ATTR_VIF_SUPP,
		4842	NL80211_TID_CONFIG_ATTR_PEER_SUPP,
		4843	NL80211_TID_CONFIG_ATTR_OVERRIDE,
		4844	NL80211_TID_CONFIG_ATTR_TIDS,
		4845	NL80211_TID_CONFIG_ATTR_NOACK,
		4846	NL80211_TID_CONFIG_ATTR_RETRY_SHORT,
		4847	NL80211_TID_CONFIG_ATTR_RETRY_LONG,
		4848	NL80211_TID_CONFIG_ATTR_AMPDU_CTRL,
		4849	NL80211_TID_CONFIG_ATTR_RTSCTS_CTRL,
		4850
		4851	/* keep last */
		4852	__NL80211_TID_CONFIG_ATTR_AFTER_LAST,
		4853	NL80211_TID_CONFIG_ATTR_MAX = __NL80211_TID_CONFIG_ATTR_AFTER_LAST - 1
		4854	};
		4855
4705	/**	4856	/**
4706	* enum nl80211_packet_pattern_attr - packet pattern attribute	4857	* enum nl80211_packet_pattern_attr - packet pattern attribute
4707	* @__NL80211_PKTPAT_INVALID: invalid number for nested attribute	4858	* @__NL80211_PKTPAT_INVALID: invalid number for nested attribute
@@ -5521,6 +5672,18 @@ enum nl80211_feature_flags { · 813 unmodified lines
5521	* feature, which prevents bufferbloat by using the expected transmission	5672	* feature, which prevents bufferbloat by using the expected transmission
5522	* time to limit the amount of data buffered in the hardware.	5673	* time to limit the amount of data buffered in the hardware.
5523	*	5674	*
		5675	* @NL80211_EXT_FEATURE_BEACON_PROTECTION: The driver supports Beacon protection
		5676	* and can receive key configuration for BIGTK using key indexes 6 and 7.
		5677	*
		5678	* @NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH: The driver can disable the
		5679	* forwarding of preauth frames over the control port. They are then
		5680	* handled as ordinary data frames.
		5681	*
		5682	* @NL80211_EXT_FEATURE_PROTECTED_TWT: Driver supports protected TWT frames
		5683	*
		5684	* @NL80211_EXT_FEATURE_DEL_IBSS_STA: The driver supports removing stations
		5685	* in IBSS mode, essentially by dropping their state.
		5686	*
5524	* @NUM_NL80211_EXT_FEATURES: number of extended features.	5687	* @NUM_NL80211_EXT_FEATURES: number of extended features.
5525	* @MAX_NL80211_EXT_FEATURES: highest extended feature index.	5688	* @MAX_NL80211_EXT_FEATURES: highest extended feature index.
5526	*/	5689	*/
@@ -5568,6 +5731,10 @@ enum nl80211_ext_feature_index { · 41 unmodified lines
5568	NL80211_EXT_FEATURE_SAE_OFFLOAD,	5731	NL80211_EXT_FEATURE_SAE_OFFLOAD,
5569	NL80211_EXT_FEATURE_VLAN_OFFLOAD,	5732	NL80211_EXT_FEATURE_VLAN_OFFLOAD,
5570	NL80211_EXT_FEATURE_AQL,	5733	NL80211_EXT_FEATURE_AQL,
		5734	NL80211_EXT_FEATURE_BEACON_PROTECTION,
		5735	NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH,
		5736	NL80211_EXT_FEATURE_PROTECTED_TWT,
		5737	NL80211_EXT_FEATURE_DEL_IBSS_STA,
5571		5738
5572	/* add new features before the definition below */	5739	/* add new features before the definition below */
5573	NUM_NL80211_EXT_FEATURES,	5740	NUM_NL80211_EXT_FEATURES,
@@ -6190,12 +6357,14 @@ enum nl80211_ftm_responder_stats { · 616 unmodified lines
6190	* @NL80211_PREAMBLE_HT: HT preamble	6357	* @NL80211_PREAMBLE_HT: HT preamble
6191	* @NL80211_PREAMBLE_VHT: VHT preamble	6358	* @NL80211_PREAMBLE_VHT: VHT preamble
6192	* @NL80211_PREAMBLE_DMG: DMG preamble	6359	* @NL80211_PREAMBLE_DMG: DMG preamble
		6360	* @NL80211_PREAMBLE_HE: HE preamble
6193	*/	6361	*/
6194	enum nl80211_preamble {	6362	enum nl80211_preamble {
6195	NL80211_PREAMBLE_LEGACY,	6363	NL80211_PREAMBLE_LEGACY,
6196	NL80211_PREAMBLE_HT,	6364	NL80211_PREAMBLE_HT,
6197	NL80211_PREAMBLE_VHT,	6365	NL80211_PREAMBLE_VHT,
6198	NL80211_PREAMBLE_DMG,	6366	NL80211_PREAMBLE_DMG,
		6367	NL80211_PREAMBLE_HE,
6199	};	6368	};
6200		6369
6201	/**	6370	/**
@@ -6388,6 +6557,10 @@ enum nl80211_peer_measurement_attrs { · 186 unmodified lines
6388	* is valid)	6557	* is valid)
6389	* @NL80211_PMSR_FTM_CAPA_ATTR_MAX_FTMS_PER_BURST: u32 attribute indicating	6558	* @NL80211_PMSR_FTM_CAPA_ATTR_MAX_FTMS_PER_BURST: u32 attribute indicating
6390	* the maximum FTMs per burst (if not present anything is valid)	6559	* the maximum FTMs per burst (if not present anything is valid)
		6560	* @NL80211_PMSR_FTM_CAPA_ATTR_TRIGGER_BASED: flag attribute indicating if
		6561	* trigger based ranging measurement is supported
		6562	* @NL80211_PMSR_FTM_CAPA_ATTR_NON_TRIGGER_BASED: flag attribute indicating
		6563	* if non trigger based ranging measurement is supported
6391	*	6564	*
6392	* @NUM_NL80211_PMSR_FTM_CAPA_ATTR: internal	6565	* @NUM_NL80211_PMSR_FTM_CAPA_ATTR: internal
6393	* @NL80211_PMSR_FTM_CAPA_ATTR_MAX: highest attribute number	6566	* @NL80211_PMSR_FTM_CAPA_ATTR_MAX: highest attribute number
@@ -6403,6 +6576,8 @@ enum nl80211_peer_measurement_ftm_capa { · 9 unmodified lines
6403	NL80211_PMSR_FTM_CAPA_ATTR_BANDWIDTHS,	6576	NL80211_PMSR_FTM_CAPA_ATTR_BANDWIDTHS,
6404	NL80211_PMSR_FTM_CAPA_ATTR_MAX_BURSTS_EXPONENT,	6577	NL80211_PMSR_FTM_CAPA_ATTR_MAX_BURSTS_EXPONENT,
6405	NL80211_PMSR_FTM_CAPA_ATTR_MAX_FTMS_PER_BURST,	6578	NL80211_PMSR_FTM_CAPA_ATTR_MAX_FTMS_PER_BURST,
		6579	NL80211_PMSR_FTM_CAPA_ATTR_TRIGGER_BASED,
		6580	NL80211_PMSR_FTM_CAPA_ATTR_NON_TRIGGER_BASED,
6406		6581
6407	/* keep last */	6582	/* keep last */
6408	NUM_NL80211_PMSR_FTM_CAPA_ATTR,	6583	NUM_NL80211_PMSR_FTM_CAPA_ATTR,
@@ -6432,6 +6607,20 @@ enum nl80211_peer_measurement_ftm_capa { · 23 unmodified lines
6432	* @NL80211_PMSR_FTM_REQ_ATTR_REQUEST_LCI: request LCI data (flag)	6607	* @NL80211_PMSR_FTM_REQ_ATTR_REQUEST_LCI: request LCI data (flag)
6433	* @NL80211_PMSR_FTM_REQ_ATTR_REQUEST_CIVICLOC: request civic location data	6608	* @NL80211_PMSR_FTM_REQ_ATTR_REQUEST_CIVICLOC: request civic location data
6434	* (flag)	6609	* (flag)
		6610	* @NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED: request trigger based ranging
		6611	* measurement (flag).
		6612	* This attribute and %NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED are
		6613	* mutually exclusive.
		6614	* if neither %NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED nor
		6615	* %NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED is set, EDCA based
		6616	* ranging will be used.
		6617	* @NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED: request non trigger based
		6618	* ranging measurement (flag)
		6619	* This attribute and %NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED are
		6620	* mutually exclusive.
		6621	* if neither %NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED nor
		6622	* %NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED is set, EDCA based
		6623	* ranging will be used.
6435	*	6624	*
6436	* @NUM_NL80211_PMSR_FTM_REQ_ATTR: internal	6625	* @NUM_NL80211_PMSR_FTM_REQ_ATTR: internal
6437	* @NL80211_PMSR_FTM_REQ_ATTR_MAX: highest attribute number	6626	* @NL80211_PMSR_FTM_REQ_ATTR_MAX: highest attribute number
@@ -6448,6 +6637,8 @@ enum nl80211_peer_measurement_ftm_req { · 10 unmodified lines
6448	NL80211_PMSR_FTM_REQ_ATTR_NUM_FTMR_RETRIES,	6637	NL80211_PMSR_FTM_REQ_ATTR_NUM_FTMR_RETRIES,
6449	NL80211_PMSR_FTM_REQ_ATTR_REQUEST_LCI,	6638	NL80211_PMSR_FTM_REQ_ATTR_REQUEST_LCI,
6450	NL80211_PMSR_FTM_REQ_ATTR_REQUEST_CIVICLOC,	6639	NL80211_PMSR_FTM_REQ_ATTR_REQUEST_CIVICLOC,
		6640	NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED,
		6641	NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED,
6451		6642
6452	/* keep last */	6643	/* keep last */
6453	NUM_NL80211_PMSR_FTM_REQ_ATTR,	6644	NUM_NL80211_PMSR_FTM_REQ_ATTR,
@@ -6587,5 +6778,51 @@ enum nl80211_obss_pd_attributes { · 133 unmodified lines
6587	NL80211_HE_OBSS_PD_ATTR_MAX = __NL80211_HE_OBSS_PD_ATTR_LAST - 1,	6778	NL80211_HE_OBSS_PD_ATTR_MAX = __NL80211_HE_OBSS_PD_ATTR_LAST - 1,
6588	};	6779	};
6589		6780
		6781	/**
		6782	* enum nl80211_bss_color_attributes - BSS Color attributes
		6783	* @__NL80211_HE_BSS_COLOR_ATTR_INVALID: Invalid
		6784	*
		6785	* @NL80211_HE_BSS_COLOR_ATTR_COLOR: the current BSS Color.
		6786	* @NL80211_HE_BSS_COLOR_ATTR_DISABLED: is BSS coloring disabled.
		6787	* @NL80211_HE_BSS_COLOR_ATTR_PARTIAL: the AID equation to be used..
		6788	*
		6789	* @__NL80211_HE_BSS_COLOR_ATTR_LAST: Internal
		6790	* @NL80211_HE_BSS_COLOR_ATTR_MAX: highest BSS Color attribute.
		6791	*/
		6792	enum nl80211_bss_color_attributes {
		6793	__NL80211_HE_BSS_COLOR_ATTR_INVALID,
		6794
		6795	NL80211_HE_BSS_COLOR_ATTR_COLOR,
		6796	NL80211_HE_BSS_COLOR_ATTR_DISABLED,
		6797	NL80211_HE_BSS_COLOR_ATTR_PARTIAL,
		6798
		6799	/* keep last */
		6800	__NL80211_HE_BSS_COLOR_ATTR_LAST,
		6801	NL80211_HE_BSS_COLOR_ATTR_MAX = __NL80211_HE_BSS_COLOR_ATTR_LAST - 1,
		6802	};
		6803
		6804	/**
		6805	* enum nl80211_iftype_akm_attributes - interface type AKM attributes
		6806	* @__NL80211_IFTYPE_AKM_ATTR_INVALID: Invalid
		6807	*
		6808	* @NL80211_IFTYPE_AKM_ATTR_IFTYPES: nested attribute containing a flag
		6809	* attribute for each interface type that supports AKM suites specified in
		6810	* %NL80211_IFTYPE_AKM_ATTR_SUITES
		6811	* @NL80211_IFTYPE_AKM_ATTR_SUITES: an array of u32. Used to indicate supported
		6812	* AKM suites for the specified interface types.
		6813	*
		6814	* @__NL80211_IFTYPE_AKM_ATTR_LAST: Internal
		6815	* @NL80211_IFTYPE_AKM_ATTR_MAX: highest interface type AKM attribute.
		6816	*/
		6817	enum nl80211_iftype_akm_attributes {
		6818	__NL80211_IFTYPE_AKM_ATTR_INVALID,
		6819
		6820	NL80211_IFTYPE_AKM_ATTR_IFTYPES,
		6821	NL80211_IFTYPE_AKM_ATTR_SUITES,
		6822
		6823	/* keep last */
		6824	__NL80211_IFTYPE_AKM_ATTR_LAST,
		6825	NL80211_IFTYPE_AKM_ATTR_MAX = __NL80211_IFTYPE_AKM_ATTR_LAST - 1,
		6826	};
6590		6827
6591	#endif /* __LINUX_NL80211_H */	6828	#endif /* __LINUX_NL80211_H */

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

 	OVS_ACTION_ATTR_CLONE,        /* Nested OVS_CLONE_ATTR_*.  */
 	OVS_ACTION_ATTR_CHECK_PKT_LEN, /* Nested OVS_CHECK_PKT_LEN_ATTR_*. */
 	OVS_ACTION_ATTR_ADD_MPLS,     /* struct ovs_action_add_mpls. */
+	OVS_ACTION_ATTR_DEC_TTL,      /* Nested OVS_DEC_TTL_ATTR_*. */
 	__OVS_ACTION_ATTR_MAX,	      /* Nothing past this will be accepted
 				       * from userspace. */
 	__u32 count;
 };
+enum ovs_dec_ttl_attr {
+	OVS_DEC_TTL_ATTR_UNSPEC,
+	OVS_DEC_TTL_ATTR_ACTION,	/* Nested struct nlattr */
+	__OVS_DEC_TTL_ATTR_MAX
+};
 #endif /* _LINUX_OPENVSWITCH_H */

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

 #define  PCI_EXP_SLTCTL_PWR_OFF        0x0400 /* Power Off */
 #define  PCI_EXP_SLTCTL_EIC	0x0800	/* Electromechanical Interlock Control */
 #define  PCI_EXP_SLTCTL_DLLSCE	0x1000	/* Data Link Layer State Changed Enable */
+#define  PCI_EXP_SLTCTL_IBPD_DISABLE	0x4000 /* In-band PD disable */
 #define PCI_EXP_SLTSTA		26	/* Slot Status */
 #define  PCI_EXP_SLTSTA_ABP	0x0001	/* Attention Button Pressed */
 #define  PCI_EXP_SLTSTA_PFD	0x0002	/* Power Fault Detected */
 #define PCI_EXP_LNKSTA2		50	/* Link Status 2 */
 #define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2	52	/* v2 endpoints with link end here */
 #define PCI_EXP_SLTCAP2		52	/* Slot Capabilities 2 */
+#define  PCI_EXP_SLTCAP2_IBPD	0x00000001 /* In-band PD Disable Supported */
 #define PCI_EXP_SLTCTL2		56	/* Slot Control 2 */
 #define PCI_EXP_SLTSTA2		58	/* Slot Status 2 */

include/uapi/linux/pcitest.h+8−0

@@ -19,5 +19,13 @@ · 18 unmodified lines
19	#define PCITEST_MSIX _IOW('P', 0x7, int)	19	#define PCITEST_MSIX _IOW('P', 0x7, int)
20	#define PCITEST_SET_IRQTYPE _IOW('P', 0x8, int)	20	#define PCITEST_SET_IRQTYPE _IOW('P', 0x8, int)
21	#define PCITEST_GET_IRQTYPE _IO('P', 0x9)	21	#define PCITEST_GET_IRQTYPE _IO('P', 0x9)
		22	#define PCITEST_CLEAR_IRQ _IO('P', 0x10)
		23
		24	#define PCITEST_FLAGS_USE_DMA 0x00000001
		25
		26	struct pci_endpoint_test_xfer_param {
		27	unsigned long size;
		28	unsigned char flags;
		29	};
22		30
23	#endif /* __UAPI_LINUX_PCITEST_H */	31	#endif /* __UAPI_LINUX_PCITEST_H */

include/uapi/linux/perf_event.h+21−3

 	PERF_SAMPLE_REGS_INTR			= 1U << 18,
 	PERF_SAMPLE_PHYS_ADDR			= 1U << 19,
 	PERF_SAMPLE_AUX				= 1U << 20,
+	PERF_SAMPLE_CGROUP			= 1U << 21,
-	PERF_SAMPLE_MAX = 1U << 21,		/* non-ABI */
+	PERF_SAMPLE_MAX = 1U << 22,		/* non-ABI */
 	__PERF_SAMPLE_CALLCHAIN_EARLY		= 1ULL << 63, /* non-ABI; internal use */
 };
 	PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT	= 16, /* save branch type */
+	PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT	= 17, /* save low level index of raw branch records */
 	PERF_SAMPLE_BRANCH_MAX_SHIFT		/* non-ABI */
 };
 	PERF_SAMPLE_BRANCH_TYPE_SAVE	=
 		1U << PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT,
+	PERF_SAMPLE_BRANCH_HW_INDEX	= 1U << PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT,
 	PERF_SAMPLE_BRANCH_MAX		= 1U << PERF_SAMPLE_BRANCH_MAX_SHIFT,
 };
 				ksymbol        :  1, /* include ksymbol events */
 				bpf_event      :  1, /* include bpf events */
 				aux_output     :  1, /* generate AUX records instead of events */
-				__reserved_1   : 32;
+				cgroup         :  1, /* include cgroup events */
+				__reserved_1   : 31;
 	union {
 		__u32		wakeup_events;	  /* wakeup every n events */
 	 *	  char                  data[size];}&& PERF_SAMPLE_RAW
 	 *
 	 *	{ u64                   nr;
-	 *        { u64 from, to, flags } lbr[nr];} && PERF_SAMPLE_BRANCH_STACK
+	 *	  { u64	hw_idx; } && PERF_SAMPLE_BRANCH_HW_INDEX
+	 *        { u64 from, to, flags } lbr[nr];
+	 *      } && PERF_SAMPLE_BRANCH_STACK
 	 *
 	 * 	{ u64			abi; # enum perf_sample_regs_abi
 	 * 	  u64			regs[weight(mask)]; } && PERF_SAMPLE_REGS_USER
 	 */
 	PERF_RECORD_BPF_EVENT			= 18,
+	/*
+	 * struct {
+	 *	struct perf_event_header	header;
+	 *	u64				id;
+	 *	char				path[];
+	 *	struct sample_id		sample_id;
+	 * };
+	 */
+	PERF_RECORD_CGROUP			= 19,
 	PERF_RECORD_MAX,			/* non-ABI */
 };

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

@@ -17,6 +17,8 @@ enum { · 16 unmodified lines
17	TCA_ACT_PAD,	17	TCA_ACT_PAD,
18	TCA_ACT_COOKIE,	18	TCA_ACT_COOKIE,
19	TCA_ACT_FLAGS,	19	TCA_ACT_FLAGS,
		20	TCA_ACT_HW_STATS,
		21	TCA_ACT_USED_HW_STATS,
20	__TCA_ACT_MAX	22	__TCA_ACT_MAX
21	};	23	};
22		24
@@ -24,6 +26,26 @@ enum { · 1 unmodified line
24	* actions stats.	26	* actions stats.
25	*/	27	*/
26		28
		29	/* tca HW stats type
		30	* When user does not pass the attribute, he does not care.
		31	* It is the same as if he would pass the attribute with
		32	* all supported bits set.
		33	* In case no bits are set, user is not interested in getting any HW statistics.
		34	*/
		35	#define TCA_ACT_HW_STATS_IMMEDIATE (1 << 0) /* Means that in dump, user
		36	* gets the current HW stats
		37	* state from the device
		38	* queried at the dump time.
		39	*/
		40	#define TCA_ACT_HW_STATS_DELAYED (1 << 1) /* Means that in dump, user gets
		41	* HW stats that might be out of date
		42	* for some time, maybe couple of
		43	* seconds. This is the case when
		44	* driver polls stats updates
		45	* periodically or when it gets async
		46	* stats update from the device.
		47	*/
		48
27	#define TCA_ACT_MAX __TCA_ACT_MAX	49	#define TCA_ACT_MAX __TCA_ACT_MAX
28	#define TCA_OLD_COMPAT (TCA_ACT_MAX+1)	50	#define TCA_OLD_COMPAT (TCA_ACT_MAX+1)
29	#define TCA_ACT_MAX_PRIO 32	51	#define TCA_ACT_MAX_PRIO 32

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

 	TCA_RED_PARMS,
 	TCA_RED_STAB,
 	TCA_RED_MAX_P,
+	TCA_RED_FLAGS,		/* bitfield32 */
 	__TCA_RED_MAX,
 };
 	unsigned char   Wlog;		/* log(W)		*/
 	unsigned char   Plog;		/* log(P_max/(qth_max-qth_min))	*/
 	unsigned char   Scell_log;	/* cell size for idle damping */
+	/* This field can be used for flags that a RED-like qdisc has
+	 * historically supported. E.g. when configuring RED, it can be used for
+	 * ECN, HARDDROP and ADAPTATIVE. For SFQ it can be used for ECN,
+	 * HARDDROP. Etc. Because this field has not been validated, and is
+	 * copied back on dump, any bits besides those to which a given qdisc
+	 * has assigned a historical meaning need to be considered for free use
+	 * by userspace tools.
+	 *
+	 * Any further flags need to be passed differently, e.g. through an
+	 * attribute (such as TCA_RED_FLAGS above). Such attribute should allow
+	 * passing both recent and historic flags in one value.
+	 */
 	unsigned char	flags;
 #define TC_RED_ECN		1
 #define TC_RED_HARDDROP		2
 #define TC_RED_ADAPTATIVE	4
+#define TC_RED_NODROP		8
 };
+#define TC_RED_HISTORIC_FLAGS (TC_RED_ECN | TC_RED_HARDDROP | TC_RED_ADAPTATIVE)
 struct tc_red_xstats {
 	__u32           early;          /* Early drops */
 	__u32           pdrop;          /* Drops due to queue limits */
 	TCA_FQ_CE_THRESHOLD,	/* DCTCP-like CE-marking threshold */
+	TCA_FQ_TIMER_SLACK,	/* timer slack */
 	__TCA_FQ_MAX
 };
  *       [TCA_TAPRIO_ATTR_SCHED_ENTRY_INTERVAL]
  */
-#define TCA_TAPRIO_ATTR_FLAG_TXTIME_ASSIST	BIT(0)
+#define TCA_TAPRIO_ATTR_FLAG_TXTIME_ASSIST	_BITUL(0)
-#define TCA_TAPRIO_ATTR_FLAG_FULL_OFFLOAD	BIT(1)
+#define TCA_TAPRIO_ATTR_FLAG_FULL_OFFLOAD	_BITUL(1)
 enum {
 	TCA_TAPRIO_ATTR_UNSPEC,

include/uapi/linux/rpl.h+48−0

@@ -0,0 +1,48 @@
	1	/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
	2	/*
	3	* IPv6 RPL-SR implementation
	4	*
	5	* Author:
	6	* (C) 2020 Alexander Aring <alex.aring@gmail.com>
	7	*/
	8
	9	#ifndef _UAPI_LINUX_RPL_H
	10	#define _UAPI_LINUX_RPL_H
	11
	12	#include <asm/byteorder.h>
	13	#include <linux/types.h>
	14	#include <linux/in6.h>
	15
	16	/*
	17	* RPL SR Header
	18	*/
	19	struct ipv6_rpl_sr_hdr {
	20	__u8 nexthdr;
	21	__u8 hdrlen;
	22	__u8 type;
	23	__u8 segments_left;
	24	#if defined(__LITTLE_ENDIAN_BITFIELD)
	25	__u32 cmpre:4,
	26	cmpri:4,
	27	reserved:4,
	28	pad:4,
	29	reserved1:16;
	30	#elif defined(__BIG_ENDIAN_BITFIELD)
	31	__u32 reserved:20,
	32	pad:4,
	33	cmpri:4,
	34	cmpre:4;
	35	#else
	36	#error "Please fix <asm/byteorder.h>"
	37	#endif
	38
	39	union {
	40	struct in6_addr addr[0];
	41	__u8 data[0];
	42	} segments;
	43	} __attribute__((packed));
	44
	45	#define rpl_segaddr segments.addr
	46	#define rpl_segdata segments.data
	47
	48	#endif

include/uapi/linux/rpl_iptunnel.h+21−0

@@ -0,0 +1,21 @@
	1	/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
	2	/*
	3	* IPv6 RPL-SR implementation
	4	*
	5	* Author:
	6	* (C) 2020 Alexander Aring <alex.aring@gmail.com>
	7	*/
	8
	9	#ifndef _UAPI_LINUX_RPL_IPTUNNEL_H
	10	#define _UAPI_LINUX_RPL_IPTUNNEL_H
	11
	12	enum {
	13	RPL_IPTUNNEL_UNSPEC,
	14	RPL_IPTUNNEL_SRH,
	15	__RPL_IPTUNNEL_MAX,
	16	};
	17	#define RPL_IPTUNNEL_MAX (__RPL_IPTUNNEL_MAX - 1)
	18
	19	#define RPL_IPTUNNEL_SRH_SIZE(srh) (((srh)->hdrlen + 1) << 3)
	20
	21	#endif

include/uapi/linux/rtc.h+7−4

 #ifndef _UAPI_LINUX_RTC_H_
 #define _UAPI_LINUX_RTC_H_
+#include <linux/const.h>
+#include <linux/ioctl.h>
 /*
  * The struct used to pass data via the following ioctl. Similar to the
  * struct tm in <time.h>, but it needs to be here so that the kernel
 #define RTC_PLL_GET	_IOR('p', 0x11, struct rtc_pll_info)  /* Get PLL correction */
 #define RTC_PLL_SET	_IOW('p', 0x12, struct rtc_pll_info)  /* Set PLL correction */
-#define RTC_VL_DATA_INVALID	BIT(0) /* Voltage too low, RTC data is invalid */
+#define RTC_VL_DATA_INVALID	_BITUL(0) /* Voltage too low, RTC data is invalid */
-#define RTC_VL_BACKUP_LOW	BIT(1) /* Backup voltage is low */
+#define RTC_VL_BACKUP_LOW	_BITUL(1) /* Backup voltage is low */
-#define RTC_VL_BACKUP_EMPTY	BIT(2) /* Backup empty or not present */
+#define RTC_VL_BACKUP_EMPTY	_BITUL(2) /* Backup empty or not present */
-#define RTC_VL_ACCURACY_LOW	BIT(3) /* Voltage is low, RTC accuracy is reduced */
+#define RTC_VL_ACCURACY_LOW	_BITUL(3) /* Voltage is low, RTC accuracy is reduced */
 #define RTC_VL_READ	_IOR('p', 0x13, unsigned int)	/* Voltage low detection */
 #define RTC_VL_CLR	_IO('p', 0x14)		/* Clear voltage low information */

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

 /* Flags for the clone3() syscall. */
 #define CLONE_CLEAR_SIGHAND 0x100000000ULL /* Clear any signal handler and reset to SIG_DFL. */
+#define CLONE_INTO_CGROUP 0x200000000ULL /* Clone into a specific cgroup given the right permissions. */
 /*
  * cloning flags intersect with CSIGNAL so can be used with unshare and clone3
  * @set_tid_size: This defines the size of the array referenced
  *                in @set_tid. This cannot be larger than the
  *                kernel's limit of nested PID namespaces.
+ * @cgroup:       If CLONE_INTO_CGROUP is specified set this to
+ *                a file descriptor for the cgroup.
  *
  * The structure is versioned by size and thus extensible.
  * New struct members must go at the end of the struct and
 	__aligned_u64 tls;
 	__aligned_u64 set_tid;
 	__aligned_u64 set_tid_size;
+	__aligned_u64 cgroup;
 };
 #endif
 #define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */
 #define CLONE_ARGS_SIZE_VER1 80 /* sizeof second published struct */
+#define CLONE_ARGS_SIZE_VER2 88 /* sizeof third published struct */
 /*
  * Scheduling policies

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

@@ -22,6 +22,7 @@ · 21 unmodified lines
22	#define SECCOMP_FILTER_FLAG_LOG (1UL << 1)	22	#define SECCOMP_FILTER_FLAG_LOG (1UL << 1)
23	#define SECCOMP_FILTER_FLAG_SPEC_ALLOW (1UL << 2)	23	#define SECCOMP_FILTER_FLAG_SPEC_ALLOW (1UL << 2)
24	#define SECCOMP_FILTER_FLAG_NEW_LISTENER (1UL << 3)	24	#define SECCOMP_FILTER_FLAG_NEW_LISTENER (1UL << 3)
		25	#define SECCOMP_FILTER_FLAG_TSYNC_ESRCH (1UL << 4)
25		26
26	/*	27	/*
27	* All BPF programs must return a 32-bit value.	28	* All BPF programs must return a 32-bit value.

include/uapi/linux/serio.h+5−5

@@ -9,7 +9,7 @@ · 8 unmodified lines
9	#ifndef _UAPI_SERIO_H	9	#ifndef _UAPI_SERIO_H
10	#define _UAPI_SERIO_H	10	#define _UAPI_SERIO_H
11		11
12		12	#include <linux/const.h>
13	#include <linux/ioctl.h>	13	#include <linux/ioctl.h>
14		14
15	#define SPIOCSTYPE _IOW('q', 0x01, unsigned long)	15	#define SPIOCSTYPE _IOW('q', 0x01, unsigned long)
@@ -18,10 +18,10 @@ · 2 unmodified lines
18	/*	18	/*
19	* bit masks for use in "interrupt" flags (3rd argument)	19	* bit masks for use in "interrupt" flags (3rd argument)
20	*/	20	*/
21	#define SERIO_TIMEOUT BIT(0)	21	#define SERIO_TIMEOUT _BITUL(0)
22	#define SERIO_PARITY BIT(1)	22	#define SERIO_PARITY _BITUL(1)
23	#define SERIO_FRAME BIT(2)	23	#define SERIO_FRAME _BITUL(2)
24	#define SERIO_OOB_DATA BIT(3)	24	#define SERIO_OOB_DATA _BITUL(3)
25		25
26	/*	26	/*
27	* Serio types	27	* Serio types

include/uapi/linux/sock_diag.h+26−0

@@ -36,4 +36,30 @@ enum sknetlink_groups { · 35 unmodified lines
36	};	36	};
37	#define SKNLGRP_MAX (__SKNLGRP_MAX - 1)	37	#define SKNLGRP_MAX (__SKNLGRP_MAX - 1)
38		38
		39	enum {
		40	SK_DIAG_BPF_STORAGE_REQ_NONE,
		41	SK_DIAG_BPF_STORAGE_REQ_MAP_FD,
		42	__SK_DIAG_BPF_STORAGE_REQ_MAX,
		43	};
		44
		45	#define SK_DIAG_BPF_STORAGE_REQ_MAX (__SK_DIAG_BPF_STORAGE_REQ_MAX - 1)
		46
		47	enum {
		48	SK_DIAG_BPF_STORAGE_REP_NONE,
		49	SK_DIAG_BPF_STORAGE,
		50	__SK_DIAG_BPF_STORAGE_REP_MAX,
		51	};
		52
		53	#define SK_DIAB_BPF_STORAGE_REP_MAX (__SK_DIAG_BPF_STORAGE_REP_MAX - 1)
		54
		55	enum {
		56	SK_DIAG_BPF_STORAGE_NONE,
		57	SK_DIAG_BPF_STORAGE_PAD,
		58	SK_DIAG_BPF_STORAGE_MAP_ID,
		59	SK_DIAG_BPF_STORAGE_MAP_VALUE,
		60	__SK_DIAG_BPF_STORAGE_MAX,
		61	};
		62
		63	#define SK_DIAG_BPF_STORAGE_MAX (__SK_DIAG_BPF_STORAGE_MAX - 1)
		64
39	#endif /* _UAPI__SOCK_DIAG_H__ */	65	#endif /* _UAPI__SOCK_DIAG_H__ */

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

@@ -135,9 +135,9 @@ static inline __attribute_const__ __u32 __fswahb32(__u32 val) · 134 unmodified lines
135		135
136	static __always_inline unsigned long __swab(const unsigned long y)	136	static __always_inline unsigned long __swab(const unsigned long y)
137	{	137	{
138	#if BITS_PER_LONG == 64	138	#if __BITS_PER_LONG == 64
139	return __swab64(y);	139	return __swab64(y);
140	#else /* BITS_PER_LONG == 32 */	140	#else /* __BITS_PER_LONG == 32 */
141	return __swab32(y);	141	return __swab32(y);
142	#endif	142	#endif
143	}	143	}

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

 	TCP_NLA_REORD_SEEN,	/* reordering events seen */
 	TCP_NLA_SRTT,		/* smoothed RTT in usecs */
 	TCP_NLA_TIMEOUT_REHASH, /* Timeout-triggered rehash attempts */
+	TCP_NLA_BYTES_NOTSENT,	/* Bytes in write queue not yet sent */
 };
 /* for TCP_MD5SIG socket option */
 	__u64 address;		/* in: address of mapping */
 	__u32 length;		/* in/out: number of bytes to map/mapped */
 	__u32 recv_skip_hint;	/* out: amount of bytes to skip */
+	__u32 inq; /* out: amount of bytes in read queue */
+	__s32 err; /* out: socket error */
 };
 #endif /* _UAPI_LINUX_TCP_H */

include/uapi/linux/time.h+12−10

 #include <linux/types.h>
 #include <linux/time_types.h>
+#ifndef __KERNEL__
 #ifndef _STRUCT_TIMESPEC
 #define _STRUCT_TIMESPEC
 struct timespec {
 	__kernel_suseconds_t	tv_usec;	/* microseconds */
 };
+struct itimerspec {
+	struct timespec it_interval;/* timer period */
+	struct timespec it_value;	/* timer expiration */
+};
+struct itimerval {
+	struct timeval it_interval;/* timer interval */
+	struct timeval it_value;	/* current value */
+};
+#endif
 struct timezone {
 	int	tz_minuteswest;	/* minutes west of Greenwich */
 	int	tz_dsttime;	/* type of dst correction */
 #define	ITIMER_VIRTUAL		1
 #define	ITIMER_PROF		2
-struct itimerspec {
-	struct timespec it_interval;	/* timer period */
-	struct timespec it_value;	/* timer expiration */
-};
-struct itimerval {
-	struct timeval it_interval;	/* timer interval */
-	struct timeval it_value;	/* current value */
-};
 /*
  * The IDs of the various system clocks (for POSIX.1b interval timers):
  */

include/uapi/linux/um_timetravel.h+128−0

@@ -0,0 +1,128 @@
	1	/*
	2	* Permission to use, copy, modify, and/or distribute this software for any
	3	* purpose with or without fee is hereby granted, provided that the above
	4	* copyright notice and this permission notice appear in all copies.
	5	*
	6	* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
	7	* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
	8	* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
	9	* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
	10	* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
	11	* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
	12	* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
	13	*
	14	* Copyright (C) 2019 Intel Corporation
	15	*/
	16	#ifndef _UAPI_LINUX_UM_TIMETRAVEL_H
	17	#define _UAPI_LINUX_UM_TIMETRAVEL_H
	18	#include <linux/types.h>
	19
	20	/**
	21	* struct um_timetravel_msg - UM time travel message
	22	*
	23	* This is the basic message type, going in both directions.
	24	*
	25	* This is the message passed between the host (user-mode Linux instance)
	26	* and the calendar (the application on the other side of the socket) in
	27	* order to implement common scheduling.
	28	*
	29	* Whenever UML has an event it will request runtime for it from the
	30	* calendar, and then wait for its turn until it can run, etc. Note
	31	* that it will only ever request the single next runtime, i.e. multiple
	32	* REQUEST messages override each other.
	33	*/
	34	struct um_timetravel_msg {
	35	/**
	36	* @op: operation value from &enum um_timetravel_ops
	37	*/
	38	__u32 op;
	39
	40	/**
	41	* @seq: sequence number for the message - shall be reflected in
	42	* the ACK response, and should be checked while processing
	43	* the response to see if it matches
	44	*/
	45	__u32 seq;
	46
	47	/**
	48	* @time: time in nanoseconds
	49	*/
	50	__u64 time;
	51	};
	52
	53	/**
	54	* enum um_timetravel_ops - Operation codes
	55	*/
	56	enum um_timetravel_ops {
	57	/**
	58	* @UM_TIMETRAVEL_ACK: response (ACK) to any previous message,
	59	* this usually doesn't carry any data in the 'time' field
	60	* unless otherwise specified below
	61	*/
	62	UM_TIMETRAVEL_ACK = 0,
	63
	64	/**
	65	* @UM_TIMETRAVEL_START: initialize the connection, the time
	66	* field contains an (arbitrary) ID to possibly be able
	67	* to distinguish the connections.
	68	*/
	69	UM_TIMETRAVEL_START = 1,
	70
	71	/**
	72	* @UM_TIMETRAVEL_REQUEST: request to run at the given time
	73	* (host -> calendar)
	74	*/
	75	UM_TIMETRAVEL_REQUEST = 2,
	76
	77	/**
	78	* @UM_TIMETRAVEL_WAIT: Indicate waiting for the previously requested
	79	* runtime, new requests may be made while waiting (e.g. due to
	80	* interrupts); the time field is ignored. The calendar must process
	81	* this message and later send a %UM_TIMETRAVEL_RUN message when
	82	* the host can run again.
	83	* (host -> calendar)
	84	*/
	85	UM_TIMETRAVEL_WAIT = 3,
	86
	87	/**
	88	* @UM_TIMETRAVEL_GET: return the current time from the calendar in the
	89	* ACK message, the time in the request message is ignored
	90	* (host -> calendar)
	91	*/
	92	UM_TIMETRAVEL_GET = 4,
	93
	94	/**
	95	* @UM_TIMETRAVEL_UPDATE: time update to the calendar, must be sent e.g.
	96	* before kicking an interrupt to another calendar
	97	* (host -> calendar)
	98	*/
	99	UM_TIMETRAVEL_UPDATE = 5,
	100
	101	/**
	102	* @UM_TIMETRAVEL_RUN: run time request granted, current time is in
	103	* the time field
	104	* (calendar -> host)
	105	*/
	106	UM_TIMETRAVEL_RUN = 6,
	107
	108	/**
	109	* @UM_TIMETRAVEL_FREE_UNTIL: Enable free-running until the given time,
	110	* this is a message from the calendar telling the host that it can
	111	* freely do its own scheduling for anything before the indicated
	112	* time.
	113	* Note that if a calendar sends this message once, the host may
	114	* assume that it will also do so in the future, if it implements
	115	* wraparound semantics for the time field.
	116	* (calendar -> host)
	117	*/
	118	UM_TIMETRAVEL_FREE_UNTIL = 7,
	119
	120	/**
	121	* @UM_TIMETRAVEL_GET_TOD: Return time of day, typically used once at
	122	* boot by the virtual machines to get a synchronized time from
	123	* the simulation.
	124	*/
	125	UM_TIMETRAVEL_GET_TOD = 8,
	126	};
	127
	128	#endif /* _UAPI_LINUX_UM_TIMETRAVEL_H */

include/uapi/linux/usb/charger.h+8−8

@@ -14,18 +14,18 @@ · 13 unmodified lines
14	* ACA (Accessory Charger Adapters)	14	* ACA (Accessory Charger Adapters)
15	*/	15	*/
16	enum usb_charger_type {	16	enum usb_charger_type {
17	UNKNOWN_TYPE,	17	UNKNOWN_TYPE = 0,
18	SDP_TYPE,	18	SDP_TYPE = 1,
19	DCP_TYPE,	19	DCP_TYPE = 2,
20	CDP_TYPE,	20	CDP_TYPE = 3,
21	ACA_TYPE,	21	ACA_TYPE = 4,
22	};	22	};
23		23
24	/* USB charger state */	24	/* USB charger state */
25	enum usb_charger_state {	25	enum usb_charger_state {
26	USB_CHARGER_DEFAULT,	26	USB_CHARGER_DEFAULT = 0,
27	USB_CHARGER_PRESENT,	27	USB_CHARGER_PRESENT = 1,
28	USB_CHARGER_ABSENT,	28	USB_CHARGER_ABSENT = 2,
29	};	29	};
30		30
31	#endif /* _UAPI__LINUX_USB_CHARGER_H */	31	#endif /* _UAPI__LINUX_USB_CHARGER_H */

include/uapi/linux/usb/raw_gadget.h+167−0

@@ -0,0 +1,167 @@
	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
	2	/*
	3	* USB Raw Gadget driver.
	4	*
	5	* See Documentation/usb/raw-gadget.rst for more details.
	6	*/
	7
	8	#ifndef _UAPI__LINUX_USB_RAW_GADGET_H
	9	#define _UAPI__LINUX_USB_RAW_GADGET_H
	10
	11	#include <asm/ioctl.h>
	12	#include <linux/types.h>
	13	#include <linux/usb/ch9.h>
	14
	15	/* Maximum length of driver_name/device_name in the usb_raw_init struct. */
	16	#define UDC_NAME_LENGTH_MAX 128
	17
	18	/*
	19	* struct usb_raw_init - argument for USB_RAW_IOCTL_INIT ioctl.
	20	* @speed: The speed of the emulated USB device, takes the same values as
	21	* the usb_device_speed enum: USB_SPEED_FULL, USB_SPEED_HIGH, etc.
	22	* @driver_name: The name of the UDC driver.
	23	* @device_name: The name of a UDC instance.
	24	*
	25	* The last two fields identify a UDC the gadget driver should bind to.
	26	* For example, Dummy UDC has "dummy_udc" as its driver_name and "dummy_udc.N"
	27	* as its device_name, where N in the index of the Dummy UDC instance.
	28	* At the same time the dwc2 driver that is used on Raspberry Pi Zero, has
	29	* "20980000.usb" as both driver_name and device_name.
	30	*/
	31	struct usb_raw_init {
	32	__u8 driver_name[UDC_NAME_LENGTH_MAX];
	33	__u8 device_name[UDC_NAME_LENGTH_MAX];
	34	__u8 speed;
	35	};
	36
	37	/* The type of event fetched with the USB_RAW_IOCTL_EVENT_FETCH ioctl. */
	38	enum usb_raw_event_type {
	39	USB_RAW_EVENT_INVALID = 0,
	40
	41	/* This event is queued when the driver has bound to a UDC. */
	42	USB_RAW_EVENT_CONNECT = 1,
	43
	44	/* This event is queued when a new control request arrived to ep0. */
	45	USB_RAW_EVENT_CONTROL = 2,
	46
	47	/* The list might grow in the future. */
	48	};
	49
	50	/*
	51	* struct usb_raw_event - argument for USB_RAW_IOCTL_EVENT_FETCH ioctl.
	52	* @type: The type of the fetched event.
	53	* @length: Length of the data buffer. Updated by the driver and set to the
	54	* actual length of the fetched event data.
	55	* @data: A buffer to store the fetched event data.
	56	*
	57	* Currently the fetched data buffer is empty for USB_RAW_EVENT_CONNECT,
	58	* and contains struct usb_ctrlrequest for USB_RAW_EVENT_CONTROL.
	59	*/
	60	struct usb_raw_event {
	61	__u32 type;
	62	__u32 length;
	63	__u8 data[0];
	64	};
	65
	66	#define USB_RAW_IO_FLAGS_ZERO 0x0001
	67	#define USB_RAW_IO_FLAGS_MASK 0x0001
	68
	69	static inline int usb_raw_io_flags_valid(__u16 flags)
	70	{
	71	return (flags & ~USB_RAW_IO_FLAGS_MASK) == 0;
	72	}
	73
	74	static inline int usb_raw_io_flags_zero(__u16 flags)
	75	{
	76	return (flags & USB_RAW_IO_FLAGS_ZERO);
	77	}
	78
	79	/*
	80	* struct usb_raw_ep_io - argument for USB_RAW_IOCTL_EP0/EP_WRITE/READ ioctls.
	81	* @ep: Endpoint handle as returned by USB_RAW_IOCTL_EP_ENABLE for
	82	* USB_RAW_IOCTL_EP_WRITE/READ. Ignored for USB_RAW_IOCTL_EP0_WRITE/READ.
	83	* @flags: When USB_RAW_IO_FLAGS_ZERO is specified, the zero flag is set on
	84	* the submitted USB request, see include/linux/usb/gadget.h for details.
	85	* @length: Length of data.
	86	* @data: Data to send for USB_RAW_IOCTL_EP0/EP_WRITE. Buffer to store received
	87	* data for USB_RAW_IOCTL_EP0/EP_READ.
	88	*/
	89	struct usb_raw_ep_io {
	90	__u16 ep;
	91	__u16 flags;
	92	__u32 length;
	93	__u8 data[0];
	94	};
	95
	96	/*
	97	* Initializes a Raw Gadget instance.
	98	* Accepts a pointer to the usb_raw_init struct as an argument.
	99	* Returns 0 on success or negative error code on failure.
	100	*/
	101	#define USB_RAW_IOCTL_INIT _IOW('U', 0, struct usb_raw_init)
	102
	103	/*
	104	* Instructs Raw Gadget to bind to a UDC and start emulating a USB device.
	105	* Returns 0 on success or negative error code on failure.
	106	*/
	107	#define USB_RAW_IOCTL_RUN _IO('U', 1)
	108
	109	/*
	110	* A blocking ioctl that waits for an event and returns fetched event data to
	111	* the user.
	112	* Accepts a pointer to the usb_raw_event struct.
	113	* Returns 0 on success or negative error code on failure.
	114	*/
	115	#define USB_RAW_IOCTL_EVENT_FETCH _IOR('U', 2, struct usb_raw_event)
	116
	117	/*
	118	* Queues an IN (OUT for READ) urb as a response to the last control request
	119	* received on endpoint 0, provided that was an IN (OUT for READ) request and
	120	* waits until the urb is completed. Copies received data to user for READ.
	121	* Accepts a pointer to the usb_raw_ep_io struct as an argument.
	122	* Returns length of trasferred data on success or negative error code on
	123	* failure.
	124	*/
	125	#define USB_RAW_IOCTL_EP0_WRITE _IOW('U', 3, struct usb_raw_ep_io)
	126	#define USB_RAW_IOCTL_EP0_READ _IOWR('U', 4, struct usb_raw_ep_io)
	127
	128	/*
	129	* Finds an endpoint that supports the transfer type specified in the
	130	* descriptor and enables it.
	131	* Accepts a pointer to the usb_endpoint_descriptor struct as an argument.
	132	* Returns enabled endpoint handle on success or negative error code on failure.
	133	*/
	134	#define USB_RAW_IOCTL_EP_ENABLE _IOW('U', 5, struct usb_endpoint_descriptor)
	135
	136	/* Disables specified endpoint.
	137	* Accepts endpoint handle as an argument.
	138	* Returns 0 on success or negative error code on failure.
	139	*/
	140	#define USB_RAW_IOCTL_EP_DISABLE _IOW('U', 6, __u32)
	141
	142	/*
	143	* Queues an IN (OUT for READ) urb as a response to the last control request
	144	* received on endpoint usb_raw_ep_io.ep, provided that was an IN (OUT for READ)
	145	* request and waits until the urb is completed. Copies received data to user
	146	* for READ.
	147	* Accepts a pointer to the usb_raw_ep_io struct as an argument.
	148	* Returns length of trasferred data on success or negative error code on
	149	* failure.
	150	*/
	151	#define USB_RAW_IOCTL_EP_WRITE _IOW('U', 7, struct usb_raw_ep_io)
	152	#define USB_RAW_IOCTL_EP_READ _IOWR('U', 8, struct usb_raw_ep_io)
	153
	154	/*
	155	* Switches the gadget into the configured state.
	156	* Returns 0 on success or negative error code on failure.
	157	*/
	158	#define USB_RAW_IOCTL_CONFIGURE _IO('U', 9)
	159
	160	/*
	161	* Constrains UDC VBUS power usage.
	162	* Accepts current limit in 2 mA units as an argument.
	163	* Returns 0 on success or negative error code on failure.
	164	*/
	165	#define USB_RAW_IOCTL_VBUS_DRAW _IOW('U', 10, __u32)
	166
	167	#endif /* _UAPI__LINUX_USB_RAW_GADGET_H */

include/uapi/linux/userfaultfd.h+33−7

  * means the userland is reading).
  */
 #define UFFD_API ((__u64)0xAA)
-#define UFFD_API_FEATURES (UFFD_FEATURE_EVENT_FORK |		\
+#define UFFD_API_FEATURES (UFFD_FEATURE_PAGEFAULT_FLAG_WP |	\
+			   UFFD_FEATURE_EVENT_FORK |		\
 			   UFFD_FEATURE_EVENT_REMAP |		\
 			   UFFD_FEATURE_EVENT_REMOVE |	\
 			   UFFD_FEATURE_EVENT_UNMAP |		\
 #define UFFD_API_RANGE_IOCTLS			\
 	((__u64)1 << _UFFDIO_WAKE |		\
 	 (__u64)1 << _UFFDIO_COPY |		\
-	 (__u64)1 << _UFFDIO_ZEROPAGE)
+	 (__u64)1 << _UFFDIO_ZEROPAGE |		\
+	 (__u64)1 << _UFFDIO_WRITEPROTECT)
 #define UFFD_API_RANGE_IOCTLS_BASIC		\
 	((__u64)1 << _UFFDIO_WAKE |		\
 	 (__u64)1 << _UFFDIO_COPY)
 #define _UFFDIO_WAKE			(0x02)
 #define _UFFDIO_COPY			(0x03)
 #define _UFFDIO_ZEROPAGE		(0x04)
+#define _UFFDIO_WRITEPROTECT		(0x06)
 #define _UFFDIO_API			(0x3F)
 /* userfaultfd ioctl ids */
 				      struct uffdio_copy)
 #define UFFDIO_ZEROPAGE		_IOWR(UFFDIO, _UFFDIO_ZEROPAGE,	\
 				      struct uffdio_zeropage)
+#define UFFDIO_WRITEPROTECT	_IOWR(UFFDIO, _UFFDIO_WRITEPROTECT, \
+				      struct uffdio_writeprotect)
 /* read() structure */
 struct uffd_msg {
 	__u64 dst;
 	__u64 src;
 	__u64 len;
+#define UFFDIO_COPY_MODE_DONTWAKE		((__u64)1<<0)
 	/*
-	 * There will be a wrprotection flag later that allows to map
+	 * UFFDIO_COPY_MODE_WP will map the page write protected on
-	 * pages wrprotected on the fly. And such a flag will be
+	 * the fly.  UFFDIO_COPY_MODE_WP is available only if the
-	 * available if the wrprotection ioctl are implemented for the
+	 * write protected ioctl is implemented for the range
-	 * range according to the uffdio_register.ioctls.
+	 * according to the uffdio_register.ioctls.
 	 */
-#define UFFDIO_COPY_MODE_DONTWAKE		((__u64)1<<0)
+#define UFFDIO_COPY_MODE_WP			((__u64)1<<1)
 	__u64 mode;
 	/*
 	__s64 zeropage;
 };
+struct uffdio_writeprotect {
+	struct uffdio_range range;
+/*
+ * UFFDIO_WRITEPROTECT_MODE_WP: set the flag to write protect a range,
+ * unset the flag to undo protection of a range which was previously
+ * write protected.
+ *
+ * UFFDIO_WRITEPROTECT_MODE_DONTWAKE: set the flag to avoid waking up
+ * any wait thread after the operation succeeds.
+ *
+ * NOTE: Write protecting a region (WP=1) is unrelated to page faults,
+ * therefore DONTWAKE flag is meaningless with WP=1.  Removing write
+ * protection (WP=0) in response to a page fault wakes the faulting
+ * task unless DONTWAKE is set.
+ */
+#define UFFDIO_WRITEPROTECT_MODE_WP		((__u64)1<<0)
+#define UFFDIO_WRITEPROTECT_MODE_DONTWAKE	((__u64)1<<1)
+	__u64 mode;
+};
 #endif /* _LINUX_USERFAULTFD_H */

include/uapi/linux/v4l2-controls.h+6−0

  * We reserve 16 controls for this driver. */
 #define V4L2_CID_USER_IMX_BASE			(V4L2_CID_USER_BASE + 0x10b0)
+/*
+ * The base for the atmel isc driver controls.
+ * We reserve 32 controls for this driver.
+ */
+#define V4L2_CID_USER_ATMEL_ISC_BASE		(V4L2_CID_USER_BASE + 0x10c0)
 /* MPEG-class control IDs */
 /* The MPEG controls are applicable to all codec controls
  * and the 'MPEG' part of the define is historical */

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

@@ -707,6 +707,43 @@ struct vfio_device_ioeventfd { · 706 unmodified lines
707		707
708	#define VFIO_DEVICE_IOEVENTFD _IO(VFIO_TYPE, VFIO_BASE + 16)	708	#define VFIO_DEVICE_IOEVENTFD _IO(VFIO_TYPE, VFIO_BASE + 16)
709		709
		710	/**
		711	* VFIO_DEVICE_FEATURE - _IORW(VFIO_TYPE, VFIO_BASE + 17,
		712	* struct vfio_device_feature)
		713	*
		714	* Get, set, or probe feature data of the device. The feature is selected
		715	* using the FEATURE_MASK portion of the flags field. Support for a feature
		716	* can be probed by setting both the FEATURE_MASK and PROBE bits. A probe
		717	* may optionally include the GET and/or SET bits to determine read vs write
		718	* access of the feature respectively. Probing a feature will return success
		719	* if the feature is supported and all of the optionally indicated GET/SET
		720	* methods are supported. The format of the data portion of the structure is
		721	* specific to the given feature. The data portion is not required for
		722	* probing. GET and SET are mutually exclusive, except for use with PROBE.
		723	*
		724	* Return 0 on success, -errno on failure.
		725	*/
		726	struct vfio_device_feature {
		727	__u32 argsz;
		728	__u32 flags;
		729	#define VFIO_DEVICE_FEATURE_MASK (0xffff) /* 16-bit feature index */
		730	#define VFIO_DEVICE_FEATURE_GET (1 << 16) /* Get feature into data[] */
		731	#define VFIO_DEVICE_FEATURE_SET (1 << 17) /* Set feature from data[] */
		732	#define VFIO_DEVICE_FEATURE_PROBE (1 << 18) /* Probe feature support */
		733	__u8 data[];
		734	};
		735
		736	#define VFIO_DEVICE_FEATURE _IO(VFIO_TYPE, VFIO_BASE + 17)
		737
		738	/*
		739	* Provide support for setting a PCI VF Token, which is used as a shared
		740	* secret between PF and VF drivers. This feature may only be set on a
		741	* PCI SR-IOV PF when SR-IOV is enabled on the PF and there are no existing
		742	* open VFs. Data provided when setting this feature is a 16-byte array
		743	* (__u8 b[16]), representing a UUID.
		744	*/
		745	#define VFIO_DEVICE_FEATURE_PCI_VF_TOKEN (0)
		746
710	/* -------- API for Type1 VFIO IOMMU -------- */	747	/* -------- API for Type1 VFIO IOMMU -------- */
711		748
712	/**	749	/**

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

@@ -116,4 +116,28 @@ · 115 unmodified lines
116	#define VHOST_VSOCK_SET_GUEST_CID _IOW(VHOST_VIRTIO, 0x60, __u64)	116	#define VHOST_VSOCK_SET_GUEST_CID _IOW(VHOST_VIRTIO, 0x60, __u64)
117	#define VHOST_VSOCK_SET_RUNNING _IOW(VHOST_VIRTIO, 0x61, int)	117	#define VHOST_VSOCK_SET_RUNNING _IOW(VHOST_VIRTIO, 0x61, int)
118		118
		119	/* VHOST_VDPA specific defines */
		120
		121	/* Get the device id. The device ids follow the same definition of
		122	* the device id defined in virtio-spec.
		123	*/
		124	#define VHOST_VDPA_GET_DEVICE_ID _IOR(VHOST_VIRTIO, 0x70, __u32)
		125	/* Get and set the status. The status bits follow the same definition
		126	* of the device status defined in virtio-spec.
		127	*/
		128	#define VHOST_VDPA_GET_STATUS _IOR(VHOST_VIRTIO, 0x71, __u8)
		129	#define VHOST_VDPA_SET_STATUS _IOW(VHOST_VIRTIO, 0x72, __u8)
		130	/* Get and set the device config. The device config follows the same
		131	* definition of the device config defined in virtio-spec.
		132	*/
		133	#define VHOST_VDPA_GET_CONFIG _IOR(VHOST_VIRTIO, 0x73, \
		134	struct vhost_vdpa_config)
		135	#define VHOST_VDPA_SET_CONFIG _IOW(VHOST_VIRTIO, 0x74, \
		136	struct vhost_vdpa_config)
		137	/* Enable/disable the ring. */
		138	#define VHOST_VDPA_SET_VRING_ENABLE _IOW(VHOST_VIRTIO, 0x75, \
		139	struct vhost_vring_state)
		140	/* Get the max ring size. */
		141	#define VHOST_VDPA_GET_VRING_NUM _IOR(VHOST_VIRTIO, 0x76, __u16)
		142
119	#endif	143	#endif

include/uapi/linux/vhost_types.h+8−0

@@ -119,6 +119,14 @@ struct vhost_scsi_target { · 118 unmodified lines
119	unsigned short reserved;	119	unsigned short reserved;
120	};	120	};
121		121
		122	/* VHOST_VDPA specific definitions */
		123
		124	struct vhost_vdpa_config {
		125	__u32 off;
		126	__u32 len;
		127	__u8 buf[0];
		128	};
		129
122	/* Feature bits */	130	/* Feature bits */
123	/* Log all write descriptors. Can be changed while device is active. */	131	/* Log all write descriptors. Can be changed while device is active. */
124	#define VHOST_F_LOG_ALL 26	132	#define VHOST_F_LOG_ALL 26

include/uapi/linux/videodev2.h+9−0

 #define V4L2_PIX_FMT_Y6      v4l2_fourcc('Y', '0', '6', ' ') /*  6  Greyscale     */
 #define V4L2_PIX_FMT_Y10     v4l2_fourcc('Y', '1', '0', ' ') /* 10  Greyscale     */
 #define V4L2_PIX_FMT_Y12     v4l2_fourcc('Y', '1', '2', ' ') /* 12  Greyscale     */
+#define V4L2_PIX_FMT_Y14     v4l2_fourcc('Y', '1', '4', ' ') /* 14  Greyscale     */
 #define V4L2_PIX_FMT_Y16     v4l2_fourcc('Y', '1', '6', ' ') /* 16  Greyscale     */
 #define V4L2_PIX_FMT_Y16_BE  v4l2_fourcc_be('Y', '1', '6', ' ') /* 16  Greyscale BE  */
 #define V4L2_PIX_FMT_SGBRG12P v4l2_fourcc('p', 'G', 'C', 'C')
 #define V4L2_PIX_FMT_SGRBG12P v4l2_fourcc('p', 'g', 'C', 'C')
 #define V4L2_PIX_FMT_SRGGB12P v4l2_fourcc('p', 'R', 'C', 'C')
+#define V4L2_PIX_FMT_SBGGR14 v4l2_fourcc('B', 'G', '1', '4') /* 14  BGBG.. GRGR.. */
+#define V4L2_PIX_FMT_SGBRG14 v4l2_fourcc('G', 'B', '1', '4') /* 14  GBGB.. RGRG.. */
+#define V4L2_PIX_FMT_SGRBG14 v4l2_fourcc('G', 'R', '1', '4') /* 14  GRGR.. BGBG.. */
+#define V4L2_PIX_FMT_SRGGB14 v4l2_fourcc('R', 'G', '1', '4') /* 14  RGRG.. GBGB.. */
 	/* 14bit raw bayer packed, 7 bytes for every 4 pixels */
 #define V4L2_PIX_FMT_SBGGR14P v4l2_fourcc('p', 'B', 'E', 'E')
 #define V4L2_PIX_FMT_SGBRG14P v4l2_fourcc('p', 'G', 'E', 'E')
 typedef __u64 v4l2_std_id;
+/*
+ * Attention: Keep the V4L2_STD_* bit definitions in sync with
+ * include/dt-bindings/display/sdtv-standards.h SDTV_STD_* bit definitions.
+ */
 /* one bit for each */
 #define V4L2_STD_PAL_B          ((v4l2_std_id)0x00000001)
 #define V4L2_STD_PAL_B1         ((v4l2_std_id)0x00000002)

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

@@ -36,6 +36,7 @@ · 35 unmodified lines
36	#define VIRTIO_BALLOON_F_DEFLATE_ON_OOM 2 /* Deflate balloon on OOM */	36	#define VIRTIO_BALLOON_F_DEFLATE_ON_OOM 2 /* Deflate balloon on OOM */
37	#define VIRTIO_BALLOON_F_FREE_PAGE_HINT 3 /* VQ to report free pages */	37	#define VIRTIO_BALLOON_F_FREE_PAGE_HINT 3 /* VQ to report free pages */
38	#define VIRTIO_BALLOON_F_PAGE_POISON 4 /* Guest is using page poisoning */	38	#define VIRTIO_BALLOON_F_PAGE_POISON 4 /* Guest is using page poisoning */
		39	#define VIRTIO_BALLOON_F_REPORTING 5 /* Page reporting virtqueue */
39		40
40	/* Size of a PFN in the balloon interface. */	41	/* Size of a PFN in the balloon interface. */
41	#define VIRTIO_BALLOON_PFN_SHIFT 12	42	#define VIRTIO_BALLOON_PFN_SHIFT 12

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

@@ -46,5 +46,6 @@ · 45 unmodified lines
46	#define VIRTIO_ID_IOMMU 23 /* virtio IOMMU */	46	#define VIRTIO_ID_IOMMU 23 /* virtio IOMMU */
47	#define VIRTIO_ID_FS 26 /* virtio filesystem */	47	#define VIRTIO_ID_FS 26 /* virtio filesystem */
48	#define VIRTIO_ID_PMEM 27 /* virtio pmem */	48	#define VIRTIO_ID_PMEM 27 /* virtio pmem */
		49	#define VIRTIO_ID_MAC80211_HWSIM 29 /* virtio mac80211-hwsim */
49		50
50	#endif /* _LINUX_VIRTIO_IDS_H */	51	#endif /* _LINUX_VIRTIO_IDS_H */

include/uapi/linux/virtio_iommu.h+6−6

@@ -18,24 +18,24 @@ · 17 unmodified lines
18	#define VIRTIO_IOMMU_F_MMIO 5	18	#define VIRTIO_IOMMU_F_MMIO 5
19		19
20	struct virtio_iommu_range_64 {	20	struct virtio_iommu_range_64 {
21	__le64 start;	21	__u64 start;
22	__le64 end;	22	__u64 end;
23	};	23	};
24		24
25	struct virtio_iommu_range_32 {	25	struct virtio_iommu_range_32 {
26	__le32 start;	26	__u32 start;
27	__le32 end;	27	__u32 end;
28	};	28	};
29		29
30	struct virtio_iommu_config {	30	struct virtio_iommu_config {
31	/* Supported page sizes */	31	/* Supported page sizes */
32	__le64 page_size_mask;	32	__u64 page_size_mask;
33	/* Supported IOVA range */	33	/* Supported IOVA range */
34	struct virtio_iommu_range_64 input_range;	34	struct virtio_iommu_range_64 input_range;
35	/* Max domain ID size */	35	/* Max domain ID size */
36	struct virtio_iommu_range_32 domain_range;	36	struct virtio_iommu_range_32 domain_range;
37	/* Probe buffer size */	37	/* Probe buffer size */
38	__le32 probe_size;	38	__u32 probe_size;
39	};	39	};
40		40
41	/* Request types */	41	/* Request types */

include/uapi/linux/virtio_net.h+98−4

@@ -57,6 +57,9 @@ · 56 unmodified lines
57	* Steering */	57	* Steering */
58	#define VIRTIO_NET_F_CTRL_MAC_ADDR 23 /* Set MAC address */	58	#define VIRTIO_NET_F_CTRL_MAC_ADDR 23 /* Set MAC address */
59		59
		60	#define VIRTIO_NET_F_HASH_REPORT 57 /* Supports hash report */
		61	#define VIRTIO_NET_F_RSS 60 /* Supports RSS RX steering */
		62	#define VIRTIO_NET_F_RSC_EXT 61 /* extended coalescing info */
60	#define VIRTIO_NET_F_STANDBY 62 /* Act as standby for another device	63	#define VIRTIO_NET_F_STANDBY 62 /* Act as standby for another device
61	* with the same MAC.	64	* with the same MAC.
62	*/	65	*/
@@ -69,6 +72,17 @@ · 6 unmodified lines
69	#define VIRTIO_NET_S_LINK_UP 1 /* Link is up */	72	#define VIRTIO_NET_S_LINK_UP 1 /* Link is up */
70	#define VIRTIO_NET_S_ANNOUNCE 2 /* Announcement is needed */	73	#define VIRTIO_NET_S_ANNOUNCE 2 /* Announcement is needed */
71		74
		75	/* supported/enabled hash types */
		76	#define VIRTIO_NET_RSS_HASH_TYPE_IPv4 (1 << 0)
		77	#define VIRTIO_NET_RSS_HASH_TYPE_TCPv4 (1 << 1)
		78	#define VIRTIO_NET_RSS_HASH_TYPE_UDPv4 (1 << 2)
		79	#define VIRTIO_NET_RSS_HASH_TYPE_IPv6 (1 << 3)
		80	#define VIRTIO_NET_RSS_HASH_TYPE_TCPv6 (1 << 4)
		81	#define VIRTIO_NET_RSS_HASH_TYPE_UDPv6 (1 << 5)
		82	#define VIRTIO_NET_RSS_HASH_TYPE_IP_EX (1 << 6)
		83	#define VIRTIO_NET_RSS_HASH_TYPE_TCP_EX (1 << 7)
		84	#define VIRTIO_NET_RSS_HASH_TYPE_UDP_EX (1 << 8)
		85
72	struct virtio_net_config {	86	struct virtio_net_config {
73	/* The config defining mac address (if VIRTIO_NET_F_MAC) */	87	/* The config defining mac address (if VIRTIO_NET_F_MAC) */
74	__u8 mac[ETH_ALEN];	88	__u8 mac[ETH_ALEN];
@@ -92,6 +106,12 @@ struct virtio_net_config { · 17 unmodified lines
92	* Any other value stands for unknown.	106	* Any other value stands for unknown.
93	*/	107	*/
94	__u8 duplex;	108	__u8 duplex;
		109	/* maximum size of RSS key */
		110	__u8 rss_max_key_size;
		111	/* maximum number of indirection table entries */
		112	__le16 rss_max_indirection_table_length;
		113	/* bitmask of supported VIRTIO_NET_RSS_HASH_ types */
		114	__le32 supported_hash_types;
95	} __attribute__((packed));	115	} __attribute__((packed));
96		116
97	/*	117	/*
@@ -104,6 +124,7 @@ struct virtio_net_config { · 6 unmodified lines
104	struct virtio_net_hdr_v1 {	124	struct virtio_net_hdr_v1 {
105	#define VIRTIO_NET_HDR_F_NEEDS_CSUM 1 /* Use csum_start, csum_offset */	125	#define VIRTIO_NET_HDR_F_NEEDS_CSUM 1 /* Use csum_start, csum_offset */
106	#define VIRTIO_NET_HDR_F_DATA_VALID 2 /* Csum is valid */	126	#define VIRTIO_NET_HDR_F_DATA_VALID 2 /* Csum is valid */
		127	#define VIRTIO_NET_HDR_F_RSC_INFO 4 /* rsc info in csum_ fields */
107	__u8 flags;	128	__u8 flags;
108	#define VIRTIO_NET_HDR_GSO_NONE 0 /* Not a GSO frame */	129	#define VIRTIO_NET_HDR_GSO_NONE 0 /* Not a GSO frame */
109	#define VIRTIO_NET_HDR_GSO_TCPV4 1 /* GSO frame, IPv4 TCP (TSO) */	130	#define VIRTIO_NET_HDR_GSO_TCPV4 1 /* GSO frame, IPv4 TCP (TSO) */
@@ -113,11 +134,46 @@ struct virtio_net_hdr_v1 { · 3 unmodified lines
113	__u8 gso_type;	134	__u8 gso_type;
114	__virtio16 hdr_len; /* Ethernet + IP + tcp/udp hdrs */	135	__virtio16 hdr_len; /* Ethernet + IP + tcp/udp hdrs */
115	__virtio16 gso_size; /* Bytes to append to hdr_len per frame */	136	__virtio16 gso_size; /* Bytes to append to hdr_len per frame */
116	__virtio16 csum_start; /* Position to start checksumming from */	137	union {
117	__virtio16 csum_offset; /* Offset after that to place checksum */	138	struct {
		139	__virtio16 csum_start;
		140	__virtio16 csum_offset;
		141	};
		142	/* Checksum calculation */
		143	struct {
		144	/* Position to start checksumming from */
		145	__virtio16 start;
		146	/* Offset after that to place checksum */
		147	__virtio16 offset;
		148	} csum;
		149	/* Receive Segment Coalescing */
		150	struct {
		151	/* Number of coalesced segments */
		152	__le16 segments;
		153	/* Number of duplicated acks */
		154	__le16 dup_acks;
		155	} rsc;
		156	};
118	__virtio16 num_buffers; /* Number of merged rx buffers */	157	__virtio16 num_buffers; /* Number of merged rx buffers */
119	};	158	};
120		159
		160	struct virtio_net_hdr_v1_hash {
		161	struct virtio_net_hdr_v1 hdr;
		162	__le32 hash_value;
		163	#define VIRTIO_NET_HASH_REPORT_NONE 0
		164	#define VIRTIO_NET_HASH_REPORT_IPv4 1
		165	#define VIRTIO_NET_HASH_REPORT_TCPv4 2
		166	#define VIRTIO_NET_HASH_REPORT_UDPv4 3
		167	#define VIRTIO_NET_HASH_REPORT_IPv6 4
		168	#define VIRTIO_NET_HASH_REPORT_TCPv6 5
		169	#define VIRTIO_NET_HASH_REPORT_UDPv6 6
		170	#define VIRTIO_NET_HASH_REPORT_IPv6_EX 7
		171	#define VIRTIO_NET_HASH_REPORT_TCPv6_EX 8
		172	#define VIRTIO_NET_HASH_REPORT_UDPv6_EX 9
		173	__le16 hash_report;
		174	__le16 padding;
		175	};
		176
121	#ifndef VIRTIO_NET_NO_LEGACY	177	#ifndef VIRTIO_NET_NO_LEGACY
122	/* This header comes first in the scatter-gather list.	178	/* This header comes first in the scatter-gather list.
123	* For legacy virtio, if VIRTIO_F_ANY_LAYOUT is not negotiated, it must	179	* For legacy virtio, if VIRTIO_F_ANY_LAYOUT is not negotiated, it must
@@ -228,7 +284,9 @@ struct virtio_net_ctrl_mac { · 104 unmodified lines
228		284
229	/*	285	/*
230	* Control Receive Flow Steering	286	* Control Receive Flow Steering
231	*	287	*/
		288	#define VIRTIO_NET_CTRL_MQ 4
		289	/*
232	* The command VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET	290	* The command VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET
233	* enables Receive Flow Steering, specifying the number of the transmit and	291	* enables Receive Flow Steering, specifying the number of the transmit and
234	* receive queues that will be used. After the command is consumed and acked by	292	* receive queues that will be used. After the command is consumed and acked by
@@ -241,11 +299,47 @@ struct virtio_net_ctrl_mq { · 6 unmodified lines
241	__virtio16 virtqueue_pairs;	299	__virtio16 virtqueue_pairs;
242	};	300	};
243		301
244	#define VIRTIO_NET_CTRL_MQ 4
245	#define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET 0	302	#define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET 0
246	#define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN 1	303	#define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN 1
247	#define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX 0x8000	304	#define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX 0x8000
248		305
		306	/*
		307	* The command VIRTIO_NET_CTRL_MQ_RSS_CONFIG has the same effect as
		308	* VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET does and additionally configures
		309	* the receive steering to use a hash calculated for incoming packet
		310	* to decide on receive virtqueue to place the packet. The command
		311	* also provides parameters to calculate a hash and receive virtqueue.
		312	*/
		313	struct virtio_net_rss_config {
		314	__le32 hash_types;
		315	__le16 indirection_table_mask;
		316	__le16 unclassified_queue;
		317	__le16 indirection_table[1/* + indirection_table_mask */];
		318	__le16 max_tx_vq;
		319	__u8 hash_key_length;
		320	__u8 hash_key_data[/* hash_key_length */];
		321	};
		322
		323	#define VIRTIO_NET_CTRL_MQ_RSS_CONFIG 1
		324
		325	/*
		326	* The command VIRTIO_NET_CTRL_MQ_HASH_CONFIG requests the device
		327	* to include in the virtio header of the packet the value of the
		328	* calculated hash and the report type of hash. It also provides
		329	* parameters for hash calculation. The command requires feature
		330	* VIRTIO_NET_F_HASH_REPORT to be negotiated to extend the
		331	* layout of virtio header as defined in virtio_net_hdr_v1_hash.
		332	*/
		333	struct virtio_net_hash_config {
		334	__le32 hash_types;
		335	/* for compatibility with virtio_net_rss_config */
		336	__le16 reserved[4];
		337	__u8 hash_key_length;
		338	__u8 hash_key_data[/* hash_key_length */];
		339	};
		340
		341	#define VIRTIO_NET_CTRL_MQ_HASH_CONFIG 2
		342
249	/*	343	/*
250	* Control network offloads	344	* Control network offloads
251	*	345	*

include/uapi/linux/wireless.h+3−2

 #include <linux/socket.h>		/* for "struct sockaddr" et al	*/
 #include <linux/if.h>			/* for IFNAMSIZ and co... */
+#include <stddef.h>                     /* for offsetof */
 /***************************** VERSION *****************************/
 /*
  * This constant is used to know the availability of the wireless
 /* iw_point events are special. First, the payload (extra data) come at
  * the end of the event, so they are bigger than IW_EV_POINT_LEN. Second,
  * we omit the pointer, so start at an offset. */
-#define IW_EV_POINT_OFF (((char *) &(((struct iw_point *) NULL)->length)) - \
+#define IW_EV_POINT_OFF offsetof(struct iw_point, length)
-			  (char *) NULL)
 #define IW_EV_POINT_LEN	(IW_EV_LCP_LEN + sizeof(struct iw_point) - \
 			 IW_EV_POINT_OFF)

include/uapi/misc/uacce/hisi_qm.h+23−0

@@ -0,0 +1,23 @@
	1	/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
	2	#ifndef _UAPI_HISI_QM_H
	3	#define _UAPI_HISI_QM_H
	4
	5	#include <linux/types.h>
	6
	7	/**
	8	* struct hisi_qp_ctx - User data for hisi qp.
	9	* @id: qp_index return to user space
	10	* @qc_type: Accelerator algorithm type
	11	*/
	12	struct hisi_qp_ctx {
	13	__u16 id;
	14	__u16 qc_type;
	15	};
	16
	17	#define HISI_QM_API_VER_BASE "hisi_qm_v1"
	18	#define HISI_QM_API_VER2_BASE "hisi_qm_v2"
	19
	20	/* UACCE_CMD_QM_SET_QP_CTX: Set qp algorithm type */
	21	#define UACCE_CMD_QM_SET_QP_CTX _IOWR('H', 10, struct hisi_qp_ctx)
	22
	23	#endif

include/uapi/misc/uacce/uacce.h+38−0

@@ -0,0 +1,38 @@
	1	/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
	2	#ifndef _UAPIUUACCE_H
	3	#define _UAPIUUACCE_H
	4
	5	#include <linux/types.h>
	6	#include <linux/ioctl.h>
	7
	8	/*
	9	* UACCE_CMD_START_Q: Start queue
	10	*/
	11	#define UACCE_CMD_START_Q _IO('W', 0)
	12
	13	/*
	14	* UACCE_CMD_PUT_Q:
	15	* User actively stop queue and free queue resource immediately
	16	* Optimization method since close fd may delay
	17	*/
	18	#define UACCE_CMD_PUT_Q _IO('W', 1)
	19
	20	/*
	21	* UACCE Device flags:
	22	* UACCE_DEV_SVA: Shared Virtual Addresses
	23	* Support PASID
	24	* Support device page faults (PCI PRI or SMMU Stall)
	25	*/
	26	#define UACCE_DEV_SVA BIT(0)
	27
	28	/**
	29	* enum uacce_qfrt: queue file region type
	30	* @UACCE_QFRT_MMIO: device mmio region
	31	* @UACCE_QFRT_DUS: device user share region
	32	*/
	33	enum uacce_qfrt {
	34	UACCE_QFRT_MMIO = 0,
	35	UACCE_QFRT_DUS = 1,
	36	};
	37
	38	#endif

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

 	MLX5_QP_FLAG_TIR_ALLOW_SELF_LB_MC = 1 << 7,
 	MLX5_QP_FLAG_ALLOW_SCATTER_CQE	= 1 << 8,
 	MLX5_QP_FLAG_PACKET_BASED_CREDIT_MODE	= 1 << 9,
+	MLX5_QP_FLAG_UAR_PAGE_INDEX = 1 << 10,
 };
 enum {
 enum mlx5_lib_caps {
 	MLX5_LIB_CAP_4K_UAR	= (__u64)1 << 0,
+	MLX5_LIB_CAP_DYN_UAR	= (__u64)1 << 1,
 };
 enum mlx5_ib_alloc_uctx_v2_flags {
 enum mlx5_ib_create_cq_flags {
 	MLX5_IB_CREATE_CQ_FLAGS_CQE_128B_PAD	= 1 << 0,
+	MLX5_IB_CREATE_CQ_FLAGS_UAR_PAGE_INDEX  = 1 << 1,
 };
 struct mlx5_ib_create_cq {
 	__u8    cqe_comp_en;
 	__u8    cqe_comp_res_format;
 	__u16	flags;
+	__u16	uar_page_index;
+	__u16	reserved0;
+	__u32	reserved1;
 };
 struct mlx5_ib_create_cq_resp {

include/uapi/rdma/mlx5_user_ioctl_cmds.h+35−0

@@ -131,6 +131,23 @@ enum mlx5_ib_var_obj_methods { · 130 unmodified lines
131	MLX5_IB_METHOD_VAR_OBJ_DESTROY,	131	MLX5_IB_METHOD_VAR_OBJ_DESTROY,
132	};	132	};
133		133
		134	enum mlx5_ib_uar_alloc_attrs {
		135	MLX5_IB_ATTR_UAR_OBJ_ALLOC_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
		136	MLX5_IB_ATTR_UAR_OBJ_ALLOC_TYPE,
		137	MLX5_IB_ATTR_UAR_OBJ_ALLOC_MMAP_OFFSET,
		138	MLX5_IB_ATTR_UAR_OBJ_ALLOC_MMAP_LENGTH,
		139	MLX5_IB_ATTR_UAR_OBJ_ALLOC_PAGE_ID,
		140	};
		141
		142	enum mlx5_ib_uar_obj_destroy_attrs {
		143	MLX5_IB_ATTR_UAR_OBJ_DESTROY_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
		144	};
		145
		146	enum mlx5_ib_uar_obj_methods {
		147	MLX5_IB_METHOD_UAR_OBJ_ALLOC = (1U << UVERBS_ID_NS_SHIFT),
		148	MLX5_IB_METHOD_UAR_OBJ_DESTROY,
		149	};
		150
134	enum mlx5_ib_devx_umem_reg_attrs {	151	enum mlx5_ib_devx_umem_reg_attrs {
135	MLX5_IB_ATTR_DEVX_UMEM_REG_HANDLE = (1U << UVERBS_ID_NS_SHIFT),	152	MLX5_IB_ATTR_DEVX_UMEM_REG_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
136	MLX5_IB_ATTR_DEVX_UMEM_REG_ADDR,	153	MLX5_IB_ATTR_DEVX_UMEM_REG_ADDR,
@@ -143,6 +160,22 @@ enum mlx5_ib_devx_umem_dereg_attrs { · 6 unmodified lines
143	MLX5_IB_ATTR_DEVX_UMEM_DEREG_HANDLE = (1U << UVERBS_ID_NS_SHIFT),	160	MLX5_IB_ATTR_DEVX_UMEM_DEREG_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
144	};	161	};
145		162
		163	enum mlx5_ib_pp_obj_methods {
		164	MLX5_IB_METHOD_PP_OBJ_ALLOC = (1U << UVERBS_ID_NS_SHIFT),
		165	MLX5_IB_METHOD_PP_OBJ_DESTROY,
		166	};
		167
		168	enum mlx5_ib_pp_alloc_attrs {
		169	MLX5_IB_ATTR_PP_OBJ_ALLOC_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
		170	MLX5_IB_ATTR_PP_OBJ_ALLOC_CTX,
		171	MLX5_IB_ATTR_PP_OBJ_ALLOC_FLAGS,
		172	MLX5_IB_ATTR_PP_OBJ_ALLOC_INDEX,
		173	};
		174
		175	enum mlx5_ib_pp_obj_destroy_attrs {
		176	MLX5_IB_ATTR_PP_OBJ_DESTROY_HANDLE = (1U << UVERBS_ID_NS_SHIFT),
		177	};
		178
146	enum mlx5_ib_devx_umem_methods {	179	enum mlx5_ib_devx_umem_methods {
147	MLX5_IB_METHOD_DEVX_UMEM_REG = (1U << UVERBS_ID_NS_SHIFT),	180	MLX5_IB_METHOD_DEVX_UMEM_REG = (1U << UVERBS_ID_NS_SHIFT),
148	MLX5_IB_METHOD_DEVX_UMEM_DEREG,	181	MLX5_IB_METHOD_DEVX_UMEM_DEREG,
@@ -173,6 +206,8 @@ enum mlx5_ib_objects { · 24 unmodified lines
173	MLX5_IB_OBJECT_DEVX_ASYNC_CMD_FD,	206	MLX5_IB_OBJECT_DEVX_ASYNC_CMD_FD,
174	MLX5_IB_OBJECT_DEVX_ASYNC_EVENT_FD,	207	MLX5_IB_OBJECT_DEVX_ASYNC_EVENT_FD,
175	MLX5_IB_OBJECT_VAR,	208	MLX5_IB_OBJECT_VAR,
		209	MLX5_IB_OBJECT_PP,
		210	MLX5_IB_OBJECT_UAR,
176	};	211	};
177		212
178	enum mlx5_ib_flow_matcher_create_attrs {	213	enum mlx5_ib_flow_matcher_create_attrs {

include/uapi/rdma/mlx5_user_ioctl_verbs.h+10−0

 	MLX5_IB_UAPI_FLOW_TABLE_TYPE_NIC_TX	= 0x1,
 	MLX5_IB_UAPI_FLOW_TABLE_TYPE_FDB	= 0x2,
 	MLX5_IB_UAPI_FLOW_TABLE_TYPE_RDMA_RX	= 0x3,
+	MLX5_IB_UAPI_FLOW_TABLE_TYPE_RDMA_TX	= 0x4,
 };
 enum mlx5_ib_uapi_flow_action_packet_reformat_type {
 	__u8		out_data[];
 };
+enum mlx5_ib_uapi_pp_alloc_flags {
+	MLX5_IB_UAPI_PP_ALLOC_FLAGS_DEDICATED_INDEX = 1 << 0,
+};
+enum mlx5_ib_uapi_uar_alloc_type {
+	MLX5_IB_UAPI_UAR_ALLOC_TYPE_BF = 0x0,
+	MLX5_IB_UAPI_UAR_ALLOC_TYPE_NC = 0x1,
+};
 #endif

include/uapi/scsi/fc/fc_els.h+196−15

@@ -9,6 +9,7 @@ · 8 unmodified lines
9	#define _FC_ELS_H_	9	#define _FC_ELS_H_
10		10
11	#include <linux/types.h>	11	#include <linux/types.h>
		12	#include <asm/byteorder.h>
12		13
13	/*	14	/*
14	* Fibre Channel Switch - Enhanced Link Services definitions.	15	* Fibre Channel Switch - Enhanced Link Services definitions.
@@ -40,6 +41,7 @@ enum fc_els_cmd { · 25 unmodified lines
40	ELS_REC = 0x13, /* read exchange concise */	41	ELS_REC = 0x13, /* read exchange concise */
41	ELS_SRR = 0x14, /* sequence retransmission request */	42	ELS_SRR = 0x14, /* sequence retransmission request */
42	ELS_FPIN = 0x16, /* Fabric Performance Impact Notification */	43	ELS_FPIN = 0x16, /* Fabric Performance Impact Notification */
		44	ELS_RDF = 0x19, /* Register Diagnostic Functions */
43	ELS_PRLI = 0x20, /* process login */	45	ELS_PRLI = 0x20, /* process login */
44	ELS_PRLO = 0x21, /* process logout */	46	ELS_PRLO = 0x21, /* process logout */
45	ELS_SCN = 0x22, /* state change notification */	47	ELS_SCN = 0x22, /* state change notification */
@@ -108,6 +110,7 @@ enum fc_els_cmd { · 62 unmodified lines
108	[ELS_REC] = "REC", \	110	[ELS_REC] = "REC", \
109	[ELS_SRR] = "SRR", \	111	[ELS_SRR] = "SRR", \
110	[ELS_FPIN] = "FPIN", \	112	[ELS_FPIN] = "FPIN", \
		113	[ELS_RDF] = "RDF", \
111	[ELS_PRLI] = "PRLI", \	114	[ELS_PRLI] = "PRLI", \
112	[ELS_PRLO] = "PRLO", \	115	[ELS_PRLO] = "PRLO", \
113	[ELS_SCN] = "SCN", \	116	[ELS_SCN] = "SCN", \
@@ -207,6 +210,99 @@ enum fc_els_rjt_explan { · 93 unmodified lines
207	/* TBD - above definitions incomplete */	210	/* TBD - above definitions incomplete */
208	};	211	};
209		212
		213	/*
		214	* Link Service TLV Descriptor Tag Values
		215	*/
		216	enum fc_ls_tlv_dtag {
		217	ELS_DTAG_LS_REQ_INFO = 0x00000001,
		218	/* Link Service Request Information Descriptor */
		219	ELS_DTAG_LNK_INTEGRITY = 0x00020001,
		220	/* Link Integrity Notification Descriptor */
		221	ELS_DTAG_DELIVERY = 0x00020002,
		222	/* Delivery Notification Descriptor */
		223	ELS_DTAG_PEER_CONGEST = 0x00020003,
		224	/* Peer Congestion Notification Descriptor */
		225	ELS_DTAG_CONGESTION = 0x00020004,
		226	/* Congestion Notification Descriptor */
		227	ELS_DTAG_FPIN_REGISTER = 0x00030001,
		228	/* FPIN Registration Descriptor */
		229	};
		230
		231	/*
		232	* Initializer useful for decoding table.
		233	* Please keep this in sync with the above definitions.
		234	*/
		235	#define FC_LS_TLV_DTAG_INIT { \
		236	{ ELS_DTAG_LS_REQ_INFO, "Link Service Request Information" }, \
		237	{ ELS_DTAG_LNK_INTEGRITY, "Link Integrity Notification" }, \
		238	{ ELS_DTAG_DELIVERY, "Delivery Notification Present" }, \
		239	{ ELS_DTAG_PEER_CONGEST, "Peer Congestion Notification" }, \
		240	{ ELS_DTAG_CONGESTION, "Congestion Notification" }, \
		241	{ ELS_DTAG_FPIN_REGISTER, "FPIN Registration" }, \
		242	}
		243
		244
		245	/*
		246	* Generic Link Service TLV Descriptor format
		247	*
		248	* This structure, as it defines no payload, will also be referred to
		249	* as the "tlv header" - which contains the tag and len fields.
		250	*/
		251	struct fc_tlv_desc {
		252	__be32 desc_tag; /* Notification Descriptor Tag */
		253	__be32 desc_len; /* Length of Descriptor (in bytes).
		254	* Size of descriptor excluding
		255	* desc_tag and desc_len fields.
		256	*/
		257	__u8 desc_value[0]; /* Descriptor Value */
		258	};
		259
		260	/* Descriptor tag and len fields are considered the mandatory header
		261	* for a descriptor
		262	*/
		263	#define FC_TLV_DESC_HDR_SZ sizeof(struct fc_tlv_desc)
		264
		265	/*
		266	* Macro, used when initializing payloads, to return the descriptor length.
		267	* Length is size of descriptor minus the tag and len fields.
		268	*/
		269	#define FC_TLV_DESC_LENGTH_FROM_SZ(desc) \
		270	(sizeof(desc) - FC_TLV_DESC_HDR_SZ)
		271
		272	/* Macro, used on received payloads, to return the descriptor length */
		273	#define FC_TLV_DESC_SZ_FROM_LENGTH(tlv) \
		274	(__be32_to_cpu((tlv)->desc_len) + FC_TLV_DESC_HDR_SZ)
		275
		276	/*
		277	* This helper is used to walk descriptors in a descriptor list.
		278	* Given the address of the current descriptor, which minimally contains a
		279	* tag and len field, calculate the address of the next descriptor based
		280	* on the len field.
		281	*/
		282	static inline void fc_tlv_next_desc(void desc)
		283	{
		284	struct fc_tlv_desc *tlv = desc;
		285
		286	return (desc + FC_TLV_DESC_SZ_FROM_LENGTH(tlv));
		287	}
		288
		289
		290	/*
		291	* Link Service Request Information Descriptor
		292	*/
		293	struct fc_els_lsri_desc {
		294	__be32 desc_tag; /* descriptor tag (0x0000 0001) */
		295	__be32 desc_len; /* Length of Descriptor (in bytes) (4).
		296	* Size of descriptor excluding
		297	* desc_tag and desc_len fields.
		298	*/
		299	struct {
		300	__u8 cmd; /* ELS cmd byte */
		301	__u8 bytes[3]; /* bytes 1..3 */
		302	} rqst_w0; /* Request word 0 */
		303	};
		304
		305
210	/*	306	/*
211	* Common service parameters (N ports).	307	* Common service parameters (N ports).
212	*/	308	*/
@@ -819,24 +915,61 @@ enum fc_els_clid_ic { · 606 unmodified lines
819	};	915	};
820		916
821		917
		918	enum fc_fpin_li_event_types {
		919	FPIN_LI_UNKNOWN = 0x0,
		920	FPIN_LI_LINK_FAILURE = 0x1,
		921	FPIN_LI_LOSS_OF_SYNC = 0x2,
		922	FPIN_LI_LOSS_OF_SIG = 0x3,
		923	FPIN_LI_PRIM_SEQ_ERR = 0x4,
		924	FPIN_LI_INVALID_TX_WD = 0x5,
		925	FPIN_LI_INVALID_CRC = 0x6,
		926	FPIN_LI_DEVICE_SPEC = 0xF,
		927	};
		928
822	/*	929	/*
823	* Fabric Notification Descriptor Tag values	930	* Initializer useful for decoding table.
		931	* Please keep this in sync with the above definitions.
824	*/	932	*/
825	enum fc_fn_dtag {	933	#define FC_FPIN_LI_EVT_TYPES_INIT { \
826	ELS_FN_DTAG_LNK_INTEGRITY = 0x00020001, /* Link Integrity */	934	{ FPIN_LI_UNKNOWN, "Unknown" }, \
827	ELS_FN_DTAG_PEER_CONGEST = 0x00020003, /* Peer Congestion */	935	{ FPIN_LI_LINK_FAILURE, "Link Failure" }, \
828	ELS_FN_DTAG_CONGESTION = 0x00020004, /* Congestion */	936	{ FPIN_LI_LOSS_OF_SYNC, "Loss of Synchronization" }, \
829	};	937	{ FPIN_LI_LOSS_OF_SIG, "Loss of Signal" }, \
		938	{ FPIN_LI_PRIM_SEQ_ERR, "Primitive Sequence Protocol Error" }, \
		939	{ FPIN_LI_INVALID_TX_WD, "Invalid Transmission Word" }, \
		940	{ FPIN_LI_INVALID_CRC, "Invalid CRC" }, \
		941	{ FPIN_LI_DEVICE_SPEC, "Device Specific" }, \
		942	}
		943
830		944
831	/*	945	/*
832	* Fabric Notification Descriptor	946	* Link Integrity Notification Descriptor
833	*/	947	*/
834	struct fc_fn_desc {	948	struct fc_fn_li_desc {
835	__be32 fn_desc_tag; /* Notification Descriptor Tag */	949	__be32 desc_tag; /* Descriptor Tag (0x00020001) */
836	__be32 fn_desc_value_len; /* Length of Descriptor Value field	950	__be32 desc_len; /* Length of Descriptor (in bytes).
837	* (in bytes)	951	* Size of descriptor excluding
838	*/	952	* desc_tag and desc_len fields.
839	__u8 fn_desc_value[0]; /* Descriptor Value */	953	*/
		954	__be64 detecting_wwpn; /* Port Name that detected event */
		955	__be64 attached_wwpn; /* Port Name of device attached to
		956	* detecting Port Name
		957	*/
		958	__be16 event_type; /* see enum fc_fpin_li_event_types */
		959	__be16 event_modifier; /* Implementation specific value
		960	* describing the event type
		961	*/
		962	__be32 event_threshold;/* duration in ms of the link
		963	* integrity detection cycle
		964	*/
		965	__be32 event_count; /* minimum number of event
		966	* occurrences during the event
		967	* threshold to caause the LI event
		968	*/
		969	__be32 pname_count; /* number of portname_list elements */
		970	__be64 pname_list[0]; /* list of N_Port_Names accessible
		971	* through the attached port
		972	*/
840	};	973	};
841		974
842	/*	975	/*
@@ -845,8 +978,56 @@ struct fc_fn_desc { · 2 unmodified lines
845	struct fc_els_fpin {	978	struct fc_els_fpin {
846	__u8 fpin_cmd; /* command (0x16) */	979	__u8 fpin_cmd; /* command (0x16) */
847	__u8 fpin_zero[3]; /* specified as zero - part of cmd */	980	__u8 fpin_zero[3]; /* specified as zero - part of cmd */
848	__be32 fpin_desc_cnt; /* count of descriptors */	981	__be32 desc_len; /* Length of Descriptor List (in bytes).
849	struct fc_fn_desc fpin_desc[0]; /* Descriptor list */	982	* Size of ELS excluding fpin_cmd,
		983	* fpin_zero and desc_len fields.
		984	*/
		985	struct fc_tlv_desc fpin_desc[0]; /* Descriptor list */
		986	};
		987
		988	/* Diagnostic Function Descriptor - FPIN Registration */
		989	struct fc_df_desc_fpin_reg {
		990	__be32 desc_tag; /* FPIN Registration (0x00030001) */
		991	__be32 desc_len; /* Length of Descriptor (in bytes).
		992	* Size of descriptor excluding
		993	* desc_tag and desc_len fields.
		994	*/
		995	__be32 count; /* Number of desc_tags elements */
		996	__be32 desc_tags[0]; /* Array of Descriptor Tags.
		997	* Each tag indicates a function
		998	* supported by the N_Port (request)
		999	* or by the N_Port and Fabric
		1000	* Controller (reply; may be a subset
		1001	* of the request).
		1002	* See ELS_FN_DTAG_xxx for tag values.
		1003	*/
850	};	1004	};
851		1005
		1006	/*
		1007	* ELS_RDF - Register Diagnostic Functions
		1008	*/
		1009	struct fc_els_rdf {
		1010	__u8 fpin_cmd; /* command (0x19) */
		1011	__u8 fpin_zero[3]; /* specified as zero - part of cmd */
		1012	__be32 desc_len; /* Length of Descriptor List (in bytes).
		1013	* Size of ELS excluding fpin_cmd,
		1014	* fpin_zero and desc_len fields.
		1015	*/
		1016	struct fc_tlv_desc desc[0]; /* Descriptor list */
		1017	};
		1018
		1019	/*
		1020	* ELS RDF LS_ACC Response.
		1021	*/
		1022	struct fc_els_rdf_resp {
		1023	struct fc_els_ls_acc acc_hdr;
		1024	__be32 desc_list_len; /* Length of response (in
		1025	* bytes). Excludes acc_hdr
		1026	* and desc_list_len fields.
		1027	*/
		1028	struct fc_els_lsri_desc lsri;
		1029	struct fc_tlv_desc desc[0]; /* Supported Descriptor list */
		1030	};
		1031
		1032
852	#endif /* _FC_ELS_H_ */	1033	#endif /* _FC_ELS_H_ */

include/uapi/scsi/scsi_bsg_fc.h+1−1

@@ -209,7 +209,7 @@ struct fc_bsg_host_vendor { · 208 unmodified lines
209	__u64 vendor_id;	209	__u64 vendor_id;
210		210
211	/* start of vendor command area */	211	/* start of vendor command area */
212	__u32 vendor_cmd[0];	212	__u32 vendor_cmd[];
213	};	213	};
214		214
215	/* Response:	215	/* Response:

include/uapi/sound/asoc.h+1−0

@@ -17,6 +17,7 @@ · 16 unmodified lines
17	#define __LINUX_UAPI_SND_ASOC_H	17	#define __LINUX_UAPI_SND_ASOC_H
18		18
19	#include <linux/types.h>	19	#include <linux/types.h>
		20	#include <sound/asound.h>
20		21
21	/*	22	/*
22	* Maximum number of channels topology kcontrol can represent.	23	* Maximum number of channels topology kcontrol can represent.

include/uapi/sound/compress_offload.h+1−1

@@ -31,7 +31,7 @@ · 30 unmodified lines
31	#include <sound/compress_params.h>	31	#include <sound/compress_params.h>
32		32
33		33
34	#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 2)	34	#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 2, 0)
35	/**	35	/**
36	* struct snd_compressed_buffer - compressed buffer	36	* struct snd_compressed_buffer - compressed buffer
37	* @fragment_size: size of buffer fragment in bytes	37	* @fragment_size: size of buffer fragment in bytes

include/uapi/sound/compress_params.h+36−1

@@ -75,7 +75,9 @@ · 74 unmodified lines
75	#define SND_AUDIOCODEC_G723_1 ((__u32) 0x0000000C)	75	#define SND_AUDIOCODEC_G723_1 ((__u32) 0x0000000C)
76	#define SND_AUDIOCODEC_G729 ((__u32) 0x0000000D)	76	#define SND_AUDIOCODEC_G729 ((__u32) 0x0000000D)
77	#define SND_AUDIOCODEC_BESPOKE ((__u32) 0x0000000E)	77	#define SND_AUDIOCODEC_BESPOKE ((__u32) 0x0000000E)
78	#define SND_AUDIOCODEC_MAX SND_AUDIOCODEC_BESPOKE	78	#define SND_AUDIOCODEC_ALAC ((__u32) 0x0000000F)
		79	#define SND_AUDIOCODEC_APE ((__u32) 0x00000010)
		80	#define SND_AUDIOCODEC_MAX SND_AUDIOCODEC_APE
79		81
80	/*	82	/*
81	* Profile and modes are listed with bit masks. This allows for a	83	* Profile and modes are listed with bit masks. This allows for a
@@ -142,6 +144,9 @@ · 60 unmodified lines
142	#define SND_AUDIOPROFILE_WMA8 ((__u32) 0x00000002)	144	#define SND_AUDIOPROFILE_WMA8 ((__u32) 0x00000002)
143	#define SND_AUDIOPROFILE_WMA9 ((__u32) 0x00000004)	145	#define SND_AUDIOPROFILE_WMA9 ((__u32) 0x00000004)
144	#define SND_AUDIOPROFILE_WMA10 ((__u32) 0x00000008)	146	#define SND_AUDIOPROFILE_WMA10 ((__u32) 0x00000008)
		147	#define SND_AUDIOPROFILE_WMA9_PRO ((__u32) 0x00000010)
		148	#define SND_AUDIOPROFILE_WMA9_LOSSLESS ((__u32) 0x00000020)
		149	#define SND_AUDIOPROFILE_WMA10_LOSSLESS ((__u32) 0x00000040)
145		150
146	#define SND_AUDIOMODE_WMA_LEVEL1 ((__u32) 0x00000001)	151	#define SND_AUDIOMODE_WMA_LEVEL1 ((__u32) 0x00000001)
147	#define SND_AUDIOMODE_WMA_LEVEL2 ((__u32) 0x00000002)	152	#define SND_AUDIOMODE_WMA_LEVEL2 ((__u32) 0x00000002)
@@ -326,6 +331,33 @@ struct snd_dec_flac { · 178 unmodified lines
326	__u16 reserved;	331	__u16 reserved;
327	} __attribute__((packed, aligned(4)));	332	} __attribute__((packed, aligned(4)));
328		333
		334	struct snd_dec_wma {
		335	__u32 encoder_option;
		336	__u32 adv_encoder_option;
		337	__u32 adv_encoder_option2;
		338	__u32 reserved;
		339	} __attribute__((packed, aligned(4)));
		340
		341	struct snd_dec_alac {
		342	__u32 frame_length;
		343	__u8 compatible_version;
		344	__u8 pb;
		345	__u8 mb;
		346	__u8 kb;
		347	__u32 max_run;
		348	__u32 max_frame_bytes;
		349	} __attribute__((packed, aligned(4)));
		350
		351	struct snd_dec_ape {
		352	__u16 compatible_version;
		353	__u16 compression_level;
		354	__u32 format_flags;
		355	__u32 blocks_per_frame;
		356	__u32 final_frame_blocks;
		357	__u32 total_frames;
		358	__u32 seek_table_present;
		359	} __attribute__((packed, aligned(4)));
		360
329	union snd_codec_options {	361	union snd_codec_options {
330	struct snd_enc_wma wma;	362	struct snd_enc_wma wma;
331	struct snd_enc_vorbis vorbis;	363	struct snd_enc_vorbis vorbis;
@@ -333,6 +365,9 @@ union snd_codec_options { · 1 unmodified line
333	struct snd_enc_flac flac;	365	struct snd_enc_flac flac;
334	struct snd_enc_generic generic;	366	struct snd_enc_generic generic;
335	struct snd_dec_flac flac_d;	367	struct snd_dec_flac flac_d;
		368	struct snd_dec_wma wma_d;
		369	struct snd_dec_alac alac_d;
		370	struct snd_dec_ape ape_d;
336	} __attribute__((packed, aligned(4)));	371	} __attribute__((packed, aligned(4)));
337		372
338	/** struct snd_codec_desc - description of codec capabilities	373	/** struct snd_codec_desc - description of codec capabilities

include/uapi/sound/sof/abi.h+1−1

@@ -26,7 +26,7 @@ · 25 unmodified lines
26		26
27	/* SOF ABI version major, minor and patch numbers */	27	/* SOF ABI version major, minor and patch numbers */
28	#define SOF_ABI_MAJOR 3	28	#define SOF_ABI_MAJOR 3
29	#define SOF_ABI_MINOR 12	29	#define SOF_ABI_MINOR 13
30	#define SOF_ABI_PATCH 0	30	#define SOF_ABI_PATCH 0
31		31
32	/* SOF ABI version number. Format within 32bit word is MMmmmppp */	32	/* SOF ABI version number. Format within 32bit word is MMmmmppp */