Commit 8245d47c authored by Kees Cook's avatar Kees Cook
Browse files

x86: Handle KCOV __init vs inline mismatches 

GCC appears to have kind of fragile inlining heuristics, in the
sense that it can change whether or not it inlines something based on
optimizations. It looks like the kcov instrumentation being added (or in
this case, removed) from a function changes the optimization results,
and some functions marked "inline" are _not_ inlined. In that case,
we end up with __init code calling a function not marked __init, and we
get the build warnings I'm trying to eliminate in the coming patch that
adds __no_sanitize_coverage to __init functions:

WARNING: modpost: vmlinux: section mismatch in reference: xbc_exit+0x8 (section: .text.unlikely) -> _xbc_exit (section: .init.text)
WARNING: modpost: vmlinux: section mismatch in reference: real_mode_size_needed+0x15 (section: .text.unlikely) -> real_mode_blob_end (section: .init.data)
WARNING: modpost: vmlinux: section mismatch in reference: __set_percpu_decrypted+0x16 (section: .text.unlikely) -> early_set_memory_decrypted (section: .init.text)
WARNING: modpost: vmlinux: section mismatch in reference: memblock_alloc_from+0x26 (section: .text.unlikely) -> memblock_alloc_try_nid (section: .init.text)
WARNING: modpost: vmlinux: section mismatch in reference: acpi_arch_set_root_pointer+0xc (section: .text.unlikely) -> x86_init (section: .init.data)
WARNING: modpost: vmlinux: section mismatch in reference: acpi_arch_get_root_pointer+0x8 (section: .text.unlikely) -> x86_init (section: .init.data)
WARNING: modpost: vmlinux: section mismatch in reference: efi_config_table_is_usable+0x16 (section: .text.unlikely) -> xen_efi_config_table_is_usable (section: .init.text)

This problem is somewhat fragile (though using either __always_inline
or __init will deterministically solve it), but we've tripped over
this before with GCC and the solution has usually been to just use
__always_inline and move on.

For x86 this means forcing several functions to be inline with
__always_inline.

Link: https://lore.kernel.org/r/20250724055029.3623499-2-kees@kernel.org


Signed-off-by: default avatarKees Cook <kees@kernel.org>
parent 65c43090

arch/x86/include/asm/acpi.h

+2 −2
Original line number Diff line number Diff line
@@ -158,13 +158,13 @@ static inline bool acpi_has_cpu_in_madt(void) 
}



#define ACPI_HAVE_ARCH_SET_ROOT_POINTER

static inline void acpi_arch_set_root_pointer(u64 addr)

static __always_inline void acpi_arch_set_root_pointer(u64 addr)

{

	x86_init.acpi.set_root_pointer(addr);

}



#define ACPI_HAVE_ARCH_GET_ROOT_POINTER

static inline u64 acpi_arch_get_root_pointer(void)

static __always_inline u64 acpi_arch_get_root_pointer(void)

{

	return x86_init.acpi.get_root_pointer();

}

arch/x86/include/asm/realmode.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ extern unsigned char secondary_startup_64[]; 
extern unsigned char secondary_startup_64_no_verify[];

#endif



static inline size_t real_mode_size_needed(void)

static __always_inline size_t real_mode_size_needed(void)

{

	if (real_mode_header)

		return 0;	/* already allocated. */

arch/x86/kernel/kvm.c

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static u64 kvm_steal_clock(int cpu) 
	return steal;

}



static inline void __set_percpu_decrypted(void *ptr, unsigned long size)

static inline __init void __set_percpu_decrypted(void *ptr, unsigned long size)

{

	early_set_memory_decrypted((unsigned long) ptr, size);

}

arch/x86/mm/init_64.c

+1 −1
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ kernel_physical_mapping_change(unsigned long paddr_start, 
}



#ifndef CONFIG_NUMA

static inline void x86_numa_init(void)

static __always_inline void x86_numa_init(void)

{

	memblock_set_node(0, PHYS_ADDR_MAX, &memblock.memory, 0);

}

include/linux/acpi.h

+2 −2
Original line number Diff line number Diff line
@@ -759,13 +759,13 @@ int acpi_arch_timer_mem_init(struct arch_timer_mem *timer_mem, int *timer_count) 
#endif



#ifndef ACPI_HAVE_ARCH_SET_ROOT_POINTER

static inline void acpi_arch_set_root_pointer(u64 addr)

static __always_inline void acpi_arch_set_root_pointer(u64 addr)

{

}

#endif



#ifndef ACPI_HAVE_ARCH_GET_ROOT_POINTER

static inline u64 acpi_arch_get_root_pointer(void)

static __always_inline u64 acpi_arch_get_root_pointer(void)

{

	return 0;

}