All of lore.kernel.org
 help / color / mirror / Atom feed
From: Adrian Hunter <adrian.hunter@intel.com>
To: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Ingo Molnar <mingo@redhat.com>,
	linux-kernel@vger.kernel.org, David Ahern <dsahern@gmail.com>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Jiri Olsa <jolsa@redhat.com>, Mike Galbraith <efault@gmx.de>,
	Namhyung Kim <namhyung@gmail.com>,
	Paul Mackerras <paulus@samba.org>,
	Stephane Eranian <eranian@google.com>
Subject: [PATCH V2 4/9] perf tools: Set up ref_reloc_sym in machine__create_kernel_maps()
Date: Wed, 29 Jan 2014 16:14:39 +0200	[thread overview]
Message-ID: <1391004884-10334-5-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1391004884-10334-1-git-send-email-adrian.hunter@intel.com>

The ref_reloc_sym is always needed for the
kernel map in order to check for relocation.
Consequently set it up when the kernel map is
created.  Otherwise it was only being set up
by 'perf record'.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
 tools/perf/util/machine.c | 23 +++++++++++++++++++++++
 tools/perf/util/machine.h |  2 ++
 2 files changed, 25 insertions(+)

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 290c2e6..c872991 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -832,9 +832,25 @@ static int machine__create_modules(struct machine *machine)
 	return 0;
 }
 
+const char *ref_reloc_sym_names[] = {"_text", "_stext", NULL};
+
 int machine__create_kernel_maps(struct machine *machine)
 {
 	struct dso *kernel = machine__get_kernel(machine);
+	char filename[PATH_MAX];
+	const char *name;
+	u64 addr = 0;
+	int i;
+
+	machine__get_kallsyms_filename(machine, filename, PATH_MAX);
+
+	for (i = 0; (name = ref_reloc_sym_names[i]) != NULL; i++) {
+		addr = kallsyms__get_function_start(filename, name);
+		if (addr)
+			break;
+	}
+	if (!addr)
+		return -1;
 
 	if (kernel == NULL ||
 	    __machine__create_kernel_maps(machine, kernel) < 0)
@@ -853,6 +869,13 @@ int machine__create_kernel_maps(struct machine *machine)
 	 * Now that we have all the maps created, just set the ->end of them:
 	 */
 	map_groups__fixup_end(&machine->kmaps);
+
+	if (maps__set_kallsyms_ref_reloc_sym(machine->vmlinux_maps, name,
+					     addr)) {
+		machine__destroy_kernel_maps(machine);
+		return -1;
+	}
+
 	return 0;
 }
 
diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h
index 4771330..f77e91e 100644
--- a/tools/perf/util/machine.h
+++ b/tools/perf/util/machine.h
@@ -18,6 +18,8 @@ union perf_event;
 #define	HOST_KERNEL_ID			(-1)
 #define	DEFAULT_GUEST_KERNEL_ID		(0)
 
+extern const char *ref_reloc_sym_names[];
+
 struct machine {
 	struct rb_node	  rb_node;
 	pid_t		  pid;
-- 
1.7.11.7


  parent reply	other threads:[~2014-01-29 14:13 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-29 14:14 [PATCH V2 0/9] perf tools: kaslr fixes Adrian Hunter
2014-01-29 14:14 ` [PATCH V2 1/9] perf tools: Fix symbol annotation for relocated kernel Adrian Hunter
2014-01-29 18:57   ` Arnaldo Carvalho de Melo
2014-01-30  7:20     ` Adrian Hunter
2014-01-30  8:59       ` Ingo Molnar
2014-01-30  9:21         ` Adrian Hunter
2014-01-30  9:20           ` Ingo Molnar
2014-01-30 18:08             ` Arnaldo Carvalho de Melo
2014-01-30 18:12               ` Arnaldo Carvalho de Melo
2014-01-30 18:15                 ` Arnaldo Carvalho de Melo
2014-01-30 20:10                   ` Arnaldo Carvalho de Melo
2014-02-02  8:55   ` [tip:perf/urgent] perf symbols: " tip-bot for Adrian Hunter
2014-01-29 14:14 ` [PATCH V2 2/9] perf tools: Add kallsyms__get_function_start() Adrian Hunter
2014-02-02  8:55   ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2014-01-29 14:14 ` [PATCH V2 3/9] perf tools: Add machine__get_kallsyms_filename() Adrian Hunter
2014-02-02  8:55   ` [tip:perf/urgent] perf machine: " tip-bot for Adrian Hunter
2014-01-29 14:14 ` Adrian Hunter [this message]
2014-02-02  8:55   ` [tip:perf/urgent] perf machine: Set up ref_reloc_sym in machine__create_kernel_maps() tip-bot for Adrian Hunter
2014-01-29 14:14 ` [PATCH V2 5/9] perf record: Get ref_reloc_sym from kernel map Adrian Hunter
2014-02-02  8:55   ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2014-01-29 14:14 ` [PATCH V2 6/9] perf tools: Prevent the use of kcore if the kernel has moved Adrian Hunter
2014-02-02  8:56   ` [tip:perf/urgent] perf symbols: " tip-bot for Adrian Hunter
2014-01-29 14:14 ` [PATCH V2 7/9] perf tools: Test does not need to set up ref_reloc_sym Adrian Hunter
2014-02-02  8:56   ` [tip:perf/urgent] perf tests: No " tip-bot for Adrian Hunter
2014-01-29 14:14 ` [PATCH V2 8/9] perf tools: Adjust kallsyms for relocated kernel Adrian Hunter
2014-01-29 19:08   ` Arnaldo Carvalho de Melo
2014-01-30  8:10     ` Adrian Hunter
2014-01-31 18:21       ` Arnaldo Carvalho de Melo
2014-02-02  8:56   ` [tip:perf/urgent] " tip-bot for Adrian Hunter
2014-01-29 14:14 ` [PATCH V2 9/9] perf buildid-cache: Check relocation when checking for existing kcore Adrian Hunter
2014-01-29 19:14   ` Arnaldo Carvalho de Melo
2014-01-30  9:34     ` Adrian Hunter
2014-01-30 14:18       ` Arnaldo Carvalho de Melo
2014-01-30 16:35         ` Adrian Hunter
2014-02-02  8:56   ` [tip:perf/urgent] " tip-bot for 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=1391004884-10334-5-git-send-email-adrian.hunter@intel.com \
    --to=adrian.hunter@intel.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@ghostprotocols.net \
    --cc=dsahern@gmail.com \
    --cc=efault@gmx.de \
    --cc=eranian@google.com \
    --cc=fweisbec@gmail.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=namhyung@gmail.com \
    --cc=paulus@samba.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.