iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf pmu: Add const to pmu_events_map.

Browse Source 
The pmu_events_map is generated at compile time and used for lookup. For
testing purposes we need to swap the map being used.

Having the pmu_events_map be non-const is misleading as it may be an out
argument.

Make it const and update uses so they work on const too.

Reviewed-by: John Garry <john.garry@huawei.com>
Signed-off-by: Ian Rogers <irogers@google.com>
Acked-by: Andi Kleen <ak@linux.intel.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Antonov <alexander.antonov@linux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andrew Kilroy <andrew.kilroy@arm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Changbin Du <changbin.du@intel.com>
Cc: Denys Zagorui <dzagorui@cisco.com>
Cc: Fabian Hemmer <copy@copy.sh>
Cc: Felix Fietkau <nbd@nbd.name>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jacob Keller <jacob.e.keller@intel.com>
Cc: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Joakim Zhang <qiangqing.zhang@nxp.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Kees Kook <keescook@chromium.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nicholas Fraser <nfraser@codeweavers.com>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Paul Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Sami Tolvanen <samitolvanen@google.com>
Cc: ShihCheng Tu <mrtoastcheng@gmail.com>
Cc: Song Liu <songliubraving@fb.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Sumanth Korikkar <sumanthk@linux.ibm.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Wan Jiabing <wanjiabing@vivo.com>
Cc: Zhen Lei <thunder.leizhen@huawei.com>
Link: https://lore.kernel.org/r/20211015172132.1162559-3-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Ian Rogers 2021-10-15 10:21:13 -07:00 committed by Arnaldo Carvalho de Melo
parent 92ec3cc94c
commit 0ec43c0837
11 changed files with 36 additions and 36 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"
struct pmu_events_map *pmu_events_map__find(void)
const struct pmu_events_map *pmu_events_map__find(void)
{
struct perf_pmu *pmu = NULL;

2
tools/perf/pmu-events/jevents.c
View File

@ -798,7 +798,7 @@ static bool is_sys_dir(char *fname)
static void print_mapping_table_prefix(FILE *outfp)
{
fprintf(outfp, "struct pmu_events_map pmu_events_map[] = {\n");
fprintf(outfp, "const struct pmu_events_map pmu_events_map[] = {\n");
}
static void print_mapping_table_suffix(FILE *outfp)

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

@ -53,7 +53,7 @@ struct pmu_sys_events {
* Global table mapping each known CPU for the architecture to its
* table of PMU events.
*/
extern struct pmu_events_map pmu_events_map[];
extern const struct pmu_events_map pmu_events_map[];
extern struct pmu_sys_events pmu_sys_event_tables[];
#endif

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

@ -193,7 +193,7 @@ static int expand_metric_events(void)
.metric_name = NULL,
},
};
struct pmu_events_map ev_map = {
const struct pmu_events_map ev_map = {
.cpuid = "test",
.version = "1",
.type = "core",

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

@ -79,7 +79,7 @@ static struct pmu_event pme_test[] = {
}
};
static struct pmu_events_map map = {
static const struct pmu_events_map map = {
.cpuid = "test",
.version = "1",
.type = "core",

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

@ -242,9 +242,9 @@ static bool is_same(const char *reference, const char *test)
return !strcmp(reference, test);
}
static struct pmu_events_map *__test_pmu_get_events_map(void)
static const struct pmu_events_map *__test_pmu_get_events_map(void)
{
struct pmu_events_map *map;
const struct pmu_events_map *map;
for (map = &pmu_events_map[0]; map->cpuid; map++) {
if (!strcmp(map->cpuid, "testcpu"))
@ -421,7 +421,7 @@ static int compare_alias_to_test_event(struct perf_pmu_alias *alias,
static int test_pmu_event_table(void)
{
struct pmu_event *sys_event_tables = __test_pmu_get_sys_events_table();
struct pmu_events_map *map = __test_pmu_get_events_map();
const struct pmu_events_map *map = __test_pmu_get_events_map();
struct pmu_event *table;
int map_events = 0, expected_events;
@ -518,7 +518,7 @@ static int __test_core_pmu_event_aliases(char *pmu_name, int *count)
struct perf_pmu *pmu;
LIST_HEAD(aliases);
int res = 0;
struct pmu_events_map *map = __test_pmu_get_events_map();
const struct pmu_events_map *map = __test_pmu_get_events_map();
struct perf_pmu_alias *a, *tmp;
if (!map)
@ -571,7 +571,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;
struct pmu_events_map *map;
const struct pmu_events_map *map;
LIST_HEAD(aliases);
int res = 0;
@ -825,7 +825,7 @@ struct metric {
static int resolve_metric_simple(struct expr_parse_ctx *pctx,
struct list_head *compound_list,
struct pmu_events_map *map,
const struct pmu_events_map *map,
const char *metric_name)
{
struct hashmap_entry *cur, *cur_tmp;
@ -885,8 +885,8 @@ out_err:
static int test_parsing(void)
{
struct pmu_events_map *cpus_map = pmu_events_map__find();
struct pmu_events_map *map;
const struct pmu_events_map *cpus_map = pmu_events_map__find();
const struct pmu_events_map *map;
struct pmu_event *pe;
int i, j, k;
int ret = 0;
@ -1027,7 +1027,7 @@ out:
*/
static int test_parsing_fake(void)
{
struct pmu_events_map *map;
const struct pmu_events_map *map;
struct pmu_event *pe;
unsigned int i, j;
int err = 0;

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

@ -623,7 +623,7 @@ static int metricgroup__print_sys_event_iter(struct pmu_event *pe, void *data)
void metricgroup__print(bool metrics, bool metricgroups, char *filter,
bool raw, bool details)
{
struct pmu_events_map *map = pmu_events_map__find();
const struct pmu_events_map *map = pmu_events_map__find();
struct pmu_event *pe;
int i;
struct rblist groups;
@ -910,7 +910,7 @@ static int __add_metric(struct list_head *metric_list,
match_metric(__pe->metric_name, __metric)))
struct pmu_event *metricgroup__find_metric(const char *metric,
struct pmu_events_map *map)
const struct pmu_events_map *map)
{
struct pmu_event *pe;
int i;
@ -977,7 +977,7 @@ static int add_metric(struct list_head *metric_list,
static int __resolve_metric(struct metric *m,
bool metric_no_group,
struct list_head *metric_list,
struct pmu_events_map *map,
const struct pmu_events_map *map,
struct expr_ids *ids)
{
struct hashmap_entry *cur;
@ -1025,7 +1025,7 @@ static int __resolve_metric(struct metric *m,
static int resolve_metric(bool metric_no_group,
struct list_head *metric_list,
struct pmu_events_map *map,
const struct pmu_events_map *map,
struct expr_ids *ids)
{
struct metric *m;
@ -1099,7 +1099,7 @@ out:
static int metricgroup__add_metric(const char *metric, bool metric_no_group,
struct strbuf *events,
struct list_head *metric_list,
struct pmu_events_map *map)
const struct pmu_events_map *map)
{
struct expr_ids ids = { .cnt = 0, };
struct pmu_event *pe;
@ -1173,7 +1173,7 @@ out:
static int metricgroup__add_metric_list(const char *list, bool metric_no_group,
struct strbuf *events,
struct list_head *metric_list,
struct pmu_events_map *map)
const struct pmu_events_map *map)
{
char *llist, *nlist, *p;
int ret = -EINVAL;
@ -1230,7 +1230,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,
struct pmu_events_map *map)
const struct pmu_events_map *map)
{
struct parse_events_error parse_error;
struct strbuf extra_events;
@ -1266,14 +1266,14 @@ int metricgroup__parse_groups(const struct option *opt,
struct rblist *metric_events)
{
struct evlist *perf_evlist = *(struct evlist **)opt->value;
struct pmu_events_map *map = pmu_events_map__find();
const struct pmu_events_map *map = pmu_events_map__find();
return parse_groups(perf_evlist, str, metric_no_group,
metric_no_merge, NULL, metric_events, map);
}
int metricgroup__parse_groups_test(struct evlist *evlist,
struct pmu_events_map *map,
const struct pmu_events_map *map,
const char *str,
bool metric_no_group,
bool metric_no_merge,
@ -1285,7 +1285,7 @@ int metricgroup__parse_groups_test(struct evlist *evlist,
bool metricgroup__has_metric(const char *metric)
{
struct pmu_events_map *map = pmu_events_map__find();
const struct pmu_events_map *map = pmu_events_map__find();
struct pmu_event *pe;
int i;

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

@ -44,9 +44,9 @@ int metricgroup__parse_groups(const struct option *opt,
bool metric_no_merge,
struct rblist *metric_events);
struct pmu_event *metricgroup__find_metric(const char *metric,
struct pmu_events_map *map);
const struct pmu_events_map *map);
int metricgroup__parse_groups_test(struct evlist *evlist,
struct pmu_events_map *map,
const struct pmu_events_map *map,
const char *str,
bool metric_no_group,
bool metric_no_merge,

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

@ -710,9 +710,9 @@ static char *perf_pmu__getcpuid(struct perf_pmu *pmu)
return cpuid;
}
struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu)
const struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu)
{
struct pmu_events_map *map;
const struct pmu_events_map *map;
char *cpuid = perf_pmu__getcpuid(pmu);
int i;
@ -737,7 +737,7 @@ struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu)
return map;
}
struct pmu_events_map *__weak pmu_events_map__find(void)
const struct pmu_events_map *__weak pmu_events_map__find(void)
{
return perf_pmu__find_map(NULL);
}
@ -824,7 +824,7 @@ out:
* as aliases.
*/
void pmu_add_cpu_aliases_map(struct list_head *head, struct perf_pmu *pmu,
struct pmu_events_map *map)
const struct pmu_events_map *map)
{
int i;
const char *name = pmu->name;
@ -859,7 +859,7 @@ new_alias:
static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu)
{
struct pmu_events_map *map;
const struct pmu_events_map *map;
map = perf_pmu__find_map(pmu);
if (!map)

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

@ -120,10 +120,10 @@ 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);
const struct pmu_events_map *map);
struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu);
struct pmu_events_map *pmu_events_map__find(void);
const struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu);
const struct pmu_events_map *pmu_events_map__find(void);
bool pmu_uncore_alias_match(const char *pmu_name, const char *name);
void perf_pmu_free_alias(struct perf_pmu_alias *alias);

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

@ -135,7 +135,7 @@ static int get_counterset_start(int setnr)
* 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, struct pmu_events_map *map)
static const char *get_counter_name(int set, int nr, const struct pmu_events_map *map)
{
int rc, event_nr, wanted = get_counterset_start(set) + nr;
@ -159,7 +159,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;
struct pmu_events_map *map;
const struct pmu_events_map *map;
u64 *p;
map = pmu_events_map__find();