arm64: mm: don't assume struct page is always 64 bytes

Commit 8c96400d6a39be7 simplified the page-to-virt and virt-to-page
conversions, based on the assumption that struct page is always 64
bytes in size, in which case we can use a single signed shift to
perform the conversion (provided that the vmemmap array is placed
appropriately in the kernel VA space)

Unfortunately, this assumption turns out not to hold, and so we need
to revert part of this commit, and go back to an affine transformation.
Given that all the quantities involved are compile time constants,
this should not make any practical difference.

Fixes: 8c96400d6a39 ("arm64: mm: make vmemmap region a projection of the linear region")
Reported-by: Geert Uytterhoeven <[email protected]>
Signed-off-by: Ard Biesheuvel <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Tested-by: Geert Uytterhoeven <[email protected]>
Signed-off-by: Catalin Marinas <[email protected]>

diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
index 03e9b112bd9494f763791f18a71637a753b831c2..556cb2d62b5bb907d66d10dc27d3446268dd7946 100644 (file)
--- a/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@ -308,13 +308,15 @@ static inline void *phys_to_virt(phys_addr_t x)
 #else
 #define page_to_virt(x)        ({                                              \
        __typeof__(x) __page = x;                                       \
-       u64 __addr = (u64)__page << VMEMMAP_SHIFT;                      \
+       u64 __idx = ((u64)__page - VMEMMAP_START) / sizeof(struct page);\
+       u64 __addr = PAGE_OFFSET + (__idx * PAGE_SIZE);                 \
        (void *)__tag_set((const void *)__addr, page_kasan_tag(__page));\
 })
 
 #define virt_to_page(x)        ({                                              \
-       u64 __addr = __tag_reset((u64)(x)) & PAGE_MASK;                 \
-       (struct page *)((s64)__addr >> VMEMMAP_SHIFT);                  \
+       u64 __idx = (__tag_reset((u64)x) - PAGE_OFFSET) / PAGE_SIZE;    \
+       u64 __addr = VMEMMAP_START + (__idx * sizeof(struct page));     \
+       (struct page *)__addr;                                          \
 })
 #endif /* !CONFIG_SPARSEMEM_VMEMMAP || CONFIG_DEBUG_VIRTUAL */
 

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 3a5e9f9298e963d59b2d881fddb73a7ec0f3e964..7e15d92836d8a1faf59013e4be0ea0c839f65242 100644 (file)
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -502,8 +502,6 @@ static void __init free_unused_memmap(void)
  */
 void __init mem_init(void)
 {
-       BUILD_BUG_ON(!is_power_of_2(sizeof(struct page)));
-
        if (swiotlb_force == SWIOTLB_FORCE ||
            max_pfn > PFN_DOWN(arm64_dma_phys_limit ? : arm64_dma32_phys_limit))
                swiotlb_init(1);