Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf (15192f25) · Commits · 戴 / test

Documentation/bpf/btf.rst

+2 −0

Original line number	Diff line number	Diff line
		@@ -578,6 +578,7 @@ For line_info, the line number and column number are defined as below:
		#define BPF_LINE_INFO_LINE_COL(line_col) ((line_col) & 0x3ff)

		3.4 BPF_{PROG,MAP}_GET_NEXT_ID
		==============================

		In kernel, every loaded program, map or btf has a unique id. The id won't
		change during the lifetime of a program, map, or btf.
		@@ -587,6 +588,7 @@ each command, to user space, for bpf program or maps, respectively, so an
		inspection tool can inspect all programs and maps.

		3.5 BPF_{PROG,MAP}_GET_FD_BY_ID
		===============================

		An introspection tool cannot use id to get details about program or maps.
		A file descriptor needs to be obtained first for reference-counting purpose.

+12 −1

Original line number	Diff line number	Diff line
		@@ -328,7 +328,18 @@ __emit_shf(struct nfp_prog *nfp_prog, u16 dst, enum alu_dst_ab dst_ab,
		return;
		}

		if (sc == SHF_SC_L_SHF)
		/* NFP shift instruction has something special. If shift direction is
		* left then shift amount of 1 to 31 is specified as 32 minus the amount
		* to shift.
		*
		* But no need to do this for indirect shift which has shift amount be
		* 0. Even after we do this subtraction, shift amount 0 will be turned
		* into 32 which will eventually be encoded the same as 0 because only
		* low 5 bits are encoded, but shift amount be 32 will fail the
		* FIELD_PREP check done later on shift mask (0x1f), due to 32 is out of
		* mask range.
		*/
		if (sc == SHF_SC_L_SHF && shift)
		shift = 32 - shift;

		insn = OP_SHF_BASE \|

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ static int libbpf_debug_print(enum libbpf_print_level level,
		static int check_load(const char *file)
		{
		struct bpf_prog_load_attr attr;
		struct bpf_object *obj;
		struct bpf_object *obj = NULL;
		int err, prog_fd;

		memset(&attr, 0, sizeof(struct bpf_prog_load_attr));

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ static void test_task_fd_query_tp_core(const char *probe_name,
		struct perf_event_attr attr = {};
		__u64 probe_offset, probe_addr;
		__u32 len, prog_id, fd_type;
		struct bpf_object *obj;
		struct bpf_object *obj = NULL;
		__u32 duration = 0;
		char buf[256];

+3 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,9 @@ void test_tp_attach_query(void)
		struct bpf_prog_info prog_info;
		char buf[256];

		for (i = 0; i < num_progs; i++)
		obj[i] = NULL;

		snprintf(buf, sizeof(buf),
		"/sys/kernel/debug/tracing/events/sched/sched_switch/id");
		efd = open(buf, O_RDONLY, 0);