From: Ian Rogers <irogers@google.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Ian Rogers <irogers@google.com>,
Adrian Hunter <adrian.hunter@intel.com>,
James Clark <james.clark@arm.com>,
Kan Liang <kan.liang@linux.intel.com>,
John Garry <john.g.garry@oracle.com>,
Kajol Jain <kjain@linux.ibm.com>,
Jing Zhang <renyu.zj@linux.alibaba.com>,
Ravi Bangoria <ravi.bangoria@amd.com>,
Rob Herring <robh@kernel.org>,
Gaosheng Cui <cuigaosheng1@huawei.com>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v1 07/25] perf pmu: Avoid passing format list to perf_pmu__format_bits
Date: Wed, 23 Aug 2023 01:08:10 -0700 [thread overview]
Message-ID: <20230823080828.1460376-8-irogers@google.com> (raw)
In-Reply-To: <20230823080828.1460376-1-irogers@google.com>
Pass the pmu so the format list can be better abstracted and later
lazily loaded.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/arch/x86/util/intel-pt.c | 7 +++----
tools/perf/util/parse-events.c | 2 +-
tools/perf/util/pmu.c | 6 +++---
tools/perf/util/pmu.h | 2 +-
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c
index 0da76f848cbc..27944c15ac14 100644
--- 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 8ede27089766..7d9d687d9191 100644
--- 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 96189afe54b0..1839c3668ec5 100644
--- 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 1ea78d2fa531..1249fca02ffd 100644
--- 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);
--
2.42.0.rc1.204.g551eb34607-goog
next prev parent reply other threads:[~2023-08-23 8:11 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-23 8:08 [PATCH v1 00/25] Lazily load PMU data Ian Rogers
2023-08-23 8:08 ` [PATCH v1 01/25] perf script ibs: Remove unused include Ian Rogers
2023-08-23 8:08 ` [PATCH v1 02/25] perf pmu: Avoid a path name copy Ian Rogers
2023-08-23 8:08 ` [PATCH v1 03/25] perf pmu: Move perf_pmu__set_format to pmu.y Ian Rogers
2023-08-23 8:08 ` [PATCH v1 04/25] perf pmu: Reduce scope of perf_pmu_error Ian Rogers
2023-08-23 8:08 ` [PATCH v1 05/25] perf pmu: Avoid passing format list to perf_pmu__config_terms Ian Rogers
2023-08-23 8:08 ` [PATCH v1 06/25] perf pmu: Avoid passing format list to perf_pmu__format_type Ian Rogers
2023-08-23 8:08 ` Ian Rogers [this message]
2023-08-23 8:08 ` [PATCH v1 08/25] perf pmu: Pass PMU rather than aliases and format Ian Rogers
2023-08-23 8:08 ` [PATCH v1 09/25] perf pmu: Make the loading of formats lazy Ian Rogers
2023-08-23 11:54 ` Arnaldo Carvalho de Melo
2023-08-24 2:23 ` Ian Rogers
2023-08-23 8:08 ` [PATCH v1 10/25] perf pmu: Abstract alias/event struct Ian Rogers
2023-08-23 8:08 ` [PATCH v1 11/25] perf pmu-events: Add extra underscore to function names Ian Rogers
2023-08-23 8:08 ` [PATCH v1 12/25] perf jevents: Group events by PMU Ian Rogers
2023-08-23 8:08 ` [PATCH v1 13/25] perf parse-events: Improve error message for double setting Ian Rogers
2023-08-23 8:08 ` [PATCH v1 14/25] perf s390 s390_cpumcfdg_dump: Don't scan all PMUs Ian Rogers
2023-08-23 8:08 ` [PATCH v1 15/25] perf pmu-events: Reduce processed events by passing PMU Ian Rogers
2023-08-23 8:08 ` [PATCH v1 16/25] perf pmu-events: Add pmu_events_table__find_event Ian Rogers
2023-08-23 8:08 ` [PATCH v1 17/25] perf pmu: Parse sysfs events directly from a file Ian Rogers
2023-08-23 8:08 ` [PATCH v1 18/25] perf pmu: Prefer passing pmu to aliases list Ian Rogers
2023-08-23 8:08 ` [PATCH v1 19/25] perf pmu: Merge json events with sysfs at load time Ian Rogers
2023-08-23 8:08 ` [PATCH v1 20/25] perf pmu: Cache json events table Ian Rogers
2023-08-23 8:08 ` [PATCH v1 21/25] perf pmu: Lazily add json events Ian Rogers
2023-08-23 8:08 ` [PATCH v1 22/25] perf pmu: Scan type early to fail an invalid PMU quickly Ian Rogers
2023-08-23 8:08 ` [PATCH v1 23/25] perf pmu: Be lazy about loading event info files from sysfs Ian Rogers
2023-08-23 8:08 ` [PATCH v1 24/25] perf pmu: Lazily load sysfs aliases Ian Rogers
2023-08-23 8:08 ` [PATCH v1 25/25] perf jevents: Sort strings in the big C string to reduce faults Ian Rogers
2023-08-23 8:12 ` [PATCH v1 00/25] Lazily load PMU data Ian Rogers
2023-08-23 15:56 ` Arnaldo Carvalho de Melo
[not found] ` <CAP-5=fXYDMo6GgSaLuC3YMNr66yAXLMyZoAOMpdgmMb=xazCOw@mail.gmail.com>
2023-08-23 17:11 ` Arnaldo Carvalho de Melo
2023-08-23 17:40 ` Ian Rogers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230823080828.1460376-8-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=cuigaosheng1@huawei.com \
--cc=james.clark@arm.com \
--cc=john.g.garry@oracle.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=kjain@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=ravi.bangoria@amd.com \
--cc=renyu.zj@linux.alibaba.com \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).