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

Merge branch 'bpf-perf-hw-sw-events' 

Alexei Starovoitov says:

====================
perf, bpf: add support for bpf in sw/hw perf_events

this patch set is a follow up to the discussion:
https://lkml.kernel.org/r/20160804142853.GO6862%20()%20twins%20!%20programming%20!%20kicks-ass%20!%20net


It turned out to be simpler than what we discussed.

Patches 1-3 is bpf-side prep for the main patch 4
that adds bpf program as an overflow_handler to sw and hw perf_events.

Patches 5 and 6 are examples from myself and Brendan.

Peter,
to implement your suggestion to add ifdef CONFIG_BPF_SYSCALL
inside struct perf_event, I had to shuffle ifdefs in events/core.c
Please double check whether that is what you wanted to see.

v2->v3: fixed few more minor issues
v1->v2: fixed issues spotted by Peter and Daniel.
====================

Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 569e937e 72874418

include/linux/bpf.h

+4 −0
Original line number Diff line number Diff line
@@ -297,6 +297,10 @@ static inline struct bpf_prog *bpf_prog_add(struct bpf_prog *prog, int i) 
static inline void bpf_prog_put(struct bpf_prog *prog)

{

}

static inline struct bpf_prog *bpf_prog_inc(struct bpf_prog *prog)

{

	return ERR_PTR(-EOPNOTSUPP);

}

#endif /* CONFIG_BPF_SYSCALL */



/* verifier prototypes for helper functions called from eBPF programs */

include/linux/perf_event.h

+9 −0
Original line number Diff line number Diff line
@@ -679,6 +679,10 @@ struct perf_event { 
	u64				(*clock)(void);

	perf_overflow_handler_t		overflow_handler;

	void				*overflow_handler_context;

#ifdef CONFIG_BPF_SYSCALL

	perf_overflow_handler_t		orig_overflow_handler;

	struct bpf_prog			*prog;

#endif



#ifdef CONFIG_EVENT_TRACING

	struct trace_event_call		*tp_event;
@@ -788,6 +792,11 @@ struct perf_output_handle { 
	int				page;

};



struct bpf_perf_event_data_kern {

	struct pt_regs *regs;

	struct perf_sample_data *data;

};



#ifdef CONFIG_CGROUP_PERF



/*

include/uapi/linux/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ header-y += binfmts.h 
header-y += blkpg.h

header-y += blktrace_api.h

header-y += bpf_common.h

header-y += bpf_perf_event.h

header-y += bpf.h

header-y += bpqether.h

header-y += bsg.h

include/uapi/linux/bpf.h

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ enum bpf_prog_type { 
	BPF_PROG_TYPE_SCHED_ACT,

	BPF_PROG_TYPE_TRACEPOINT,

	BPF_PROG_TYPE_XDP,

	BPF_PROG_TYPE_PERF_EVENT,

};



#define BPF_PSEUDO_MAP_FD	1

include/uapi/linux/bpf_perf_event.h

0 → 100644
+18 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2016 Facebook

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of version 2 of the GNU General Public

 * License as published by the Free Software Foundation.

 */

#ifndef _UAPI__LINUX_BPF_PERF_EVENT_H__

#define _UAPI__LINUX_BPF_PERF_EVENT_H__



#include <linux/types.h>

#include <linux/ptrace.h>



struct bpf_perf_event_data {

	struct pt_regs regs;

	__u64 sample_period;

};



#endif /* _UAPI__LINUX_BPF_PERF_EVENT_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE