Skip to content

Commit 5385dec

Browse files
bjackmanbp3tk0v
authored andcommitted
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/
1 parent 211ddde commit 5385dec

2 files changed

Lines changed: 11 additions & 14 deletions

File tree

arch/x86/include/asm/page_64.h

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <asm/alternative.h>
1010

1111
#include <linux/kmsan-checks.h>
12+
#include <linux/mmdebug.h>
1213

1314
/* duplicated to the one in bootmem.h */
1415
extern unsigned long max_pfn;
@@ -31,13 +32,20 @@ static __always_inline unsigned long __phys_addr_nodebug(unsigned long x)
3132

3233
#ifdef CONFIG_DEBUG_VIRTUAL
3334
extern unsigned long __phys_addr(unsigned long);
34-
extern unsigned long __phys_addr_symbol(unsigned long);
3535
#else
3636
#define __phys_addr(x) __phys_addr_nodebug(x)
37-
#define __phys_addr_symbol(x) \
38-
((unsigned long)(x) - __START_KERNEL_map + phys_base)
3937
#endif
4038

39+
static inline unsigned long __phys_addr_symbol(unsigned long x)
40+
{
41+
unsigned long y = x - __START_KERNEL_map;
42+
43+
/* only check upper bounds since lower bounds will trigger carry */
44+
VIRTUAL_BUG_ON(y >= KERNEL_IMAGE_SIZE);
45+
46+
return y + phys_base;
47+
}
48+
4149
#define __phys_reloc_hide(x) (x)
4250

4351
void clear_page_orig(void *page);

arch/x86/mm/physaddr.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,6 @@ unsigned long __phys_addr(unsigned long x)
3131
return x;
3232
}
3333
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);
4534
#endif
4635

4736
bool __virt_addr_valid(unsigned long x)

0 commit comments

Comments
 (0)