bd98c81346
This fixes objtool for both a GCC issue and a Clang issue:
1) GCC issue:
kernel/bpf/core.o: warning: objtool: ___bpf_prog_run()+0x8d5: sibling call from callable instruction with modified stack frame
With CONFIG_RETPOLINE=n, GCC is doing the following optimization in
___bpf_prog_run().
Before:
select_insn:
jmp *jumptable(,%rax,8)
...
ALU64_ADD_X:
...
jmp select_insn
ALU_ADD_X:
...
jmp select_insn
After:
select_insn:
jmp *jumptable(, %rax, 8)
...
ALU64_ADD_X:
...
jmp *jumptable(, %rax, 8)
ALU_ADD_X:
...
jmp *jumptable(, %rax, 8)
This confuses objtool. It has never seen multiple indirect jump
sites which use the same jump table.
For GCC switch tables, the only way of detecting the size of a table
is by continuing to scan for more tables. The size of the previous
table can only be determined after another switch table is found, or
when the scan reaches the end of the function.
That logic was reused for C jump tables, and was based on the
assumption that each jump table only has a single jump site. The
above optimization breaks that assumption.
2) Clang issue:
drivers/usb/misc/sisusbvga/sisusb.o: warning: objtool: sisusb_write_mem_bulk()+0x588: can't find switch jump table
With clang 9, code can be generated where a function contains two
indirect jump instructions which use the same switch table.
The fix is the same for both issues: split the jump table parsing into
two passes.
In the first pass, locate the heads of all switch tables for the
function and mark their locations.
In the second pass, parse the switch tables and add them.
Fixes: e55a73251d ("bpf: Fix ORC unwinding in non-JIT BPF code")
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jann Horn <jannh@google.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Nick Desaulniers <ndesaulniers@google.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/e995befaada9d4d8b2cf788ff3f566ba900d2b4d.1563413318.git.jpoimboe@redhat.com
Co-developed-by: Josh Poimboeuf <jpoimboe@redhat.com>
98 lines
2.4 KiB
C
98 lines
2.4 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/*
|
|
* Copyright (C) 2015 Josh Poimboeuf <jpoimboe@redhat.com>
|
|
*/
|
|
|
|
#ifndef _OBJTOOL_ELF_H
|
|
#define _OBJTOOL_ELF_H
|
|
|
|
#include <stdio.h>
|
|
#include <gelf.h>
|
|
#include <linux/list.h>
|
|
#include <linux/hashtable.h>
|
|
|
|
#ifdef LIBELF_USE_DEPRECATED
|
|
# define elf_getshdrnum elf_getshnum
|
|
# define elf_getshdrstrndx elf_getshstrndx
|
|
#endif
|
|
|
|
/*
|
|
* Fallback for systems without this "read, mmaping if possible" cmd.
|
|
*/
|
|
#ifndef ELF_C_READ_MMAP
|
|
#define ELF_C_READ_MMAP ELF_C_READ
|
|
#endif
|
|
|
|
struct section {
|
|
struct list_head list;
|
|
GElf_Shdr sh;
|
|
struct list_head symbol_list;
|
|
DECLARE_HASHTABLE(symbol_hash, 8);
|
|
struct list_head rela_list;
|
|
DECLARE_HASHTABLE(rela_hash, 16);
|
|
struct section *base, *rela;
|
|
struct symbol *sym;
|
|
Elf_Data *data;
|
|
char *name;
|
|
int idx;
|
|
unsigned int len;
|
|
bool changed, text, rodata;
|
|
};
|
|
|
|
struct symbol {
|
|
struct list_head list;
|
|
struct hlist_node hash;
|
|
GElf_Sym sym;
|
|
struct section *sec;
|
|
char *name;
|
|
unsigned int idx;
|
|
unsigned char bind, type;
|
|
unsigned long offset;
|
|
unsigned int len;
|
|
struct symbol *pfunc, *cfunc, *alias;
|
|
bool uaccess_safe;
|
|
};
|
|
|
|
struct rela {
|
|
struct list_head list;
|
|
struct hlist_node hash;
|
|
GElf_Rela rela;
|
|
struct section *sec;
|
|
struct symbol *sym;
|
|
unsigned int type;
|
|
unsigned long offset;
|
|
int addend;
|
|
bool jump_table_start;
|
|
};
|
|
|
|
struct elf {
|
|
Elf *elf;
|
|
GElf_Ehdr ehdr;
|
|
int fd;
|
|
char *name;
|
|
struct list_head sections;
|
|
DECLARE_HASHTABLE(rela_hash, 16);
|
|
};
|
|
|
|
|
|
struct elf *elf_read(const char *name, int flags);
|
|
struct section *find_section_by_name(struct elf *elf, const char *name);
|
|
struct symbol *find_symbol_by_offset(struct section *sec, unsigned long offset);
|
|
struct symbol *find_symbol_by_name(struct elf *elf, const char *name);
|
|
struct symbol *find_symbol_containing(struct section *sec, unsigned long offset);
|
|
struct rela *find_rela_by_dest(struct section *sec, unsigned long offset);
|
|
struct rela *find_rela_by_dest_range(struct section *sec, unsigned long offset,
|
|
unsigned int len);
|
|
struct symbol *find_containing_func(struct section *sec, unsigned long offset);
|
|
struct section *elf_create_section(struct elf *elf, const char *name, size_t
|
|
entsize, int nr);
|
|
struct section *elf_create_rela_section(struct elf *elf, struct section *base);
|
|
int elf_rebuild_rela_section(struct section *sec);
|
|
int elf_write(struct elf *elf);
|
|
void elf_close(struct elf *elf);
|
|
|
|
#define for_each_sec(file, sec) \
|
|
list_for_each_entry(sec, &file->elf->sections, list)
|
|
|
|
#endif /* _OBJTOOL_ELF_H */
|