Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1441819

[PATCH net-next 2/3] bpf, perf: split bpf_perf_event_output

Show all headers | View raw

Split the bpf_perf_event_output() helper as a preparation into two
parts. The newly bpf_perf_event_output() will prepare the raw record
itself and test for unknown flags from BPF trace context, where the
__bpf_perf_event_output() does the core work and will be reused later
as well.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
---
 kernel/trace/bpf_trace.c | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index 8540bd5..4d3d5b8 100644
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -233,25 +233,17 @@ static const struct bpf_func_proto bpf_perf_event_read_proto = {
 	.arg2_type	= ARG_ANYTHING,
 };
 
-static u64 bpf_perf_event_output(u64 r1, u64 r2, u64 flags, u64 r4, u64 size)
+static __always_inline u64
+__bpf_perf_event_output(struct pt_regs *regs, struct bpf_map *map,
+			u64 flags, struct perf_raw_record *raw)
 {
-	struct pt_regs *regs = (struct pt_regs *) (long) r1;
-	struct bpf_map *map = (struct bpf_map *) (long) r2;
 	struct bpf_array *array = container_of(map, struct bpf_array, map);
 	unsigned int cpu = smp_processor_id();
 	u64 index = flags & BPF_F_INDEX_MASK;
-	void *data = (void *) (long) r4;
 	struct perf_sample_data sample_data;
 	struct bpf_event_entry *ee;
 	struct perf_event *event;
-	struct perf_raw_record raw = {
-		.size = size,
-		.size_head = size,
-		.data = data,
-	};
 
-	if (unlikely(flags & ~(BPF_F_INDEX_MASK)))
-		return -EINVAL;
 	if (index == BPF_F_CURRENT_CPU)
 		index = cpu;
 	if (unlikely(index >= array->map.max_entries))
@@ -270,11 +262,27 @@ static u64 bpf_perf_event_output(u64 r1, u64 r2, u64 flags, u64 r4, u64 size)
 		return -EOPNOTSUPP;
 
 	perf_sample_data_init(&sample_data, 0, 0);
-	sample_data.raw = &raw;
+	sample_data.raw = raw;
 	perf_event_output(event, &sample_data, regs);
 	return 0;
 }
 
+static u64 bpf_perf_event_output(u64 r1, u64 r2, u64 flags, u64 r4, u64 size)
+{
+	struct perf_raw_record raw = {
+		.size		= size,
+		.size_head	= size,
+		.data		= (void *)(long) r4,
+	};
+
+	if (unlikely(flags & ~(BPF_F_INDEX_MASK)))
+		return -EINVAL;
+
+	return __bpf_perf_event_output((struct pt_regs *)(long) r1,
+				       (struct bpf_map *)(long) r2,
+				       flags, &raw);
+}
+
 static const struct bpf_func_proto bpf_perf_event_output_proto = {
 	.func		= bpf_perf_event_output,
 	.gpl_only	= true,
-- 
1.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH net-next 0/3] BPF event output helper improvements Daniel Borkmann <daniel@iogearbox.net> - 2016-07-13 00:40 +0200
  [PATCH net-next 3/3] bpf: avoid stack copy and use skb ctx for event output Daniel Borkmann <daniel@iogearbox.net> - 2016-07-13 00:40 +0200
  [PATCH net-next 1/3] perf, events: add non-linear data support for raw records Daniel Borkmann <daniel@iogearbox.net> - 2016-07-13 00:40 +0200
    Re: [PATCH net-next 1/3] perf, events: add non-linear data support  for raw records Peter Zijlstra <peterz@infradead.org> - 2016-07-13 10:00 +0200
      Re: [PATCH net-next 1/3] perf, events: add non-linear data support  for raw records Daniel Borkmann <daniel@iogearbox.net> - 2016-07-13 11:30 +0200
        Re: [PATCH net-next 1/3] perf, events: add non-linear data support  for raw records Peter Zijlstra <peterz@infradead.org> - 2016-07-13 14:20 +0200
          Re: [PATCH net-next 1/3] perf, events: add non-linear data support  for raw records Daniel Borkmann <daniel@iogearbox.net> - 2016-07-13 15:20 +0200
    Re: [PATCH net-next 1/3] perf, events: add non-linear data support  for raw records Peter Zijlstra <peterz@infradead.org> - 2016-07-13 15:50 +0200
      Re: [PATCH net-next 1/3] perf, events: add non-linear data support  for raw records Daniel Borkmann <daniel@iogearbox.net> - 2016-07-13 16:10 +0200
        Re: [PATCH net-next 1/3] perf, events: add non-linear data support  for raw records Peter Zijlstra <peterz@infradead.org> - 2016-07-13 18:50 +0200
          Re: [PATCH net-next 1/3] perf, events: add non-linear data support  for raw records Daniel Borkmann <daniel@iogearbox.net> - 2016-07-13 19:00 +0200
  [PATCH net-next 2/3] bpf, perf: split bpf_perf_event_output Daniel Borkmann <daniel@iogearbox.net> - 2016-07-13 00:40 +0200

csiph-web