[RFC 10/31] objtool: Use 'struct elf' in elf macros

Josh Poimboeuf
2024-09-03T04:00:34Z

'struct objtool_file' is specific to the check code and doesn't belong
in the elf code.

Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
tools/objtool/check.c | 22 +++++++++++-----------
tools/objtool/include/objtool/elf.h | 8 ++++----
tools/objtool/orc_gen.c | 2 +-
3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index a813a6194c61..06e7b3f5481d 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -107,7 +107,7 @@ static struct instruction *prev_insn_same_sym(struct objtool_file *file,
#define for_each_insn(file, insn) \
for (struct section *__sec, *__fake = (struct section *)1; \
__fake; __fake = NULL) \
- for_each_sec(file, __sec) \
+ for_each_sec(file->elf, __sec) \
sec_for_each_insn(file, __sec, insn)

#define func_for_each_insn(file, func, insn) \
@@ -374,7 +374,7 @@ static int decode_instructions(struct objtool_file *file)
struct instruction *insn;
int ret;

- for_each_sec(file, sec) {
+ for_each_sec(file->elf, sec) {
struct instruction *insns = NULL;
u8 prev_len = 0;
u8 idx = 0;
@@ -899,7 +899,7 @@ static int create_cfi_sections(struct objtool_file *file)
}

idx = 0;
- for_each_sym(file, sym) {
+ for_each_sym(file->elf, sym) {
if (sym->type != STT_FUNC)
continue;

@@ -915,7 +915,7 @@ static int create_cfi_sections(struct objtool_file *file)
return -1;

idx = 0;
- for_each_sym(file, sym) {
+ for_each_sym(file->elf, sym) {
if (sym->type != STT_FUNC)
continue;

@@ -2198,7 +2198,7 @@ static int add_jump_table_alts(struct objtool_file *file)
if (!file->rodata)
return 0;

- for_each_sym(file, func) {
+ for_each_sym(file->elf, func) {
if (func->type != STT_FUNC)
continue;

@@ -2534,7 +2534,7 @@ static int classify_symbols(struct objtool_file *file)
{
struct symbol *func;

- for_each_sym(file, func) {
+ for_each_sym(file->elf, func) {
if (func->type == STT_NOTYPE && strstarts(func->name, ".L"))
func->local_label = true;

@@ -2579,7 +2579,7 @@ static void mark_rodata(struct objtool_file *file)
*
* .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) &&
!strstr(sec->name, ".str1.")) {
sec->rodata = true;
@@ -4198,7 +4198,7 @@ static int add_prefix_symbols(struct objtool_file *file)
struct section *sec;
struct symbol *func;

- for_each_sec(file, sec) {
+ for_each_sec(file->elf, sec) {
if (!(sec->sh.sh_flags & SHF_EXECINSTR))
continue;

@@ -4289,7 +4289,7 @@ static int validate_functions(struct objtool_file *file)
struct section *sec;
int warnings = 0;

- for_each_sec(file, sec) {
+ for_each_sec(file->elf, sec) {
if (!(sec->sh.sh_flags & SHF_EXECINSTR))
continue;

@@ -4458,7 +4458,7 @@ static int validate_ibt(struct objtool_file *file)
for_each_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() */
if (sec->sh.sh_flags & SHF_EXECINSTR)
@@ -4645,7 +4645,7 @@ static int disas_warned_funcs(struct objtool_file *file)
struct symbol *sym;
char *funcs = NULL, *tmp;

- for_each_sym(file, sym) {
+ for_each_sym(file->elf, sym) {
if (sym->warned) {
if (!funcs) {
funcs = malloc(strlen(sym->name) + 1);
diff --git a/tools/objtool/include/objtool/elf.h b/tools/objtool/include/objtool/elf.h
index a027fc34d605..7524510b5565 100644
--- a/tools/objtool/include/objtool/elf.h
+++ b/tools/objtool/include/objtool/elf.h
@@ -296,16 +296,16 @@ static inline void set_reloc_type(struct elf *elf, struct reloc *reloc, unsigned
mark_sec_changed(elf, reloc->sec, true);
}

-#define for_each_sec(file, sec) \
- list_for_each_entry(sec, &file->elf->sections, list)
+#define for_each_sec(elf, sec) \
+ list_for_each_entry(sec, &elf->sections, list)

#define sec_for_each_sym(sec, sym) \
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; \
__fake; __fake = NULL) \
- for_each_sec(file, __sec) \
+ for_each_sec(elf, __sec) \
sec_for_each_sym(__sec, sym)

#define for_each_reloc(rsec, reloc) \
diff --git a/tools/objtool/orc_gen.c b/tools/objtool/orc_gen.c
index 922e6aac7cea..6eff3d6a125c 100644
--- a/tools/objtool/orc_gen.c
+++ b/tools/objtool/orc_gen.c
@@ -57,7 +57,7 @@ int orc_create(struct objtool_file *file)

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