Make phys_mem_access_prot() work with pfns instead of addresses
Subsystems (2)
PATCH 1/1 Make phys_mem_access_prot() work with pfns instead of addresses
Here's a patch that makes mmap64() work better on /dev/mem. On ppc, we currently call phys_mem_access_prot() on the address being mmap'ed; unfortunately calculating the address to pass in can overflow on 32-bit architectures. Fortunately, mmap_mem() already has the pfn, so it's simple to get rid of the conversion and work directly with the pfn.
My interest comes from being able to access memory-mapped peripherals on PowerPC 44x chips (which are 32-bit). The registers are typically located at addresses above 4G, and it's nice to be able to just use mmap64() from userspace to peek and poke at things.
I tested the patch on a PowerPC 440SPe system by successfully using mmap64() on an address above 4G.
I only compile tested for ppc64. Also, I don't have access to a system where Ben's original change helped performance. The changes seem pretty safe to me but someone should check my work.
Thanks,
Roland
--
Change the phys_mem_access_prot() function to take a pfn instead of an address. This allows mmap64() to work on /dev/mem for addresses above 4G on 32-bit architectures. We start with a pfn in mmap_mem(), so there's no need to convert to an address; in fact, it's actively bad, since the conversion can overflow when the address is above 4G.
Similarly fix the ppc32 page_is_ram() function to avoid a conversion to an address by directly comparing to max_pfn. Working with max_pfn instead of high_memory fixes page_is_ram() to give the right answer for highmem pages.
arch/ppc/kernel/pci.c +3 -2
@@ -1586,16 +1586,17 @@ static pgprot_t __pci_mmap_set_pgprot(st* above routine */ pgprot_t pci_phys_mem_access_prot (struct file *file, -unsigned long offset, +unsigned long pfn,unsigned long size,pgprot_t protection) {struct pci_dev *pdev =NULL ;struct resource *found =NULL ;unsigned long prot =pgprot_val (protection); +unsigned long offset = pfn <<PAGE_SHIFT ;int i; -if (page_is_ram (offset >>PAGE_SHIFT )) +if (page_is_ram (pfn))return prot; prot |= _PAGE_NO_CACHE | _PAGE_GUARDED;
arch/ppc/mm/init.c +4 -6
@@ -648,18 +648,16 @@ void update_mmu_cache(struct vm_area_str*/ int page_is_ram (unsigned long pfn) { -unsigned long paddr = (pfn <<PAGE_SHIFT ); - -return paddr <__pa (high_memory); +return pfn < max_pfn; } -pgprot_t phys_mem_access_prot (struct file *file,unsigned long addr, +pgprot_t phys_mem_access_prot (struct file *file,unsigned long pfn,unsigned long size,pgprot_t vma_prot) {if (ppc_md.phys_mem_access_prot) -return ppc_md.phys_mem_access_prot (file, addr, size, vma_prot); +return ppc_md.phys_mem_access_prot (file, pfn, size, vma_prot); -if (!page_is_ram (addr >>PAGE_SHIFT )) +if (!page_is_ram (pfn)) vma_prot =__pgprot (pgprot_val (vma_prot) | _PAGE_GUARDED | _PAGE_NO_CACHE);return vma_prot;
arch/ppc64/kernel/pci.c +3 -2
@@ -727,16 +727,17 @@ static pgprot_t __pci_mmap_set_pgprot(st* above routine */ pgprot_t pci_phys_mem_access_prot (struct file *file, -unsigned long offset, +unsigned long pfn,unsigned long size,pgprot_t protection) {struct pci_dev *pdev =NULL ;struct resource *found =NULL ;unsigned long prot =pgprot_val (protection); +unsigned long offset = pfn <<PAGE_SHIFT ;int i; -if (page_is_ram (offset >>PAGE_SHIFT )) +if (page_is_ram (pfn))return __pgprot (prot); prot |= _PAGE_NO_CACHE | _PAGE_GUARDED;
arch/ppc64/mm/init.c +3 -3
@@ -856,13 +856,13 @@ void pgtable_cache_init(void) } } -pgprot_t phys_mem_access_prot (struct file *file,unsigned long addr, +pgprot_t phys_mem_access_prot (struct file *file,unsigned long pfn,unsigned long size,pgprot_t vma_prot) {if (ppc_md.phys_mem_access_prot) -return ppc_md.phys_mem_access_prot (file, addr, size, vma_prot); +return ppc_md.phys_mem_access_prot (file, pfn, size, vma_prot); -if (!page_is_ram (addr >>PAGE_SHIFT )) +if (!page_is_ram (pfn)) vma_prot =__pgprot (pgprot_val (vma_prot) | _PAGE_GUARDED | _PAGE_NO_CACHE);return vma_prot;
drivers/char/mem.c +1 -3
@@ -231,9 +231,7 @@ static ssize_t write_mem(struct file * fstatic int mmap_mem (struct file * file,struct vm_area_struct * vma) {#if defined(__HAVE_PHYS_MEM_ACCESS_PROT) -unsigned long offset = vma->vm_pgoff <<PAGE_SHIFT ; - - vma->vm_page_prot =phys_mem_access_prot (file, offset, + vma->vm_page_prot =phys_mem_access_prot (file, vma->vm_pgoff, vma->vm_end - vma->vm_start, vma->vm_page_prot);#elif defined(pgprot_noncached)
drivers/video/fbmem.c +1 -1
@@ -918,7 +918,7 @@ fb_mmap(struct file *file, struct vm_are }#endif #elif defined(__powerpc__) - vma->vm_page_prot =phys_mem_access_prot (file, off, + vma->vm_page_prot =phys_mem_access_prot (file, off >>PAGE_SHIFT , vma->vm_end - vma->vm_start, vma->vm_page_prot);#elif defined(__alpha__)
include/asm-ppc/machdep.h +1 -1
@@ -98,7 +98,7 @@ struct machdep_calls {/* Get access protection for /dev/mem */ pgprot_t (*phys_mem_access_prot)(struct file *file, -unsigned long offset, +unsigned long pfn,unsigned long size,pgprot_t vma_prot);
include/asm-ppc/pci.h +1 -1
@@ -126,7 +126,7 @@ extern void pcibios_add_platform_entriesstruct file ;extern pgprot_t pci_phys_mem_access_prot (struct file *file, -unsigned long offset, +unsigned long pfn,unsigned long size,pgprot_t prot);
include/asm-ppc/pgtable.h +1 -1
@@ -705,7 +705,7 @@ static inline void __ptep_set_access_fla#define pgprot_noncached (prot) (__pgprot(pgprot_val(prot) | _PAGE_NO_CACHE | _PAGE_GUARDED))struct file ; -extern pgprot_t phys_mem_access_prot (struct file *file,unsigned long addr, +extern pgprot_t phys_mem_access_prot (struct file *file,unsigned long pfn,unsigned long size,pgprot_t vma_prot);#define __HAVE_PHYS_MEM_ACCESS_PROT
include/asm-ppc64/machdep.h +1 -1
@@ -130,7 +130,7 @@ struct machdep_calls {/* Get access protection for /dev/mem */ pgprot_t (*phys_mem_access_prot)(struct file *file, -unsigned long offset, +unsigned long pfn,unsigned long size,pgprot_t vma_prot);
include/asm-ppc64/pci.h +1 -1
@@ -168,7 +168,7 @@ extern void pcibios_add_platform_entriesstruct file ;extern pgprot_t pci_phys_mem_access_prot (struct file *file, -unsigned long offset, +unsigned long pfn,unsigned long size,pgprot_t prot);
include/asm-ppc64/pgtable.h +1 -1
@@ -471,7 +471,7 @@ static inline void __ptep_set_access_fla#define pgprot_noncached (prot) (__pgprot(pgprot_val(prot) | _PAGE_NO_CACHE | _PAGE_GUARDED))struct file ; -extern pgprot_t phys_mem_access_prot (struct file *file,unsigned long addr, +extern pgprot_t phys_mem_access_prot (struct file *file,unsigned long pfn,unsigned long size,pgprot_t vma_prot);#define __HAVE_PHYS_MEM_ACCESS_PROT