bpf, trace: add BPF_F_CURRENT_CPU flag for bpf_perf_event_output (1e33759c) · Commits · 戴 / test

include/uapi/linux/bpf.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -347,6 +347,10 @@ enum bpf_func_id {
	#define BPF_F_ZERO_CSUM_TX (1ULL << 1)		#define BPF_F_ZERO_CSUM_TX (1ULL << 1)
	#define BPF_F_DONT_FRAGMENT (1ULL << 2)		#define BPF_F_DONT_FRAGMENT (1ULL << 2)

			/* BPF_FUNC_perf_event_output flags. */
			#define BPF_F_INDEX_MASK 0xffffffffULL
			#define BPF_F_CURRENT_CPU BPF_F_INDEX_MASK

	/* user accessible mirror of in-kernel sk_buff.		/* user accessible mirror of in-kernel sk_buff.
	* new fields can only be added to the end of this structure		* new fields can only be added to the end of this structure
	*/		*/

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -225,11 +225,12 @@ static const struct bpf_func_proto bpf_perf_event_read_proto = {
	.arg2_type = ARG_ANYTHING,		.arg2_type = ARG_ANYTHING,
	};		};

	static u64 bpf_perf_event_output(u64 r1, u64 r2, u64 index, u64 r4, u64 size)		static u64 bpf_perf_event_output(u64 r1, u64 r2, u64 flags, u64 r4, u64 size)
	{		{
	struct pt_regs regs = (struct pt_regs ) (long) r1;		struct pt_regs regs = (struct pt_regs ) (long) r1;
	struct bpf_map map = (struct bpf_map ) (long) r2;		struct bpf_map map = (struct bpf_map ) (long) r2;
	struct bpf_array *array = container_of(map, struct bpf_array, map);		struct bpf_array *array = container_of(map, struct bpf_array, map);
			u64 index = flags & BPF_F_INDEX_MASK;
	void data = (void ) (long) r4;		void data = (void ) (long) r4;
	struct perf_sample_data sample_data;		struct perf_sample_data sample_data;
	struct perf_event *event;		struct perf_event *event;
	@@ -239,6 +240,10 @@ static u64 bpf_perf_event_output(u64 r1, u64 r2, u64 index, u64 r4, u64 size)
	.data = data,		.data = data,
	};		};

			if (unlikely(flags & ~(BPF_F_INDEX_MASK)))
			return -EINVAL;
			if (index == BPF_F_CURRENT_CPU)
			index = raw_smp_processor_id();
	if (unlikely(index >= array->map.max_entries))		if (unlikely(index >= array->map.max_entries))
	return -E2BIG;		return -E2BIG;