From: Adrian Hunter <adrian.hunter@intel.com>
To: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>,
Masami Hiramatsu <mhiramat@kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
Borislav Petkov <bp@alien8.de>, "H . Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Leo Yan <leo.yan@linaro.org>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Jiri Olsa <jolsa@redhat.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH V3 09/13] perf kcore_copy: Fix module map when there are no modules loaded
Date: Fri, 28 Feb 2020 15:51:21 +0200 [thread overview]
Message-ID: <20200228135125.567-10-adrian.hunter@intel.com> (raw)
In-Reply-To: <20200228135125.567-1-adrian.hunter@intel.com>
In the absence of any modules, no "modules" map is created, but there are
other executable pages to map, due to eBPF JIT, kprobe or ftrace. Map them
by recognizing that the first "module" symbol is not necessarily from a
module, and adjust the map accordingly.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
tools/perf/util/symbol-elf.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
index 1965aefccb02..3df77b56e28a 100644
--- a/tools/perf/util/symbol-elf.c
+++ b/tools/perf/util/symbol-elf.c
@@ -1452,6 +1452,7 @@ struct kcore_copy_info {
u64 first_symbol;
u64 last_symbol;
u64 first_module;
+ u64 first_module_symbol;
u64 last_module_symbol;
size_t phnum;
struct list_head phdrs;
@@ -1528,6 +1529,8 @@ static int kcore_copy__process_kallsyms(void *arg, const char *name, char type,
return 0;
if (strchr(name, '[')) {
+ if (!kci->first_module_symbol || start < kci->first_module_symbol)
+ kci->first_module_symbol = start;
if (start > kci->last_module_symbol)
kci->last_module_symbol = start;
return 0;
@@ -1725,6 +1728,10 @@ static int kcore_copy__calc_maps(struct kcore_copy_info *kci, const char *dir,
kci->etext += page_size;
}
+ if (kci->first_module_symbol &&
+ (!kci->first_module || kci->first_module_symbol < kci->first_module))
+ kci->first_module = kci->first_module_symbol;
+
kci->first_module = round_down(kci->first_module, page_size);
if (kci->last_module_symbol) {
--
2.17.1
next prev parent reply other threads:[~2020-02-28 13:52 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-28 13:51 [PATCH V3 00/13] perf/x86: Add perf text poke events Adrian Hunter
2020-02-28 13:51 ` [PATCH V3 01/13] perf: Add perf text poke event Adrian Hunter
2020-02-28 13:51 ` [PATCH V3 02/13] perf/x86: Add support for perf text poke event for text_poke_bp_batch() callers Adrian Hunter
2020-02-28 13:51 ` [PATCH V3 03/13] kprobes: Add symbols for kprobe insn pages Adrian Hunter
2020-02-28 14:36 ` Masami Hiramatsu
2020-02-28 17:20 ` Jiri Olsa
2020-02-28 18:51 ` Arnaldo Carvalho de Melo
2020-02-29 4:49 ` Masami Hiramatsu
2020-02-29 23:49 ` Steven Rostedt
2020-03-02 14:43 ` Jiri Olsa
2020-03-03 10:47 ` [OT] Pseudo module name in kallsyms (Re: [PATCH V3 03/13] kprobes: Add symbols for kprobe insn pages) Masami Hiramatsu
2020-03-03 10:55 ` Adrian Hunter
2020-03-03 14:21 ` Steven Rostedt
2020-03-03 15:40 ` Masami Hiramatsu
2020-02-28 13:51 ` [PATCH V3 04/13] kprobes: Add perf ksymbol events for kprobe insn pages Adrian Hunter
2020-02-28 15:11 ` Masami Hiramatsu
2020-02-29 3:51 ` Masami Hiramatsu
2020-02-28 13:51 ` [PATCH V3 05/13] perf/x86: Add perf text poke events for kprobes Adrian Hunter
2020-02-28 13:51 ` [PATCH V3 06/13] ftrace: Add symbols for ftrace trampolines Adrian Hunter
2020-02-28 16:27 ` Steven Rostedt
2020-02-28 13:51 ` [PATCH V3 07/13] ftrace: Add perf ksymbol events " Adrian Hunter
2020-02-28 13:51 ` [PATCH V3 08/13] ftrace: Add perf text poke " Adrian Hunter
2020-02-28 13:51 ` Adrian Hunter [this message]
2020-02-28 13:51 ` [PATCH V3 10/13] perf evlist: Disable 'immediate' events last Adrian Hunter
2020-02-28 13:51 ` [PATCH V3 11/13] perf tools: Add support for PERF_RECORD_TEXT_POKE Adrian Hunter
2020-02-28 13:51 ` [PATCH V3 12/13] perf tools: Add support for PERF_RECORD_KSYMBOL_TYPE_OOL Adrian Hunter
2020-02-28 13:51 ` [PATCH V3 13/13] perf intel-pt: Add support for text poke events Adrian Hunter
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=20200228135125.567-10-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=leo.yan@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.poirier@linaro.org \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=x86@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