Skip to contentSkip to conversation

dma-mapping: Deinline dma_[un]map_single_attrs()

PATCH New Denys Vlasenko 1 participant 1 message Sep 22, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 dma-mapping: Deinline dma_[un]map_single_attrs()

With this .config: http://busybox.net/~vda/kernel_config_ALLYES_Os,
after deinlining these functions have sizes and callsite counts as follows:

dma_map_single_attrs: 214 bytes, 587 calls
dma_unmap_single_attrs: 115 bytes, 771 calls

This patch reduces kernel size by 152310 bytes.

text data bss dec hex filename
91622364 19945240 36421632 147989236 8d222f4 vmlinux.before 91470054 19945080 36421632 147836766 8cfcf5e vmlinux

CC Christoph Hellwig <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Ingo Molnar <[email protected]>
CC David Woodhouse <[email protected]>
CC Marek Szyprowski <[email protected]>
CC Konrad Rzeszutek Wilk <[email protected]>
CC Don Dutile <[email protected]>
CC Thomas Gleixner <[email protected]>

---

Changes since v1: moved dma-mapping-common.c to lib/.

 include/asm-generic/dma-mapping-common.h | 40 ++++++---------------------
 lib/Makefile                             |  1 +
 lib/dma-mapping-common.c                 | 47 ++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 31 deletions(-)
 create mode 100644 lib/dma-mapping-common.c
include/asm-generic/dma-mapping-common.h +9 -31
index b1bc954..3fa4d28 100644
@@ -8,37 +8,15 @@
 #include <linux/dma-attrs.h>
 #include <asm-generic/dma-coherent.h>
 
-static inline dma_addr_t dma_map_single_attrs(struct device *dev, void *ptr,
-					      size_t size,
-					      enum dma_data_direction dir,
-					      struct dma_attrs *attrs)
-{
-	struct dma_map_ops *ops = get_dma_ops(dev);
-	dma_addr_t addr;
-
-	kmemcheck_mark_initialized(ptr, size);
-	BUG_ON(!valid_dma_direction(dir));
-	addr = ops->map_page(dev, virt_to_page(ptr),
-			     (unsigned long)ptr & ~PAGE_MASK, size,
-			     dir, attrs);
-	debug_dma_map_page(dev, virt_to_page(ptr),
-			   (unsigned long)ptr & ~PAGE_MASK, size,
-			   dir, addr, true);
-	return addr;
-}
-
-static inline void dma_unmap_single_attrs(struct device *dev, dma_addr_t addr,
-					  size_t size,
-					  enum dma_data_direction dir,
-					  struct dma_attrs *attrs)
-{
-	struct dma_map_ops *ops = get_dma_ops(dev);
-
-	BUG_ON(!valid_dma_direction(dir));
-	if (ops->unmap_page)
-		ops->unmap_page(dev, addr, size, dir, attrs);
-	debug_dma_unmap_page(dev, addr, size, dir, true);
-}
+dma_addr_t dma_map_single_attrs(struct device *dev, void *ptr,
+				size_t size,
+				enum dma_data_direction dir,
+				struct dma_attrs *attrs);
+
+void dma_unmap_single_attrs(struct device *dev, dma_addr_t addr,
+			    size_t size,
+			    enum dma_data_direction dir,
+			    struct dma_attrs *attrs);
 
 /*
  * dma_maps_sg_attrs returns 0 on error and > 0 on success.
lib/Makefile +1 -0
index 13a7c6a..d973812 100644
@@ -27,6 +27,7 @@ obj-y += bcd.o div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
 	 gcd.o lcm.o list_sort.o uuid.o flex_array.o iov_iter.o clz_ctz.o \
 	 bsearch.o find_bit.o llist.o memweight.o kfifo.o \
 	 percpu-refcount.o percpu_ida.o rhashtable.o reciprocal_div.o
+obj-y += dma-mapping-common.o
 obj-y += string_helpers.o
 obj-$(CONFIG_TEST_STRING_HELPERS) += test-string_helpers.o
 obj-y += hexdump.o
lib/dma-mapping-common.c new file +47 -0

47 lines not on this page · raw message

Signature · 1 line
1.8.1.4