Merge remote-tracking branch 'wireless/main' into wireless-next

Pull in wireless/main content since some new code would otherwise conflict with it.

Johannes Berg committed 4 years ago

Commit dfd2d872 parents a790cc3 10d5ea51238 files · +50310 −13759Browse files

Showing the changes to include/uapi (8 of 1238 files). Show all

Unified · Split

8 files

include/uapi/linux/bpf.h +60 −6
include/uapi/linux/dlm.h +0 −1
include/uapi/linux/ethtool.h +45 −0
include/uapi/linux/ethtool_netlink.h +16 −0
include/uapi/linux/if_link.h +1 −0
include/uapi/linux/landlock.h +5 −5
include/uapi/linux/lwtunnel.h +10 −0
include/uapi/linux/stat.h +3 −1

 		__u32	cgroup_fd;
 		__u64	cgroup_id;
 	} cgroup;
+	/* Parameters of task iterators. */
+	struct {
+		__u32	tid;
+		__u32	pid;
+		__u32	pid_fd;
+	} task;
 };
 /* BPF syscall commands, see bpf(2) man-page for more details. */
 	BPF_MAP_TYPE_INODE_STORAGE,
 	BPF_MAP_TYPE_TASK_STORAGE,
 	BPF_MAP_TYPE_BLOOM_FILTER,
+	BPF_MAP_TYPE_USER_RINGBUF,
 };
 /* Note that tracing related programs such as
 /* Query effective (directly attached + inherited from ancestor cgroups)
  * programs that will be executed for events within a cgroup.
- * attach_flags with this flag are returned only for directly attached programs.
+ * attach_flags with this flag are always returned 0.
  */
 #define BPF_F_QUERY_EFFECTIVE	(1U << 0)
 		__u32		attach_flags;
 		__aligned_u64	prog_ids;
 		__u32		prog_cnt;
-		__aligned_u64	prog_attach_flags; /* output: per-program attach_flags */
+		/* output: per-program attach_flags.
+		 * not allowed to be set during effective query.
+		 */
+		__aligned_u64	prog_attach_flags;
 	} query;
 	struct { /* anonymous struct used by BPF_RAW_TRACEPOINT_OPEN command */
  * 		Get address of the traced function (for tracing and kprobe programs).
  * 	Return
  * 		Address of the traced function.
+ * 		0 for kprobes placed within the function (not at the entry).
  *
  * u64 bpf_get_attach_cookie(void *ctx)
  * 	Description
  *
  * long bpf_get_func_arg(void *ctx, u32 n, u64 *value)
  *	Description
- *		Get **n**-th argument (zero based) of the traced function (for tracing programs)
+ *		Get **n**-th argument register (zero based) of the traced function (for tracing programs)
  *		returned in **value**.
  *
  *	Return
  *		0 on success.
- *		**-EINVAL** if n >= arguments count of traced function.
+ *		**-EINVAL** if n >= argument register count of traced function.
  *
  * long bpf_get_func_ret(void *ctx, u64 *value)
  *	Description
  *
  * long bpf_get_func_arg_cnt(void *ctx)
  *	Description
- *		Get number of arguments of the traced function (for tracing programs).
+ *		Get number of registers of the traced function (for tracing programs) where
+ *		function arguments are stored in these registers.
  *
  *	Return
- *		The number of arguments of the traced function.
+ *		The number of argument registers of the traced function.
  *
  * int bpf_get_retval(void)
  *	Description
  *	Return
  *		Current *ktime*.
  *
+ * long bpf_user_ringbuf_drain(struct bpf_map *map, void *callback_fn, void *ctx, u64 flags)
+ *	Description
+ *		Drain samples from the specified user ring buffer, and invoke
+ *		the provided callback for each such sample:
+ *
+ *		long (\*callback_fn)(struct bpf_dynptr \*dynptr, void \*ctx);
+ *
+ *		If **callback_fn** returns 0, the helper will continue to try
+ *		and drain the next sample, up to a maximum of
+ *		BPF_MAX_USER_RINGBUF_SAMPLES samples. If the return value is 1,
+ *		the helper will skip the rest of the samples and return. Other
+ *		return values are not used now, and will be rejected by the
+ *		verifier.
+ *	Return
+ *		The number of drained samples if no error was encountered while
+ *		draining samples, or 0 if no samples were present in the ring
+ *		buffer. If a user-space producer was epoll-waiting on this map,
+ *		and at least one sample was drained, they will receive an event
+ *		notification notifying them of available space in the ring
+ *		buffer. If the BPF_RB_NO_WAKEUP flag is passed to this
+ *		function, no wakeup notification will be sent. If the
+ *		BPF_RB_FORCE_WAKEUP flag is passed, a wakeup notification will
+ *		be sent even if no sample was drained.
+ *
+ *		On failure, the returned value is one of the following:
+ *
+ *		**-EBUSY** if the ring buffer is contended, and another calling
+ *		context was concurrently draining the ring buffer.
+ *
+ *		**-EINVAL** if user-space is not properly tracking the ring
+ *		buffer due to the producer position not being aligned to 8
+ *		bytes, a sample not being aligned to 8 bytes, or the producer
+ *		position not matching the advertised length of a sample.
+ *
+ *		**-E2BIG** if user-space has tried to publish a sample which is
+ *		larger than the size of the ring buffer, or which cannot fit
+ *		within a struct bpf_dynptr.
  */
 #define __BPF_FUNC_MAPPER(FN)		\
 	FN(unspec),			\
 	FN(tcp_raw_check_syncookie_ipv4),	\
 	FN(tcp_raw_check_syncookie_ipv6),	\
 	FN(ktime_get_tai_ns),		\
+	FN(user_ringbuf_drain),		\
 	/* */
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper
 					__u64 cgroup_id;
 					__u32 order;
 				} cgroup;
+				struct {
+					__u32 tid;
+					__u32 pid;
+				} task;
 			};
 		} iter;
 		struct  {

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

@@ -69,7 +69,6 @@ struct dlm_lksb { · 68 unmodified lines
69	/* dlm_new_lockspace() flags */	69	/* dlm_new_lockspace() flags */
70		70
71	#define DLM_LSFL_TIMEWARN 0x00000002	71	#define DLM_LSFL_TIMEWARN 0x00000002
72	#define DLM_LSFL_FS 0x00000004
73	#define DLM_LSFL_NEWEXCL 0x00000008	72	#define DLM_LSFL_NEWEXCL 0x00000008
74		73
75		74

include/uapi/linux/ethtool.h+45−0

@@ -736,6 +736,51 @@ enum ethtool_module_power_mode { · 735 unmodified lines
736	ETHTOOL_MODULE_POWER_MODE_HIGH,	736	ETHTOOL_MODULE_POWER_MODE_HIGH,
737	};	737	};
738		738
		739	/**
		740	* enum ethtool_podl_pse_admin_state - operational state of the PoDL PSE
		741	* functions. IEEE 802.3-2018 30.15.1.1.2 aPoDLPSEAdminState
		742	* @ETHTOOL_PODL_PSE_ADMIN_STATE_UNKNOWN: state of PoDL PSE functions are
		743	* unknown
		744	* @ETHTOOL_PODL_PSE_ADMIN_STATE_DISABLED: PoDL PSE functions are disabled
		745	* @ETHTOOL_PODL_PSE_ADMIN_STATE_ENABLED: PoDL PSE functions are enabled
		746	*/
		747	enum ethtool_podl_pse_admin_state {
		748	ETHTOOL_PODL_PSE_ADMIN_STATE_UNKNOWN = 1,
		749	ETHTOOL_PODL_PSE_ADMIN_STATE_DISABLED,
		750	ETHTOOL_PODL_PSE_ADMIN_STATE_ENABLED,
		751	};
		752
		753	/**
		754	* enum ethtool_podl_pse_pw_d_status - power detection status of the PoDL PSE.
		755	* IEEE 802.3-2018 30.15.1.1.3 aPoDLPSEPowerDetectionStatus:
		756	* @ETHTOOL_PODL_PSE_PW_D_STATUS_UNKNOWN: PoDL PSE
		757	* @ETHTOOL_PODL_PSE_PW_D_STATUS_DISABLED: "The enumeration “disabled” is
		758	* asserted true when the PoDL PSE state diagram variable mr_pse_enable is
		759	* false"
		760	* @ETHTOOL_PODL_PSE_PW_D_STATUS_SEARCHING: "The enumeration “searching” is
		761	* asserted true when either of the PSE state diagram variables
		762	* pi_detecting or pi_classifying is true."
		763	* @ETHTOOL_PODL_PSE_PW_D_STATUS_DELIVERING: "The enumeration “deliveringPower”
		764	* is asserted true when the PoDL PSE state diagram variable pi_powered is
		765	* true."
		766	* @ETHTOOL_PODL_PSE_PW_D_STATUS_SLEEP: "The enumeration “sleep” is asserted
		767	* true when the PoDL PSE state diagram variable pi_sleeping is true."
		768	* @ETHTOOL_PODL_PSE_PW_D_STATUS_IDLE: "The enumeration “idle” is asserted true
		769	* when the logical combination of the PoDL PSE state diagram variables
		770	* pi_prebiased*!pi_sleeping is true."
		771	* @ETHTOOL_PODL_PSE_PW_D_STATUS_ERROR: "The enumeration “error” is asserted
		772	* true when the PoDL PSE state diagram variable overload_held is true."
		773	*/
		774	enum ethtool_podl_pse_pw_d_status {
		775	ETHTOOL_PODL_PSE_PW_D_STATUS_UNKNOWN = 1,
		776	ETHTOOL_PODL_PSE_PW_D_STATUS_DISABLED,
		777	ETHTOOL_PODL_PSE_PW_D_STATUS_SEARCHING,
		778	ETHTOOL_PODL_PSE_PW_D_STATUS_DELIVERING,
		779	ETHTOOL_PODL_PSE_PW_D_STATUS_SLEEP,
		780	ETHTOOL_PODL_PSE_PW_D_STATUS_IDLE,
		781	ETHTOOL_PODL_PSE_PW_D_STATUS_ERROR,
		782	};
		783
739	/**	784	/**
740	* struct ethtool_gstrings - string set for data tagging	785	* struct ethtool_gstrings - string set for data tagging
741	* @cmd: Command number = %ETHTOOL_GSTRINGS	786	* @cmd: Command number = %ETHTOOL_GSTRINGS

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

 	ETHTOOL_MSG_PHC_VCLOCKS_GET,
 	ETHTOOL_MSG_MODULE_GET,
 	ETHTOOL_MSG_MODULE_SET,
+	ETHTOOL_MSG_PSE_GET,
+	ETHTOOL_MSG_PSE_SET,
 	/* add new constants above here */
 	__ETHTOOL_MSG_USER_CNT,
 	ETHTOOL_MSG_PHC_VCLOCKS_GET_REPLY,
 	ETHTOOL_MSG_MODULE_GET_REPLY,
 	ETHTOOL_MSG_MODULE_NTF,
+	ETHTOOL_MSG_PSE_GET_REPLY,
 	/* add new constants above here */
 	__ETHTOOL_MSG_KERNEL_CNT,
 	ETHTOOL_A_MODULE_MAX = (__ETHTOOL_A_MODULE_CNT - 1)
 };
+/* Power Sourcing Equipment */
+enum {
+	ETHTOOL_A_PSE_UNSPEC,
+	ETHTOOL_A_PSE_HEADER,			/* nest - _A_HEADER_* */
+	ETHTOOL_A_PODL_PSE_ADMIN_STATE,		/* u32 */
+	ETHTOOL_A_PODL_PSE_ADMIN_CONTROL,	/* u32 */
+	ETHTOOL_A_PODL_PSE_PW_D_STATUS,		/* u32 */
+	/* add new constants above here */
+	__ETHTOOL_A_PSE_CNT,
+	ETHTOOL_A_PSE_MAX = (__ETHTOOL_A_PSE_CNT - 1)
+};
 /* generic netlink info */
 #define ETHTOOL_GENL_NAME "ethtool"
 #define ETHTOOL_GENL_VERSION 1

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

@@ -695,6 +695,7 @@ enum { · 694 unmodified lines
695	IFLA_XFRM_UNSPEC,	695	IFLA_XFRM_UNSPEC,
696	IFLA_XFRM_LINK,	696	IFLA_XFRM_LINK,
697	IFLA_XFRM_IF_ID,	697	IFLA_XFRM_IF_ID,
		698	IFLA_XFRM_COLLECT_METADATA,
698	__IFLA_XFRM_MAX	699	__IFLA_XFRM_MAX
699	};	700	};
700		701

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

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

 	LWTUNNEL_ENCAP_SEG6_LOCAL,
 	LWTUNNEL_ENCAP_RPL,
 	LWTUNNEL_ENCAP_IOAM6,
+	LWTUNNEL_ENCAP_XFRM,
 	__LWTUNNEL_ENCAP_MAX,
 };
 #define LWT_BPF_MAX_HEADROOM 256
+enum {
+	LWT_XFRM_UNSPEC,
+	LWT_XFRM_IF_ID,
+	LWT_XFRM_LINK,
+	__LWT_XFRM_MAX,
+};
+#define LWT_XFRM_MAX (__LWT_XFRM_MAX - 1)
 #endif /* _UAPI_LWTUNNEL_H_ */

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

 	__u32	stx_dev_minor;
 	/* 0x90 */
 	__u64	stx_mnt_id;
-	__u64	__spare2;
+	__u32	stx_dio_mem_align;	/* Memory buffer alignment for direct I/O */
+	__u32	stx_dio_offset_align;	/* File offset alignment for direct I/O */
 	/* 0xa0 */
 	__u64	__spare3[12];	/* Spare space for future expansion */
 	/* 0x100 */
 #define STATX_BASIC_STATS	0x000007ffU	/* The stuff in the normal stat struct */
 #define STATX_BTIME		0x00000800U	/* Want/got stx_btime */
 #define STATX_MNT_ID		0x00001000U	/* Got stx_mnt_id */
+#define STATX_DIOALIGN		0x00002000U	/* Want/got direct I/O alignment info */
 #define STATX__RESERVED		0x80000000U	/* Reserved for future struct statx expansion */

@@ -26,7 +26,7 @@ struct landlock_ruleset_attr { · 25 unmodified lines
26	* Landlock filesystem access rights that are not part of	26	* Landlock filesystem access rights that are not part of
27	* handled_access_fs are allowed. This is needed for backward	27	* handled_access_fs are allowed. This is needed for backward
28	* compatibility reasons. One exception is the	28	* compatibility reasons. One exception is the
29	* LANDLOCK_ACCESS_FS_REFER access right, which is always implicitly	29	* %LANDLOCK_ACCESS_FS_REFER access right, which is always implicitly
30	* handled, but must still be explicitly handled to add new rules with	30	* handled, but must still be explicitly handled to add new rules with
31	* this access right.	31	* this access right.
32	*/	32	*/
@@ -128,11 +128,11 @@ struct landlock_path_beneath_attr { · 95 unmodified lines
128	* hierarchy must also always have the same or a superset of restrictions of	128	* hierarchy must also always have the same or a superset of restrictions of
129	* the source hierarchy. If it is not the case, or if the domain doesn't	129	* the source hierarchy. If it is not the case, or if the domain doesn't
130	* handle this access right, such actions are denied by default with errno	130	* handle this access right, such actions are denied by default with errno
131	* set to EXDEV. Linking also requires a LANDLOCK_ACCESS_FS_MAKE_* access	131	* set to ``EXDEV``. Linking also requires a ``LANDLOCK_ACCESS_FS_MAKE_*``
132	* right on the destination directory, and renaming also requires a	132	* access right on the destination directory, and renaming also requires a
133	* LANDLOCK_ACCESS_FS_REMOVE_* access right on the source's (file or	133	* ``LANDLOCK_ACCESS_FS_REMOVE_*`` access right on the source's (file or
134	* directory) parent. Otherwise, such actions are denied with errno set to	134	* directory) parent. Otherwise, such actions are denied with errno set to
135	* EACCES. The EACCES errno prevails over EXDEV to let user space	135	* ``EACCES``. The ``EACCES`` errno prevails over ``EXDEV`` to let user space
136	* efficiently deal with an unrecoverable error.	136	* efficiently deal with an unrecoverable error.
137	*	137	*
138	* .. warning::	138	* .. warning::