lkml.org 
[lkml]   [2021]   [Jun]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v14 04/12] swiotlb: Update is_swiotlb_buffer to add a struct device argument
    Date
    Update is_swiotlb_buffer to add a struct device argument. 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>
    ---
    drivers/iommu/dma-iommu.c | 12 ++++++------
    drivers/xen/swiotlb-xen.c | 2 +-
    include/linux/swiotlb.h | 7 ++++---
    kernel/dma/direct.c | 6 +++---
    kernel/dma/direct.h | 6 +++---
    5 files changed, 17 insertions(+), 16 deletions(-)

    diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
    index 3087d9fa6065..10997ef541f8 100644
    --- a/drivers/iommu/dma-iommu.c
    +++ b/drivers/iommu/dma-iommu.c
    @@ -507,7 +507,7 @@ static void __iommu_dma_unmap_swiotlb(struct device *dev, dma_addr_t dma_addr,

    __iommu_dma_unmap(dev, dma_addr, size);

    - if (unlikely(is_swiotlb_buffer(phys)))
    + if (unlikely(is_swiotlb_buffer(dev, phys)))
    swiotlb_tbl_unmap_single(dev, phys, size, dir, attrs);
    }

    @@ -578,7 +578,7 @@ static dma_addr_t __iommu_dma_map_swiotlb(struct device *dev, phys_addr_t phys,
    }

    iova = __iommu_dma_map(dev, phys, aligned_size, prot, dma_mask);
    - if (iova == DMA_MAPPING_ERROR && is_swiotlb_buffer(phys))
    + if (iova == DMA_MAPPING_ERROR && is_swiotlb_buffer(dev, phys))
    swiotlb_tbl_unmap_single(dev, phys, org_size, dir, attrs);
    return iova;
    }
    @@ -749,7 +749,7 @@ static void iommu_dma_sync_single_for_cpu(struct device *dev,
    if (!dev_is_dma_coherent(dev))
    arch_sync_dma_for_cpu(phys, size, dir);

    - if (is_swiotlb_buffer(phys))
    + if (is_swiotlb_buffer(dev, phys))
    swiotlb_sync_single_for_cpu(dev, phys, size, dir);
    }

    @@ -762,7 +762,7 @@ static void iommu_dma_sync_single_for_device(struct device *dev,
    return;

    phys = iommu_iova_to_phys(iommu_get_dma_domain(dev), dma_handle);
    - if (is_swiotlb_buffer(phys))
    + if (is_swiotlb_buffer(dev, phys))
    swiotlb_sync_single_for_device(dev, phys, size, dir);

    if (!dev_is_dma_coherent(dev))
    @@ -783,7 +783,7 @@ static void iommu_dma_sync_sg_for_cpu(struct device *dev,
    if (!dev_is_dma_coherent(dev))
    arch_sync_dma_for_cpu(sg_phys(sg), sg->length, dir);

    - if (is_swiotlb_buffer(sg_phys(sg)))
    + if (is_swiotlb_buffer(dev, sg_phys(sg)))
    swiotlb_sync_single_for_cpu(dev, sg_phys(sg),
    sg->length, dir);
    }
    @@ -800,7 +800,7 @@ static void iommu_dma_sync_sg_for_device(struct device *dev,
    return;

    for_each_sg(sgl, sg, nelems, i) {
    - if (is_swiotlb_buffer(sg_phys(sg)))
    + if (is_swiotlb_buffer(dev, sg_phys(sg)))
    swiotlb_sync_single_for_device(dev, sg_phys(sg),
    sg->length, dir);

    diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
    index 4c89afc0df62..0c6ed09f8513 100644
    --- a/drivers/xen/swiotlb-xen.c
    +++ b/drivers/xen/swiotlb-xen.c
    @@ -100,7 +100,7 @@ static int is_xen_swiotlb_buffer(struct device *dev, dma_addr_t dma_addr)
    * in our domain. Therefore _only_ check address within our domain.
    */
    if (pfn_valid(PFN_DOWN(paddr)))
    - return is_swiotlb_buffer(paddr);
    + return is_swiotlb_buffer(dev, paddr);
    return 0;
    }

    diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
    index 216854a5e513..d1f3d95881cd 100644
    --- a/include/linux/swiotlb.h
    +++ b/include/linux/swiotlb.h
    @@ -2,6 +2,7 @@
    #ifndef __LINUX_SWIOTLB_H
    #define __LINUX_SWIOTLB_H

    +#include <linux/device.h>
    #include <linux/dma-direction.h>
    #include <linux/init.h>
    #include <linux/types.h>
    @@ -101,9 +102,9 @@ struct io_tlb_mem {
    };
    extern struct io_tlb_mem *io_tlb_default_mem;

    -static inline bool is_swiotlb_buffer(phys_addr_t paddr)
    +static inline bool is_swiotlb_buffer(struct device *dev, phys_addr_t paddr)
    {
    - struct io_tlb_mem *mem = io_tlb_default_mem;
    + struct io_tlb_mem *mem = dev->dma_io_tlb_mem;

    return mem && paddr >= mem->start && paddr < mem->end;
    }
    @@ -115,7 +116,7 @@ bool is_swiotlb_active(void);
    void __init swiotlb_adjust_size(unsigned long size);
    #else
    #define swiotlb_force SWIOTLB_NO_FORCE
    -static inline bool is_swiotlb_buffer(phys_addr_t paddr)
    +static inline bool is_swiotlb_buffer(struct device *dev, phys_addr_t paddr)
    {
    return false;
    }
    diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
    index f737e3347059..84c9feb5474a 100644
    --- a/kernel/dma/direct.c
    +++ b/kernel/dma/direct.c
    @@ -343,7 +343,7 @@ void dma_direct_sync_sg_for_device(struct device *dev,
    for_each_sg(sgl, sg, nents, i) {
    phys_addr_t paddr = dma_to_phys(dev, sg_dma_address(sg));

    - if (unlikely(is_swiotlb_buffer(paddr)))
    + if (unlikely(is_swiotlb_buffer(dev, paddr)))
    swiotlb_sync_single_for_device(dev, paddr, sg->length,
    dir);

    @@ -369,7 +369,7 @@ void dma_direct_sync_sg_for_cpu(struct device *dev,
    if (!dev_is_dma_coherent(dev))
    arch_sync_dma_for_cpu(paddr, sg->length, dir);

    - if (unlikely(is_swiotlb_buffer(paddr)))
    + if (unlikely(is_swiotlb_buffer(dev, paddr)))
    swiotlb_sync_single_for_cpu(dev, paddr, sg->length,
    dir);

    @@ -504,7 +504,7 @@ size_t dma_direct_max_mapping_size(struct device *dev)
    bool dma_direct_need_sync(struct device *dev, dma_addr_t dma_addr)
    {
    return !dev_is_dma_coherent(dev) ||
    - is_swiotlb_buffer(dma_to_phys(dev, dma_addr));
    + is_swiotlb_buffer(dev, dma_to_phys(dev, dma_addr));
    }

    /**
    diff --git a/kernel/dma/direct.h b/kernel/dma/direct.h
    index 50afc05b6f1d..13e9e7158d94 100644
    --- a/kernel/dma/direct.h
    +++ b/kernel/dma/direct.h
    @@ -56,7 +56,7 @@ static inline void dma_direct_sync_single_for_device(struct device *dev,
    {
    phys_addr_t paddr = dma_to_phys(dev, addr);

    - if (unlikely(is_swiotlb_buffer(paddr)))
    + if (unlikely(is_swiotlb_buffer(dev, paddr)))
    swiotlb_sync_single_for_device(dev, paddr, size, dir);

    if (!dev_is_dma_coherent(dev))
    @@ -73,7 +73,7 @@ static inline void dma_direct_sync_single_for_cpu(struct device *dev,
    arch_sync_dma_for_cpu_all();
    }

    - if (unlikely(is_swiotlb_buffer(paddr)))
    + if (unlikely(is_swiotlb_buffer(dev, paddr)))
    swiotlb_sync_single_for_cpu(dev, paddr, size, dir);

    if (dir == DMA_FROM_DEVICE)
    @@ -113,7 +113,7 @@ static inline void dma_direct_unmap_page(struct device *dev, dma_addr_t addr,
    if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))
    dma_direct_sync_single_for_cpu(dev, addr, size, dir);

    - if (unlikely(is_swiotlb_buffer(phys)))
    + if (unlikely(is_swiotlb_buffer(dev, phys)))
    swiotlb_tbl_unmap_single(dev, phys, size, dir, attrs);
    }
    #endif /* _KERNEL_DMA_DIRECT_H */
    --
    2.32.0.288.g62a8d224e6-goog
    \
     
     \ /
      Last update: 2021-06-19 05:43    [W:3.264 / U:0.292 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site