Patch "kallsyms: fix nonconverging kallsyms table with lld" has been added to the 5.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    kallsyms: fix nonconverging kallsyms table with lld

to the 5.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     kallsyms-fix-nonconverging-kallsyms-table-with-lld.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit dfbe29c3e3c13504c002fea6b124c7f7d7af5778
Author: Arnd Bergmann <arnd@xxxxxxxx>
Date:   Thu Feb 4 16:29:47 2021 +0100

    kallsyms: fix nonconverging kallsyms table with lld
    
    [ Upstream commit efe6e3068067212b85c2d0474b5ee3b2d0c7adab ]
    
    ARM randconfig builds with lld sometimes show a build failure
    from kallsyms:
    
      Inconsistent kallsyms data
      Try make KALLSYMS_EXTRA_PASS=1 as a workaround
    
    The problem is the veneers/thunks getting added by the linker extend
    the symbol table, which in turn leads to more veneers being needed,
    so it may take a few extra iterations to converge.
    
    This bug has been fixed multiple times before, but comes back every time
    a new symbol name is used. lld uses a different set of identifiers from
    ld.bfd, so the additional ones need to be added as well.
    
    I looked through the sources and found that arm64 and mips define similar
    prefixes, so I'm adding those as well, aside from the ones I observed. I'm
    not sure about powerpc64, which seems to already be handled through a
    section match, but if it comes back, the "__long_branch_" and "__plt_"
    prefixes would have to get added as well.
    
    Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
    Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 7ecd2ccba531b..54ad86d137849 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -112,6 +112,12 @@ static bool is_ignored_symbol(const char *name, char type)
 		"__crc_",		/* modversions */
 		"__efistub_",		/* arm64 EFI stub namespace */
 		"__kvm_nvhe_",		/* arm64 non-VHE KVM namespace */
+		"__AArch64ADRPThunk_",	/* arm64 lld */
+		"__ARMV5PILongThunk_",	/* arm lld */
+		"__ARMV7PILongThunk_",
+		"__ThumbV7PILongThunk_",
+		"__LA25Thunk_",		/* mips lld */
+		"__microLA25Thunk_",
 		NULL
 	};