Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1508681

[net-next PATCH 23/27] dma: Add calls for dma_map_page_attrs and dma_unmap_page_attrs

Show all headers | View raw

Add support for mapping and unmapping a page with attributes.  The primary
use for this is currently to allow for us to pass the
DMA_ATTR_SKIP_CPU_SYNC attribute when mapping and unmapping a page.  On
some architectures such as ARM the synchronization has significant overhead
and if we are already taking care of the sync_for_cpu and sync_for_device
from the driver there isn't much need to handle this in the map/unmap calls
as well.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
---
 include/linux/dma-mapping.h |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 08528af..10c5a17 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -243,29 +243,33 @@ static inline void dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg
 		ops->unmap_sg(dev, sg, nents, dir, attrs);
 }
 
-static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
-				      size_t offset, size_t size,
-				      enum dma_data_direction dir)
+static inline dma_addr_t dma_map_page_attrs(struct device *dev,
+					    struct page *page,
+					    size_t offset, size_t size,
+					    enum dma_data_direction dir,
+					    unsigned long attrs)
 {
 	struct dma_map_ops *ops = get_dma_ops(dev);
 	dma_addr_t addr;
 
 	kmemcheck_mark_initialized(page_address(page) + offset, size);
 	BUG_ON(!valid_dma_direction(dir));
-	addr = ops->map_page(dev, page, offset, size, dir, 0);
+	addr = ops->map_page(dev, page, offset, size, dir, attrs);
 	debug_dma_map_page(dev, page, offset, size, dir, addr, false);
 
 	return addr;
 }
 
-static inline void dma_unmap_page(struct device *dev, dma_addr_t addr,
-				  size_t size, enum dma_data_direction dir)
+static inline void dma_unmap_page_attrs(struct device *dev,
+					dma_addr_t addr, size_t size,
+					enum dma_data_direction dir,
+					unsigned long 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, 0);
+		ops->unmap_page(dev, addr, size, dir, attrs);
 	debug_dma_unmap_page(dev, addr, size, dir, false);
 }
 
@@ -385,6 +389,8 @@ static inline void dma_sync_single_range_for_device(struct device *dev,
 #define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, 0)
 #define dma_map_sg(d, s, n, r) dma_map_sg_attrs(d, s, n, r, 0)
 #define dma_unmap_sg(d, s, n, r) dma_unmap_sg_attrs(d, s, n, r, 0)
+#define dma_map_page(d, p, o, s, r) dma_map_page_attrs(d, p, o, s, r, 0)
+#define dma_unmap_page(d, a, s, r) dma_unmap_page_attrs(d, a, s, r, 0)
 
 extern int dma_common_mmap(struct device *dev, struct vm_area_struct *vma,
 			   void *cpu_addr, dma_addr_t dma_addr, size_t size);

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[net-next PATCH 00/27] Add support for DMA writable pages being  writable by the network stack Alexander Duyck <alexander.h.duyck@intel.com> - 2016-10-25 23:40 +0200
  [net-next PATCH 23/27] dma: Add calls for dma_map_page_attrs and  dma_unmap_page_attrs Alexander Duyck <alexander.h.duyck@intel.com> - 2016-10-25 23:40 +0200
  [net-next PATCH 26/27] igb: Update code to better handle  incrementing page count Alexander Duyck <alexander.h.duyck@intel.com> - 2016-10-25 23:50 +0200
    Re: [Intel-wired-lan] [net-next PATCH 26/27] igb: Update code to  better handle incrementing page count Jeff Kirsher <jeffrey.t.kirsher@intel.com> - 2016-10-26 19:30 +0200
  [net-next PATCH 01/27] swiotlb: Drop unused function swiotlb_map_sg Alexander Duyck <alexander.h.duyck@intel.com> - 2016-10-25 23:50 +0200
  [net-next PATCH 05/27] arch/arm: Add option to skip sync on DMA map  and unmap Alexander Duyck <alexander.h.duyck@intel.com> - 2016-10-25 23:50 +0200
  [net-next PATCH 04/27] arch/arc: Add option to skip sync on DMA  mapping Alexander Duyck <alexander.h.duyck@intel.com> - 2016-10-25 23:50 +0200
    Re: [net-next PATCH 04/27] arch/arc: Add option to skip sync on DMA  mapping Vineet Gupta <Vineet.Gupta1@synopsys.com> - 2016-10-26 00:10 +0200
  [net-next PATCH 27/27] igb: Revert "igb: Revert support for  build_skb in igb" Alexander Duyck <alexander.h.duyck@intel.com> - 2016-10-25 23:50 +0200
    Re: [Intel-wired-lan] [net-next PATCH 27/27] igb: Revert "igb:  Revert support for build_skb in igb" Jeff Kirsher <jeffrey.t.kirsher@intel.com> - 2016-10-26 19:30 +0200
  [net-next PATCH 17/27] arch/parisc: Add option to skip DMA sync as  a part of map and unmap Alexander Duyck <alexander.h.duyck@intel.com> - 2016-10-25 23:50 +0200
  [net-next PATCH 08/27] arch/c6x: Add option to skip sync on DMA map  and unmap Alexander Duyck <alexander.h.duyck@intel.com> - 2016-10-25 23:50 +0200
  [net-next PATCH 07/27] arch/blackfin: Add option to skip sync on  DMA map Alexander Duyck <alexander.h.duyck@intel.com> - 2016-10-25 23:50 +0200
  [net-next PATCH 15/27] arch/nios2: Add option to skip DMA sync as a  part of map and unmap Alexander Duyck <alexander.h.duyck@intel.com> - 2016-10-25 23:50 +0200
  [net-next PATCH 06/27] arch/avr32: Add option to skip sync on DMA  map Alexander Duyck <alexander.h.duyck@intel.com> - 2016-10-25 23:50 +0200
  [net-next PATCH 03/27] swiotlb: Add support for  DMA_ATTR_SKIP_CPU_SYNC Alexander Duyck <alexander.h.duyck@intel.com> - 2016-10-25 23:50 +0200
  Re: [net-next PATCH 00/27] Add support for DMA writable pages being  writable by the network stack Jesper Dangaard Brouer <brouer@redhat.com> - 2016-10-26 17:50 +0200

csiph-web