All of lore.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Adrian Hunter <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org,
	eranian@google.com, paulus@samba.org, mingo@redhat.com,
	hpa@zytor.com, mingo@kernel.org, a.p.zijlstra@chello.nl,
	efault@gmx.de, namhyung@gmail.com, jolsa@redhat.com,
	fweisbec@gmail.com, adrian.hunter@intel.com, dsahern@gmail.com,
	tglx@linutronix.de
Subject: [tip:perf/urgent] perf tools: Add kallsyms__get_function_start()
Date: Sun, 2 Feb 2014 00:55:21 -0800	[thread overview]
Message-ID: <tip-29b596b57426831fce92cd0ebb01c77627616fdf@git.kernel.org> (raw)
In-Reply-To: <1391004884-10334-3-git-send-email-adrian.hunter@intel.com>

Commit-ID:  29b596b57426831fce92cd0ebb01c77627616fdf
Gitweb:     http://git.kernel.org/tip/29b596b57426831fce92cd0ebb01c77627616fdf
Author:     Adrian Hunter <adrian.hunter@intel.com>
AuthorDate: Wed, 29 Jan 2014 16:14:37 +0200
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 31 Jan 2014 17:21:47 -0300

perf tools: Add kallsyms__get_function_start()

Separate out the logic used to find the start address of the reference
symbol used to track kernel relocation.  kallsyms__get_function_start()
is used in subsequent patches.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Tested-by: Jiri Olsa <jolsa@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1391004884-10334-3-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/event.c | 18 +++++++++++++++---
 tools/perf/util/event.h |  3 +++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 1fc1c2f..17476df 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -470,6 +470,17 @@ static int find_symbol_cb(void *arg, const char *name, char type,
 	return 1;
 }
 
+u64 kallsyms__get_function_start(const char *kallsyms_filename,
+				 const char *symbol_name)
+{
+	struct process_symbol_args args = { .name = symbol_name, };
+
+	if (kallsyms__parse(kallsyms_filename, &args, find_symbol_cb) <= 0)
+		return 0;
+
+	return args.start;
+}
+
 int perf_event__synthesize_kernel_mmap(struct perf_tool *tool,
 				       perf_event__handler_t process,
 				       struct machine *machine,
@@ -480,13 +491,13 @@ int perf_event__synthesize_kernel_mmap(struct perf_tool *tool,
 	char path[PATH_MAX];
 	char name_buff[PATH_MAX];
 	struct map *map;
+	u64 start;
 	int err;
 	/*
 	 * We should get this from /sys/kernel/sections/.text, but till that is
 	 * available use this, and after it is use this as a fallback for older
 	 * kernels.
 	 */
-	struct process_symbol_args args = { .name = symbol_name, };
 	union perf_event *event = zalloc((sizeof(event->mmap) +
 					  machine->id_hdr_size));
 	if (event == NULL) {
@@ -513,7 +524,8 @@ int perf_event__synthesize_kernel_mmap(struct perf_tool *tool,
 		}
 	}
 
-	if (kallsyms__parse(filename, &args, find_symbol_cb) <= 0) {
+	start = kallsyms__get_function_start(filename, symbol_name);
+	if (!start) {
 		free(event);
 		return -ENOENT;
 	}
@@ -525,7 +537,7 @@ int perf_event__synthesize_kernel_mmap(struct perf_tool *tool,
 	event->mmap.header.type = PERF_RECORD_MMAP;
 	event->mmap.header.size = (sizeof(event->mmap) -
 			(sizeof(event->mmap.filename) - size) + machine->id_hdr_size);
-	event->mmap.pgoff = args.start;
+	event->mmap.pgoff = start;
 	event->mmap.start = map->start;
 	event->mmap.len   = map->end - event->mmap.start;
 	event->mmap.pid   = machine->pid;
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index faf6e21..66a0c03 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -279,4 +279,7 @@ size_t perf_event__fprintf_mmap2(union perf_event *event, FILE *fp);
 size_t perf_event__fprintf_task(union perf_event *event, FILE *fp);
 size_t perf_event__fprintf(union perf_event *event, FILE *fp);
 
+u64 kallsyms__get_function_start(const char *kallsyms_filename,
+				 const char *symbol_name);
+
 #endif /* __PERF_RECORD_H */

  reply	other threads:[~2014-02-02  8:55 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-bot for Adrian Hunter [this message]
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 ` [PATCH V2 4/9] perf tools: Set up ref_reloc_sym in machine__create_kernel_maps() Adrian Hunter
2014-02-02  8:55   ` [tip:perf/urgent] perf machine: " 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=tip-29b596b57426831fce92cd0ebb01c77627616fdf@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=adrian.hunter@intel.com \
    --cc=dsahern@gmail.com \
    --cc=efault@gmx.de \
    --cc=eranian@google.com \
    --cc=fweisbec@gmail.com \
    --cc=hpa@zytor.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=mingo@redhat.com \
    --cc=namhyung@gmail.com \
    --cc=paulus@samba.org \
    --cc=tglx@linutronix.de \
    /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.