]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
tools headers uapi: Sync tools/include/uapi/linux/perf_event.h
authorSong Liu <songliubraving@fb.com>
Thu, 17 Jan 2019 16:15:16 +0000 (08:15 -0800)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 21 Jan 2019 20:00:57 +0000 (17:00 -0300)
Sync for PERF_RECORD_BPF_EVENT.

Signed-off-by: Song Liu <songliubraving@fb.com>
Reviewed-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: kernel-team@fb.com
Cc: netdev@vger.kernel.org
Link: http://lkml.kernel.org/r/20190117161521.1341602-5-songliubraving@fb.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/include/uapi/linux/perf_event.h

index 1dee5c8f166b0f3e751152ac6e81798eb8eaf0be..7198ddd0c6b11d07286aa60504aedc6a0bea69ed 100644 (file)
@@ -373,7 +373,8 @@ struct perf_event_attr {
                                write_backward :  1, /* Write ring buffer from end to beginning */
                                namespaces     :  1, /* include namespaces data */
                                ksymbol        :  1, /* include ksymbol events */
-                               __reserved_1   : 34;
+                               bpf_event      :  1, /* include bpf events */
+                               __reserved_1   : 33;
 
        union {
                __u32           wakeup_events;    /* wakeup every n events */
@@ -979,6 +980,25 @@ enum perf_event_type {
         */
        PERF_RECORD_KSYMBOL                     = 17,
 
+       /*
+        * Record bpf events:
+        *  enum perf_bpf_event_type {
+        *      PERF_BPF_EVENT_UNKNOWN          = 0,
+        *      PERF_BPF_EVENT_PROG_LOAD        = 1,
+        *      PERF_BPF_EVENT_PROG_UNLOAD      = 2,
+        *  };
+        *
+        * struct {
+        *      struct perf_event_header        header;
+        *      u16                             type;
+        *      u16                             flags;
+        *      u32                             id;
+        *      u8                              tag[BPF_TAG_SIZE];
+        *      struct sample_id                sample_id;
+        * };
+        */
+       PERF_RECORD_BPF_EVENT                   = 18,
+
        PERF_RECORD_MAX,                        /* non-ABI */
 };
 
@@ -990,6 +1010,13 @@ enum perf_record_ksymbol_type {
 
 #define PERF_RECORD_KSYMBOL_FLAGS_UNREGISTER   (1 << 0)
 
+enum perf_bpf_event_type {
+       PERF_BPF_EVENT_UNKNOWN          = 0,
+       PERF_BPF_EVENT_PROG_LOAD        = 1,
+       PERF_BPF_EVENT_PROG_UNLOAD      = 2,
+       PERF_BPF_EVENT_MAX,             /* non-ABI */
+};
+
 #define PERF_MAX_STACK_DEPTH           127
 #define PERF_MAX_CONTEXTS_PER_STACK      8