objtool: Create reloc sections implicitly

commit d0c5c4cc73da0b05b0d9e5f833f2d859e1b45f8e upstream.

Have elf_add_reloc() create the relocation section implicitly.

Suggested-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Link: https://lkml.kernel.org/r/20210326151259.880174448@infradead.org
[bwh: Backported to 5.10: drop changes in create_mcount_loc_sections()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 76a63294d64e365cd61ec5f2fc21e634ea6c1964..2cb40985908129beb8216d143bdcf5324ca7387f 100644 (file)
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -459,9 +459,6 @@ static int create_static_call_sections(struct objtool_file *file)
        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) {
 

diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 973f0c481bacc211cf1a073844189bb9ba67d070..b76d687bc962dd71e146fbaa0afd09355f1e4452 100644 (file)
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -498,11 +498,18 @@ err:
        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");
@@ -880,7 +887,7 @@ static struct section *elf_create_rela_reloc_section(struct elf *elf, struct sec
        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)
 {

diff --git a/tools/objtool/elf.h b/tools/objtool/elf.h
index 825ad326201dc49161081548bba1ede024b6b215..463f329f1c6653381908042105bf00bb26d7ca11 100644 (file)
--- a/tools/objtool/elf.h
+++ b/tools/objtool/elf.h
@@ -122,7 +122,6 @@ static inline u32 reloc_hash(struct reloc *reloc)
 
 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);

diff --git a/tools/objtool/orc_gen.c b/tools/objtool/orc_gen.c
index 57de202c51b4cb70f15e5f258753ab41af92a3f3..671f3b296c1ad04c2f8a26f8f84c698cf656547d 100644 (file)
--- a/tools/objtool/orc_gen.c
+++ b/tools/objtool/orc_gen.c
@@ -222,8 +222,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) {