Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/mm: Unify __phys_addr_symbol()

There are two implementations on 64-bit, depending on CONFIG_DEBUG_VIRTUAL,
but they differ only regarding the presence of VIRTUAL_BUG_ON, which is
already ifdef'd on CONFIG_DEBUG_VIRTUAL.

To avoid adding a function call on non-LTO non-DEBUG_VIRTUAL builds, move the
function into the header. (Note the function is already only used on 64-bit).

Signed-off-by: Brendan Jackman <jackmanb@google.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://patch.msgid.link/all/20250813-phys-addr-cleanup-v1-1-19e334b1c466@google.com/

authored by

Brendan Jackman and committed by
Borislav Petkov (AMD)
5385dec7 211ddde0

+11 -14
+11 -3
arch/x86/include/asm/page_64.h
··· 9 9 #include <asm/alternative.h> 10 10 11 11 #include <linux/kmsan-checks.h> 12 + #include <linux/mmdebug.h> 12 13 13 14 /* duplicated to the one in bootmem.h */ 14 15 extern unsigned long max_pfn; ··· 32 31 33 32 #ifdef CONFIG_DEBUG_VIRTUAL 34 33 extern unsigned long __phys_addr(unsigned long); 35 - extern unsigned long __phys_addr_symbol(unsigned long); 36 34 #else 37 35 #define __phys_addr(x) __phys_addr_nodebug(x) 38 - #define __phys_addr_symbol(x) \ 39 - ((unsigned long)(x) - __START_KERNEL_map + phys_base) 40 36 #endif 37 + 38 + static inline unsigned long __phys_addr_symbol(unsigned long x) 39 + { 40 + unsigned long y = x - __START_KERNEL_map; 41 + 42 + /* only check upper bounds since lower bounds will trigger carry */ 43 + VIRTUAL_BUG_ON(y >= KERNEL_IMAGE_SIZE); 44 + 45 + return y + phys_base; 46 + } 41 47 42 48 #define __phys_reloc_hide(x) (x) 43 49
-11
arch/x86/mm/physaddr.c
··· 31 31 return x; 32 32 } 33 33 EXPORT_SYMBOL(__phys_addr); 34 - 35 - unsigned long __phys_addr_symbol(unsigned long x) 36 - { 37 - unsigned long y = x - __START_KERNEL_map; 38 - 39 - /* only check upper bounds since lower bounds will trigger carry */ 40 - VIRTUAL_BUG_ON(y >= KERNEL_IMAGE_SIZE); 41 - 42 - return y + phys_base; 43 - } 44 - EXPORT_SYMBOL(__phys_addr_symbol); 45 34 #endif 46 35 47 36 bool __virt_addr_valid(unsigned long x)