objtool: Add for_each_reloc()

Link: https://lore.kernel.org/r/dbfcb1037d8b958e52d097b67829c4c6811c24bb.1685464332.git.jpoimboe@kernel.org
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 3bc97c2b4f01c871897d4878ba42decf2493d8f7..e21138d36e00983bc46ad899cb0ae42110feb282 100644 (file)
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -591,7 +591,7 @@ static int add_dead_ends(struct objtool_file *file)
        if (!rsec)
                goto reachable;
 
-       list_for_each_entry(reloc, &rsec->reloc_list, list) {
+       for_each_reloc(rsec, reloc) {
                if (reloc->sym->type != STT_SECTION) {
                        WARN("unexpected relocation symbol type in %s", rsec->name);
                        return -1;
@@ -626,7 +626,7 @@ reachable:
        if (!rsec)
                return 0;
 
-       list_for_each_entry(reloc, &rsec->reloc_list, list) {
+       for_each_reloc(rsec, reloc) {
                if (reloc->sym->type != STT_SECTION) {
                        WARN("unexpected relocation symbol type in %s", rsec->name);
                        return -1;
@@ -1019,7 +1019,7 @@ static void add_ignores(struct objtool_file *file)
        if (!rsec)
                return;
 
-       list_for_each_entry(reloc, &rsec->reloc_list, list) {
+       for_each_reloc(rsec, reloc) {
                switch (reloc->sym->type) {
                case STT_FUNC:
                        func = reloc->sym;
@@ -1260,7 +1260,7 @@ static int add_ignore_alternatives(struct objtool_file *file)
        if (!rsec)
                return 0;
 
-       list_for_each_entry(reloc, &rsec->reloc_list, list) {
+       for_each_reloc(rsec, reloc) {
                if (reloc->sym->type != STT_SECTION) {
                        WARN("unexpected relocation symbol type in %s", rsec->name);
                        return -1;
@@ -1991,7 +1991,7 @@ static int add_jump_table(struct objtool_file *file, struct instruction *insn,
         * Each @reloc is a switch table relocation which points to the target
         * instruction.
         */
-       list_for_each_entry_from(reloc, &table->sec->reloc_list, list) {
+       for_each_reloc_from(table->sec, reloc) {
 
                /* Check for the end of the table: */
                if (reloc != table && reloc->jump_table_start)
@@ -2270,7 +2270,7 @@ static int read_noendbr_hints(struct objtool_file *file)
        if (!rsec)
                return 0;
 
-       list_for_each_entry(reloc, &rsec->reloc_list, list) {
+       for_each_reloc(rsec, reloc) {
                insn = find_insn(file, reloc->sym->sec, reloc->sym->offset + reloc->addend);
                if (!insn) {
                        WARN("bad .discard.noendbr entry");
@@ -2293,7 +2293,7 @@ static int read_retpoline_hints(struct objtool_file *file)
        if (!rsec)
                return 0;
 
-       list_for_each_entry(reloc, &rsec->reloc_list, list) {
+       for_each_reloc(rsec, reloc) {
                if (reloc->sym->type != STT_SECTION) {
                        WARN("unexpected relocation symbol type in %s", rsec->name);
                        return -1;
@@ -2329,7 +2329,7 @@ static int read_instr_hints(struct objtool_file *file)
        if (!rsec)
                return 0;
 
-       list_for_each_entry(reloc, &rsec->reloc_list, list) {
+       for_each_reloc(rsec, reloc) {
                if (reloc->sym->type != STT_SECTION) {
                        WARN("unexpected relocation symbol type in %s", rsec->name);
                        return -1;
@@ -2348,7 +2348,7 @@ static int read_instr_hints(struct objtool_file *file)
        if (!rsec)
                return 0;
 
-       list_for_each_entry(reloc, &rsec->reloc_list, list) {
+       for_each_reloc(rsec, reloc) {
                if (reloc->sym->type != STT_SECTION) {
                        WARN("unexpected relocation symbol type in %s", rsec->name);
                        return -1;
@@ -2376,7 +2376,7 @@ static int read_validate_unret_hints(struct objtool_file *file)
        if (!rsec)
                return 0;
 
-       list_for_each_entry(reloc, &rsec->reloc_list, list) {
+       for_each_reloc(rsec, reloc) {
                if (reloc->sym->type != STT_SECTION) {
                        WARN("unexpected relocation symbol type in %s", rsec->name);
                        return -1;
@@ -2404,7 +2404,7 @@ static int read_intra_function_calls(struct objtool_file *file)
        if (!rsec)
                return 0;
 
-       list_for_each_entry(reloc, &rsec->reloc_list, list) {
+       for_each_reloc(rsec, reloc) {
                unsigned long dest_off;
 
                if (reloc->sym->type != STT_SECTION) {
@@ -4404,7 +4404,7 @@ static int validate_ibt(struct objtool_file *file)
                    strstr(sec->name, "__patchable_function_entries"))
                        continue;
 
-               list_for_each_entry(reloc, &sec->rsec->reloc_list, list)
+               for_each_reloc(sec->rsec, reloc)
                        warnings += validate_ibt_data_reloc(file, reloc);
        }
 

diff --git a/tools/objtool/include/objtool/elf.h b/tools/objtool/include/objtool/elf.h
index 74f63934afd31a68fe4bc54f4702ee8c1e548056..a938cb1d41720a1fa54c295ee7d5f91fdc5d6fd9 100644 (file)
--- a/tools/objtool/include/objtool/elf.h
+++ b/tools/objtool/include/objtool/elf.h
@@ -209,6 +209,12 @@ static inline void mark_sec_changed(struct elf *elf, struct section *sec,
                for_each_sec(file, __sec)                               \
                        sec_for_each_sym(__sec, sym)
 
+#define for_each_reloc(rsec, reloc)                                    \
+       list_for_each_entry(reloc, &rsec->reloc_list, list)
+
+#define for_each_reloc_from(rsec, reloc)                               \
+       list_for_each_entry_from(reloc, &rsec->reloc_list, list)
+
 #define OFFSET_STRIDE_BITS     4
 #define OFFSET_STRIDE          (1UL << OFFSET_STRIDE_BITS)
 #define OFFSET_STRIDE_MASK     (~(OFFSET_STRIDE - 1))