mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@redhat.com>,
	Arun Sharma <asharma@fb.com>,
	Benjamin Redelings <benjamin.redelings@nescent.org>,
	Corey Ashford <cjashfor@linux.vnet.ibm.com>,
	Cyrill Gorcunov <gorcunov@openvz.org>,
	"Frank Ch. Eigler" <fche@redhat.com>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
	Paul Mackerras <paulus@samba.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Robert Richter <robert.richter@amd.com>,
	Stephane Eranian <eranian@google.com>,
	Tom Zanussi <tzanussi@gmail.com>,
	Ulrich Drepper <drepper@gmail.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 11/13] perf symbols: Add '.note' check into search for NOTE section
Date: Mon,  2 Jul 2012 17:18:49 -0300	[thread overview]
Message-ID: <1341260331-10204-12-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1341260331-10204-1-git-send-email-acme@infradead.org>

From: Jiri Olsa <jolsa@redhat.com>

Adding '.note' section name to be check when looking for notes section.
The '.note' name is used by kernel VDSO.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Arun Sharma <asharma@fb.com>
Cc: Benjamin Redelings <benjamin.redelings@nescent.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Frank Ch. Eigler <fche@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Robert Richter <robert.richter@amd.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
Cc: Ulrich Drepper <drepper@gmail.com>
Link: http://lkml.kernel.org/r/1340120894-9465-15-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/symbol.c |   29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 994f4ff..50958bb 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1478,14 +1478,31 @@ static int elf_read_build_id(Elf *elf, void *bf, size_t size)
 		goto out;
 	}
 
-	sec = elf_section_by_name(elf, &ehdr, &shdr,
-				  ".note.gnu.build-id", NULL);
-	if (sec == NULL) {
+	/*
+	 * Check following sections for notes:
+	 *   '.note.gnu.build-id'
+	 *   '.notes'
+	 *   '.note' (VDSO specific)
+	 */
+	do {
+		sec = elf_section_by_name(elf, &ehdr, &shdr,
+					  ".note.gnu.build-id", NULL);
+		if (sec)
+			break;
+
 		sec = elf_section_by_name(elf, &ehdr, &shdr,
 					  ".notes", NULL);
-		if (sec == NULL)
-			goto out;
-	}
+		if (sec)
+			break;
+
+		sec = elf_section_by_name(elf, &ehdr, &shdr,
+					  ".note", NULL);
+		if (sec)
+			break;
+
+		return err;
+
+	} while (0);
 
 	data = elf_getdata(sec, NULL);
 	if (data == NULL)
-- 
1.7.9.2.358.g22243


  parent reply	other threads:[~2012-07-02 20:19 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-02 20:18 [GIT PULL 00/13] perf/core fixes and improvements Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 01/13] tools lib traceevent: Fix clean target in Makefile Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 02/13] tools lib traceevent: Teach [ce]tags about libtraceeevent error codes Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 03/13] tools lib traceevent: Make dependency files regeneratable Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 04/13] tools lib traceevent: Check string is really printable Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 05/13] tools lib traceevent: Use local variable 'field' Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 06/13] tools lib traceevent: Add support for __print_hex() Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 07/13] tools lib traceevent: Replace malloc_or_die to plain malloc in alloc_event() Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 08/13] perf tools: Fix hw breakpoint's type modifier parsing Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 09/13] perf evsel: Handle hw breakpoints event names in perf_evsel__name() Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 10/13] perf tools: Fix generation of pmu list Arnaldo Carvalho de Melo
2012-07-02 20:18 ` Arnaldo Carvalho de Melo [this message]
2012-07-02 20:18 ` [PATCH 12/13] perf tools: Adding round_up/round_down macros Arnaldo Carvalho de Melo
2012-07-02 20:18 ` [PATCH 13/13] perf bench: Fix confused variable namings and descriptions in mem subsystem Arnaldo Carvalho de Melo
2012-07-06  8:24 ` [GIT PULL 00/13] perf/core fixes and improvements Ingo Molnar

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=1341260331-10204-12-git-send-email-acme@infradead.org \
    --to=acme@infradead.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=asharma@fb.com \
    --cc=benjamin.redelings@nescent.org \
    --cc=cjashfor@linux.vnet.ibm.com \
    --cc=drepper@gmail.com \
    --cc=eranian@google.com \
    --cc=fche@redhat.com \
    --cc=fweisbec@gmail.com \
    --cc=gorcunov@openvz.org \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=masami.hiramatsu.pt@hitachi.com \
    --cc=mingo@kernel.org \
    --cc=paulus@samba.org \
    --cc=robert.richter@amd.com \
    --cc=tzanussi@gmail.com \
    /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

all inboxes | Powered by JetHome®