tools headers UAPI: Sync linux/perf_event.h with the kernel sources
PATCH 1/1 tools headers UAPI: Sync linux/perf_event.h with the kernel sources
To pick the changes in:
cfef80bad4cf79cd ("perf/uapi: Define PERF_MEM_SNOOPX_PEER in kernel header file") ee3e88dfec23153d ("perf/mem: Introduce PERF_MEM_LVLNUM_{EXTN_MEM|IO}") b4e12b2d70fd9ecc ("perf: Kill __PERF_SAMPLE_CALLCHAIN_EARLY")
A previous sync:
b7ddd38ccc723f0d ("tools headers UAPI: Sync include/uapi/linux/perf_event.h header with the kernel")
brought a PERF_MEM_LVLNUM_CXL, and used it in tools/perf/util/mem-events.c, but when the feature really hit the kernel that define had been renamed to PERF_MEM_LVLNUM_EXTN_MEM, so reflect that on the tooling side.
This addresses this perf build warning:
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
--- tools/include/uapi/linux/perf_event.h | 29 ++++++++++++++++++--------- tools/perf/util/mem-events.c | 2 +- 2 files changed, 21 insertions(+), 10 deletions(-)
tools/include/uapi/linux/perf_event.h +20 -9
@@ -164,8 +164,6 @@ enum perf_event_sample_format {PERF_SAMPLE_WEIGHT_STRUCT =1U <<24 , PERF_SAMPLE_MAX = 1U << 25, /* non-ABI */ - - __PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, /* non-ABI; internal use */ };#define PERF_SAMPLE_WEIGHT_TYPE (PERF_SAMPLE_WEIGHT | PERF_SAMPLE_WEIGHT_STRUCT)
@@ -263,6 +261,17 @@ enum { PERF_BR_MAX, }; +/* +* Common branch speculation outcome classification +*/ +enum { +PERF_BR_SPEC_NA =0 ,/* Not available */ +PERF_BR_SPEC_WRONG_PATH =1 ,/* Speculative but on wrong path */ +PERF_BR_NON_SPEC_CORRECT_PATH =2 ,/* Non-speculative but on correct path */ +PERF_BR_SPEC_CORRECT_PATH =3 ,/* Speculative and on correct path */ +PERF_BR_SPEC_MAX , +}; +enum {PERF_BR_NEW_FAULT_ALGN =0 ,/* Alignment fault */ PERF_BR_NEW_FAULT_DATA =1 ,/* Data fault */
@@ -282,11 +291,11 @@ enum { PERF_BR_PRIV_HV = 3, }; -#define PERF_BR_ARM64_FIQ PERF_BR_NEW_ARCH_1 -#define PERF_BR_ARM64_DEBUG_HALT PERF_BR_NEW_ARCH_2 -#define PERF_BR_ARM64_DEBUG_EXIT PERF_BR_NEW_ARCH_3 -#define PERF_BR_ARM64_DEBUG_INST PERF_BR_NEW_ARCH_4 -#define PERF_BR_ARM64_DEBUG_DATA PERF_BR_NEW_ARCH_5 +#define PERF_BR_ARM64_FIQ PERF_BR_NEW_ARCH_1 +#define PERF_BR_ARM64_DEBUG_HALT PERF_BR_NEW_ARCH_2 +#define PERF_BR_ARM64_DEBUG_EXIT PERF_BR_NEW_ARCH_3 +#define PERF_BR_ARM64_DEBUG_INST PERF_BR_NEW_ARCH_4 +#define PERF_BR_ARM64_DEBUG_DATA PERF_BR_NEW_ARCH_5#define PERF_SAMPLE_BRANCH_PLM_ALL \ (PERF_SAMPLE_BRANCH_USER|\
@@ -1328,7 +1337,7 @@ union perf_mem_data_src {#define PERF_MEM_LVLNUM_L3 0x03/* L3 */ #define PERF_MEM_LVLNUM_L4 0x04/* L4 */ /* 5-0x8 available */ -#define PERF_MEM_LVLNUM_CXL 0x09/* CXL */ +#define PERF_MEM_LVLNUM_EXTN_MEM 0x09/* Extension memory */ #define PERF_MEM_LVLNUM_IO 0x0a/* I/O */ #define PERF_MEM_LVLNUM_ANY_CACHE 0x0b/* Any cache */ #define PERF_MEM_LVLNUM_LFB 0x0c/* LFB */
@@ -1397,6 +1406,7 @@ union perf_mem_data_src {* abort: aborting a hardware transaction * cycles: cycles from last branch (or 0 if not supported) * type: branch type +* spec: branch speculation info (or 0 if not supported) */ struct perf_branch_entry {__u64 from;
@@ -1407,9 +1417,10 @@ struct perf_branch_entry { abort:1, /* transaction abort */ cycles:16, /* cycle count to last branch */ type:4, /* branch type */ + spec:2, /* branch speculation info */ new_type:4, /* additional branch type */ priv:3, /* privilege level */ - reserved:33; + reserved:31; };union perf_sample_weight {
tools/perf/util/mem-events.c +1 -1
@@ -295,7 +295,7 @@ static const char * const mem_lvl[] = { };static const char *const mem_lvlnum[] = { - [PERF_MEM_LVLNUM_CXL ] ="CXL" , + [PERF_MEM_LVLNUM_EXTN_MEM ] ="Extension mem" , [PERF_MEM_LVLNUM_IO ] ="I/O" , [PERF_MEM_LVLNUM_ANY_CACHE ] ="Any cache" , [PERF_MEM_LVLNUM_LFB ] ="LFB/MAB" ,
Signature · 1 line
2.37.3
Hi Arnaldo,
Quoted 6 lines · On 26-Oct-22 1:34 AM, [email protected] wrote:
To pick the changes in:
cfef80bad4cf79cd("perf/uapi: DefinePERF_MEM_SNOOPX_PEERin kernel header file")ee3e88dfec23153d("perf/mem: Introduce PERF_MEM_LVLNUM_{EXTN_MEM|IO}")b4e12b2d70fd9ecc("perf: Kill__PERF_SAMPLE_CALLCHAIN_EARLY")
Quoted 8 lines
A previous sync:
b7ddd38ccc723f0d("tools headers UAPI: Syncinclude/uapi/linux/perf_event.hheader with the kernel")brought a
PERF_MEM_LVLNUM_CXL, and used it intools/perf/util/mem-events.c, but when the feature really hit the kernel that define had been renamed toPERF_MEM_LVLNUM_EXTN_MEM, so reflect that on the tooling side.
It's other way around. I proposed PERF_MEM_LVLNUM_EXTN_MEM but it was vague and thus we replaced it with PERF_MEM_LVLNUM_CXL. So tool side file is correct and kernel header needs to be fixed:
https://lore.kernel.org/lkml/[email protected]
Thanks,
Ravi