From: Peter Zijlstra <peterz@infradead.org>
To: x86@kernel.org, jpoimboe@redhat.com, jgross@suse.com, mbenes@suse.com
Cc: linux-kernel@vger.kernel.org, peterz@infradead.org
Subject: [PATCH v3 09/16] objtool: Implicitly create reloc sections
Date: Fri, 26 Mar 2021 16:12:08 +0100 [thread overview]
Message-ID: <20210326151259.880174448@infradead.org> (raw)
In-Reply-To: 20210326151159.128534163@infradead.org
Have elf_add_reloc() create the relocation section implicity.
Suggested-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
tools/objtool/check.c | 6 ------
tools/objtool/elf.c | 9 ++++++++-
tools/objtool/include/objtool/elf.h | 1 -
tools/objtool/orc_gen.c | 2 --
4 files changed, 8 insertions(+), 10 deletions(-)
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -459,9 +459,6 @@ static int create_static_call_sections(s
if (!sec)
return -1;
- if (!elf_create_reloc_section(file->elf, sec, SHT_RELA))
- return -1;
-
idx = 0;
list_for_each_entry(insn, &file->static_call_list, static_call_node) {
@@ -547,9 +544,6 @@ static int create_mcount_loc_sections(st
if (!sec)
return -1;
- if (!elf_create_reloc_section(file->elf, sec, SHT_RELA))
- return -1;
-
idx = 0;
list_for_each_entry(insn, &file->mcount_loc_list, mcount_loc_node) {
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -447,11 +447,18 @@ static int read_symbols(struct elf *elf)
return -1;
}
+static struct section *elf_create_reloc_section(struct elf *elf,
+ struct section *base,
+ int reltype);
+
int elf_add_reloc(struct elf *elf, struct section *sec, unsigned long offset,
unsigned int type, struct symbol *sym, int addend)
{
struct reloc *reloc;
+ if (!sec->reloc && !elf_create_reloc_section(elf, sec, SHT_RELA))
+ return -1;
+
reloc = malloc(sizeof(*reloc));
if (!reloc) {
perror("malloc");
@@ -829,7 +836,7 @@ static struct section *elf_create_rela_r
return sec;
}
-struct section *elf_create_reloc_section(struct elf *elf,
+static struct section *elf_create_reloc_section(struct elf *elf,
struct section *base,
int reltype)
{
--- a/tools/objtool/include/objtool/elf.h
+++ b/tools/objtool/include/objtool/elf.h
@@ -122,7 +122,6 @@ static inline u32 reloc_hash(struct relo
struct elf *elf_open_read(const char *name, int flags);
struct section *elf_create_section(struct elf *elf, const char *name, unsigned int sh_flags, size_t entsize, int nr);
-struct section *elf_create_reloc_section(struct elf *elf, struct section *base, int reltype);
int elf_add_reloc(struct elf *elf, struct section *sec, unsigned long offset,
unsigned int type, struct symbol *sym, int addend);
--- a/tools/objtool/orc_gen.c
+++ b/tools/objtool/orc_gen.c
@@ -225,8 +225,6 @@ int orc_create(struct objtool_file *file
sec = elf_create_section(file->elf, ".orc_unwind_ip", 0, sizeof(int), nr);
if (!sec)
return -1;
- if (!elf_create_reloc_section(file->elf, sec, SHT_RELA))
- return -1;
/* Write ORC entries to sections: */
list_for_each_entry(entry, &orc_list, list) {
next prev parent reply other threads:[~2021-03-26 15:16 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 ` Peter Zijlstra [this message]
2021-04-01 15:08 ` [tip: x86/core] objtool: Implicitly create reloc sections 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: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` 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=20210326151259.880174448@infradead.org \
--to=peterz@infradead.org \
--cc=jgross@suse.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mbenes@suse.com \
--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).