[PATCH v1] arm64/mm: use lm_alias() with addresses passed to memblock_free()
Joey Gouly
joey.gouly at arm.com
Thu Sep 5 06:01:15 PDT 2024
__init_begin and __init_end are kernel image addresses, use lm_alias() to
convert them to linear mapping addresses.
This fixes the following splat at boot time (seen with CONFIG_DEBUG_VIRTUAL=y):
[ 1.574253] virt_to_phys used for non-linear address: ffff800081270000 (set_reset_devices+0x0/0x10)
[ 1.574272] WARNING: CPU: 0 PID: 1 at arch/arm64/mm/physaddr.c:12 __virt_to_phys+0x54/0x70
[ 1.574291] Modules linked in:
[ 1.574300] CPU: 0 UID: 0 PID: 1 Comm: swapper/0 Not tainted 6.11.0-rc6-next-20240905 #5810 b1ebb0ad06653f35ce875413d5afad24668df3f3
[ 1.574316] Hardware name: FVP Base RevC (DT)
[ 1.574324] pstate: 2161402005 (nZCv daif +PAN -UAO -TCO +DIT -SSBS BTYPE=--)
[ 1.574338] pc : __virt_to_phys+0x54/0x70
[ 1.574351] lr : __virt_to_phys+0x54/0x70
[ 1.574365] sp : ffff80008169be20
[...]
[ 1.574568] Call trace:
[ 1.574574] __virt_to_phys+0x54/0x70
[ 1.574588] memblock_free+0x18/0x30
[ 1.574599] free_initmem+0x3c/0x9c
[ 1.574610] kernel_init+0x30/0x1cc
[ 1.574624] ret_from_fork+0x10/0x20
Fixes: 1db9716d4487 ("arm64/mm: Delete __init region from memblock.reserved")
Signed-off-by: Joey Gouly <joey.gouly at arm.com>
Suggested-by: Mark Rutland <mark.rutland at arm.com>
Cc: Will Deacon <will at kernel.org>
Cc: Catalin Marinas <catalin.marinas at arm.com>
Cc: Rong Qianfeng <rongqianfeng at vivo.com>
---
Saw this when trying out next-20240905.
arch/arm64/mm/init.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 0bde16aadc83..f24095bd7e7d 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -411,8 +411,8 @@ void __init mem_init(void)
void free_initmem(void)
{
- unsigned long aligned_begin = ALIGN_DOWN((u64)__init_begin, PAGE_SIZE);
- unsigned long aligned_end = ALIGN((u64)__init_end, PAGE_SIZE);
+ unsigned long aligned_begin = ALIGN_DOWN((u64)lm_alias(__init_begin), PAGE_SIZE);
+ unsigned long aligned_end = ALIGN((u64)lm_alias(__init_end), PAGE_SIZE);
/* Delete __init region from memblock.reserved. */
memblock_free((void *)aligned_begin, aligned_end - aligned_begin);
--
2.25.1
More information about the linux-arm-kernel
mailing list