Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-24 11:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf pmu-events: Hide the pmu_events

Browse Source 
Hide that the pmu_event structs are an array with a new wrapper struct.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
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: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Will Deacon <will@kernel.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20220812230949.683239-12-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Ian Rogers 2022-08-12 16:09:46 -07:00 committed by Arnaldo Carvalho de Melo
parent 660842e468
commit 1ba3752aec
12 changed files with 101 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/arch/arm64/util/pmu.c
View File

@ -3,7 +3,7 @@
#include "../../../util/cpumap.h"
#include "../../../util/pmu.h"
const struct pmu_event *pmu_events_table__find(void)
const struct pmu_events_table *pmu_events_table__find(void)
{
struct perf_pmu *pmu = NULL;

44
tools/perf/pmu-events/empty-pmu-events.c
View File

@ -176,6 +176,10 @@ static const struct pmu_event pme_test_soc_cpu[] = {
},
};
/* Struct used to make the PMU event table implementation opaque to callers. */
struct pmu_events_table {
const struct pmu_event *entries;
};
/*
* Map a CPU to its table of PMU events. The CPU is identified by the
@ -188,7 +192,7 @@ static const struct pmu_event pme_test_soc_cpu[] = {
struct pmu_events_map {
const char *arch;
const char *cpuid;
const struct pmu_event *table;
const struct pmu_events_table table;
};
/*
@ -199,12 +203,12 @@ static const struct pmu_events_map pmu_events_map[] = {
{
.arch = "testarch",
.cpuid = "testcpu",
.table = pme_test_soc_cpu,
.table = { pme_test_soc_cpu },
},
{
.arch = 0,
.cpuid = 0,
.table = 0,
.table = { 0 },
},
};
@ -234,23 +238,23 @@ static const struct pmu_event pme_test_soc_sys[] = {
struct pmu_sys_events {
const char *name;
const struct pmu_event *table;
const struct pmu_events_table table;
};
static const struct pmu_sys_events pmu_sys_event_tables[] = {
{
.table = pme_test_soc_sys,
.table = { pme_test_soc_sys },
.name = "pme_test_soc_sys",
},
{
.table = 0
.table = { 0 }
},
};
int pmu_events_table_for_each_event(const struct pmu_event *table, pmu_event_iter_fn fn,
int pmu_events_table_for_each_event(const struct pmu_events_table *table, pmu_event_iter_fn fn,
void *data)
{
for (const struct pmu_event *pe = &table[0];
for (const struct pmu_event *pe = &table->entries[0];
pe->name || pe->metric_group || pe->metric_name;
pe++) {
int ret = fn(pe, table, data);
@ -261,9 +265,9 @@ int pmu_events_table_for_each_event(const struct pmu_event *table, pmu_event_ite
return 0;
}
const struct pmu_event *perf_pmu__find_table(struct perf_pmu *pmu)
const struct pmu_events_table *perf_pmu__find_table(struct perf_pmu *pmu)
{
const struct pmu_event *table = NULL;
const struct pmu_events_table *table = NULL;
char *cpuid = perf_pmu__getcpuid(pmu);
int i;
@ -277,11 +281,11 @@ const struct pmu_event *perf_pmu__find_table(struct perf_pmu *pmu)
for (;;) {
const struct pmu_events_map *map = &pmu_events_map[i++];
if (!map->table)
if (!map->cpuid)
break;
if (!strcmp_cpuid_str(map->cpuid, cpuid)) {
table = map->table;
table = &map->table;
break;
}
}
@ -289,13 +293,13 @@ const struct pmu_event *perf_pmu__find_table(struct perf_pmu *pmu)
return table;
}
const struct pmu_event *find_core_events_table(const char *arch, const char *cpuid)
const struct pmu_events_table *find_core_events_table(const char *arch, const char *cpuid)
{
for (const struct pmu_events_map *tables = &pmu_events_map[0];
tables->table;
tables->arch;
tables++) {
if (!strcmp(tables->arch, arch) && !strcmp_cpuid_str(tables->cpuid, cpuid))
return tables->table;
return &tables->table;
}
return NULL;
}
@ -303,9 +307,9 @@ const struct pmu_event *find_core_events_table(const char *arch, const char *cpu
int pmu_for_each_core_event(pmu_event_iter_fn fn, void *data)
{
for (const struct pmu_events_map *tables = &pmu_events_map[0];
tables->table;
tables->arch;
tables++) {
int ret = pmu_events_table_for_each_event(tables->table, fn, data);
int ret = pmu_events_table_for_each_event(&tables->table, fn, data);
if (ret)
return ret;
@ -313,13 +317,13 @@ int pmu_for_each_core_event(pmu_event_iter_fn fn, void *data)
return 0;
}
const struct pmu_event *find_sys_events_table(const char *name)
const struct pmu_events_table *find_sys_events_table(const char *name)
{
for (const struct pmu_sys_events *tables = &pmu_sys_event_tables[0];
tables->name;
tables++) {
if (!strcmp(tables->name, name))
return tables->table;
return &tables->table;
}
return NULL;
}
@ -329,7 +333,7 @@ int pmu_for_each_sys_event(pmu_event_iter_fn fn, void *data)
for (const struct pmu_sys_events *tables = &pmu_sys_event_tables[0];
tables->name;
tables++) {
int ret = pmu_events_table_for_each_event(tables->table, fn, data);
int ret = pmu_events_table_for_each_event(&tables->table, fn, data);
if (ret)
return ret;

47
tools/perf/pmu-events/jevents.py
View File

@ -335,6 +335,11 @@ def process_one_file(parents: Sequence[str], item: os.DirEntry) -> None:
def print_mapping_table(archs: Sequence[str]) -> None:
"""Read the mapfile and generate the struct from cpuid string to event table."""
_args.output_file.write("""
/* Struct used to make the PMU event table implementation opaque to callers. */
struct pmu_events_table {
const struct pmu_event *entries;
};
/*
* Map a CPU to its table of PMU events. The CPU is identified by the
* cpuid field, which is an arch-specific identifier for the CPU.
@ -346,7 +351,7 @@ def print_mapping_table(archs: Sequence[str]) -> None:
struct pmu_events_map {
const char *arch;
const char *cpuid;
const struct pmu_event *table;
struct pmu_events_table table;
};
/*
@ -360,7 +365,7 @@ const struct pmu_events_map pmu_events_map[] = {
_args.output_file.write("""{
\t.arch = "testarch",
\t.cpuid = "testcpu",
\t.table = pme_test_soc_cpu,
\t.table = { pme_test_soc_cpu },
},
""")
else:
@ -375,7 +380,7 @@ const struct pmu_events_map pmu_events_map[] = {
_args.output_file.write(f"""{{
\t.arch = "{arch}",
\t.cpuid = "{cpuid}",
\t.table = {tblname}
\t.table = {{ {tblname} }}
}},
""")
first = False
@ -383,7 +388,7 @@ const struct pmu_events_map pmu_events_map[] = {
_args.output_file.write("""{
\t.arch = 0,
\t.cpuid = 0,
\t.table = 0,
\t.table = { 0 },
}
};
""")
@ -394,26 +399,26 @@ def print_system_mapping_table() -> None:
_args.output_file.write("""
struct pmu_sys_events {
\tconst char *name;
\tconst struct pmu_event *table;
\tstruct pmu_events_table table;
};
static const struct pmu_sys_events pmu_sys_event_tables[] = {
""")
for tblname in _sys_event_tables:
_args.output_file.write(f"""\t{{
\t\t.table = {tblname},
\t\t.table = {{ {tblname} }},
\t\t.name = \"{tblname}\",
\t}},
""")
_args.output_file.write("""\t{
\t\t.table = 0
\t\t.table = { 0 }
\t},
};
int pmu_events_table_for_each_event(const struct pmu_event *table, pmu_event_iter_fn fn,
int pmu_events_table_for_each_event(const struct pmu_events_table *table, pmu_event_iter_fn fn,
void *data)
{
for (const struct pmu_event *pe = &table[0];
for (const struct pmu_event *pe = &table->entries[0];
pe->name || pe->metric_group || pe->metric_name;
pe++) {
int ret = fn(pe, table, data);
@ -424,9 +429,9 @@ int pmu_events_table_for_each_event(const struct pmu_event *table, pmu_event_ite
return 0;
}
const struct pmu_event *perf_pmu__find_table(struct perf_pmu *pmu)
const struct pmu_events_table *perf_pmu__find_table(struct perf_pmu *pmu)
{
const struct pmu_event *table = NULL;
const struct pmu_events_table *table = NULL;
char *cpuid = perf_pmu__getcpuid(pmu);
int i;
@ -439,11 +444,11 @@ const struct pmu_event *perf_pmu__find_table(struct perf_pmu *pmu)
i = 0;
for (;;) {
const struct pmu_events_map *map = &pmu_events_map[i++];
if (!map->table)
if (!map->arch)
break;
if (!strcmp_cpuid_str(map->cpuid, cpuid)) {
table = map->table;
table = &map->table;
break;
}
}
@ -451,13 +456,13 @@ const struct pmu_event *perf_pmu__find_table(struct perf_pmu *pmu)
return table;
}
const struct pmu_event *find_core_events_table(const char *arch, const char *cpuid)
const struct pmu_events_table *find_core_events_table(const char *arch, const char *cpuid)
{
for (const struct pmu_events_map *tables = &pmu_events_map[0];
tables->table;
tables->arch;
tables++) {
if (!strcmp(tables->arch, arch) && !strcmp_cpuid_str(tables->cpuid, cpuid))
return tables->table;
return &tables->table;
}
return NULL;
}
@ -465,9 +470,9 @@ const struct pmu_event *find_core_events_table(const char *arch, const char *cpu
int pmu_for_each_core_event(pmu_event_iter_fn fn, void *data)
{
for (const struct pmu_events_map *tables = &pmu_events_map[0];
tables->table;
tables->arch;
tables++) {
int ret = pmu_events_table_for_each_event(tables->table, fn, data);
int ret = pmu_events_table_for_each_event(&tables->table, fn, data);
if (ret)
return ret;
@ -475,13 +480,13 @@ int pmu_for_each_core_event(pmu_event_iter_fn fn, void *data)
return 0;
}
const struct pmu_event *find_sys_events_table(const char *name)
const struct pmu_events_table *find_sys_events_table(const char *name)
{
for (const struct pmu_sys_events *tables = &pmu_sys_event_tables[0];
tables->name;
tables++) {
if (!strcmp(tables->name, name))
return tables->table;
return &tables->table;
}
return NULL;
}
@ -491,7 +496,7 @@ int pmu_for_each_sys_event(pmu_event_iter_fn fn, void *data)
for (const struct pmu_sys_events *tables = &pmu_sys_event_tables[0];
tables->name;
tables++) {
int ret = pmu_events_table_for_each_event(tables->table, fn, data);
int ret = pmu_events_table_for_each_event(&tables->table, fn, data);
if (ret)
return ret;

12
tools/perf/pmu-events/pmu-events.h
View File

@ -30,18 +30,20 @@ struct pmu_event {
const char *metric_constraint;
};
struct pmu_events_table;
typedef int (*pmu_event_iter_fn)(const struct pmu_event *pe,
const struct pmu_event *table,
const struct pmu_events_table *table,
void *data);
int pmu_events_table_for_each_event(const struct pmu_event *table, pmu_event_iter_fn fn,
int pmu_events_table_for_each_event(const struct pmu_events_table *table, pmu_event_iter_fn fn,
void *data);
const struct pmu_event *perf_pmu__find_table(struct perf_pmu *pmu);
const struct pmu_event *find_core_events_table(const char *arch, const char *cpuid);
const struct pmu_events_table *perf_pmu__find_table(struct perf_pmu *pmu);
const struct pmu_events_table *find_core_events_table(const char *arch, const char *cpuid);
int pmu_for_each_core_event(pmu_event_iter_fn fn, void *data);
const struct pmu_event *find_sys_events_table(const char *name);
const struct pmu_events_table *find_sys_events_table(const char *name);
int pmu_for_each_sys_event(pmu_event_iter_fn fn, void *data);
#endif

2
tools/perf/tests/expand-cgroup.c
View File

@ -180,7 +180,7 @@ static int expand_metric_events(void)
struct evlist *evlist;
struct rblist metric_events;
const char metric_str[] = "CPI";
const struct pmu_event *pme_test;
const struct pmu_events_table *pme_test;
evlist = evlist__new();
TEST_ASSERT_VAL("failed to get evlist", evlist);

2
tools/perf/tests/parse-metric.c
View File

@ -72,7 +72,7 @@ static int __compute_metric(const char *name, struct value *vals,
struct rblist metric_events = {
.nr_entries = 0,
};
const struct pmu_event *pme_test;
const struct pmu_events_table *pme_test;
struct perf_cpu_map *cpus;
struct runtime_stat st;
struct evlist *evlist;

16
tools/perf/tests/pmu-events.c
View File

@ -424,7 +424,7 @@ static int compare_alias_to_test_event(struct perf_pmu_alias *alias,
}
static int test__pmu_event_table_core_callback(const struct pmu_event *pe,
const struct pmu_event *table __maybe_unused,
const struct pmu_events_table *table __maybe_unused,
void *data)
{
int *map_events = data;
@ -461,7 +461,7 @@ static int test__pmu_event_table_core_callback(const struct pmu_event *pe,
}
static int test__pmu_event_table_sys_callback(const struct pmu_event *pe,
const struct pmu_event *table __maybe_unused,
const struct pmu_events_table *table __maybe_unused,
void *data)
{
int *map_events = data;
@ -495,8 +495,8 @@ static int test__pmu_event_table_sys_callback(const struct pmu_event *pe,
static int test__pmu_event_table(struct test_suite *test __maybe_unused,
int subtest __maybe_unused)
{
const struct pmu_event *sys_event_table = find_sys_events_table("pme_test_soc_sys");
const struct pmu_event *table = find_core_events_table("testarch", "testcpu");
const struct pmu_events_table *sys_event_table = find_sys_events_table("pme_test_soc_sys");
const struct pmu_events_table *table = find_core_events_table("testarch", "testcpu");
int map_events = 0, expected_events, err;
/* ignore 3x sentinels */
@ -544,7 +544,7 @@ static int __test_core_pmu_event_aliases(char *pmu_name, int *count)
struct perf_pmu *pmu;
LIST_HEAD(aliases);
int res = 0;
const struct pmu_event *table = find_core_events_table("testarch", "testcpu");
const struct pmu_events_table *table = find_core_events_table("testarch", "testcpu");
struct perf_pmu_alias *a, *tmp;
if (!table)
@ -597,7 +597,7 @@ static int __test_uncore_pmu_event_aliases(struct perf_pmu_test_pmu *test_pmu)
struct perf_pmu *pmu = &test_pmu->pmu;
const char *pmu_name = pmu->name;
struct perf_pmu_alias *a, *tmp, *alias;
const struct pmu_event *events_table;
const struct pmu_events_table *events_table;
LIST_HEAD(aliases);
int res = 0;
@ -839,7 +839,7 @@ struct metric {
struct metric_ref metric_ref;
};
static int test__parsing_callback(const struct pmu_event *pe, const struct pmu_event *table,
static int test__parsing_callback(const struct pmu_event *pe, const struct pmu_events_table *table,
void *data)
{
int *failures = data;
@ -1016,7 +1016,7 @@ out:
}
static int test__parsing_fake_callback(const struct pmu_event *pe,
const struct pmu_event *table __maybe_unused,
const struct pmu_events_table *table __maybe_unused,
void *data __maybe_unused)
{
if (!pe->metric_expr)

42
tools/perf/util/metricgroup.c
View File

@ -508,7 +508,7 @@ struct metricgroup_iter_data {
};
static int metricgroup__sys_event_iter(const struct pmu_event *pe,
const struct pmu_event *table __maybe_unused,
const struct pmu_events_table *table,
void *data)
{
struct metricgroup_iter_data *d = data;
@ -529,7 +529,7 @@ static int metricgroup__sys_event_iter(const struct pmu_event *pe,
}
static int metricgroup__print_sys_event_iter(const struct pmu_event *pe,
const struct pmu_event *table __maybe_unused,
const struct pmu_events_table *table __maybe_unused,
void *data)
{
struct metricgroup_print_sys_idata *d = data;
@ -549,7 +549,7 @@ struct metricgroup_print_data {
};
static int metricgroup__print_callback(const struct pmu_event *pe,
const struct pmu_event *table __maybe_unused,
const struct pmu_events_table *table __maybe_unused,
void *vdata)
{
struct metricgroup_print_data *data = vdata;
@ -571,7 +571,7 @@ void metricgroup__print(bool metrics, bool metricgroups, char *filter,
struct rblist groups;
struct rb_node *node, *next;
struct strlist *metriclist = NULL;
const struct pmu_event *table;
const struct pmu_events_table *table;
if (!metricgroups) {
metriclist = strlist__new(NULL, NULL);
@ -876,7 +876,7 @@ struct metricgroup_add_iter_data {
bool metric_no_group;
struct metric *root_metric;
const struct visited_metric *visited;
const struct pmu_event *table;
const struct pmu_events_table *table;
};
static int add_metric(struct list_head *metric_list,
@ -885,7 +885,7 @@ static int add_metric(struct list_head *metric_list,
bool metric_no_group,
struct metric *root_metric,
const struct visited_metric *visited,
const struct pmu_event *table);
const struct pmu_events_table *table);
/**
* resolve_metric - Locate metrics within the root metric and recursively add
@ -908,7 +908,7 @@ static int resolve_metric(struct list_head *metric_list,
bool metric_no_group,
struct metric *root_metric,
const struct visited_metric *visited,
const struct pmu_event *table)
const struct pmu_events_table *table)
{
struct hashmap_entry *cur;
size_t bkt;
@ -986,7 +986,7 @@ static int __add_metric(struct list_head *metric_list,
int runtime,
struct metric *root_metric,
const struct visited_metric *visited,
const struct pmu_event *table)
const struct pmu_events_table *table)
{
const struct visited_metric *vm;
int ret;
@ -1077,7 +1077,7 @@ struct metricgroup__find_metric_data {
};
static int metricgroup__find_metric_callback(const struct pmu_event *pe,
const struct pmu_event *table __maybe_unused,
const struct pmu_events_table *table __maybe_unused,
void *vdata)
{
struct metricgroup__find_metric_data *data = vdata;
@ -1090,7 +1090,7 @@ static int metricgroup__find_metric_callback(const struct pmu_event *pe,
}
const struct pmu_event *metricgroup__find_metric(const char *metric,
const struct pmu_event *table)
const struct pmu_events_table *table)
{
struct metricgroup__find_metric_data data = {
.metric = metric,
@ -1108,7 +1108,7 @@ static int add_metric(struct list_head *metric_list,
bool metric_no_group,
struct metric *root_metric,
const struct visited_metric *visited,
const struct pmu_event *table)
const struct pmu_events_table *table)
{
int ret = 0;
@ -1136,8 +1136,8 @@ static int add_metric(struct list_head *metric_list,
}
static int metricgroup__add_metric_sys_event_iter(const struct pmu_event *pe,
const struct pmu_event *table __maybe_unused,
void *data)
const struct pmu_events_table *table __maybe_unused,
void *data)
{
struct metricgroup_add_iter_data *d = data;
int ret;
@ -1193,7 +1193,7 @@ struct metricgroup__add_metric_data {
};
static int metricgroup__add_metric_callback(const struct pmu_event *pe,
const struct pmu_event *table,
const struct pmu_events_table *table,
void *vdata)
{
struct metricgroup__add_metric_data *data = vdata;
@ -1227,7 +1227,7 @@ static int metricgroup__add_metric_callback(const struct pmu_event *pe,
static int metricgroup__add_metric(const char *metric_name, const char *modifier,
bool metric_no_group,
struct list_head *metric_list,
const struct pmu_event *table)
const struct pmu_events_table *table)
{
LIST_HEAD(list);
int ret;
@ -1296,7 +1296,7 @@ out:
*/
static int metricgroup__add_metric_list(const char *list, bool metric_no_group,
struct list_head *metric_list,
const struct pmu_event *table)
const struct pmu_events_table *table)
{
char *list_itr, *list_copy, *metric_name, *modifier;
int ret, count = 0;
@ -1504,7 +1504,7 @@ static int parse_groups(struct evlist *perf_evlist, const char *str,
bool metric_no_merge,
struct perf_pmu *fake_pmu,
struct rblist *metric_events_list,
const struct pmu_event *table)
const struct pmu_events_table *table)
{
struct evlist *combined_evlist = NULL;
LIST_HEAD(metric_list);
@ -1650,14 +1650,14 @@ int metricgroup__parse_groups(const struct option *opt,
struct rblist *metric_events)
{
struct evlist *perf_evlist = *(struct evlist **)opt->value;
const struct pmu_event *table = pmu_events_table__find();
const struct pmu_events_table *table = pmu_events_table__find();
return parse_groups(perf_evlist, str, metric_no_group,
metric_no_merge, NULL, metric_events, table);
}
int metricgroup__parse_groups_test(struct evlist *evlist,
const struct pmu_event *table,
const struct pmu_events_table *table,
const char *str,
bool metric_no_group,
bool metric_no_merge,
@ -1668,7 +1668,7 @@ int metricgroup__parse_groups_test(struct evlist *evlist,
}
static int metricgroup__has_metric_callback(const struct pmu_event *pe,
const struct pmu_event *table __maybe_unused,
const struct pmu_events_table *table __maybe_unused,
void *vdata)
{
const char *metric = vdata;
@ -1684,7 +1684,7 @@ static int metricgroup__has_metric_callback(const struct pmu_event *pe,
bool metricgroup__has_metric(const char *metric)
{
const struct pmu_event *table = pmu_events_table__find();
const struct pmu_events_table *table = pmu_events_table__find();
if (!table)
return false;

5
tools/perf/util/metricgroup.h
View File

@ -11,7 +11,6 @@ struct evlist;
struct evsel;
struct option;
struct rblist;
struct pmu_events_map;
struct cgroup;
/**
@ -71,9 +70,9 @@ int metricgroup__parse_groups(const struct option *opt,
bool metric_no_merge,
struct rblist *metric_events);
const struct pmu_event *metricgroup__find_metric(const char *metric,
const struct pmu_event *table);
const struct pmu_events_table *table);
int metricgroup__parse_groups_test(struct evlist *evlist,
const struct pmu_event *table,
const struct pmu_events_table *table,
const char *str,
bool metric_no_group,
bool metric_no_merge,

10
tools/perf/util/pmu.c
View File

@ -710,7 +710,7 @@ char *perf_pmu__getcpuid(struct perf_pmu *pmu)
return cpuid;
}
__weak const struct pmu_event *pmu_events_table__find(void)
__weak const struct pmu_events_table *pmu_events_table__find(void)
{
return perf_pmu__find_table(NULL);
}
@ -799,7 +799,7 @@ struct pmu_add_cpu_aliases_map_data {
};
static int pmu_add_cpu_aliases_map_callback(const struct pmu_event *pe,
const struct pmu_event *table __maybe_unused,
const struct pmu_events_table *table __maybe_unused,
void *vdata)
{
struct pmu_add_cpu_aliases_map_data *data = vdata;
@ -827,7 +827,7 @@ new_alias:
* as aliases.
*/
void pmu_add_cpu_aliases_table(struct list_head *head, struct perf_pmu *pmu,
const struct pmu_event *table)
const struct pmu_events_table *table)
{
struct pmu_add_cpu_aliases_map_data data = {
.head = head,
@ -841,7 +841,7 @@ void pmu_add_cpu_aliases_table(struct list_head *head, struct perf_pmu *pmu,
static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu)
{
const struct pmu_event *table;
const struct pmu_events_table *table;
table = perf_pmu__find_table(pmu);
if (!table)
@ -856,7 +856,7 @@ struct pmu_sys_event_iter_data {
};
static int pmu_add_sys_aliases_iter_fn(const struct pmu_event *pe,
const struct pmu_event *table __maybe_unused,
const struct pmu_events_table *table __maybe_unused,
void *data)
{
struct pmu_sys_event_iter_data *idata = data;

4
tools/perf/util/pmu.h
View File

@ -126,10 +126,10 @@ int perf_pmu__test(void);
struct perf_event_attr *perf_pmu__get_default_config(struct perf_pmu *pmu);
void pmu_add_cpu_aliases_table(struct list_head *head, struct perf_pmu *pmu,
const struct pmu_event *table);
const struct pmu_events_table *table);
char *perf_pmu__getcpuid(struct perf_pmu *pmu);
const struct pmu_event *pmu_events_table__find(void);
const struct pmu_events_table *pmu_events_table__find(void);
bool pmu_uncore_alias_match(const char *pmu_name, const char *name);
void perf_pmu_free_alias(struct perf_pmu_alias *alias);

6
tools/perf/util/s390-sample-raw.c
View File

@ -135,7 +135,7 @@ struct get_counter_name_data {
};
static int get_counter_name_callback(const struct pmu_event *evp,
const struct pmu_event *table __maybe_unused,
const struct pmu_events_table *table __maybe_unused,
void *vdata)
{
struct get_counter_name_data *data = vdata;
@ -157,7 +157,7 @@ static int get_counter_name_callback(const struct pmu_event *evp,
* the name of this counter.
* If no match is found a NULL pointer is returned.
*/
static const char *get_counter_name(int set, int nr, const struct pmu_event *table)
static const char *get_counter_name(int set, int nr, const struct pmu_events_table *table)
{
struct get_counter_name_data data = {
.wanted = get_counterset_start(set) + nr,
@ -177,7 +177,7 @@ static void s390_cpumcfdg_dump(struct perf_sample *sample)
unsigned char *buf = sample->raw_data;
const char *color = PERF_COLOR_BLUE;
struct cf_ctrset_entry *cep, ce;
const struct pmu_event *table;
const struct pmu_events_table *table;
u64 *p;
table = pmu_events_table__find();