From: "tip-bot2 for Peter Zijlstra" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>,
Borislav Petkov <bp@suse.de>, Miroslav Benes <mbenes@suse.cz>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/core] objtool: Extract elf_symbol_add()
Date: Thu, 01 Apr 2021 15:08:55 -0000 [thread overview]
Message-ID: <161728973564.29796.17344493642659515112.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210326151300.003468981@infradead.org>
The following commit has been merged into the x86/core branch of tip:
Commit-ID: d56a3568827ec4b8efcbcfc46fdc944995b6dcf1
Gitweb: https://git.kernel.org/tip/d56a3568827ec4b8efcbcfc46fdc944995b6dcf1
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Fri, 26 Mar 2021 16:12:10 +01:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Thu, 01 Apr 2021 13:08:52 +02:00
objtool: Extract elf_symbol_add()
Create a common helper to add symbols.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Link: https://lkml.kernel.org/r/20210326151300.003468981@infradead.org
---
tools/objtool/elf.c | 56 ++++++++++++++++++++++++--------------------
1 file changed, 31 insertions(+), 25 deletions(-)
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index c278a04..8457218 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -290,12 +290,39 @@ static int read_sections(struct elf *elf)
return 0;
}
+static void elf_add_symbol(struct elf *elf, struct symbol *sym)
+{
+ struct list_head *entry;
+ struct rb_node *pnode;
+
+ sym->type = GELF_ST_TYPE(sym->sym.st_info);
+ sym->bind = GELF_ST_BIND(sym->sym.st_info);
+
+ sym->offset = sym->sym.st_value;
+ sym->len = sym->sym.st_size;
+
+ rb_add(&sym->node, &sym->sec->symbol_tree, symbol_to_offset);
+ pnode = rb_prev(&sym->node);
+ if (pnode)
+ entry = &rb_entry(pnode, struct symbol, node)->list;
+ else
+ entry = &sym->sec->symbol_list;
+ list_add(&sym->list, entry);
+ elf_hash_add(elf->symbol_hash, &sym->hash, sym->idx);
+ elf_hash_add(elf->symbol_name_hash, &sym->name_hash, str_hash(sym->name));
+
+ /*
+ * Don't store empty STT_NOTYPE symbols in the rbtree. They
+ * can exist within a function, confusing the sorting.
+ */
+ if (!sym->len)
+ rb_erase(&sym->node, &sym->sec->symbol_tree);
+}
+
static int read_symbols(struct elf *elf)
{
struct section *symtab, *symtab_shndx, *sec;
struct symbol *sym, *pfunc;
- struct list_head *entry;
- struct rb_node *pnode;
int symbols_nr, i;
char *coldstr;
Elf_Data *shndx_data = NULL;
@@ -340,9 +367,6 @@ static int read_symbols(struct elf *elf)
goto err;
}
- sym->type = GELF_ST_TYPE(sym->sym.st_info);
- sym->bind = GELF_ST_BIND(sym->sym.st_info);
-
if ((sym->sym.st_shndx > SHN_UNDEF &&
sym->sym.st_shndx < SHN_LORESERVE) ||
(shndx_data && sym->sym.st_shndx == SHN_XINDEX)) {
@@ -355,32 +379,14 @@ static int read_symbols(struct elf *elf)
sym->name);
goto err;
}
- if (sym->type == STT_SECTION) {
+ if (GELF_ST_TYPE(sym->sym.st_info) == STT_SECTION) {
sym->name = sym->sec->name;
sym->sec->sym = sym;
}
} else
sym->sec = find_section_by_index(elf, 0);
- sym->offset = sym->sym.st_value;
- sym->len = sym->sym.st_size;
-
- rb_add(&sym->node, &sym->sec->symbol_tree, symbol_to_offset);
- pnode = rb_prev(&sym->node);
- if (pnode)
- entry = &rb_entry(pnode, struct symbol, node)->list;
- else
- entry = &sym->sec->symbol_list;
- list_add(&sym->list, entry);
- elf_hash_add(elf->symbol_hash, &sym->hash, sym->idx);
- elf_hash_add(elf->symbol_name_hash, &sym->name_hash, str_hash(sym->name));
-
- /*
- * Don't store empty STT_NOTYPE symbols in the rbtree. They
- * can exist within a function, confusing the sorting.
- */
- if (!sym->len)
- rb_erase(&sym->node, &sym->sec->symbol_tree);
+ elf_add_symbol(elf, sym);
}
if (stats)
next prev parent reply other threads:[~2021-04-01 17:58 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 15:11 [PATCH v3 00/16] x86,objtool: Optimize !RETPOLINE Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 01/16] x86: Add insn_decode_kernel() Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 02/16] x86/alternatives: Optimize optimize_nops() Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:11 ` tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 03/16] x86/retpoline: Simplify retpolines Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-04-06 8:56 ` David Laight
2021-03-26 15:12 ` [PATCH v3 04/16] objtool: Correctly handle retpoline thunk calls Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 05/16] objtool: Per arch retpoline naming Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] objtool: Handle per " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 06/16] objtool: Fix static_call list generation Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 07/16] objtool: Rework rebuild_reloc logic Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` [tip: x86/core] objtool: Rework the elf_rebuild_reloc_section() logic tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 08/16] objtool: Add elf_create_reloc() helper Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 09/16] objtool: Implicitly create reloc sections Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` [tip: x86/core] objtool: Create reloc sections implicitly tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 10/16] objtool: Extract elf_strtab_concat() Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 11/16] objtool: Extract elf_symbol_add() Peter Zijlstra
2021-04-01 15:08 ` tip-bot2 for Peter Zijlstra [this message]
2021-04-03 11:10 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 12/16] objtool: Add elf_create_undef_symbol() Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 13/16] objtool: Keep track of retpoline call sites Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 14/16] objtool: Cache instruction relocs Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 15/16] objtool: Skip magical retpoline .altinstr_replacement Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 16/16] objtool,x86: Rewrite retpoline thunk calls Peter Zijlstra
2021-03-29 16:38 ` Josh Poimboeuf
2021-06-02 15:51 ` Lukasz Majczak
2021-06-02 16:56 ` Peter Zijlstra
2021-06-02 17:10 ` Peter Zijlstra
2021-06-02 20:43 ` Josh Poimboeuf
2021-06-04 20:50 ` Nick Desaulniers
2021-06-04 23:27 ` Nick Desaulniers
2021-06-04 23:50 ` Fangrui Song
2021-06-05 10:38 ` Peter Zijlstra
2021-06-06 1:58 ` Fāng-ruì Sòng
2021-06-07 7:56 ` Peter Zijlstra
2021-06-07 9:22 ` Peter Zijlstra
2021-06-07 9:45 ` Peter Zijlstra
2021-06-07 17:23 ` Fāng-ruì Sòng
2021-06-07 18:25 ` Peter Zijlstra
2021-06-07 20:54 ` Nick Desaulniers
2021-06-08 9:56 ` Peter Zijlstra
2021-06-08 16:58 ` Nathan Chancellor
2021-06-08 17:22 ` Peter Zijlstra
2021-06-08 17:29 ` Nathan Chancellor
2021-06-08 18:17 ` Peter Zijlstra
2021-06-08 18:49 ` Nathan Chancellor
2021-06-09 7:11 ` Lukasz Majczak
2021-06-09 7:20 ` Peter Zijlstra
2021-06-09 12:23 ` Lukasz Majczak
2021-06-09 15:08 ` Peter Zijlstra
2021-06-09 15:11 ` Peter Zijlstra
2021-06-09 15:56 ` Nathan Chancellor
2021-06-08 18:18 ` Nick Desaulniers
2021-06-07 18:19 ` Peter Zijlstra
2021-06-07 18:27 ` Fāng-ruì Sòng
2021-06-07 18:47 ` Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] objtool/x86: " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-03-30 15:02 ` [PATCH v3 00/16] x86,objtool: Optimize !RETPOLINE Miroslav Benes
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=161728973564.29796.17344493642659515112.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@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).