mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-25 00:51:28 +07:00
4ac22b484d
On a CPU like skylakex an uncore_iio_0 PMU may alias with uncore_iio_free_running_0. The latter PMU doesn't support fc_mask as a parameter and so pmu_config_term fails. Typically parse_events_add_pmu is called in a loop where if one alias succeeds errors are ignored, however, if multiple errors occur parse_events__handle_error will currently give a WARN_ONCE. This change removes the WARN_ONCE in parse_events__handle_error and makes it a pr_debug. It adds verbose messages to parse_events_add_pmu warning that non-fatal errors may occur, while giving details on the pmu and config terms for useful context. pmu_config_term is altered so the failing term and pmu are present in the case of the 'unknown term' error which makes spotting the free_running case more straightforward. Before: $ perf --debug verbose=3 stat -M llc_misses.pcie_read sleep 1 Using CPUID GenuineIntel-6-55-4 metric expr unc_iio_data_req_of_cpu.mem_read.part0 + unc_iio_data_req_of_cpu.mem_read.part1 + unc_iio_data_req_of_cpu.mem_read.part2 + unc_iio_data_req_of_cpu.mem_read.part3 for LLC_MISSES.PCIE_READ found event unc_iio_data_req_of_cpu.mem_read.part0 found event unc_iio_data_req_of_cpu.mem_read.part1 found event unc_iio_data_req_of_cpu.mem_read.part2 found event unc_iio_data_req_of_cpu.mem_read.part3 metric expr unc_iio_data_req_of_cpu.mem_read.part0 + unc_iio_data_req_of_cpu.mem_read.part1 + unc_iio_data_req_of_cpu.mem_read.part2 + unc_iio_data_req_of_cpu.mem_read.part3 for LLC_MISSES.PCIE_READ found event unc_iio_data_req_of_cpu.mem_read.part0 found event unc_iio_data_req_of_cpu.mem_read.part1 found event unc_iio_data_req_of_cpu.mem_read.part2 found event unc_iio_data_req_of_cpu.mem_read.part3 adding {unc_iio_data_req_of_cpu.mem_read.part0,unc_iio_data_req_of_cpu.mem_read.part1,unc_iio_data_req_of_cpu.mem_read.part2,unc_iio_data_req_of_cpu.mem_read.part3}:W,{unc_iio_data_req_of_cpu.mem_read.part0,unc_iio_data_req_of_cpu.mem_read.part1,unc_iio_data_req_of_cpu.mem_read.part2,unc_iio_data_req_of_cpu.mem_read.part3}:W intel_pt default config: tsc,mtc,mtc_period=3,psb_period=3,pt,branch WARNING: multiple event parsing errors ... Invalid event/parameter 'fc_mask' ... After: $ perf --debug verbose=3 stat -M llc_misses.pcie_read sleep 1 Using CPUID GenuineIntel-6-55-4 metric expr unc_iio_data_req_of_cpu.mem_read.part0 + unc_iio_data_req_of_cpu.mem_read.part1 + unc_iio_data_req_of_cpu.mem_read.part2 + unc_iio_data_req_of_cpu.mem_read.part3 for LLC_MISSES.PCIE_READ found event unc_iio_data_req_of_cpu.mem_read.part0 found event unc_iio_data_req_of_cpu.mem_read.part1 found event unc_iio_data_req_of_cpu.mem_read.part2 found event unc_iio_data_req_of_cpu.mem_read.part3 metric expr unc_iio_data_req_of_cpu.mem_read.part0 + unc_iio_data_req_of_cpu.mem_read.part1 + unc_iio_data_req_of_cpu.mem_read.part2 + unc_iio_data_req_of_cpu.mem_read.part3 for LLC_MISSES.PCIE_READ found event unc_iio_data_req_of_cpu.mem_read.part0 found event unc_iio_data_req_of_cpu.mem_read.part1 found event unc_iio_data_req_of_cpu.mem_read.part2 found event unc_iio_data_req_of_cpu.mem_read.part3 adding {unc_iio_data_req_of_cpu.mem_read.part0,unc_iio_data_req_of_cpu.mem_read.part1,unc_iio_data_req_of_cpu.mem_read.part2,unc_iio_data_req_of_cpu.mem_read.part3}:W,{unc_iio_data_req_of_cpu.mem_read.part0,unc_iio_data_req_of_cpu.mem_read.part1,unc_iio_data_req_of_cpu.mem_read.part2,unc_iio_data_req_of_cpu.mem_read.part3}:W intel_pt default config: tsc,mtc,mtc_period=3,psb_period=3,pt,branch Attempting to add event pmu 'uncore_iio_free_running_5' with 'unc_iio_data_req_of_cpu.mem_read.part0,' that may result in non-fatal errors After aliases, add event pmu 'uncore_iio_free_running_5' with 'fc_mask,ch_mask,umask,event,' that may result in non-fatal errors Attempting to add event pmu 'uncore_iio_free_running_3' with 'unc_iio_data_req_of_cpu.mem_read.part0,' that may result in non-fatal errors After aliases, add event pmu 'uncore_iio_free_running_3' with 'fc_mask,ch_mask,umask,event,' that may result in non-fatal errors Attempting to add event pmu 'uncore_iio_free_running_1' with 'unc_iio_data_req_of_cpu.mem_read.part0,' that may result in non-fatal errors After aliases, add event pmu 'uncore_iio_free_running_1' with 'fc_mask,ch_mask,umask,event,' that may result in non-fatal errors Multiple errors dropping message: unknown term 'fc_mask' for pmu 'uncore_iio_free_running_3' (valid terms: event,umask,config,config1,config2,name,period,percore) ... So before you see a 'WARNING: multiple event parsing errors' and 'Invalid event/parameter'. After you see 'Attempting... that may result in non-fatal errors' then 'Multiple errors...' with details that 'fc_mask' wasn't known to a free running counter. While not completely clean, this makes it clearer that an error hasn't really occurred. v2. addresses review feedback from Jiri Olsa <jolsa@redhat.com>. Signed-off-by: Ian Rogers <irogers@google.com> Reviewed-by: Andi Kleen <ak@linux.intel.com> Acked-by: Jiri Olsa <jolsa@redhat.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jin Yao <yao.jin@linux.intel.com> Cc: John Garry <john.garry@huawei.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lore.kernel.org/lkml/20200513220635.54700-1-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
179 lines
3.9 KiB
C
179 lines
3.9 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include "parse-events.h"
|
|
#include "pmu.h"
|
|
#include "tests.h"
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/limits.h>
|
|
|
|
/* Simulated format definitions. */
|
|
static struct test_format {
|
|
const char *name;
|
|
const char *value;
|
|
} test_formats[] = {
|
|
{ "krava01", "config:0-1,62-63\n", },
|
|
{ "krava02", "config:10-17\n", },
|
|
{ "krava03", "config:5\n", },
|
|
{ "krava11", "config1:0,2,4,6,8,20-28\n", },
|
|
{ "krava12", "config1:63\n", },
|
|
{ "krava13", "config1:45-47\n", },
|
|
{ "krava21", "config2:0-3,10-13,20-23,30-33,40-43,50-53,60-63\n", },
|
|
{ "krava22", "config2:8,18,48,58\n", },
|
|
{ "krava23", "config2:28-29,38\n", },
|
|
};
|
|
|
|
/* Simulated users input. */
|
|
static struct parse_events_term test_terms[] = {
|
|
{
|
|
.config = (char *) "krava01",
|
|
.val.num = 15,
|
|
.type_val = PARSE_EVENTS__TERM_TYPE_NUM,
|
|
.type_term = PARSE_EVENTS__TERM_TYPE_USER,
|
|
},
|
|
{
|
|
.config = (char *) "krava02",
|
|
.val.num = 170,
|
|
.type_val = PARSE_EVENTS__TERM_TYPE_NUM,
|
|
.type_term = PARSE_EVENTS__TERM_TYPE_USER,
|
|
},
|
|
{
|
|
.config = (char *) "krava03",
|
|
.val.num = 1,
|
|
.type_val = PARSE_EVENTS__TERM_TYPE_NUM,
|
|
.type_term = PARSE_EVENTS__TERM_TYPE_USER,
|
|
},
|
|
{
|
|
.config = (char *) "krava11",
|
|
.val.num = 27,
|
|
.type_val = PARSE_EVENTS__TERM_TYPE_NUM,
|
|
.type_term = PARSE_EVENTS__TERM_TYPE_USER,
|
|
},
|
|
{
|
|
.config = (char *) "krava12",
|
|
.val.num = 1,
|
|
.type_val = PARSE_EVENTS__TERM_TYPE_NUM,
|
|
.type_term = PARSE_EVENTS__TERM_TYPE_USER,
|
|
},
|
|
{
|
|
.config = (char *) "krava13",
|
|
.val.num = 2,
|
|
.type_val = PARSE_EVENTS__TERM_TYPE_NUM,
|
|
.type_term = PARSE_EVENTS__TERM_TYPE_USER,
|
|
},
|
|
{
|
|
.config = (char *) "krava21",
|
|
.val.num = 119,
|
|
.type_val = PARSE_EVENTS__TERM_TYPE_NUM,
|
|
.type_term = PARSE_EVENTS__TERM_TYPE_USER,
|
|
},
|
|
{
|
|
.config = (char *) "krava22",
|
|
.val.num = 11,
|
|
.type_val = PARSE_EVENTS__TERM_TYPE_NUM,
|
|
.type_term = PARSE_EVENTS__TERM_TYPE_USER,
|
|
},
|
|
{
|
|
.config = (char *) "krava23",
|
|
.val.num = 2,
|
|
.type_val = PARSE_EVENTS__TERM_TYPE_NUM,
|
|
.type_term = PARSE_EVENTS__TERM_TYPE_USER,
|
|
},
|
|
};
|
|
|
|
/*
|
|
* Prepare format directory data, exported by kernel
|
|
* at /sys/bus/event_source/devices/<dev>/format.
|
|
*/
|
|
static char *test_format_dir_get(void)
|
|
{
|
|
static char dir[PATH_MAX];
|
|
unsigned int i;
|
|
|
|
snprintf(dir, PATH_MAX, "/tmp/perf-pmu-test-format-XXXXXX");
|
|
if (!mkdtemp(dir))
|
|
return NULL;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(test_formats); i++) {
|
|
static char name[PATH_MAX];
|
|
struct test_format *format = &test_formats[i];
|
|
FILE *file;
|
|
|
|
scnprintf(name, PATH_MAX, "%s/%s", dir, format->name);
|
|
|
|
file = fopen(name, "w");
|
|
if (!file)
|
|
return NULL;
|
|
|
|
if (1 != fwrite(format->value, strlen(format->value), 1, file))
|
|
break;
|
|
|
|
fclose(file);
|
|
}
|
|
|
|
return dir;
|
|
}
|
|
|
|
/* Cleanup format directory. */
|
|
static int test_format_dir_put(char *dir)
|
|
{
|
|
char buf[PATH_MAX];
|
|
snprintf(buf, PATH_MAX, "rm -f %s/*\n", dir);
|
|
if (system(buf))
|
|
return -1;
|
|
|
|
snprintf(buf, PATH_MAX, "rmdir %s\n", dir);
|
|
return system(buf);
|
|
}
|
|
|
|
static struct list_head *test_terms_list(void)
|
|
{
|
|
static LIST_HEAD(terms);
|
|
unsigned int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(test_terms); i++)
|
|
list_add_tail(&test_terms[i].list, &terms);
|
|
|
|
return &terms;
|
|
}
|
|
|
|
int test__pmu(struct test *test __maybe_unused, int subtest __maybe_unused)
|
|
{
|
|
char *format = test_format_dir_get();
|
|
LIST_HEAD(formats);
|
|
struct list_head *terms = test_terms_list();
|
|
int ret;
|
|
|
|
if (!format)
|
|
return -EINVAL;
|
|
|
|
do {
|
|
struct perf_event_attr attr;
|
|
|
|
memset(&attr, 0, sizeof(attr));
|
|
|
|
ret = perf_pmu__format_parse(format, &formats);
|
|
if (ret)
|
|
break;
|
|
|
|
ret = perf_pmu__config_terms("perf-pmu-test", &formats, &attr,
|
|
terms, false, NULL);
|
|
if (ret)
|
|
break;
|
|
|
|
ret = -EINVAL;
|
|
|
|
if (attr.config != 0xc00000000002a823)
|
|
break;
|
|
if (attr.config1 != 0x8000400000000145)
|
|
break;
|
|
if (attr.config2 != 0x0400000020041d07)
|
|
break;
|
|
|
|
ret = 0;
|
|
} while (0);
|
|
|
|
test_format_dir_put(format);
|
|
return ret;
|
|
}
|