Pull perf updates from Thomas Gleixner: "Core: - Allow ftrace to instrument parts of the perf core code - Add a new mem_hops field to perf_mem_data_src which allows to represent intra-node/package or inter-node/off-package details to prepare for next generation systems which have more hieararchy within the node/pacakge level. Tools: - Update for the new mem_hops field in perf_mem_data_src Arch: - A set of constraints fixes for the Intel uncore PMU - The usual set of small fixes and improvements for x86 and PPC" * tag 'perf-core-2021-10-31' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86/intel: Fix ICL/SPR INST_RETIRED.PREC_DIST encodings powerpc/perf: Fix data source encodings for L2.1 and L3.1 accesses tools/perf: Add mem_hops field in perf_mem_data_src structure perf: Add mem_hops field in perf_mem_data_src structure perf: Add comment about current state of PERF_MEM_LVL_* namespace and remove an extra line perf/core: Allow ftrace for functions in kernel/event/core.c perf/x86: Add new event for AUX output counter index perf/x86: Add compiler barrier after updating BTS perf/x86/intel/uncore: Fix Intel SPR M3UPI event constraints perf/x86/intel/uncore: Fix Intel SPR M2PCIE event constraints perf/x86/intel/uncore: Fix Intel SPR IIO event constraints perf/x86/intel/uncore: Fix Intel SPR CHA event constraints perf/x86/intel/uncore: Fix Intel ICX IIO event constraints perf/x86/intel/uncore: Fix invalid unit check perf/x86/intel/uncore: Support extra IMC channel on Ice Lake server
Showing the changes to tools/include/uapi/linux (1 of 15 files). Show all
Unified · Split
| @@ -1210,14 +1210,16 @@ union perf_mem_data_src { · 1209 unmodified lines | ||
| 1210 | 1210 | mem_remote:1, /* remote */ |
| 1211 | 1211 | mem_snoopx:2, /* snoop mode, ext */ |
| 1212 | 1212 | mem_blk:3, /* access blocked */ |
| 1213 | − mem_rsvd:21; | |
| 1213 | + mem_hops:3, /* hop level */ | |
| 1214 | + mem_rsvd:18; | |
| 1214 | 1215 | }; |
| 1215 | 1216 | }; |
| 1216 | 1217 | #elif defined(__BIG_ENDIAN_BITFIELD) |
| 1217 | 1218 | union perf_mem_data_src { |
| 1218 | 1219 | __u64 val; |
| 1219 | 1220 | struct { |
| 1220 | − __u64 mem_rsvd:21, | |
| 1221 | + __u64 mem_rsvd:18, | |
| 1222 | + mem_hops:3, /* hop level */ | |
| 1221 | 1223 | mem_blk:3, /* access blocked */ |
| 1222 | 1224 | mem_snoopx:2, /* snoop mode, ext */ |
| 1223 | 1225 | mem_remote:1, /* remote */ |
| @@ -1241,7 +1243,13 @@ union perf_mem_data_src { · 17 unmodified lines | ||
| 1241 | 1243 | #define PERF_MEM_OP_EXEC 0x10 /* code (execution) */ |
| 1242 | 1244 | #define PERF_MEM_OP_SHIFT 0 |
| 1243 | 1245 | |
| 1244 | −/* memory hierarchy (memory level, hit or miss) */ | |
| 1246 | +/* | |
| 1247 | + * PERF_MEM_LVL_* namespace being depricated to some extent in the | |
| 1248 | + * favour of newer composite PERF_MEM_{LVLNUM_,REMOTE_,SNOOPX_} fields. | |
| 1249 | + * Supporting this namespace inorder to not break defined ABIs. | |
| 1250 | + * | |
| 1251 | + * memory hierarchy (memory level, hit or miss) | |
| 1252 | + */ | |
| 1245 | 1253 | #define PERF_MEM_LVL_NA 0x01 /* not available */ |
| 1246 | 1254 | #define PERF_MEM_LVL_HIT 0x02 /* hit level */ |
| 1247 | 1255 | #define PERF_MEM_LVL_MISS 0x04 /* miss level */ |
| @@ -1307,6 +1315,11 @@ union perf_mem_data_src { · 59 unmodified lines | ||
| 1307 | 1315 | #define PERF_MEM_BLK_ADDR 0x04 /* address conflict */ |
| 1308 | 1316 | #define PERF_MEM_BLK_SHIFT 40 |
| 1309 | 1317 | |
| 1318 | +/* hop level */ | |
| 1319 | +#define PERF_MEM_HOPS_0 0x01 /* remote core, same node */ | |
| 1320 | +/* 2-7 available */ | |
| 1321 | +#define PERF_MEM_HOPS_SHIFT 43 | |
| 1322 | + | |
| 1310 | 1323 | #define PERF_MEM_S(a, s) \ |
| 1311 | 1324 | (((__u64)PERF_MEM_##a##_##s) << PERF_MEM_##a##_SHIFT) |
| 1312 | 1325 | |