perf pmu: Avoid passing format list to perf_pmu__format_bits()

Pass the PMU so the format list can be better abstracted and later
lazily loaded.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Gaosheng Cui <cuigaosheng1@huawei.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20230823080828.1460376-8-irogers@google.com
[ Did missing conversions in tools/perf/arch/arm*/util/cs-etm.c ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/arch/arm/util/cs-etm.c b/tools/perf/arch/arm/util/cs-etm.c
index 7c51fa1..b8d6a95 100644 (file)
--- a/tools/perf/arch/arm/util/cs-etm.c
+++ b/tools/perf/arch/arm/util/cs-etm.c
@@ -79,9 +79,9 @@ static int cs_etm_validate_context_id(struct auxtrace_record *itr,
        int err;
        u32 val;
        u64 contextid = evsel->core.attr.config &
-               (perf_pmu__format_bits(&cs_etm_pmu->format, "contextid") |
-                perf_pmu__format_bits(&cs_etm_pmu->format, "contextid1") |
-                perf_pmu__format_bits(&cs_etm_pmu->format, "contextid2"));
+               (perf_pmu__format_bits(cs_etm_pmu, "contextid") |
+                perf_pmu__format_bits(cs_etm_pmu, "contextid1") |
+                perf_pmu__format_bits(cs_etm_pmu, "contextid2"));
 
        if (!contextid)
                return 0;
@@ -106,7 +106,7 @@ static int cs_etm_validate_context_id(struct auxtrace_record *itr,
        }
 
        if (contextid &
-           perf_pmu__format_bits(&cs_etm_pmu->format, "contextid1")) {
+           perf_pmu__format_bits(cs_etm_pmu, "contextid1")) {
                /*
                 * TRCIDR2.CIDSIZE, bit [9-5], indicates whether contextID
                 * tracing is supported:
@@ -122,7 +122,7 @@ static int cs_etm_validate_context_id(struct auxtrace_record *itr,
        }
 
        if (contextid &
-           perf_pmu__format_bits(&cs_etm_pmu->format, "contextid2")) {
+           perf_pmu__format_bits(cs_etm_pmu, "contextid2")) {
                /*
                 * TRCIDR2.VMIDOPT[30:29] != 0 and
                 * TRCIDR2.VMIDSIZE[14:10] == 0b00100 (32bit virtual contextid)
@@ -151,7 +151,7 @@ static int cs_etm_validate_timestamp(struct auxtrace_record *itr,
        u32 val;
 
        if (!(evsel->core.attr.config &
-             perf_pmu__format_bits(&cs_etm_pmu->format, "timestamp")))
+             perf_pmu__format_bits(cs_etm_pmu, "timestamp")))
                return 0;
 
        if (!cs_etm_is_etmv4(itr, cpu)) {

diff --git a/tools/perf/arch/arm64/util/arm-spe.c b/tools/perf/arch/arm64/util/arm-spe.c
index 3b1676f..9cc3d6d 100644 (file)
--- a/tools/perf/arch/arm64/util/arm-spe.c
+++ b/tools/perf/arch/arm64/util/arm-spe.c
@@ -230,7 +230,7 @@ static int arm_spe_recording_options(struct auxtrace_record *itr,
         * inform that the resulting output's SPE samples contain physical addresses
         * where applicable.
         */
-       bit = perf_pmu__format_bits(&arm_spe_pmu->format, "pa_enable");
+       bit = perf_pmu__format_bits(arm_spe_pmu, "pa_enable");
        if (arm_spe_evsel->core.attr.config & bit)
                evsel__set_sample_bit(arm_spe_evsel, PHYS_ADDR);
 

diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c
index 0da76f8..27944c1 100644 (file)
--- a/tools/perf/arch/x86/util/intel-pt.c
+++ b/tools/perf/arch/x86/util/intel-pt.c
@@ -122,7 +122,7 @@ static int intel_pt_read_config(struct perf_pmu *intel_pt_pmu, const char *str,
 
        *res = 0;
 
-       mask = perf_pmu__format_bits(&intel_pt_pmu->format, str);
+       mask = perf_pmu__format_bits(intel_pt_pmu, str);
        if (!mask)
                return -EINVAL;
 
@@ -346,8 +346,7 @@ static int intel_pt_info_fill(struct auxtrace_record *itr,
        intel_pt_parse_terms(intel_pt_pmu, "tsc", &tsc_bit);
        intel_pt_parse_terms(intel_pt_pmu, "noretcomp", &noretcomp_bit);
        intel_pt_parse_terms(intel_pt_pmu, "mtc", &mtc_bit);
-       mtc_freq_bits = perf_pmu__format_bits(&intel_pt_pmu->format,
-                                             "mtc_period");
+       mtc_freq_bits = perf_pmu__format_bits(intel_pt_pmu, "mtc_period");
        intel_pt_parse_terms(intel_pt_pmu, "cyc", &cyc_bit);
 
        intel_pt_tsc_ctc_ratio(&tsc_ctc_ratio_n, &tsc_ctc_ratio_d);
@@ -502,7 +501,7 @@ static int intel_pt_val_config_term(struct perf_pmu *intel_pt_pmu, int dirfd,
 
        valid |= 1;
 
-       bits = perf_pmu__format_bits(&intel_pt_pmu->format, name);
+       bits = perf_pmu__format_bits(intel_pt_pmu, name);
 
        config &= bits;
 

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 8ede270..7d9d687 100644 (file)
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1162,7 +1162,7 @@ static int get_config_chgs(struct perf_pmu *pmu, struct list_head *head_config,
                        type = perf_pmu__format_type(pmu, term->config);
                        if (type != PERF_PMU_FORMAT_VALUE_CONFIG)
                                continue;
-                       bits |= perf_pmu__format_bits(&pmu->format, term->config);
+                       bits |= perf_pmu__format_bits(pmu, term->config);
                        break;
                case PARSE_EVENTS__TERM_TYPE_CONFIG:
                        bits = ~(u64)0;

diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index 96189af..1839c36 100644 (file)
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -1000,7 +1000,7 @@ void evsel__set_config_if_unset(struct perf_pmu *pmu, struct evsel *evsel,
        if (term)
                user_bits = term->val.cfg_chg;
 
-       bits = perf_pmu__format_bits(&pmu->format, config_name);
+       bits = perf_pmu__format_bits(pmu, config_name);
 
        /* Do nothing if the user changed the value */
        if (bits & user_bits)
@@ -1023,9 +1023,9 @@ pmu_find_format(struct list_head *formats, const char *name)
        return NULL;
 }
 
-__u64 perf_pmu__format_bits(struct list_head *formats, const char *name)
+__u64 perf_pmu__format_bits(struct perf_pmu *pmu, const char *name)
 {
-       struct perf_pmu_format *format = pmu_find_format(formats, name);
+       struct perf_pmu_format *format = pmu_find_format(&pmu->format, name);
        __u64 bits = 0;
        int fbit;
 

diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
index 1ea78d2..1249fca 100644 (file)
--- a/tools/perf/util/pmu.h
+++ b/tools/perf/util/pmu.h
@@ -221,7 +221,7 @@ int perf_pmu__config_terms(struct perf_pmu *pmu,
                           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);
+__u64 perf_pmu__format_bits(struct perf_pmu *pmu, const char *name);
 int perf_pmu__format_type(struct perf_pmu *pmu, const char *name);
 int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms,
                          struct perf_pmu_info *info);