iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

objtool: Remove reloc symbol type checks in get_alt_entry()

Browse Source 
Converting a special section's relocation reference to a symbol is
straightforward.  No need for objtool to complain that it doesn't know
how to handle it.  Just handle it.

This fixes the following warning:

  arch/x86/kvm/emulate.o: warning: objtool: __ex_table+0x4: don't know how to handle reloc symbol type: kvm_fastop_exception

Fixes: 24ff65257375 ("objtool: Teach get_alt_entry() about more relocation types")
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Link: https://lore.kernel.org/r/feadbc3dfb3440d973580fad8d3db873cbfe1694.1633367242.git.jpoimboe@redhat.com
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: x86@kernel.org
Cc: Miroslav Benes <mbenes@suse.cz>
Cc: linux-kernel@vger.kernel.org
This commit is contained in:
Josh Poimboeuf 2021-10-04 10:07:50 -07:00
parent 9e1ff307c7
commit 4d8b35968b
1 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tools/objtool/special.c
View File

@ -58,22 +58,11 @@ void __weak arch_handle_alternative(unsigned short feature, struct special_alt *
{
}
static bool reloc2sec_off(struct reloc *reloc, struct section **sec, unsigned long *off)
static void reloc_to_sec_off(struct reloc *reloc, struct section **sec,
unsigned long *off)
{
switch (reloc->sym->type) {
case STT_FUNC:
*sec = reloc->sym->sec;
*off = reloc->sym->offset + reloc->addend;
return true;
case STT_SECTION:
*sec = reloc->sym->sec;
*off = reloc->addend;
return true;
default:
return false;
}
*sec = reloc->sym->sec;
*off = reloc->sym->offset + reloc->addend;
}
static int get_alt_entry(struct elf *elf, struct special_entry *entry,
@ -109,13 +98,8 @@ static int get_alt_entry(struct elf *elf, struct special_entry *entry,
WARN_FUNC("can't find orig reloc", sec, offset + entry->orig);
return -1;
}
if (!reloc2sec_off(orig_reloc, &alt->orig_sec, &alt->orig_off)) {
WARN_FUNC("don't know how to handle reloc symbol type %d: %s",
sec, offset + entry->orig,
orig_reloc->sym->type,
orig_reloc->sym->name);
return -1;
}
reloc_to_sec_off(orig_reloc, &alt->orig_sec, &alt->orig_off);
if (!entry->group || alt->new_len) {
new_reloc = find_reloc_by_dest(elf, sec, offset + entry->new);
@ -133,13 +117,7 @@ static int get_alt_entry(struct elf *elf, struct special_entry *entry,
if (arch_is_retpoline(new_reloc->sym))
return 1;
if (!reloc2sec_off(new_reloc, &alt->new_sec, &alt->new_off)) {
WARN_FUNC("don't know how to handle reloc symbol type %d: %s",
sec, offset + entry->new,
new_reloc->sym->type,
new_reloc->sym->name);
return -1;
}
reloc_to_sec_off(new_reloc, &alt->new_sec, &alt->new_off);
/* _ASM_EXTABLE_EX hack */
if (alt->new_off >= 0x7ffffff0)