Skip to content

Commit cbf5307

Browse files
willdeaconChristoph Hellwig
authored andcommitted
swiotlb: Honour dma_alloc_coherent() alignment in swiotlb_alloc()
core-api/dma-api-howto.rst states the following properties of dma_alloc_coherent(): | The CPU virtual address and the DMA address are both guaranteed to | be aligned to the smallest PAGE_SIZE order which is greater than or | equal to the requested size. However, swiotlb_alloc() passes zero for the 'alloc_align_mask' parameter of swiotlb_find_slots() and so this property is not upheld. Instead, allocations larger than a page are aligned to PAGE_SIZE, Calculate the mask corresponding to the page order suitable for holding the allocation and pass that to swiotlb_find_slots(). Fixes: e81e99b ("swiotlb: Support aligned swiotlb buffers") Signed-off-by: Will Deacon <will@kernel.org> Reviewed-by: Michael Kelley <mhklinux@outlook.com> Reviewed-by: Petr Tesarik <petr.tesarik1@huawei-partners.com> Tested-by: Nicolin Chen <nicolinc@nvidia.com> Tested-by: Michael Kelley <mhklinux@outlook.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
1 parent 823353b commit cbf5307

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

kernel/dma/swiotlb.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1679,12 +1679,14 @@ struct page *swiotlb_alloc(struct device *dev, size_t size)
16791679
struct io_tlb_mem *mem = dev->dma_io_tlb_mem;
16801680
struct io_tlb_pool *pool;
16811681
phys_addr_t tlb_addr;
1682+
unsigned int align;
16821683
int index;
16831684

16841685
if (!mem)
16851686
return NULL;
16861687

1687-
index = swiotlb_find_slots(dev, 0, size, 0, &pool);
1688+
align = (1 << (get_order(size) + PAGE_SHIFT)) - 1;
1689+
index = swiotlb_find_slots(dev, 0, size, align, &pool);
16881690
if (index == -1)
16891691
return NULL;
16901692

0 commit comments

Comments
 (0)