mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-02 08:34:20 +08:00
perf pmu: Validate raw event with sysfs exported format bits
A raw PMU event (eventsel+umask) in the form of rNNN is supported by perf but lacks of checking for the validity of raw encoding. For example, bit 16 and bit 17 are not valid on KBL but perf doesn't report warning when encoding with these bits. Before: # ./perf stat -e cpu/r031234/ -a -- sleep 1 Performance counter stats for 'system wide': 0 cpu/r031234/ 1.003798924 seconds time elapsed It may silently measure the wrong event! The kernel supported bits have been exported through /sys/devices/<pmu>/format/. Perf collects the information to 'struct perf_pmu_format' and links it to 'pmu->format' list. The 'struct perf_pmu_format' has a bitmap which records the valid bits for this format. For example, root@kbl-ppc:/sys/devices/cpu/format# cat umask config:8-15 The valid bits (bit8-bit15) are recorded in bitmap of format 'umask'. We collect total valid bits of all formats, save to a local variable 'masks' and reverse it. Now '~masks' represents total invalid bits. bits = config & ~masks; The set bits in 'bits' indicate the invalid bits used in config. Finally we use bitmap_scnprintf to report the invalid bits. Some architectures may not export supported bits through sysfs, so if masks is 0, perf_pmu__warn_invalid_config directly returns. After: Single event without name: # ./perf stat -e cpu/r031234/ -a -- sleep 1 WARNING: event 'N/A' not valid (bits 16-17 of config '31234' not supported by kernel)! Performance counter stats for 'system wide': 0 cpu/r031234/ 1.001597373 seconds time elapsed Multiple events with names: # ./perf stat -e cpu/rf01234,name=aaa/,cpu/r031234,name=bbb/ -a -- sleep 1 WARNING: event 'aaa' not valid (bits 20,22 of config 'f01234' not supported by kernel)! WARNING: event 'bbb' not valid (bits 16-17 of config '31234' not supported by kernel)! Performance counter stats for 'system wide': 0 aaa 0 bbb 1.001573787 seconds time elapsed Warnings are reported for invalid bits. Co-developed-by: Jiri Olsa <jolsa@redhat.com> Signed-off-by: Jin Yao <yao.jin@linux.intel.com> Reviewed-by: Jiri Olsa <jolsa@redhat.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Jin Yao <yao.jin@intel.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lore.kernel.org/lkml/20210310051138.12154-1-yao.jin@linux.intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
689bb69093
commit
e40647762f
@ -356,6 +356,9 @@ __add_event(struct list_head *list, int *idx,
|
||||
struct perf_cpu_map *cpus = pmu ? perf_cpu_map__get(pmu->cpus) :
|
||||
cpu_list ? perf_cpu_map__new(cpu_list) : NULL;
|
||||
|
||||
if (pmu && attr->type == PERF_TYPE_RAW)
|
||||
perf_pmu__warn_invalid_config(pmu, attr->config, name);
|
||||
|
||||
if (init_attr)
|
||||
event_attr_init(attr);
|
||||
|
||||
|
@ -1812,3 +1812,36 @@ int perf_pmu__caps_parse(struct perf_pmu *pmu)
|
||||
|
||||
return nr_caps;
|
||||
}
|
||||
|
||||
void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config,
|
||||
char *name)
|
||||
{
|
||||
struct perf_pmu_format *format;
|
||||
__u64 masks = 0, bits;
|
||||
char buf[100];
|
||||
unsigned int i;
|
||||
|
||||
list_for_each_entry(format, &pmu->format, list) {
|
||||
if (format->value != PERF_PMU_FORMAT_VALUE_CONFIG)
|
||||
continue;
|
||||
|
||||
for_each_set_bit(i, format->bits, PERF_PMU_FORMAT_BITS)
|
||||
masks |= 1ULL << i;
|
||||
}
|
||||
|
||||
/*
|
||||
* Kernel doesn't export any valid format bits.
|
||||
*/
|
||||
if (masks == 0)
|
||||
return;
|
||||
|
||||
bits = config & ~masks;
|
||||
if (bits == 0)
|
||||
return;
|
||||
|
||||
bitmap_scnprintf((unsigned long *)&bits, sizeof(bits) * 8, buf, sizeof(buf));
|
||||
|
||||
pr_warning("WARNING: event '%s' not valid (bits %s of config "
|
||||
"'%llx' not supported by kernel)!\n",
|
||||
name ?: "N/A", buf, config);
|
||||
}
|
||||
|
@ -123,4 +123,7 @@ int perf_pmu__convert_scale(const char *scale, char **end, double *sval);
|
||||
|
||||
int perf_pmu__caps_parse(struct perf_pmu *pmu);
|
||||
|
||||
void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config,
|
||||
char *name);
|
||||
|
||||
#endif /* __PMU_H */
|
||||
|
Loading…
Reference in New Issue
Block a user