powerpc: Wire up /proc/vmallocinfo to our ioremap()
Subsystems (4)
PATCH 1/1 powerpc: Wire up /proc/vmallocinfo to our ioremap()
This adds the necessary bits and pieces to powerpc implementation of ioremap to benefit from caller tracking in /proc/vmallocinfo, at least for ioremap's done after mem init as the older ones aren't tracked.
Note the small addition to the generic code exposing a __get_vm_area_caller() which we need for the ppc64 implementation.
Signed-off-by Benjamin Herrenschmidt <[email protected]>
---
Can some mm person review the generic bit and maybe ack it ?
Cheers,
Ben.
arch/powerpc/include/asm/io.h | 6 ++++++ arch/powerpc/include/asm/machdep.h | 2 +- arch/powerpc/mm/pgtable_32.c | 14 +++++++++++--- arch/powerpc/mm/pgtable_64.c | 25 +++++++++++++++++-------- arch/powerpc/platforms/cell/io-workarounds.c | 4 ++-- arch/powerpc/platforms/iseries/setup.c | 2 +- include/linux/vmalloc.h | 3 +++ mm/vmalloc.c | 8 ++++++++ 8 files changed, 49 insertions(+), 15 deletions(-)
arch/powerpc/include/asm/io.h +6 -0
@@ -632,6 +632,9 @@ static inline void iosync(void)* ioremap_flags and cannot be hooked (but can be used by a hook on one * of the previous ones) * +* * __ioremap_caller is the same as above but takes an explicit caller +* reference rather than using __builtin_return_address(0) +* * * __iounmap, is the low level implementation used by iounmap and cannot * be hooked (but can be used by a hook on iounmap) *
@@ -646,6 +649,9 @@ extern void iounmap(volatile void __iomeextern void __iomem *__ioremap (phys_addr_t ,unsigned long size,unsigned long flags); +extern void __iomem *__ioremap_caller (phys_addr_t ,unsigned long size, +unsigned long flags,void *caller); +extern void __iounmap (volatile void __iomem *addr); extern void __iomem * __ioremap_at(phys_addr_t pa, void *ea,
arch/powerpc/include/asm/machdep.h +1 -1
@@ -90,7 +90,7 @@ struct machdep_calls {void (*tce_flush)(struct iommu_table *tbl);void __iomem * (*ioremap)(phys_addr_t addr,unsigned long size, -unsigned long flags); +unsigned long flags,void *caller);void (*iounmap)(volatile void __iomem *token);#ifdef CONFIG_PM
arch/powerpc/mm/pgtable_32.c +11 -3
@@ -129,7 +129,8 @@ pgtable_t pte_alloc_one(struct mm_structvoid __iomem *ioremap (phys_addr_t addr,unsigned long size) { -return __ioremap (addr, size, _PAGE_NO_CACHE | _PAGE_GUARDED); +return __ioremap_caller (addr, size, _PAGE_NO_CACHE | _PAGE_GUARDED, +__builtin_return_address (0 )); }EXPORT_SYMBOL (ioremap);
@@ -143,13 +144,20 @@ ioremap_flags(phys_addr_t addr, unsigned/* we don't want to let _PAGE_USER and _PAGE_EXEC leak out */ flags &= ~(_PAGE_USER | _PAGE_EXEC | _PAGE_HWEXEC); -return __ioremap (addr, size, flags); +return __ioremap_caller (addr, size, flags,__builtin_return_address (0 )); }EXPORT_SYMBOL (ioremap_flags);void __iomem *__ioremap (phys_addr_t addr,unsigned long size,unsigned long flags) { +return __ioremap_caller (addr, size, flags,__builtin_return_address (0 )); +} + +void __iomem * +__ioremap_caller (phys_addr_t addr,unsigned long size,unsigned long flags, +void *caller) +{unsigned long v, i;phys_addr_t p;int err;
@@ -212,7 +220,7 @@ __ioremap(phys_addr_t addr, unsigned lonif (mem_init_done) {struct vm_struct *area; - area =get_vm_area (size,VM_IOREMAP ); + area =get_vm_area_caller (size,VM_IOREMAP , caller);if (area ==0 )return NULL ; v = (unsigned long ) area->addr;
arch/powerpc/mm/pgtable_64.c +17 -8
@@ -144,8 +144,8 @@ void __iounmap_at(void *ea, unsigned lonunmap_kernel_range ((unsigned long )ea, size); } -void __iomem *__ioremap (phys_addr_t addr,unsigned long size, -unsigned long flags) +void __iomem *__ioremap_caller (phys_addr_t addr,unsigned long size, +unsigned long flags,void *caller) {phys_addr_t paligned;void __iomem *ret;
@@ -168,8 +168,9 @@ void __iomem * __ioremap(phys_addr_t addif (mem_init_done) {struct vm_struct *area; - area =__get_vm_area (size,VM_IOREMAP , - ioremap_bot,IOREMAP_END ); + area =__get_vm_area_caller (size,VM_IOREMAP , + ioremap_bot,IOREMAP_END , + caller);if (area ==NULL )return NULL ; ret =__ioremap_at (paligned, area->addr, size, flags);
@@ -186,19 +187,27 @@ void __iomem * __ioremap(phys_addr_t addreturn ret; } +void __iomem *__ioremap (phys_addr_t addr,unsigned long size, +unsigned long flags) +{ +return __ioremap_caller (addr, size, flags,__builtin_return_address (0 )); +}void __iomem *ioremap (phys_addr_t addr,unsigned long size) {unsigned long flags = _PAGE_NO_CACHE | _PAGE_GUARDED; +void *caller =__builtin_return_address (0 );if (ppc_md.ioremap) -return ppc_md.ioremap (addr, size, flags); -return __ioremap (addr, size, flags); +return ppc_md.ioremap (addr, size, flags, caller); +return __ioremap_caller (addr, size, flags, caller); }void __iomem *ioremap_flags (phys_addr_t addr,unsigned long size,unsigned long flags) { +void *caller =__builtin_return_address (0 ); +/* writeable implies dirty for kernel addresses */ if (flags & _PAGE_RW) flags |= _PAGE_DIRTY;
@@ -207,8 +216,8 @@ void __iomem * ioremap_flags(phys_addr_t flags &= ~(_PAGE_USER | _PAGE_EXEC);if (ppc_md.ioremap) -return ppc_md.ioremap (addr, size, flags); -return __ioremap (addr, size, flags); +return ppc_md.ioremap (addr, size, flags, caller); +return __ioremap_caller (addr, size, flags, caller); }
arch/powerpc/platforms/cell/io-workarounds.c +2 -2
@@ -131,10 +131,10 @@ static const struct ppc_pci_io __devinit };static void __iomem *iowa_ioremap (phys_addr_t addr,unsigned long size, -unsigned long flags) +unsigned long flags,void *caller) {struct iowa_bus *bus; -void __iomem *res =__ioremap (addr, size, flags); +void __iomem *res =__ioremap_caller (addr, size, flags, caller);int busno; bus =iowa_pci_find (0 , (unsigned long )addr);
arch/powerpc/platforms/iseries/setup.c +1 -1
@@ -617,7 +617,7 @@ static void iseries_dedicated_idle(void) }static void __iomem *iseries_ioremap (phys_addr_t address,unsigned long size, -unsigned long flags) +unsigned long flags,void *caller) {return (void __iomem *)address; }
include/linux/vmalloc.h +3 -0
@@ -84,6 +84,9 @@ extern struct vm_struct *get_vm_area_cal unsigned long flags, void *caller);extern struct vm_struct *__get_vm_area (unsigned long size,unsigned long flags,unsigned long start,unsigned long end); +extern struct vm_struct *__get_vm_area_caller (unsigned long size,unsigned long flags, +unsigned long start,unsigned long end, +void *caller);extern struct vm_struct *get_vm_area_node (unsigned long size,unsigned long flags,int node,gfp_t gfp_mask);
mm/vmalloc.c +8 -0
@@ -1106,6 +1106,14 @@ struct vm_struct *__get_vm_area(unsigned }EXPORT_SYMBOL_GPL (__get_vm_area); +struct vm_struct *__get_vm_area_caller (unsigned long size,unsigned long flags, +unsigned long start,unsigned long end, +void *caller) +{ +return __get_vm_area_node (size, flags, start, end,-1 ,GFP_KERNEL , + caller); +} +/** * get_vm_area - reserve a contiguous kernel virtual area * @size: size of the area