From: Josh Poimboeuf <jpoimboe@redhat.com>
To: x86@kernel.org
Cc: linux-kernel@vger.kernel.org,
Peter Zijlstra <peterz@infradead.org>,
Miroslav Benes <mbenes@suse.cz>,
Julien Thierry <jthierry@redhat.com>
Subject: [PATCH 2/5] objtool: Support Clang non-section symbols in ORC dump
Date: Wed, 1 Apr 2020 13:23:26 -0500 [thread overview]
Message-ID: <b811b5eb1a42602c3b523576dc5efab9ad1c174d.1585761021.git.jpoimboe@redhat.com> (raw)
In-Reply-To: <cover.1585761021.git.jpoimboe@redhat.com>
Historically, the relocation symbols for ORC entries have only been
section symbols:
.text+0: sp:sp+8 bp:(und) type:call end:0
However, the Clang assembler is aggressive about stripping section
symbols. In that case we will need to use function symbols:
freezing_slow_path+0: sp:sp+8 bp:(und) type:call end:0
In preparation for the generation of such entries in "objtool orc
generate", add support for reading them in "objtool orc dump".
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
---
tools/objtool/orc_dump.c | 44 ++++++++++++++++++++++++----------------
1 file changed, 27 insertions(+), 17 deletions(-)
diff --git a/tools/objtool/orc_dump.c b/tools/objtool/orc_dump.c
index 13ccf775a83a..ba4cbb1cdd63 100644
--- a/tools/objtool/orc_dump.c
+++ b/tools/objtool/orc_dump.c
@@ -66,7 +66,7 @@ int orc_dump(const char *_objname)
char *name;
size_t nr_sections;
Elf64_Addr orc_ip_addr = 0;
- size_t shstrtab_idx;
+ size_t shstrtab_idx, strtab_idx = 0;
Elf *elf;
Elf_Scn *scn;
GElf_Shdr sh;
@@ -127,6 +127,8 @@ int orc_dump(const char *_objname)
if (!strcmp(name, ".symtab")) {
symtab = data;
+ } else if (!strcmp(name, ".strtab")) {
+ strtab_idx = i;
} else if (!strcmp(name, ".orc_unwind")) {
orc = data->d_buf;
orc_size = sh.sh_size;
@@ -138,7 +140,7 @@ int orc_dump(const char *_objname)
}
}
- if (!symtab || !orc || !orc_ip)
+ if (!symtab || !strtab_idx || !orc || !orc_ip)
return 0;
if (orc_size % sizeof(*orc) != 0) {
@@ -159,21 +161,29 @@ int orc_dump(const char *_objname)
return -1;
}
- scn = elf_getscn(elf, sym.st_shndx);
- if (!scn) {
- WARN_ELF("elf_getscn");
- return -1;
- }
-
- if (!gelf_getshdr(scn, &sh)) {
- WARN_ELF("gelf_getshdr");
- return -1;
- }
-
- name = elf_strptr(elf, shstrtab_idx, sh.sh_name);
- if (!name || !*name) {
- WARN_ELF("elf_strptr");
- return -1;
+ if (GELF_ST_TYPE(sym.st_info) == STT_SECTION) {
+ scn = elf_getscn(elf, sym.st_shndx);
+ if (!scn) {
+ WARN_ELF("elf_getscn");
+ return -1;
+ }
+
+ if (!gelf_getshdr(scn, &sh)) {
+ WARN_ELF("gelf_getshdr");
+ return -1;
+ }
+
+ name = elf_strptr(elf, shstrtab_idx, sh.sh_name);
+ if (!name) {
+ WARN_ELF("elf_strptr");
+ return -1;
+ }
+ } else {
+ name = elf_strptr(elf, strtab_idx, sym.st_name);
+ if (!name) {
+ WARN_ELF("elf_strptr");
+ return -1;
+ }
}
printf("%s+%llx:", name, (unsigned long long)rela.r_addend);
--
2.21.1
next prev parent reply other threads:[~2020-04-01 18:23 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-01 18:23 [PATCH 0/5] objtool fixes Josh Poimboeuf
2020-04-01 18:23 ` [PATCH 1/5] objtool: Fix CONFIG_UBSAN_TRAP unreachable warnings Josh Poimboeuf
2020-04-02 7:30 ` Kees Cook
2020-04-14 10:34 ` [tip: x86/urgent] " tip-bot2 for Josh Poimboeuf
2020-04-01 18:23 ` Josh Poimboeuf [this message]
2020-04-14 10:34 ` [tip: x86/urgent] objtool: Support Clang non-section symbols in ORC dump tip-bot2 for Josh Poimboeuf
2020-04-01 18:23 ` [PATCH 3/5] objtool: Support Clang non-section symbols in ORC generation Josh Poimboeuf
2020-04-01 18:49 ` Peter Zijlstra
2020-04-01 19:05 ` Josh Poimboeuf
2020-04-01 19:08 ` Josh Poimboeuf
2020-04-03 8:58 ` Miroslav Benes
2020-04-03 14:58 ` Josh Poimboeuf
2020-04-14 10:34 ` [tip: x86/urgent] " tip-bot2 for Josh Poimboeuf
2020-04-01 18:23 ` [PATCH 4/5] objtool: Fix switch table detection in .text.unlikely Josh Poimboeuf
2020-04-14 10:34 ` [tip: x86/urgent] " tip-bot2 for Josh Poimboeuf
2020-04-01 18:23 ` [PATCH 5/5] objtool: Make BP scratch register warning more robust Josh Poimboeuf
2020-04-14 10:34 ` [tip: x86/urgent] " tip-bot2 for Josh Poimboeuf
2020-04-02 14:28 ` [PATCH 0/5] objtool fixes Peter Zijlstra
2020-04-03 9:00 ` Miroslav Benes
2020-04-09 13:53 ` Josh Poimboeuf
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=b811b5eb1a42602c3b523576dc5efab9ad1c174d.1585761021.git.jpoimboe@redhat.com \
--to=jpoimboe@redhat.com \
--cc=jthierry@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mbenes@suse.cz \
--cc=peterz@infradead.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;
as well as URLs for NNTP newsgroup(s).