linux-stable.git/kernel/dma, branch v5.10.45

swiotlb: Fix the type of index

2021-05-19T08:13:04+00:00

[ Upstream commit 95b079d8215b83b37fa59341fda92fcb9392f14a ]

Fix the type of index from unsigned int to int since find_slots() might
return -1.

Fixes: 26a7e094783d ("swiotlb: refactor swiotlb_tbl_map_single")
Reviewed-by: Christoph Hellwig 
Signed-off-by: Claire Chang 
Signed-off-by: Konrad Rzeszutek Wilk 
Signed-off-by: Sasha Levin

swiotlb: respect min_align_mask

2021-05-07T09:04:32+00:00

commit: 1f221a0d0dbf0e48ef3a9c62871281d6a7819f05

swiotlb: respect min_align_mask

Respect the min_align_mask in struct device_dma_parameters in swiotlb.

There are two parts to it:
 1) for the lower bits of the alignment inside the io tlb slot, just
    extent the size of the allocation and leave the start of the slot
     empty
 2) for the high bits ensure we find a slot that matches the high bits
    of the alignment to avoid wasting too much memory

Based on an earlier patch from Jianxiong Gao .

Signed-off-by: Christoph Hellwig 
Acked-by: Jianxiong Gao 
Tested-by: Jianxiong Gao 
Signed-off-by: Konrad Rzeszutek Wilk 
Signed-off-by: Jianxiong Gao 
Signed-off-by: Greg Kroah-Hartman

swiotlb: don't modify orig_addr in swiotlb_tbl_sync_single

2021-05-07T09:04:32+00:00

commit: 16fc3cef33a04632ab6b31758abdd77563a20759

swiotlb_tbl_map_single currently nevers sets a tlb_addr that is not
aligned to the tlb bucket size.  But we're going to add such a case
soon, for which this adjustment would be bogus.

Signed-off-by: Christoph Hellwig 
Acked-by: Jianxiong Gao 
Tested-by: Jianxiong Gao 
Signed-off-by: Konrad Rzeszutek Wilk 
Signed-off-by: Jianxiong Gao 
Signed-off-by: Greg Kroah-Hartman

swiotlb: refactor swiotlb_tbl_map_single

2021-05-07T09:04:32+00:00

commit: 26a7e094783d482f3e125f09945a5bb1d867b2e6

Split out a bunch of a self-contained helpers to make the function easier
to follow.

Signed-off-by: Christoph Hellwig 
Acked-by: Jianxiong Gao 
Tested-by: Jianxiong Gao 
Signed-off-by: Konrad Rzeszutek Wilk 
Signed-off-by: Jianxiong Gao 
Signed-off-by: Greg Kroah-Hartman

swiotlb: clean up swiotlb_tbl_unmap_single

2021-05-07T09:04:32+00:00

commit: ca10d0f8e530600ec63c603dbace2c30927d70b7

swiotlb: clean up swiotlb_tbl_unmap_single

Remove a layer of pointless indentation, replace a hard to follow
ternary expression with a plain if/else.

Signed-off-by: Christoph Hellwig 
Acked-by: Jianxiong Gao 
Tested-by: Jianxiong Gao 
Signed-off-by: Konrad Rzeszutek Wilk 
Signed-off-by: Jianxiong Gao 
Signed-off-by: Greg Kroah-Hartman

swiotlb: factor out a nr_slots helper

2021-05-07T09:04:32+00:00

commit: c32a77fd18780a5192dfb6eec69f239faebf28fd

Factor out a helper to find the number of slots for a given size.

Signed-off-by: Christoph Hellwig 
Acked-by: Jianxiong Gao 
Tested-by: Jianxiong Gao 
Signed-off-by: Konrad Rzeszutek Wilk 
Signed-off-by: Jianxiong Gao 
Signed-off-by: Greg Kroah-Hartman

swiotlb: factor out an io_tlb_offset helper

2021-05-07T09:04:32+00:00

commit: c7fbeca757fe74135d8b6a4c8ddaef76f5775d68

Replace the very genericly named OFFSET macro with a little inline
helper that hardcodes the alignment to the only value ever passed.

Signed-off-by: Christoph Hellwig 
Acked-by: Jianxiong Gao 
Tested-by: Jianxiong Gao 
Signed-off-by: Konrad Rzeszutek Wilk 
Signed-off-by: Jianxiong Gao 
Signed-off-by: Greg Kroah-Hartman

swiotlb: add a IO_TLB_SIZE define

2021-05-07T09:04:32+00:00

commit: b5d7ccb7aac3895c2138fe0980a109116ce15eff

Add a new IO_TLB_SIZE define instead open coding it using
IO_TLB_SHIFT all over.

Signed-off-by: Christoph Hellwig 
Acked-by: Jianxiong Gao 
Tested-by: Jianxiong Gao 
Signed-off-by: Konrad Rzeszutek Wilk 
Signed-off-by: Jianxiong Gao 
Signed-off-by: Greg Kroah-Hartman

swiotlb: remove the tbl_dma_addr argument to swiotlb_tbl_map_single

2020-11-02T15:10:39+00:00

The tbl_dma_addr argument is used to check the DMA boundary for the
allocations, and thus needs to be a dma_addr_t.  swiotlb-xen instead
passed a physical address, which could lead to incorrect results for
strange offsets.  Fix this by removing the parameter entirely and hard
code the DMA address for io_tlb_start instead.

Fixes: 91ffe4ad534a ("swiotlb-xen: introduce phys_to_dma/dma_to_phys translations")
Signed-off-by: Christoph Hellwig 
Reviewed-by: Stefano Stabellini 
Signed-off-by: Konrad Rzeszutek Wilk

swiotlb: fix "x86: Don't panic if can not alloc buffer for swiotlb"

2020-11-02T15:10:37+00:00

kernel/dma/swiotlb.c:swiotlb_init gets called first and tries to
allocate a buffer for the swiotlb. It does so by calling

  memblock_alloc_low(PAGE_ALIGN(bytes), PAGE_SIZE);

If the allocation must fail, no_iotlb_memory is set.

Later during initialization swiotlb-xen comes in
(drivers/xen/swiotlb-xen.c:xen_swiotlb_init) and given that io_tlb_start
is != 0, it thinks the memory is ready to use when actually it is not.

When the swiotlb is actually needed, swiotlb_tbl_map_single gets called
and since no_iotlb_memory is set the kernel panics.

Instead, if swiotlb-xen.c:xen_swiotlb_init knew the swiotlb hadn't been
initialized, it would do the initialization itself, which might still
succeed.

Fix the panic by setting io_tlb_start to 0 on swiotlb initialization
failure, and also by setting no_iotlb_memory to false on swiotlb
initialization success.

Fixes: ac2cbab21f31 ("x86: Don't panic if can not alloc buffer for swiotlb")

Reported-by: Elliott Mitchell 
Tested-by: Elliott Mitchell 
Signed-off-by: Stefano Stabellini 
Reviewed-by: Christoph Hellwig 
Cc: stable@vger.kernel.org
Signed-off-by: Konrad Rzeszutek Wilk