mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Adrian Hunter <adrian.hunter@intel.com>
To: Thomas Gleixner <tglx@linutronix.de>,
	Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Andy Lutomirski <luto@kernel.org>,
	"H. Peter Anvin" <hpa@zytor.com>, Andi Kleen <ak@linux.intel.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Dave Hansen <dave.hansen@linux.intel.com>,
	Joerg Roedel <joro@8bytes.org>, Jiri Olsa <jolsa@redhat.com>,
	linux-kernel@vger.kernel.org, x86@kernel.org
Subject: [PATCH V1 05/19] perf tools: Use the _stest symbol to identify the kernel map when loading kcore
Date: Tue, 15 May 2018 15:43:19 +0300	[thread overview]
Message-ID: <1526388213-30696-6-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1526388213-30696-1-git-send-email-adrian.hunter@intel.com>

The first symbol is not necessarily in the kernel text.  Instead of using
the first symbol, use the _stest symbol to identify the kernel map when
loading kcore.

This allows for the introduction of symbols to identify the x86 PTI
entry trampolines.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
 tools/perf/util/symbol.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index f48dc157c2bd..4a39f4d0a174 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1149,7 +1149,7 @@ static int dso__load_kcore(struct dso *dso, struct map *map,
 	bool is_64_bit;
 	int err, fd;
 	char kcore_filename[PATH_MAX];
-	struct symbol *sym;
+	u64 stext;
 
 	if (!kmaps)
 		return -EINVAL;
@@ -1198,13 +1198,13 @@ static int dso__load_kcore(struct dso *dso, struct map *map,
 		old_map = next;
 	}
 
-	/* Find the kernel map using the first symbol */
-	sym = dso__first_symbol(dso);
-	list_for_each_entry(new_map, &md.maps, node) {
-		if (sym && sym->start >= new_map->start &&
-		    sym->start < new_map->end) {
-			replacement_map = new_map;
-			break;
+	/* Find the kernel map using the '_stext' symbol */
+	if (!kallsyms__get_function_start(kallsyms_filename, "_stext", &stext)) {
+		list_for_each_entry(new_map, &md.maps, node) {
+			if (stext >= new_map->start && stext < new_map->end) {
+				replacement_map = new_map;
+				break;
+			}
 		}
 	}
 
-- 
1.9.1

  parent reply	other threads:[~2018-05-15 12:50 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-15 12:43 [PATCH V1 00/19] perf tools and x86 PTI entry trampolines Adrian Hunter
2018-05-15 12:43 ` [PATCH V1 01/19] kallsyms: Simplify update_iter_mod() Adrian Hunter
2018-05-15 12:43 ` [PATCH V1 02/19] kallsyms, x86: Export addresses of syscall trampolines Adrian Hunter
2018-05-15 12:43 ` [PATCH V1 03/19] x86: Add entry trampolines to kcore Adrian Hunter
2018-05-15 12:43 ` [PATCH V1 04/19] x86: kcore: Give entry trampolines all the same offset in kcore Adrian Hunter
2018-05-15 12:43 ` Adrian Hunter [this message]
2018-05-15 12:43 ` [PATCH V1 06/19] perf tools: Fix kernel_start for PTI on x86 Adrian Hunter
2018-05-16 13:00   ` Arnaldo Carvalho de Melo
2018-05-16 13:45     ` Adrian Hunter
2018-05-16 13:55       ` Arnaldo Carvalho de Melo
2018-05-16 18:16         ` Adrian Hunter
2018-05-16 18:38           ` Arnaldo Carvalho de Melo
2018-05-15 12:43 ` [PATCH V1 07/19] perf tools: Workaround missing maps for x86 PTI entry trampolines Adrian Hunter
2018-05-15 12:43 ` [PATCH V1 08/19] perf tools: Fix map_groups__split_kallsyms() for entry trampoline symbols Adrian Hunter
2018-05-15 12:43 ` [PATCH V1 09/19] perf tools: Allow for extra kernel maps Adrian Hunter
2018-05-15 12:43 ` [PATCH V1 10/19] perf tools: Create maps for x86 PTI entry trampolines Adrian Hunter
2018-05-16 11:06   ` Jiri Olsa
2018-05-16 11:37     ` Adrian Hunter
2018-05-15 12:43 ` [PATCH V1 11/19] perf tools: Synthesize and process mmap events " Adrian Hunter
2018-05-15 12:43 ` [PATCH V1 12/19] perf buildid-cache: kcore_copy: Keep phdr data in a list Adrian Hunter
2018-05-15 12:43 ` [PATCH V1 13/19] perf buildid-cache: kcore_copy: Keep a count of phdrs Adrian Hunter
2018-05-15 12:43 ` [PATCH V1 14/19] perf buildid-cache: kcore_copy: Calculate offset from phnum Adrian Hunter
2018-05-15 12:43 ` [PATCH V1 15/19] perf buildid-cache: kcore_copy: Layout sections Adrian Hunter
2018-05-15 12:43 ` [PATCH V1 16/19] perf buildid-cache: kcore_copy: Iterate phdrs Adrian Hunter
2018-05-15 12:43 ` [PATCH V1 17/19] perf buildid-cache: kcore_copy: Get rid of kernel_map Adrian Hunter
2018-05-15 12:43 ` [PATCH V1 18/19] perf buildid-cache: kcore_copy: Copy x86 PTI entry trampoline sections Adrian Hunter
2018-05-15 12:43 ` [PATCH V1 19/19] perf buildid-cache: kcore_copy: Amend the offset of sections that remap kernel text Adrian Hunter
2018-05-16 12:50 ` [PATCH V1 00/19] perf tools and x86 PTI entry trampolines Jiri Olsa

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=1526388213-30696-6-git-send-email-adrian.hunter@intel.com \
    --to=adrian.hunter@intel.com \
    --cc=acme@kernel.org \
    --cc=ak@linux.intel.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=dave.hansen@linux.intel.com \
    --cc=hpa@zytor.com \
    --cc=jolsa@redhat.com \
    --cc=joro@8bytes.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --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

Powered by JetHome