swiotlb: Use is_swiotlb_force_bounce for swiotlb data bouncing

Propagate the swiotlb_force into io_tlb_default_mem->force_bounce and
use it to determine whether to bounce the data or not. This will be
useful later to allow for different pools.

Signed-off-by: Claire Chang <tientzu@chromium.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Tested-by: Stefano Stabellini <sstabellini@kernel.org>
Tested-by: Will Deacon <will@kernel.org>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
[v2: Includes Will's fix]

diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 0c4fb34..785ec7e 100644 (file)
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -374,7 +374,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
        if (dma_capable(dev, dev_addr, size, true) &&
            !range_straddles_page_boundary(phys, size) &&
                !xen_arch_need_swiotlb(dev, phys, dev_addr) &&
-               swiotlb_force != SWIOTLB_FORCE)
+               !is_swiotlb_force_bounce(dev))
                goto done;
 
        /*

diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index dd1c30a..da34867 100644 (file)
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -84,6 +84,7 @@ extern enum swiotlb_force swiotlb_force;
  *             unmap calls.
  * @debugfs:   The dentry to debugfs.
  * @late_alloc:        %true if allocated using the page allocator
+ * @force_bounce: %true if swiotlb bouncing is forced
  */
 struct io_tlb_mem {
        phys_addr_t start;
@@ -94,6 +95,7 @@ struct io_tlb_mem {
        spinlock_t lock;
        struct dentry *debugfs;
        bool late_alloc;
+       bool force_bounce;
        struct io_tlb_slot {
                phys_addr_t orig_addr;
                size_t alloc_size;
@@ -109,6 +111,13 @@ static inline bool is_swiotlb_buffer(struct device *dev, phys_addr_t paddr)
        return mem && paddr >= mem->start && paddr < mem->end;
 }
 
+static inline bool is_swiotlb_force_bounce(struct device *dev)
+{
+       struct io_tlb_mem *mem = dev->dma_io_tlb_mem;
+
+       return mem && mem->force_bounce;
+}
+
 void __init swiotlb_exit(void);
 unsigned int swiotlb_max_segment(void);
 size_t swiotlb_max_mapping_size(struct device *dev);
@@ -120,6 +129,10 @@ static inline bool is_swiotlb_buffer(struct device *dev, phys_addr_t paddr)
 {
        return false;
 }
+static inline bool is_swiotlb_force_bounce(struct device *dev)
+{
+       return false;
+}
 static inline void swiotlb_exit(void)
 {
 }

diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index 7a88c34..a92465b 100644 (file)
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -496,7 +496,7 @@ size_t dma_direct_max_mapping_size(struct device *dev)
 {
        /* If SWIOTLB is active, use its maximum mapping size */
        if (is_swiotlb_active(dev) &&
-           (dma_addressing_limited(dev) || swiotlb_force == SWIOTLB_FORCE))
+           (dma_addressing_limited(dev) || is_swiotlb_force_bounce(dev)))
                return swiotlb_max_mapping_size(dev);
        return SIZE_MAX;
 }

diff --git a/kernel/dma/direct.h b/kernel/dma/direct.h
index 13e9e71..4632b0f 100644 (file)
--- a/kernel/dma/direct.h
+++ b/kernel/dma/direct.h
@@ -87,7 +87,7 @@ static inline dma_addr_t dma_direct_map_page(struct device *dev,
        phys_addr_t phys = page_to_phys(page) + offset;
        dma_addr_t dma_addr = phys_to_dma(dev, phys);
 
-       if (unlikely(swiotlb_force == SWIOTLB_FORCE))
+       if (is_swiotlb_force_bounce(dev))
                return swiotlb_map(dev, phys, size, dir, attrs);
 
        if (unlikely(!dma_capable(dev, dma_addr, size, true))) {

diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index d8677d6..04319dd 100644 (file)
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -179,6 +179,10 @@ static void swiotlb_init_io_tlb_mem(struct io_tlb_mem *mem, phys_addr_t start,
        mem->end = mem->start + bytes;
        mem->index = 0;
        mem->late_alloc = late_alloc;
+
+       if (swiotlb_force == SWIOTLB_FORCE)
+               mem->force_bounce = true;
+
        spin_lock_init(&mem->lock);
        for (i = 0; i < mem->nslabs; i++) {
                mem->slots[i].list = IO_TLB_SEGSIZE - io_tlb_offset(i);