Commit e980a076 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bpf-event-output-helper-improvements' 



Daniel Borkmann says:

====================
BPF event output helper improvements

This set adds improvements to the BPF event output helper to
support non-linear data sampling, here specifically, for skb
context. For details please see individual patches. The set
is based against net-next tree.

v1 -> v2:
  - Integrated and adapted Peter's diff into patch 1, updated
    the remaining ones accordingly. Thanks Peter!
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7acef604 555c8a86

arch/s390/kernel/perf_cpum_sf.c

+6 −3
Original line number Diff line number Diff line
@@ -979,12 +979,15 @@ static int perf_push_sample(struct perf_event *event, struct sf_raw_sample *sfr) 
	struct pt_regs regs;

	struct perf_sf_sde_regs *sde_regs;

	struct perf_sample_data data;

	struct perf_raw_record raw;

	struct perf_raw_record raw = {

		.frag = {

			.size = sfr->size,

			.data = sfr,

		},

	};



	/* Setup perf sample */

	perf_sample_data_init(&data, 0, event->hw.last_period);

	raw.size = sfr->size;

	raw.data = sfr;

	data.raw = &raw;



	/* Setup pt_regs to look like an CPU-measurement external interrupt

arch/x86/events/amd/ibs.c

+6 −2
Original line number Diff line number Diff line
@@ -655,8 +655,12 @@ fail: 
	}



	if (event->attr.sample_type & PERF_SAMPLE_RAW) {

		raw.size = sizeof(u32) + ibs_data.size;

		raw.data = ibs_data.data;

		raw = (struct perf_raw_record){

			.frag = {

				.size = sizeof(u32) + ibs_data.size,

				.data = ibs_data.data,

			},

		};

		data.raw = &raw;

	}

include/linux/bpf.h

+6 −1
Original line number Diff line number Diff line
@@ -209,7 +209,12 @@ u64 bpf_get_stackid(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5); 
bool bpf_prog_array_compatible(struct bpf_array *array, const struct bpf_prog *fp);



const struct bpf_func_proto *bpf_get_trace_printk_proto(void);

const struct bpf_func_proto *bpf_get_event_output_proto(void);



typedef unsigned long (*bpf_ctx_copy_t)(void *dst, const void *src,

					unsigned long len);



u64 bpf_event_output(struct bpf_map *map, u64 flags, void *meta, u64 meta_size,

		     void *ctx, u64 ctx_size, bpf_ctx_copy_t ctx_copy);



#ifdef CONFIG_BPF_SYSCALL

DECLARE_PER_CPU(int, bpf_prog_active);

include/linux/perf_event.h

+19 −1
Original line number Diff line number Diff line
@@ -69,9 +69,22 @@ struct perf_callchain_entry_ctx { 
	bool			    contexts_maxed;

};



typedef unsigned long (*perf_copy_f)(void *dst, const void *src,

				     unsigned long len);



struct perf_raw_frag {

	union {

		struct perf_raw_frag	*next;

		unsigned long		pad;

	};

	perf_copy_f			copy;

	void				*data;

	u32				size;

} __packed;



struct perf_raw_record {

	struct perf_raw_frag		frag;

	u32				size;

	void				*data;

};



/*
@@ -1283,6 +1296,11 @@ extern void perf_restore_debug_store(void); 
static inline void perf_restore_debug_store(void)			{ }

#endif



static __always_inline bool perf_raw_frag_last(const struct perf_raw_frag *frag)

{

	return frag->pad < sizeof(u64);

}



#define perf_output_put(handle, x) perf_output_copy((handle), &(x), sizeof(x))



/*

include/uapi/linux/bpf.h

+2 −0
Original line number Diff line number Diff line
@@ -401,6 +401,8 @@ enum bpf_func_id { 
/* BPF_FUNC_perf_event_output and BPF_FUNC_perf_event_read flags. */

#define BPF_F_INDEX_MASK		0xffffffffULL

#define 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)



/* user accessible mirror of in-kernel sk_buff.

 * new fields can only be added to the end of this structure

CRA Git | Maintained and supported by SUSTech CRA and CCSE