korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-15 23:14:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

swiotlb: Use is_swiotlb_force_bounce for swiotlb data bouncing

Browse Source 
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]
This commit is contained in:
Claire Chang 2021-06-24 23:55:20 +08:00 committed by Konrad Rzeszutek Wilk
parent 6f2beb268a
commit 903cd0f315
5 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/xen/swiotlb-xen.c
View File

@ -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) && if (dma_capable(dev, dev_addr, size, true) &&
!range_straddles_page_boundary(phys, size) && !range_straddles_page_boundary(phys, size) &&
!xen_arch_need_swiotlb(dev, phys, dev_addr) && !xen_arch_need_swiotlb(dev, phys, dev_addr) &&
swiotlb_force != SWIOTLB_FORCE) !is_swiotlb_force_bounce(dev))
goto done; goto done;
/* /*

13
include/linux/swiotlb.h
View File

@ -84,6 +84,7 @@ extern enum swiotlb_force swiotlb_force;
* unmap calls. * unmap calls.
* @debugfs: The dentry to debugfs. * @debugfs: The dentry to debugfs.
* @late_alloc: %true if allocated using the page allocator * @late_alloc: %true if allocated using the page allocator
* @force_bounce: %true if swiotlb bouncing is forced
*/ */
struct io_tlb_mem { struct io_tlb_mem {
phys_addr_t start; phys_addr_t start;
@ -94,6 +95,7 @@ struct io_tlb_mem {
spinlock_t lock; spinlock_t lock;
struct dentry *debugfs; struct dentry *debugfs;
bool late_alloc; bool late_alloc;
bool force_bounce;
struct io_tlb_slot { struct io_tlb_slot {
phys_addr_t orig_addr; phys_addr_t orig_addr;
size_t alloc_size; 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; 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); void __init swiotlb_exit(void);
unsigned int swiotlb_max_segment(void); unsigned int swiotlb_max_segment(void);
size_t swiotlb_max_mapping_size(struct device *dev); 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; return false;
} }
static inline bool is_swiotlb_force_bounce(struct device *dev)
{
return false;
}
static inline void swiotlb_exit(void) static inline void swiotlb_exit(void)
{ {
} }

2
kernel/dma/direct.c
View File

@ -496,7 +496,7 @@ size_t dma_direct_max_mapping_size(struct device *dev)
{ {
/* If SWIOTLB is active, use its maximum mapping size */ /* If SWIOTLB is active, use its maximum mapping size */
if (is_swiotlb_active(dev) && 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 swiotlb_max_mapping_size(dev);
return SIZE_MAX; return SIZE_MAX;
} }

2
kernel/dma/direct.h
View File

@ -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; phys_addr_t phys = page_to_phys(page) + offset;
dma_addr_t dma_addr = phys_to_dma(dev, phys); 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); return swiotlb_map(dev, phys, size, dir, attrs);
if (unlikely(!dma_capable(dev, dma_addr, size, true))) { if (unlikely(!dma_capable(dev, dma_addr, size, true))) {

4
kernel/dma/swiotlb.c
View File

@ -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->end = mem->start + bytes;
mem->index = 0; mem->index = 0;
mem->late_alloc = late_alloc; mem->late_alloc = late_alloc;
if (swiotlb_force == SWIOTLB_FORCE)
mem->force_bounce = true;
spin_lock_init(&mem->lock); spin_lock_init(&mem->lock);
for (i = 0; i < mem->nslabs; i++) { for (i = 0; i < mem->nslabs; i++) {
mem->slots[i].list = IO_TLB_SEGSIZE - io_tlb_offset(i); mem->slots[i].list = IO_TLB_SEGSIZE - io_tlb_offset(i);