arm64: mm: check virtual addr in virt_to_page() if CONFIG_DEBUG_VIRTUAL=y
Subsystems (2)
PATCH 1/1 arm64: mm: check virtual addr in virt_to_page() if CONFIG_DEBUG_VIRTUAL=y
This change uses the original virt_to_page() (the one with __pa()) to check the given virtual address if CONFIG_DEBUG_VIRTUAL=y.
Recently, I worked on a bug: a driver passes a symbol address to dma_map_single() and the virt_to_page() (called by dma_map_single()) does not work for non-linear addresses after commit 9f2875912dac ("arm64: mm: restrict virt_to_page() to the linear mapping").
I tried to trap the bug by enabling CONFIG_DEBUG_VIRTUAL but it did not work - bacause the commit removes the __pa() from virt_to_page() but CONFIG_DEBUG_VIRTUAL checks the virtual address in __pa()/__virt_to_phys().
A simple solution is to use the original virt_to_page() (the one with__pa()) if CONFIG_DEBUG_VIRTUAL=y.
--- arch/arm64/include/asm/memory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/include/asm/memory.h +1 -1
@@ -302,7 +302,7 @@ static inline void *phys_to_virt(phys_addr_t x)*/ #define ARCH_PFN_OFFSET ((unsigned long)PHYS_PFN_OFFSET) -#ifndef CONFIG_SPARSEMEM_VMEMMAP +#if !defined(CONFIG_SPARSEMEM_VMEMMAP ) || defined(CONFIG_DEBUG_VIRTUAL )#define virt_to_page (kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)#define _virt_addr_valid (kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)#else
Signature · 1 line
2.18.0
Quoted 27 lines · Miles Chen
This change uses the original
virt_to_page()(the one with__pa()) to check the given virtual address ifCONFIG_DEBUG_VIRTUAL=y.Recently, I worked on a bug: a driver passes a symbol address to
dma_map_single()and thevirt_to_page()(called bydma_map_single()) does not work for non-linear addresses after commit9f2875912dac("arm64: mm: restrictvirt_to_page()to the linear mapping").I tried to trap the bug by enabling
CONFIG_DEBUG_VIRTUALbut it did not work - bacause the commit removes the__pa()fromvirt_to_page()butCONFIG_DEBUG_VIRTUALchecks the virtual address in __pa()/__virt_to_phys().A simple solution is to use the original
virt_to_page()(the onewith__pa()) ifCONFIG_DEBUG_VIRTUAL=y.Signed-off-by Miles Chen <[email protected]>Cc Ard Biesheuvel <[email protected]>--- arch/arm64/include/asm/memory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm64/include/asm/memory.h +0
-0
arch/arm64/include/asm/memory.h static inline void *phys_to_virt(phys_addr_t x) · line 308
Quoted 8 lines
arch/arm64/include/asm/memory.h +1
-1@@ -302,7 +302,7 @@ static inline void *phys_to_virt(phys_addr_t x)*/ #define ARCH_PFN_OFFSET ((unsigned long)PHYS_PFN_OFFSET) -#ifndef CONFIG_SPARSEMEM_VMEMMAP +#if !defined(CONFIG_SPARSEMEM_VMEMMAP ) || defined(CONFIG_DEBUG_VIRTUAL )#define virt_to_page (kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)#define _virt_addr_valid (kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)#else
IIUC, this shouldn't change the behaviour of virt_addr_valid(). The patch looks fine to me.