Skip to content

Commit

Permalink
libperf: Add PERF_RECORD_BPF_EVENT 'struct bpf_event' to perf/event.h
Browse files Browse the repository at this point in the history
Move the PERF_RECORD_BPF_EVENT event definition to libperf's event.h.

In order to keep libperf simple, we switch 'u64/u32/u16/u8'
types used events to their generic '__u*' versions.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190825181752.722-12-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Jiri Olsa authored and Arnaldo Carvalho de Melo committed Aug 26, 2019
1 parent f15e3c2 commit b1b5101
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
11 changes: 11 additions & 0 deletions tools/perf/lib/include/perf/event.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <linux/perf_event.h>
#include <linux/types.h>
#include <linux/limits.h>
#include <linux/bpf.h>

struct mmap_event {
struct perf_event_header header;
Expand Down Expand Up @@ -93,4 +94,14 @@ struct ksymbol_event {
char name[KSYM_NAME_LEN];
};

struct bpf_event {
struct perf_event_header header;
__u16 type;
__u16 flags;
__u32 id;

/* for bpf_prog types */
__u8 tag[BPF_TAG_SIZE]; // prog tag
};

#endif /* __LIBPERF_EVENT_H */
10 changes: 0 additions & 10 deletions tools/perf/util/event.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,6 @@
#define PRI_lx64 PRIx64
#endif

struct bpf_event {
struct perf_event_header header;
u16 type;
u16 flags;
u32 id;

/* for bpf_prog types */
u8 tag[BPF_TAG_SIZE]; // prog tag
};

#define PERF_SAMPLE_MASK \
(PERF_SAMPLE_IP | PERF_SAMPLE_TID | \
PERF_SAMPLE_TIME | PERF_SAMPLE_ADDR | \
Expand Down

0 comments on commit b1b5101

Please sign in to comment.