mm: use PFN_PHYS() in phys_mem_access_prot()
Subsystems (4)
PATCH 1/1 mm: use PFN_PHYS() in phys_mem_access_prot()
From: Iván Ezequiel Rodriguez <[email protected]>
phys_mem_access_prot() stores "pfn << PAGE_SHIFT" in a phys_addr_t. The shift is evaluated as unsigned long, so on a 32-bit kernel with CONFIG_PHYS_ADDR_T_64BIT an address above 4 GiB is truncated before uncached_access() compares it with __pa(high_memory).
mmap_mem_prepare() already shifts in phys_addr_t, so the mapping is accepted and then left cacheable. PFN_PHYS() casts before the shift.
On a MIPS32 XPA Malta guest, mmap of /dev/mem at 0xf00000000 without O_DSYNC used the boot CCA. The same mapping with O_DSYNC was uncached. With PFN_PHYS() both are uncached.
--- mm/char-mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/char-mem.c +1 -1
@@ -272,7 +272,7 @@ static pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, unsigned long size, pgprot_t vma_prot) {#ifdef pgprot_noncached -phys_addr_t offset = pfn <<PAGE_SHIFT ; +phys_addr_t offset =PFN_PHYS (pfn);if (uncached_access (file, offset))return pgprot_noncached (vma_prot);
Signature · 1 line
2.43.0
Quoted 26 lines · Ivan Ezequiel Rodriguez
From: Iván Ezequiel Rodriguez <[email protected]>
phys_mem_access_prot()stores "pfn <<PAGE_SHIFT" in aphys_addr_t. The shift is evaluated as unsigned long, so on a 32-bit kernel withCONFIG_PHYS_ADDR_T_64BITan address above 4 GiB is truncated beforeuncached_access()compares it with__pa(high_memory).
mmap_mem_prepare()already shifts inphys_addr_t, so the mapping is accepted and then left cacheable.PFN_PHYS()casts before the shift.On a MIPS32 XPA Malta guest, mmap of
/dev/memat0xf00000000withoutO_DSYNCused the boot CCA. The same mapping withO_DSYNCwas uncached. WithPFN_PHYS()both are uncached.Fixes 7e6735c3578e ("/dev/mem: use phys_addr_t for physical addresses")Signed-off-by Iván Ezequiel Rodriguez <[email protected]>--- mm/char-mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/char-mem.c +0
-0
mm/char-mem.c static pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, · line 278
Quoted 8 lines
mm/char-mem.c +1
-1@@ -272,7 +272,7 @@ static pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, unsigned long size, pgprot_t vma_prot) {#ifdef pgprot_noncached -phys_addr_t offset = pfn <<PAGE_SHIFT ; +phys_addr_t offset =PFN_PHYS (pfn);if (uncached_access (file, offset))return pgprot_noncached (vma_prot);
I'm relying on Andrew to pick this up.
Signature · 3 lines
Cheers, David
Quoted 10 lines · Ivan Ezequiel Rodriguez
From: Iván Ezequiel Rodriguez <[email protected]>
phys_mem_access_prot()stores "pfn <<PAGE_SHIFT" in aphys_addr_t. The shift is evaluated as unsigned long, so on a 32-bit kernel withCONFIG_PHYS_ADDR_T_64BITan address above 4 GiB is truncated beforeuncached_access()compares it with__pa(high_memory).
mmap_mem_prepare()already shifts inphys_addr_t, so the mapping is accepted and then left cacheable.PFN_PHYS()casts before the shift.
Quoted 7 lines
On a MIPS32 XPA Malta guest, mmap of
/dev/memat0xf00000000withoutO_DSYNCused the boot CCA. The same mapping withO_DSYNCwas uncached. WithPFN_PHYS()both are uncached.Fixes 7e6735c3578e ("/dev/mem: use phys_addr_t for physical addresses")Signed-off-by Iván Ezequiel Rodriguez <[email protected]>
Quoted 20 lines
--- mm/char-mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/char-mem.c +1
-1@@ -272,7 +272,7 @@ static pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, unsigned long size, pgprot_t vma_prot) {#ifdef pgprot_noncached -phys_addr_t offset = pfn <<PAGE_SHIFT ; +phys_addr_t offset =PFN_PHYS (pfn);if (uncached_access (file, offset))return pgprot_noncached (vma_prot);Signature · 1 line
2.43.0
Signature · 2 lines
Sincerely yours, Mike.
Quoted 10 lines · Ivan Ezequiel Rodriguez
From: Iván Ezequiel Rodriguez <[email protected]>
phys_mem_access_prot()stores "pfn <<PAGE_SHIFT" in aphys_addr_t. The shift is evaluated as unsigned long, so on a 32-bit kernel withCONFIG_PHYS_ADDR_T_64BITan address above 4 GiB is truncated beforeuncached_access()compares it with__pa(high_memory).
mmap_mem_prepare()already shifts inphys_addr_t, so the mapping is accepted and then left cacheable.PFN_PHYS()casts before the shift.
Quoted 7 lines
On a MIPS32 XPA Malta guest, mmap of
/dev/memat0xf00000000withoutO_DSYNCused the boot CCA. The same mapping withO_DSYNCwas uncached. WithPFN_PHYS()both are uncached.Fixes 7e6735c3578e ("/dev/mem: use phys_addr_t for physical addresses")Signed-off-by Iván Ezequiel Rodriguez <[email protected]>
LGTM so:
Quoted 18 lines
--- mm/char-mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/char-mem.c +1
-2@@ -272,7 +272,7 @@ static pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, unsigned long size, pgprot_t vma_prot) {#ifdef pgprot_noncached -phys_addr_t offset = pfn <<PAGE_SHIFT ; +phys_addr_t offset =PFN_PHYS (pfn);if (uncached_access (file, offset))return pgprot_noncached (vma_prot); --
Quoted 2 lines
2.43.0
--
Cheers, Lorenzo