bpf: sync {btf, bpf}.h uapi header from tools infrastructure (c83fef6b) · Commits · 戴 / test

tools/include/uapi/linux/bpf.h

+18 −2

Original line number	Diff line number	Diff line
		@@ -105,6 +105,7 @@ enum bpf_cmd {
		BPF_BTF_GET_FD_BY_ID,
		BPF_TASK_FD_QUERY,
		BPF_MAP_LOOKUP_AND_DELETE_ELEM,
		BPF_MAP_FREEZE,
		};

		enum bpf_map_type {
		@@ -255,8 +256,19 @@ enum bpf_attach_type {
		*/
		#define BPF_F_ANY_ALIGNMENT (1U << 1)

		/* when bpf_ldimm64->src_reg == BPF_PSEUDO_MAP_FD, bpf_ldimm64->imm == fd */
		/* When BPF ldimm64's insn[0].src_reg != 0 then this can have
		* two extensions:
		*
		* insn[0].src_reg: BPF_PSEUDO_MAP_FD BPF_PSEUDO_MAP_VALUE
		* insn[0].imm: map fd map fd
		* insn[1].imm: 0 offset into value
		* insn[0].off: 0 0
		* insn[1].off: 0 0
		* ldimm64 rewrite: address of map address of map[0]+offset
		* verifier type: CONST_PTR_TO_MAP PTR_TO_MAP_VALUE
		*/
		#define BPF_PSEUDO_MAP_FD 1
		#define BPF_PSEUDO_MAP_VALUE 2

		/* when bpf_call->src_reg == BPF_PSEUDO_CALL, bpf_call->imm == pc-relative
		* offset to another bpf function
		@@ -283,7 +295,7 @@ enum bpf_attach_type {

		#define BPF_OBJ_NAME_LEN 16U

		/* Flags for accessing BPF object */
		/* Flags for accessing BPF object from syscall side. */
		#define BPF_F_RDONLY (1U << 3)
		#define BPF_F_WRONLY (1U << 4)

		@@ -293,6 +305,10 @@ enum bpf_attach_type {
		/* Zero-initialize hash function seed. This should only be used for testing. */
		#define BPF_F_ZERO_SEED (1U << 6)

		/* Flags for accessing BPF object from program side. */
		#define BPF_F_RDONLY_PROG (1U << 7)
		#define BPF_F_WRONLY_PROG (1U << 8)

		/* flags for BPF_PROG_QUERY */
		#define BPF_F_QUERY_EFFECTIVE (1U << 0)

+28 −4

Original line number	Diff line number	Diff line
		@@ -39,11 +39,11 @@ struct btf_type {
		* struct, union and fwd
		*/
		__u32 info;
		/* "size" is used by INT, ENUM, STRUCT and UNION.
		/* "size" is used by INT, ENUM, STRUCT, UNION and DATASEC.
		* "size" tells the size of the type it is describing.
		*
		* "type" is used by PTR, TYPEDEF, VOLATILE, CONST, RESTRICT,
		* FUNC and FUNC_PROTO.
		* FUNC, FUNC_PROTO and VAR.
		* "type" is a type_id referring to another type.
		*/
		union {
		@@ -70,8 +70,10 @@ struct btf_type {
		#define BTF_KIND_RESTRICT 11 /* Restrict */
		#define BTF_KIND_FUNC 12 /* Function */
		#define BTF_KIND_FUNC_PROTO 13 /* Function Proto */
		#define BTF_KIND_MAX 13
		#define NR_BTF_KINDS 14
		#define BTF_KIND_VAR 14 /* Variable */
		#define BTF_KIND_DATASEC 15 /* Section */
		#define BTF_KIND_MAX BTF_KIND_DATASEC
		#define NR_BTF_KINDS (BTF_KIND_MAX + 1)

		/* For some specific BTF_KIND, "struct btf_type" is immediately
		* followed by extra data.
		@@ -138,4 +140,26 @@ struct btf_param {
		__u32 type;
		};

		enum {
		BTF_VAR_STATIC = 0,
		BTF_VAR_GLOBAL_ALLOCATED,
		};

		/* BTF_KIND_VAR is followed by a single "struct btf_var" to describe
		* additional information related to the variable such as its linkage.
		*/
		struct btf_var {
		__u32 linkage;
		};

		/* BTF_KIND_DATASEC is followed by multiple "struct btf_var_secinfo"
		* to describe all BTF_KIND_VAR types it contains along with it's
		* in-section offset as well as size.
		*/
		struct btf_var_secinfo {
		__u32 type;
		__u32 offset;
		__u32 size;
		};

		#endif /* _UAPI__LINUX_BTF_H__ */