admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

objtool: Convert elf iterator macros to use 'struct elf'

Browse Source 
'struct objtool_file' is specific to the check code and doesn't belong
in the elf code which is supposed to be objtool_file-agnostic.  Convert
the elf iterator macros to use 'struct elf' instead.

Acked-by: Petr Mladek <pmladek@suse.com>
Tested-by: Joe Lawrence <joe.lawrence@redhat.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
This commit is contained in:
Josh Poimboeuf
2025-09-17 09:03:35 -07:00
parent 72e4b6b44e
commit 96eceff331
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tools/objtool/check.c
View File

@@ -106,7 +106,7 @@ static struct instruction *prev_insn_same_sym(struct objtool_file *file,
#define for_each_insn(file, insn) \ #define for_each_insn(file, insn) \
for (struct section *__sec, *__fake = (struct section *)1; \ for (struct section *__sec, *__fake = (struct section *)1; \
__fake; __fake = NULL) \ __fake; __fake = NULL) \
for_each_sec(file, __sec) \ for_each_sec(file->elf, __sec) \
sec_for_each_insn(file, __sec, insn) sec_for_each_insn(file, __sec, insn)
#define func_for_each_insn(file, func, insn) \ #define func_for_each_insn(file, func, insn) \
@@ -431,7 +431,7 @@ static int decode_instructions(struct objtool_file *file)
unsigned long offset; unsigned long offset;
struct instruction *insn; struct instruction *insn;
for_each_sec(file, sec) { for_each_sec(file->elf, sec) {
struct instruction *insns = NULL; struct instruction *insns = NULL;
u8 prev_len = 0; u8 prev_len = 0;
u8 idx = 0; u8 idx = 0;
@@ -857,7 +857,7 @@ static int create_cfi_sections(struct objtool_file *file)
} }
idx = 0; idx = 0;
for_each_sym(file, sym) { for_each_sym(file->elf, sym) {
if (sym->type != STT_FUNC) if (sym->type != STT_FUNC)
continue; continue;
@@ -873,7 +873,7 @@ static int create_cfi_sections(struct objtool_file *file)
return -1; return -1;
idx = 0; idx = 0;
for_each_sym(file, sym) { for_each_sym(file->elf, sym) {
if (sym->type != STT_FUNC) if (sym->type != STT_FUNC)
continue; continue;
@@ -2145,7 +2145,7 @@ static int add_jump_table_alts(struct objtool_file *file)
if (!file->rodata) if (!file->rodata)
return 0; return 0;
for_each_sym(file, func) { for_each_sym(file->elf, func) {
if (func->type != STT_FUNC) if (func->type != STT_FUNC)
continue; continue;
@@ -2451,7 +2451,7 @@ static int classify_symbols(struct objtool_file *file)
{ {
struct symbol *func; struct symbol *func;
for_each_sym(file, func) { for_each_sym(file->elf, func) {
if (func->type == STT_NOTYPE && strstarts(func->name, ".L")) if (func->type == STT_NOTYPE && strstarts(func->name, ".L"))
func->local_label = true; func->local_label = true;
@@ -2496,7 +2496,7 @@ static void mark_rodata(struct objtool_file *file)
* *
* .rodata.str1.* sections are ignored; they don't contain jump tables. * .rodata.str1.* sections are ignored; they don't contain jump tables.
*/ */
for_each_sec(file, sec) { for_each_sec(file->elf, sec) {
if ((!strncmp(sec->name, ".rodata", 7) && if ((!strncmp(sec->name, ".rodata", 7) &&
!strstr(sec->name, ".str1.")) || !strstr(sec->name, ".str1.")) ||
!strncmp(sec->name, ".data.rel.ro", 12)) { !strncmp(sec->name, ".data.rel.ro", 12)) {
@@ -4178,7 +4178,7 @@ static int add_prefix_symbols(struct objtool_file *file)
struct section *sec; struct section *sec;
struct symbol *func; struct symbol *func;
for_each_sec(file, sec) { for_each_sec(file->elf, sec) {
if (!(sec->sh.sh_flags & SHF_EXECINSTR)) if (!(sec->sh.sh_flags & SHF_EXECINSTR))
continue; continue;
@@ -4270,7 +4270,7 @@ static int validate_functions(struct objtool_file *file)
struct section *sec; struct section *sec;
int warnings = 0; int warnings = 0;
for_each_sec(file, sec) { for_each_sec(file->elf, sec) {
if (!(sec->sh.sh_flags & SHF_EXECINSTR)) if (!(sec->sh.sh_flags & SHF_EXECINSTR))
continue; continue;
@@ -4449,7 +4449,7 @@ static int validate_ibt(struct objtool_file *file)
for_each_insn(file, insn) for_each_insn(file, insn)
warnings += validate_ibt_insn(file, insn); warnings += validate_ibt_insn(file, insn);
for_each_sec(file, sec) { for_each_sec(file->elf, sec) {
/* Already done by validate_ibt_insn() */ /* Already done by validate_ibt_insn() */
if (sec->sh.sh_flags & SHF_EXECINSTR) if (sec->sh.sh_flags & SHF_EXECINSTR)
@@ -4610,7 +4610,7 @@ static void disas_warned_funcs(struct objtool_file *file)
struct symbol *sym; struct symbol *sym;
char *funcs = NULL, *tmp; char *funcs = NULL, *tmp;
for_each_sym(file, sym) { for_each_sym(file->elf, sym) {
if (sym->warned) { if (sym->warned) {
if (!funcs) { if (!funcs) {
funcs = malloc(strlen(sym->name) + 1); funcs = malloc(strlen(sym->name) + 1);
@@ -4650,7 +4650,7 @@ static int check_abs_references(struct objtool_file *file)
struct reloc *reloc; struct reloc *reloc;
int ret = 0; int ret = 0;
for_each_sec(file, sec) { for_each_sec(file->elf, sec) {
/* absolute references in non-loadable sections are fine */ /* absolute references in non-loadable sections are fine */
if (!(sec->sh.sh_flags & SHF_ALLOC)) if (!(sec->sh.sh_flags & SHF_ALLOC))
continue; continue;

8
tools/objtool/include/objtool/elf.h
View File

@@ -325,16 +325,16 @@ static inline void set_sym_next_reloc(struct reloc *reloc, struct reloc *next)
reloc->_sym_next_reloc = (unsigned long)next | bit; reloc->_sym_next_reloc = (unsigned long)next | bit;
} }
#define for_each_sec(file, sec) \ #define for_each_sec(elf, sec) \
list_for_each_entry(sec, &file->elf->sections, list) list_for_each_entry(sec, &elf->sections, list)
#define sec_for_each_sym(sec, sym) \ #define sec_for_each_sym(sec, sym) \
list_for_each_entry(sym, &sec->symbol_list, list) list_for_each_entry(sym, &sec->symbol_list, list)
#define for_each_sym(file, sym) \ #define for_each_sym(elf, sym) \
for (struct section *__sec, *__fake = (struct section *)1; \ for (struct section *__sec, *__fake = (struct section *)1; \
__fake; __fake = NULL) \ __fake; __fake = NULL) \
for_each_sec(file, __sec) \ for_each_sec(elf, __sec) \
sec_for_each_sym(__sec, sym) sec_for_each_sym(__sec, sym)
#define for_each_reloc(rsec, reloc) \ #define for_each_reloc(rsec, reloc) \

2
tools/objtool/orc_gen.c
View File

@@ -57,7 +57,7 @@ int orc_create(struct objtool_file *file)
/* Build a deduplicated list of ORC entries: */ /* Build a deduplicated list of ORC entries: */
INIT_LIST_HEAD(&orc_list); INIT_LIST_HEAD(&orc_list);
for_each_sec(file, sec) { for_each_sec(file->elf, sec) {
struct orc_entry orc, prev_orc = {0}; struct orc_entry orc, prev_orc = {0};
struct instruction *insn; struct instruction *insn;
bool empty = true; bool empty = true;