lkml.org 
[lkml]   [2021]   [Jan]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/12] tools headers uapi: Update tools's copy of linux/perf_event.h
    Date
    From: Kan Liang <kan.liang@linux.intel.com>

    To get the changes in:

    ("perf/core: Add PERF_SAMPLE_WEIGHT_EXT")

    This cures the following warning during perf's build:

    Warning: Kernel ABI header at
    'tools/include/uapi/linux/perf_event.h' differs from latest version at
    'include/uapi/linux/perf_event.h'
    diff -u tools/include/uapi/linux/perf_event.h
    include/uapi/linux/perf_event.h

    Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
    ---
    tools/include/uapi/linux/perf_event.h | 30 +++++++++++++++++++++++++++---
    1 file changed, 27 insertions(+), 3 deletions(-)

    diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h
    index b15e344..17f19cc 100644
    --- a/tools/include/uapi/linux/perf_event.h
    +++ b/tools/include/uapi/linux/perf_event.h
    @@ -145,8 +145,9 @@ enum perf_event_sample_format {
    PERF_SAMPLE_CGROUP = 1U << 21,
    PERF_SAMPLE_DATA_PAGE_SIZE = 1U << 22,
    PERF_SAMPLE_CODE_PAGE_SIZE = 1U << 23,
    + PERF_SAMPLE_WEIGHT_EXT = 1U << 24,

    - PERF_SAMPLE_MAX = 1U << 24, /* non-ABI */
    + PERF_SAMPLE_MAX = 1U << 25, /* non-ABI */

    __PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, /* non-ABI; internal use */
    };
    @@ -900,6 +901,13 @@ enum perf_event_type {
    * char data[size]; } && PERF_SAMPLE_AUX
    * { u64 data_page_size;} && PERF_SAMPLE_DATA_PAGE_SIZE
    * { u64 code_page_size;} && PERF_SAMPLE_CODE_PAGE_SIZE
    + * { union {
    + * u64 weight_ext;
    + * struct {
    + * u64 instr_latency:16,
    + * reserved:48;
    + * };
    + * } && PERF_SAMPLE_WEIGHT_EXT
    * };
    */
    PERF_RECORD_SAMPLE = 9,
    @@ -1127,14 +1135,16 @@ union perf_mem_data_src {
    mem_lvl_num:4, /* memory hierarchy level number */
    mem_remote:1, /* remote */
    mem_snoopx:2, /* snoop mode, ext */
    - mem_rsvd:24;
    + mem_blk:3, /* access blocked */
    + mem_rsvd:21;
    };
    };
    #elif defined(__BIG_ENDIAN_BITFIELD)
    union perf_mem_data_src {
    __u64 val;
    struct {
    - __u64 mem_rsvd:24,
    + __u64 mem_rsvd:21,
    + mem_blk:3, /* access blocked */
    mem_snoopx:2, /* snoop mode, ext */
    mem_remote:1, /* remote */
    mem_lvl_num:4, /* memory hierarchy level number */
    @@ -1217,6 +1227,12 @@ union perf_mem_data_src {
    #define PERF_MEM_TLB_OS 0x40 /* OS fault handler */
    #define PERF_MEM_TLB_SHIFT 26

    +/* Access blocked */
    +#define PERF_MEM_BLK_NA 0x01 /* not available */
    +#define PERF_MEM_BLK_DATA 0x02 /* data could not be forwarded */
    +#define PERF_MEM_BLK_ADDR 0x04 /* address conflict */
    +#define PERF_MEM_BLK_SHIFT 40
    +
    #define PERF_MEM_S(a, s) \
    (((__u64)PERF_MEM_##a##_##s) << PERF_MEM_##a##_SHIFT)

    @@ -1248,4 +1264,12 @@ struct perf_branch_entry {
    reserved:40;
    };

    +union perf_weight_ext {
    + __u64 val;
    + struct {
    + __u64 instr_latency:16,
    + reserved:48;
    + };
    +};
    +
    #endif /* _UAPI_LINUX_PERF_EVENT_H */
    --
    2.7.4
    \
     
     \ /
      Last update: 2021-01-19 21:51    [W:4.799 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site