Commit ade8c208 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Peter Zijlstra
Browse files

x86/calldepth: Fix incorrect init section references 



The addition of callthunks_translate_call_dest means that
skip_addr() and patch_dest() can no longer be discarded
as part of the __init section freeing:

WARNING: modpost: vmlinux.o: section mismatch in reference: callthunks_translate_call_dest.cold (section: .text.unlikely) -> skip_addr (section: .init.text)
WARNING: modpost: vmlinux.o: section mismatch in reference: callthunks_translate_call_dest.cold (section: .text.unlikely) -> patch_dest (section: .init.text)
WARNING: modpost: vmlinux.o: section mismatch in reference: is_callthunk.cold (section: .text.unlikely) -> skip_addr (section: .init.text)
ERROR: modpost: Section mismatches detected.
Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.

Fixes: b2e9dfe5 ("x86/bpf: Emit call depth accounting if required")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20221215164334.968863-1-arnd@kernel.org
parent 1b929c02

arch/x86/kernel/callthunks.c

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static bool is_coretext(const struct core_text *ct, void *addr) 
	return within_module_coretext(addr);

}



static __init_or_module bool skip_addr(void *dest)

static bool skip_addr(void *dest)

{

	if (dest == error_entry)

		return true;
@@ -181,7 +181,7 @@ static const u8 nops[] = { 
	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,

};



static __init_or_module void *patch_dest(void *dest, bool direct)

static void *patch_dest(void *dest, bool direct)

{

	unsigned int tsize = SKL_TMPL_SIZE;

	u8 *pad = dest - tsize;