leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] ppc: make phys_mem_access_prot() work with pfns instead of addresses

Browse Source 
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.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
Cc: Anton Blanchard <anton@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Roland Dreier 2005-10-28 17:46:18 -07:00 committed by Paul Mackerras
parent d49b340124
commit 8b150478ae
12 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/mm/mem.c
View File

@ -88,13 +88,13 @@ int page_is_ram(unsigned long pfn)
} }
EXPORT_SYMBOL(page_is_ram); EXPORT_SYMBOL(page_is_ram);
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) unsigned long size, pgprot_t vma_prot)
{ {
if (ppc_md.phys_mem_access_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) vma_prot = __pgprot(pgprot_val(vma_prot)
| _PAGE_GUARDED | _PAGE_NO_CACHE); | _PAGE_GUARDED | _PAGE_NO_CACHE);
return vma_prot; return vma_prot;

5
arch/ppc/kernel/pci.c
View File

@ -1594,16 +1594,17 @@ static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp,
* above routine * above routine
*/ */
pgprot_t pci_phys_mem_access_prot(struct file *file, pgprot_t pci_phys_mem_access_prot(struct file *file,
unsigned long offset, unsigned long pfn,
unsigned long size, unsigned long size,
pgprot_t protection) pgprot_t protection)
{ {
struct pci_dev *pdev = NULL; struct pci_dev *pdev = NULL;
struct resource *found = NULL; struct resource *found = NULL;
unsigned long prot = pgprot_val(protection); unsigned long prot = pgprot_val(protection);
unsigned long offset = pfn << PAGE_SHIFT;
int i; int i;
if (page_is_ram(offset >> PAGE_SHIFT)) if (page_is_ram(pfn))
return prot; return prot;
prot |= _PAGE_NO_CACHE | _PAGE_GUARDED; prot |= _PAGE_NO_CACHE | _PAGE_GUARDED;

10
arch/ppc/mm/init.c
View File

@ -637,18 +637,16 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,
*/ */
int page_is_ram(unsigned long pfn) int page_is_ram(unsigned long pfn)
{ {
unsigned long paddr = (pfn << PAGE_SHIFT); return pfn < max_pfn;
return paddr < __pa(high_memory);
} }
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) unsigned long size, pgprot_t vma_prot)
{ {
if (ppc_md.phys_mem_access_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) vma_prot = __pgprot(pgprot_val(vma_prot)
| _PAGE_GUARDED | _PAGE_NO_CACHE); | _PAGE_GUARDED | _PAGE_NO_CACHE);
return vma_prot; return vma_prot;

5
arch/ppc64/kernel/pci.c
View File

@ -726,16 +726,17 @@ static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp,
* above routine * above routine
*/ */
pgprot_t pci_phys_mem_access_prot(struct file *file, pgprot_t pci_phys_mem_access_prot(struct file *file,
unsigned long offset, unsigned long pfn,
unsigned long size, unsigned long size,
pgprot_t protection) pgprot_t protection)
{ {
struct pci_dev *pdev = NULL; struct pci_dev *pdev = NULL;
struct resource *found = NULL; struct resource *found = NULL;
unsigned long prot = pgprot_val(protection); unsigned long prot = pgprot_val(protection);
unsigned long offset = pfn << PAGE_SHIFT;
int i; int i;
if (page_is_ram(offset >> PAGE_SHIFT)) if (page_is_ram(pfn))
return __pgprot(prot); return __pgprot(prot);
prot |= _PAGE_NO_CACHE | _PAGE_GUARDED; prot |= _PAGE_NO_CACHE | _PAGE_GUARDED;

4
drivers/char/mem.c
View File

@ -231,9 +231,7 @@ static ssize_t write_mem(struct file * file, const char __user * buf,
static int mmap_mem(struct file * file, struct vm_area_struct * vma) static int mmap_mem(struct file * file, struct vm_area_struct * vma)
{ {
#if defined(__HAVE_PHYS_MEM_ACCESS_PROT) #if defined(__HAVE_PHYS_MEM_ACCESS_PROT)
unsigned long offset = vma->vm_pgoff << PAGE_SHIFT; vma->vm_page_prot = phys_mem_access_prot(file, vma->vm_pgoff,
vma->vm_page_prot = phys_mem_access_prot(file, offset,
vma->vm_end - vma->vm_start, vma->vm_end - vma->vm_start,
vma->vm_page_prot); vma->vm_page_prot);
#elif defined(pgprot_noncached) #elif defined(pgprot_noncached)

2
drivers/video/fbmem.c
View File

@ -918,7 +918,7 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
} }
#endif #endif
#elif defined(__powerpc__) #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_end - vma->vm_start,
vma->vm_page_prot); vma->vm_page_prot);
#elif defined(__alpha__) #elif defined(__alpha__)

2
include/asm-powerpc/machdep.h
View File

@ -144,7 +144,7 @@ struct machdep_calls {
/* Get access protection for /dev/mem */ /* Get access protection for /dev/mem */
pgprot_t (*phys_mem_access_prot)(struct file *file, pgprot_t (*phys_mem_access_prot)(struct file *file,
unsigned long offset, unsigned long pfn,
unsigned long size, unsigned long size,
pgprot_t vma_prot); pgprot_t vma_prot);

2
include/asm-ppc/machdep.h
View File

@ -98,7 +98,7 @@ struct machdep_calls {
/* Get access protection for /dev/mem */ /* Get access protection for /dev/mem */
pgprot_t (*phys_mem_access_prot)(struct file *file, pgprot_t (*phys_mem_access_prot)(struct file *file,
unsigned long offset, unsigned long pfn,
unsigned long size, unsigned long size,
pgprot_t vma_prot); pgprot_t vma_prot);

2
include/asm-ppc/pci.h
View File

@ -126,7 +126,7 @@ extern void pcibios_add_platform_entries(struct pci_dev *dev);
struct file; struct file;
extern pgprot_t pci_phys_mem_access_prot(struct file *file, extern pgprot_t pci_phys_mem_access_prot(struct file *file,
unsigned long offset, unsigned long pfn,
unsigned long size, unsigned long size,
pgprot_t prot); pgprot_t prot);

2
include/asm-ppc/pgtable.h
View File

@ -705,7 +705,7 @@ static inline void __ptep_set_access_flags(pte_t *ptep, pte_t entry, int dirty)
#define pgprot_noncached(prot) (__pgprot(pgprot_val(prot) | _PAGE_NO_CACHE | _PAGE_GUARDED)) #define pgprot_noncached(prot) (__pgprot(pgprot_val(prot) | _PAGE_NO_CACHE | _PAGE_GUARDED))
struct file; 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); unsigned long size, pgprot_t vma_prot);
#define __HAVE_PHYS_MEM_ACCESS_PROT #define __HAVE_PHYS_MEM_ACCESS_PROT

2
include/asm-ppc64/pci.h
View File

@ -168,7 +168,7 @@ extern void pcibios_add_platform_entries(struct pci_dev *dev);
struct file; struct file;
extern pgprot_t pci_phys_mem_access_prot(struct file *file, extern pgprot_t pci_phys_mem_access_prot(struct file *file,
unsigned long offset, unsigned long pfn,
unsigned long size, unsigned long size,
pgprot_t prot); pgprot_t prot);

2
include/asm-ppc64/pgtable.h
View File

@ -471,7 +471,7 @@ static inline void __ptep_set_access_flags(pte_t *ptep, pte_t entry, int dirty)
#define pgprot_noncached(prot) (__pgprot(pgprot_val(prot) | _PAGE_NO_CACHE | _PAGE_GUARDED)) #define pgprot_noncached(prot) (__pgprot(pgprot_val(prot) | _PAGE_NO_CACHE | _PAGE_GUARDED))
struct file; 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); unsigned long size, pgprot_t vma_prot);
#define __HAVE_PHYS_MEM_ACCESS_PROT #define __HAVE_PHYS_MEM_ACCESS_PROT