From: Ian Rogers <irogers@google.com>
To: "John Garry" <john.garry@huawei.com>,
"Will Deacon" <will@kernel.org>,
"Mathieu Poirier" <mathieu.poirier@linaro.org>,
"Leo Yan" <leo.yan@linaro.org>,
"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>,
"James Clark" <james.clark@arm.com>,
"Alexandre Truong" <alexandre.truong@arm.com>,
"German Gomez" <german.gomez@arm.com>,
"Ian Rogers" <irogers@google.com>,
"Dave Marchevsky" <davemarchevsky@fb.com>,
"Song Liu" <songliubraving@fb.com>,
"Ravi Bangoria" <ravi.bangoria@amd.com>,
"Li Huafei" <lihuafei1@huawei.com>,
"Martin Liška" <mliska@suse.cz>,
"William Cohen" <wcohen@redhat.com>,
"Riccardo Mancini" <rickyman7@gmail.com>,
"Masami Hiramatsu" <mhiramat@kernel.org>,
"Thomas Richter" <tmricht@linux.ibm.com>,
"Lexi Shao" <shaolexi@huawei.com>,
"Remi Bernon" <rbernon@codeweavers.com>,
"Michael Petlan" <mpetlan@redhat.com>,
"Denis Nikitin" <denik@chromium.org>,
linux-arm-kernel@lists.infradead.org,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Stephane Eranian <eranian@google.com>
Subject: [PATCH v2 2/4] perf symbols: Add is_kernel argument to fixup end
Date: Tue, 12 Apr 2022 08:48:15 -0700 [thread overview]
Message-ID: <20220412154817.2728324-3-irogers@google.com> (raw)
In-Reply-To: <20220412154817.2728324-1-irogers@google.com>
Kernel fixups may be special so add a flag to quickly detect if they are
necessary.
---
tools/perf/arch/arm64/util/machine.c | 3 ++-
tools/perf/arch/powerpc/util/machine.c | 4 +++-
tools/perf/arch/s390/util/machine.c | 3 ++-
tools/perf/util/symbol-elf.c | 2 +-
tools/perf/util/symbol.c | 11 ++++++-----
tools/perf/util/symbol.h | 4 ++--
6 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/tools/perf/arch/arm64/util/machine.c b/tools/perf/arch/arm64/util/machine.c
index 1cc33b323c3f..54fb41de9931 100644
--- a/tools/perf/arch/arm64/util/machine.c
+++ b/tools/perf/arch/arm64/util/machine.c
@@ -18,7 +18,8 @@
#define SYMBOL_LIMIT (1 << 12) /* 4K */
-void arch__symbols__fixup_end(struct symbol *p, struct symbol *c)
+void arch__symbols__fixup_end(struct symbol *p, struct symbol *c,
+ bool is_kernel __maybe_unused)
{
if (p->end == p->start || p->end != c->start) {
if ((strchr(p->name, '[') && strchr(c->name, '[') == NULL) ||
diff --git a/tools/perf/arch/powerpc/util/machine.c b/tools/perf/arch/powerpc/util/machine.c
index 88a8abf98a57..a732601f951e 100644
--- a/tools/perf/arch/powerpc/util/machine.c
+++ b/tools/perf/arch/powerpc/util/machine.c
@@ -14,7 +14,9 @@
* Therefore do not fill this gap and do not assign it to the kernel dso map.
*/
-void arch__symbols__fixup_end(struct symbol *p, struct symbol *c)
+void arch__symbols__fixup_end(struct symbol *p, struct symbol *c,
+ bool is_kernel __maybe_unused)
+)
{
if (p->end == p->start || p->end != c->start) {
if (strchr(p->name, '[') == NULL && strchr(c->name, '['))
diff --git a/tools/perf/arch/s390/util/machine.c b/tools/perf/arch/s390/util/machine.c
index 0b750738ec68..8622a1b78748 100644
--- a/tools/perf/arch/s390/util/machine.c
+++ b/tools/perf/arch/s390/util/machine.c
@@ -42,7 +42,8 @@ int arch__fix_module_text_start(u64 *start, u64 *size, const char *name)
* and beginning of first module's text segment is very big.
* Therefore do not fill this gap and do not assign it to the kernel dso map.
*/
-void arch__symbols__fixup_end(struct symbol *p, struct symbol *c)
+void arch__symbols__fixup_end(struct symbol *p, struct symbol *c,
+ bool is_kernel __maybe_unused)
{
if (p->end == p->start || p->end != c->start) {
if (strchr(p->name, '[') == NULL && strchr(c->name, '['))
diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
index 31cd59a2b66e..6598a5d9f223 100644
--- a/tools/perf/util/symbol-elf.c
+++ b/tools/perf/util/symbol-elf.c
@@ -1290,7 +1290,7 @@ dso__load_sym_internal(struct dso *dso, struct map *map, struct symsrc *syms_ss,
* For misannotated, zeroed, ASM function sizes.
*/
if (nr > 0) {
- symbols__fixup_end(&dso->symbols);
+ symbols__fixup_end(&dso->symbols, dso->kernel != DSO_SPACE__USER);
symbols__fixup_duplicate(&dso->symbols);
if (kmap) {
/*
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 394ad493c343..cc4c46563802 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -101,7 +101,8 @@ static int prefix_underscores_count(const char *str)
return tail - str;
}
-void __weak arch__symbols__fixup_end(struct symbol *p, struct symbol *c)
+void __weak arch__symbols__fixup_end(struct symbol *p, struct symbol *c,
+ bool is_kernel __maybe_unused)
{
if (p->end == p->start || p->end != c->start)
p->end = c->start;
@@ -218,7 +219,7 @@ void symbols__fixup_duplicate(struct rb_root_cached *symbols)
}
}
-void symbols__fixup_end(struct rb_root_cached *symbols)
+void symbols__fixup_end(struct rb_root_cached *symbols, bool is_kernel)
{
struct rb_node *nd, *prevnd = rb_first_cached(symbols);
struct symbol *curr, *prev;
@@ -232,7 +233,7 @@ void symbols__fixup_end(struct rb_root_cached *symbols)
prev = curr;
curr = rb_entry(nd, struct symbol, rb_node);
- arch__symbols__fixup_end(prev, curr);
+ arch__symbols__fixup_end(prev, curr, is_kernel);
}
/* Last entry */
@@ -1467,7 +1468,7 @@ int __dso__load_kallsyms(struct dso *dso, const char *filename,
if (kallsyms__delta(kmap, filename, &delta))
return -1;
- symbols__fixup_end(&dso->symbols);
+ symbols__fixup_end(&dso->symbols, /*is_kernel=*/true);
symbols__fixup_duplicate(&dso->symbols);
if (dso->kernel == DSO_SPACE__KERNEL_GUEST)
@@ -1659,7 +1660,7 @@ int dso__load_bfd_symbols(struct dso *dso, const char *debugfile)
#undef bfd_asymbol_section
#endif
- symbols__fixup_end(&dso->symbols);
+ symbols__fixup_end(&dso->symbols, dso->kernel != DSO_SPACE__USER);
symbols__fixup_duplicate(&dso->symbols);
dso->adjust_symbols = 1;
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index fbf866d82dcc..8428f24e67df 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -203,7 +203,7 @@ void __symbols__insert(struct rb_root_cached *symbols, struct symbol *sym,
bool kernel);
void symbols__insert(struct rb_root_cached *symbols, struct symbol *sym);
void symbols__fixup_duplicate(struct rb_root_cached *symbols);
-void symbols__fixup_end(struct rb_root_cached *symbols);
+void symbols__fixup_end(struct rb_root_cached *symbols, bool is_kernel);
void maps__fixup_end(struct maps *maps);
typedef int (*mapfn_t)(u64 start, u64 len, u64 pgoff, void *data);
@@ -241,7 +241,7 @@ const char *arch__normalize_symbol_name(const char *name);
#define SYMBOL_A 0
#define SYMBOL_B 1
-void arch__symbols__fixup_end(struct symbol *p, struct symbol *c);
+void arch__symbols__fixup_end(struct symbol *p, struct symbol *c, bool is_kernel);
int arch__compare_symbol_names(const char *namea, const char *nameb);
int arch__compare_symbol_names_n(const char *namea, const char *nameb,
unsigned int n);
--
2.35.1.1178.g4f1659d476-goog
next prev parent reply other threads:[~2022-04-12 15:48 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-12 15:48 [PATCH v2 0/4] Tidy up symbol end fixup Ian Rogers
2022-04-12 15:48 ` [PATCH v2 1/4] perf symbols: Always do architecture specific fixups Ian Rogers
2022-04-12 15:48 ` Ian Rogers [this message]
2022-04-12 15:48 ` [PATCH v2 3/4] perf symbol: By default only fix zero length symbols Ian Rogers
2022-04-12 15:48 ` [PATCH v2 4/4] perf symbols: More specific architecture end fixing Ian Rogers
2022-04-12 16:20 ` [PATCH v2 0/4] Tidy up symbol end fixup Ian Rogers
2022-04-12 22:12 ` Namhyung Kim
2022-04-12 23:48 ` Ian Rogers
2022-04-13 20:28 ` Namhyung Kim
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=20220412154817.2728324-3-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=alexandre.truong@arm.com \
--cc=davemarchevsky@fb.com \
--cc=denik@chromium.org \
--cc=eranian@google.com \
--cc=german.gomez@arm.com \
--cc=james.clark@arm.com \
--cc=john.garry@huawei.com \
--cc=jolsa@kernel.org \
--cc=leo.yan@linaro.org \
--cc=lihuafei1@huawei.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.poirier@linaro.org \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=mliska@suse.cz \
--cc=mpetlan@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=ravi.bangoria@amd.com \
--cc=rbernon@codeweavers.com \
--cc=rickyman7@gmail.com \
--cc=shaolexi@huawei.com \
--cc=songliubraving@fb.com \
--cc=tmricht@linux.ibm.com \
--cc=wcohen@redhat.com \
--cc=will@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).