mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-28 11:18:45 +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>
121 lines
3.5 KiB
C
121 lines
3.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __PMU_H
|
|
#define __PMU_H
|
|
|
|
#include <linux/bitmap.h>
|
|
#include <linux/compiler.h>
|
|
#include <linux/perf_event.h>
|
|
#include <stdbool.h>
|
|
#include "parse-events.h"
|
|
#include "pmu-events/pmu-events.h"
|
|
|
|
struct evsel_config_term;
|
|
|
|
enum {
|
|
PERF_PMU_FORMAT_VALUE_CONFIG,
|
|
PERF_PMU_FORMAT_VALUE_CONFIG1,
|
|
PERF_PMU_FORMAT_VALUE_CONFIG2,
|
|
};
|
|
|
|
#define PERF_PMU_FORMAT_BITS 64
|
|
#define EVENT_SOURCE_DEVICE_PATH "/bus/event_source/devices/"
|
|
|
|
struct perf_event_attr;
|
|
|
|
struct perf_pmu_caps {
|
|
char *name;
|
|
char *value;
|
|
struct list_head list;
|
|
};
|
|
|
|
struct perf_pmu {
|
|
char *name;
|
|
__u32 type;
|
|
bool selectable;
|
|
bool is_uncore;
|
|
bool auxtrace;
|
|
int max_precise;
|
|
struct perf_event_attr *default_config;
|
|
struct perf_cpu_map *cpus;
|
|
struct list_head format; /* HEAD struct perf_pmu_format -> list */
|
|
struct list_head aliases; /* HEAD struct perf_pmu_alias -> list */
|
|
struct list_head caps; /* HEAD struct perf_pmu_caps -> list */
|
|
struct list_head list; /* ELEM */
|
|
};
|
|
|
|
struct perf_pmu_info {
|
|
const char *unit;
|
|
const char *metric_expr;
|
|
const char *metric_name;
|
|
double scale;
|
|
bool per_pkg;
|
|
bool snapshot;
|
|
};
|
|
|
|
#define UNIT_MAX_LEN 31 /* max length for event unit name */
|
|
|
|
struct perf_pmu_alias {
|
|
char *name;
|
|
char *desc;
|
|
char *long_desc;
|
|
char *topic;
|
|
char *str;
|
|
struct list_head terms; /* HEAD struct parse_events_term -> list */
|
|
struct list_head list; /* ELEM */
|
|
char unit[UNIT_MAX_LEN+1];
|
|
double scale;
|
|
bool per_pkg;
|
|
bool snapshot;
|
|
bool deprecated;
|
|
char *metric_expr;
|
|
char *metric_name;
|
|
};
|
|
|
|
struct perf_pmu *perf_pmu__find(const char *name);
|
|
struct perf_pmu *perf_pmu__find_by_type(unsigned int type);
|
|
int perf_pmu__config(struct perf_pmu *pmu, struct perf_event_attr *attr,
|
|
struct list_head *head_terms,
|
|
struct parse_events_error *error);
|
|
int perf_pmu__config_terms(const char *pmu_name, struct list_head *formats,
|
|
struct perf_event_attr *attr,
|
|
struct list_head *head_terms,
|
|
bool zero, struct parse_events_error *error);
|
|
__u64 perf_pmu__format_bits(struct list_head *formats, const char *name);
|
|
int perf_pmu__format_type(struct list_head *formats, const char *name);
|
|
int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms,
|
|
struct perf_pmu_info *info);
|
|
struct list_head *perf_pmu__alias(struct perf_pmu *pmu,
|
|
struct list_head *head_terms);
|
|
int perf_pmu_wrap(void);
|
|
void perf_pmu_error(struct list_head *list, char *name, char const *msg);
|
|
|
|
int perf_pmu__new_format(struct list_head *list, char *name,
|
|
int config, unsigned long *bits);
|
|
void perf_pmu__set_format(unsigned long *bits, long from, long to);
|
|
int perf_pmu__format_parse(char *dir, struct list_head *head);
|
|
|
|
struct perf_pmu *perf_pmu__scan(struct perf_pmu *pmu);
|
|
|
|
bool is_pmu_core(const char *name);
|
|
void print_pmu_events(const char *event_glob, bool name_only, bool quiet,
|
|
bool long_desc, bool details_flag,
|
|
bool deprecated);
|
|
bool pmu_have_event(const char *pname, const char *name);
|
|
|
|
int perf_pmu__scan_file(struct perf_pmu *pmu, const char *name, const char *fmt, ...) __scanf(3, 4);
|
|
|
|
int perf_pmu__test(void);
|
|
|
|
struct perf_event_attr *perf_pmu__get_default_config(struct perf_pmu *pmu);
|
|
void pmu_add_cpu_aliases_map(struct list_head *head, struct perf_pmu *pmu,
|
|
struct pmu_events_map *map);
|
|
|
|
struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu);
|
|
bool pmu_uncore_alias_match(const char *pmu_name, const char *name);
|
|
|
|
int perf_pmu__convert_scale(const char *scale, char **end, double *sval);
|
|
|
|
int perf_pmu__caps_parse(struct perf_pmu *pmu);
|
|
|
|
#endif /* __PMU_H */
|