x86: deinline dma_alloc_attrs()
PATCH v2 1/1 x86: deinline dma_alloc_attrs()
Reduces kernel size by 68739 bytes on allyesconfig build:
text data bss dec hex filename
82662736 22255384 20627456 125545576 77bac68 vmlinux0 82594029 22255352 20627456 125476837 77a9fe5 vmlinux1
Signed-off-by Denys Vlasenko <[email protected]>
Cc Marek Szyprowski <[email protected]>
Cc Konrad Rzeszutek Wilk <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Don Dutile <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Andi Kleen <[email protected]>
---
Changes in v2: added EXPORT_SYMBOL()
arch/x86/include/asm/dma-mapping.h | 28 ++-------------------------- arch/x86/kernel/pci-dma.c | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 26 deletions(-)
arch/x86/include/asm/dma-mapping.h +2 -26
@@ -127,33 +127,9 @@ static inline gfp_t dma_alloc_coherent_gfp_flags(struct device *dev, gfp_t gfp)#define dma_alloc_coherent (d,s,h,f) dma_alloc_attrs(d,s,h,f,NULL) -static inline void * +void *dma_alloc_attrs (struct device *dev,size_t size,dma_addr_t *dma_handle, -gfp_t gfp,struct dma_attrs *attrs) -{ -struct dma_map_ops *ops =get_dma_ops (dev); -void *memory; - - gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); - -if (dma_alloc_from_coherent (dev, size, dma_handle, &memory)) -return memory; - -if (!dev) - dev = &x86_dma_fallback_dev; - -if (!is_device_dma_capable (dev)) -return NULL ; - -if (!ops->alloc) -return NULL ; - - memory = ops->alloc (dev, size, dma_handle, -dma_alloc_coherent_gfp_flags (dev, gfp), attrs); -debug_dma_alloc_coherent (dev, size, *dma_handle, memory); - -return memory; -} +gfp_t gfp,struct dma_attrs *attrs);#define dma_free_coherent (d,s,c,h) dma_free_attrs(d,s,c,h,NULL)
arch/x86/kernel/pci-dma.c +28 -0
@@ -140,6 +140,34 @@ void dma_generic_free_coherent(struct device *dev, size_t size, void *vaddr,free_pages ((unsigned long )vaddr,get_order (size)); } +void *dma_alloc_attrs (struct device *dev,size_t size,dma_addr_t *dma_handle, +gfp_t gfp,struct dma_attrs *attrs) +{ +struct dma_map_ops *ops =get_dma_ops (dev); +void *memory; + + gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); + +if (dma_alloc_from_coherent (dev, size, dma_handle, &memory)) +return memory; + +if (!dev) + dev = &x86_dma_fallback_dev; + +if (!is_device_dma_capable (dev)) +return NULL ; + +if (!ops->alloc) +return NULL ; + + memory = ops->alloc (dev, size, dma_handle, +dma_alloc_coherent_gfp_flags (dev, gfp), attrs); +debug_dma_alloc_coherent (dev, size, *dma_handle, memory); + +return memory; +} +EXPORT_SYMBOL (dma_generic_free_coherent) +/* * See <Documentation/x86/x86_64/boot-options.txt> for the iommu kernel * parameter documentation.
Signature · 1 line
1.8.1.4
PATCH v2 1/1 x86: deinline dma_free_attrs()
Reduces kernel size by 76720 bytes on allyesconfig build:
text data bss dec hex filename
82594029 22255352 20627456 125476837 77a9fe5 vmlinux1 82517277 22255384 20627456 125400117 7797435 vmlinux2
Signed-off-by Denys Vlasenko <[email protected]>
Cc Marek Szyprowski <[email protected]>
Cc Konrad Rzeszutek Wilk <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Don Dutile <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Andi Kleen <[email protected]>
---
Changes in v2: added EXPORT_SYMBOL()
arch/x86/include/asm/dma-mapping.h | 18 +++--------------- arch/x86/kernel/pci-dma.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 15 deletions(-)
arch/x86/include/asm/dma-mapping.h +3 -15
@@ -133,20 +133,8 @@ dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle,#define dma_free_coherent (d,s,c,h) dma_free_attrs(d,s,c,h,NULL) -static inline void dma_free_attrs (struct device *dev,size_t size, -void *vaddr,dma_addr_t bus, -struct dma_attrs *attrs) -{ -struct dma_map_ops *ops =get_dma_ops (dev); - -WARN_ON (irqs_disabled ());/* for portability */ - -if (dma_release_from_coherent (dev,get_order (size), vaddr)) -return ; - -debug_dma_free_coherent (dev, size, vaddr, bus); -if (ops->free) - ops->free (dev, size, vaddr, bus, attrs); -} +void dma_free_attrs (struct device *dev,size_t size, +void *vaddr,dma_addr_t bus, +struct dma_attrs *attrs);#endif
arch/x86/kernel/pci-dma.c +17 -0
@@ -167,6 +167,23 @@ void *dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle, }EXPORT_SYMBOL (dma_generic_free_coherent) +void dma_free_attrs(struct device *dev, size_t size, +void *vaddr,dma_addr_t bus, +struct dma_attrs *attrs) +{ +struct dma_map_ops *ops =get_dma_ops (dev); + +WARN_ON (irqs_disabled ());/* for portability */ + +if (dma_release_from_coherent (dev,get_order (size), vaddr)) +return ; + +debug_dma_free_coherent (dev, size, vaddr, bus); +if (ops->free) + ops->free (dev, size, vaddr, bus, attrs); +} +EXPORT_SYMBOL (dma_alloc_attrs) +/* * See <Documentation/x86/x86_64/boot-options.txt> for the iommu kernel * parameter documentation.
Signature · 1 line
1.8.1.4