objtool/klp: Don't correlate __initstub__ symbols

With LTO, the initcall infrastructure generates __initstub__kmod_*
wrapper functions in .init.text.  These are the LTO equivalent of
__initcall__kmod_* data pointers, which are already excluded from
correlation.

These are __init functions whose memory is freed after boot, so there's
no reason to include or reference them in a livepatch module.

Acked-by: Song Liu <song@kernel.org>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>

diff --git a/tools/objtool/klp-diff.c b/tools/objtool/klp-diff.c
index 27ebe1b1f463681106caa5bac81d0f596b6767f6..4f668117c45e66d82bcf69f72d561252d06b3ae0 100644 (file)
--- a/tools/objtool/klp-diff.c
+++ b/tools/objtool/klp-diff.c
@@ -370,6 +370,12 @@ static bool is_abs_sym(struct symbol *sym)
        return sym->sym.st_shndx == SHN_ABS && !is_file_sym(sym);
 }
 
+static bool is_initcall_sym(struct symbol *sym)
+{
+       return strstarts(sym->name, "__initcall__") ||
+              strstarts(sym->name, "__initstub__");
+}
+
 /*
  * These symbols should never be correlated, so their local patched versions
  * are used instead of linking to the originals.
@@ -384,10 +390,10 @@ static bool dont_correlate(struct symbol *sym)
               is_uncorrelated_static_local(sym) ||
               is_clang_tmp_label(sym) ||
               is_string_sec(sym->sec) ||
+              is_initcall_sym(sym) ||
               is_addressable_sym(sym) ||
               is_special_section(sym->sec) ||
-              is_special_section_aux(sym->sec) ||
-              strstarts(sym->name, "__initcall__");
+              is_special_section_aux(sym->sec);
 }
 
 struct process_demangled_name_data {