1 files changed, 31 insertions, 118 deletions

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 0e164e8ae28d..429a3fe52d6c 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -7,108 +7,26 @@
 #include <linux/kernel.h>
 #include <linux/bpf.h>
 #include <linux/perf_event.h>
+#include <perf/event.h>
 
 #include "../perf.h"
 #include "build-id.h"
 #include "perf_regs.h"
 
-struct mmap_event {
-        struct perf_event_header header;
-        u32 pid, tid;
-        u64 start;
-        u64 len;
-        u64 pgoff;
-        char filename[PATH_MAX];
-};
-
-struct mmap2_event {
-        struct perf_event_header header;
-        u32 pid, tid;
-        u64 start;
-        u64 len;
-        u64 pgoff;
-        u32 maj;
-        u32 min;
-        u64 ino;
-        u64 ino_generation;
-        u32 prot;
-        u32 flags;
-        char filename[PATH_MAX];
-};
-
-struct comm_event {
-        struct perf_event_header header;
-        u32 pid, tid;
-        char comm[16];
-};
-
-struct namespaces_event {
-        struct perf_event_header header;
-        u32 pid, tid;
-        u64 nr_namespaces;
-        struct perf_ns_link_info link_info[];
-};
-
-struct fork_event {
-        struct perf_event_header header;
-        u32 pid, ppid;
-        u32 tid, ptid;
-        u64 time;
-};
-
-struct lost_event {
-        struct perf_event_header header;
-        u64 id;
-        u64 lost;
-};
-
-struct lost_samples_event {
-        struct perf_event_header header;
-        u64 lost;
-};
-
+#ifdef __LP64__
 /*
- * PERF_FORMAT_ENABLED | PERF_FORMAT_RUNNING | PERF_FORMAT_ID
+ * /usr/include/inttypes.h uses just 'lu' for PRIu64, but we end up defining
+ * __u64 as long long unsigned int, and then -Werror=format= kicks in and
+ * complains of the mismatched types, so use these two special extra PRI
+ * macros to overcome that.
  */
-struct read_event {
-        struct perf_event_header header;
-        u32 pid, tid;
-        u64 value;
-        u64 time_enabled;
-        u64 time_running;
-        u64 id;
-};
-
-struct throttle_event {
-        struct perf_event_header header;
-        u64 time;
-        u64 id;
-        u64 stream_id;
-};
-
-#ifndef KSYM_NAME_LEN
-#define KSYM_NAME_LEN 256
+#define PRI_lu64 "l" PRIu64
+#define PRI_lx64 "l" PRIx64
+#else
+#define PRI_lu64 PRIu64
+#define PRI_lx64 PRIx64
 #endif
 
-struct ksymbol_event {
-        struct perf_event_header header;
-        u64 addr;
-        u32 len;
-        u16 ksym_type;
-        u16 flags;
-        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
-};
-
 #define PERF_SAMPLE_MASK                                \
         (PERF_SAMPLE_IP | PERF_SAMPLE_TID |             \
          PERF_SAMPLE_TIME | PERF_SAMPLE_ADDR |          \
@@ -119,11 +37,6 @@ struct bpf_event {
 /* perf sample has 16 bits size limit */
 #define PERF_SAMPLE_MAX_SIZE (1 << 16)
 
-struct sample_event {
-        struct perf_event_header        header;
-        u64 array[];
-};
-
 struct regs_dump {
         u64 abi;
         u64 mask;
@@ -392,18 +305,18 @@ static inline void *perf_synth__raw_data(void *p)
  * when possible sends this number in a PERF_RECORD_LOST event. The number of
  * such "chunks" of lost events is stored in .nr_events[PERF_EVENT_LOST] while
  * total_lost tells exactly how many events the kernel in fact lost, i.e. it is
- * the sum of all struct lost_event.lost fields reported.
+ * the sum of all struct perf_record_lost.lost fields reported.
  *
  * The kernel discards mixed up samples and sends the number in a
  * PERF_RECORD_LOST_SAMPLES event. The number of lost-samples events is stored
  * in .nr_events[PERF_RECORD_LOST_SAMPLES] while total_lost_samples tells
  * exactly how many samples the kernel in fact dropped, i.e. it is the sum of
- * all struct lost_samples_event.lost fields reported.
+ * all struct perf_record_lost_samples.lost fields reported.
  *
  * The total_period is needed because by default auto-freq is used, so
  * multipling nr_events[PERF_EVENT_SAMPLE] by a frequency isn't possible to get
  * the total number of low level events, it is necessary to to sum all struct
- * sample_event.period and stash the result in total_period.
+ * perf_record_sample.period and stash the result in total_period.
  */
 struct events_stats {
         u64 total_period;
@@ -637,16 +550,18 @@ struct compressed_event {
 
 union perf_event {
         struct perf_event_header        header;
-        struct mmap_event               mmap;
-        struct mmap2_event              mmap2;
-        struct comm_event               comm;
-        struct namespaces_event         namespaces;
-        struct fork_event               fork;
-        struct lost_event               lost;
-        struct lost_samples_event       lost_samples;
-        struct read_event               read;
-        struct throttle_event           throttle;
-        struct sample_event             sample;
+        struct perf_record_mmap         mmap;
+        struct perf_record_mmap2        mmap2;
+        struct perf_record_comm         comm;
+        struct perf_record_namespaces   namespaces;
+        struct perf_record_fork         fork;
+        struct perf_record_lost         lost;
+        struct perf_record_lost_samples lost_samples;
+        struct perf_record_read         read;
+        struct perf_record_throttle     throttle;
+        struct perf_record_sample       sample;
+        struct perf_record_bpf_event    bpf;
+        struct perf_record_ksymbol      ksymbol;
         struct attr_event               attr;
         struct event_update_event       event_update;
         struct event_type_event         event_type;
@@ -666,8 +581,6 @@ union perf_event {
         struct stat_round_event         stat_round;
         struct time_conv_event          time_conv;
         struct feature_event            feat;
-        struct ksymbol_event            ksymbol_event;
-        struct bpf_event                bpf_event;
         struct compressed_event         pack;
 };
 
@@ -770,10 +683,10 @@ int perf_event__process_ksymbol(struct perf_tool *tool,
                                 union perf_event *event,
                                 struct perf_sample *sample,
                                 struct machine *machine);
-int perf_event__process_bpf_event(struct perf_tool *tool,
-                                  union perf_event *event,
-                                  struct perf_sample *sample,
-                                  struct machine *machine);
+int perf_event__process_bpf(struct perf_tool *tool,
+                            union perf_event *event,
+                            struct perf_sample *sample,
+                            struct machine *machine);
 int perf_tool__process_synth_event(struct perf_tool *tool,
                                    union perf_event *event,
                                    struct machine *machine,
@@ -838,7 +751,7 @@ size_t perf_event__fprintf_thread_map(union perf_event *event, FILE *fp);
 size_t perf_event__fprintf_cpu_map(union perf_event *event, FILE *fp);
 size_t perf_event__fprintf_namespaces(union perf_event *event, FILE *fp);
 size_t perf_event__fprintf_ksymbol(union perf_event *event, FILE *fp);
-size_t perf_event__fprintf_bpf_event(union perf_event *event, FILE *fp);
+size_t perf_event__fprintf_bpf(union perf_event *event, FILE *fp);
 size_t perf_event__fprintf(union perf_event *event, FILE *fp);
 
 int kallsyms__get_function_start(const char *kallsyms_filename,