From: Jia He <justin.he@arm.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Namhyung Kim <namhyung@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Ian Rogers <irogers@google.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Kan Liang <kan.liang@linux.intel.com>,
James Clark <james.clark@arm.com>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
Jia He <justin.he@arm.com>
Subject: [PATCH 1/2] perf pmu: Allow finishing loading json events when !events_table
Date: Fri, 10 May 2024 02:47:28 +0000 [thread overview]
Message-ID: <20240510024729.1075732-2-justin.he@arm.com> (raw)
In-Reply-To: <20240510024729.1075732-1-justin.he@arm.com>
Otherwise, cpu_aliases_added is never set to true on an Arm v8a
Neoverse N2 server.
Signed-off-by: Jia He <justin.he@arm.com>
---
tools/perf/util/pmu.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index f39cbbc1a7ec..a1eef7b2e389 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -915,13 +915,11 @@ void pmu_add_cpu_aliases_table(struct perf_pmu *pmu, const struct pmu_events_tab
static void pmu_add_cpu_aliases(struct perf_pmu *pmu)
{
- if (!pmu->events_table)
- return;
-
if (pmu->cpu_aliases_added)
return;
- pmu_add_cpu_aliases_table(pmu, pmu->events_table);
+ if (pmu->events_table)
+ pmu_add_cpu_aliases_table(pmu, pmu->events_table);
pmu->cpu_aliases_added = true;
}
--
2.34.1
next prev parent reply other threads:[~2024-05-10 2:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-10 2:47 [PATCH 0/2] Fix num_events calculation in lazy loading Jia He
2024-05-10 2:47 ` Jia He [this message]
2024-05-10 2:47 ` [PATCH 2/2] perf pmu: Fix num_events calculation Jia He
2024-05-10 6:16 ` Ian Rogers
2024-05-10 6:52 ` Justin He
2024-05-10 20:41 ` Ian Rogers
2024-05-11 0:50 ` Ian Rogers
2024-05-11 15:52 ` Arnaldo Carvalho de Melo
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=20240510024729.1075732-2-justin.he@arm.com \
--to=justin.he@arm.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=irogers@google.com \
--cc=james.clark@arm.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.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 \
/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).