linux-stable.git/kernel/dma, branch linux-5.11.y

swiotlb: Fix the type of index

2021-05-19T08:29:42+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:11:24+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:11:24+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:11:24+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:11:24+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:11:24+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:11:24+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:11:24+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

dma-mapping: benchmark: use u8 for reserved field in uAPI structure

2021-02-05T11:48:46+00:00

The original code put five u32 before a u64 expansion[10] array. Five is
odd, this will cause trouble in the extension of the structure by adding
new features. This patch moves to use u8 for reserved field to avoid
future alignment risk.
Meanwhile, it also clears the memory of struct map_benchmark in tools,
otherwise, if users use old version to run on newer kernel, the random
expansion value will cause side effect on newer kernel.

Signed-off-by: Barry Song 
Signed-off-by: Christoph Hellwig

dma-mapping: benchmark: fix kernel crash when dma_map_single fails

2021-01-27T16:18:38+00:00

if dma_map_single() fails, kernel will give the below oops since
task_struct has been destroyed and we are running into the memory
corruption due to use-after-free in kthread_stop():

[   48.095310] Unable to handle kernel paging request at virtual address 000000c473548040
[   48.095736] Mem abort info:
[   48.095864]   ESR = 0x96000004
[   48.096025]   EC = 0x25: DABT (current EL), IL = 32 bits
[   48.096268]   SET = 0, FnV = 0
[   48.096401]   EA = 0, S1PTW = 0
[   48.096538] Data abort info:
[   48.096659]   ISV = 0, ISS = 0x00000004
[   48.096820]   CM = 0, WnR = 0
[   48.097079] user pgtable: 4k pages, 48-bit VAs, pgdp=0000000104639000
[   48.098099] [000000c473548040] pgd=0000000000000000, p4d=0000000000000000
[   48.098832] Internal error: Oops: 96000004 [#1] PREEMPT SMP
[   48.099232] Modules linked in:
[   48.099387] CPU: 0 PID: 2 Comm: kthreadd Tainted: G        W
[   48.099887] Hardware name: linux,dummy-virt (DT)
[   48.100078] pstate: 60000005 (nZCv daif -PAN -UAO -TCO BTYPE=--)
[   48.100516] pc : __kmalloc_node+0x214/0x368
[   48.100944] lr : __kmalloc_node+0x1f4/0x368
[   48.101458] sp : ffff800011f0bb80
[   48.101843] x29: ffff800011f0bb80 x28: ffff0000c0098ec0
[   48.102330] x27: 0000000000000000 x26: 00000000001d4600
[   48.102648] x25: ffff0000c0098ec0 x24: ffff800011b6a000
[   48.102988] x23: 00000000ffffffff x22: ffff0000c0098ec0
[   48.103333] x21: ffff8000101d7a54 x20: 0000000000000dc0
[   48.103657] x19: ffff0000c0001e00 x18: 0000000000000000
[   48.104069] x17: 0000000000000000 x16: 0000000000000000
[   48.105449] x15: 000001aa0304e7b9 x14: 00000000000003b1
[   48.106401] x13: ffff8000122d5000 x12: ffff80001228d000
[   48.107296] x11: ffff0000c0154340 x10: 0000000000000000
[   48.107862] x9 : ffff80000fffffff x8 : ffff0000c473527f
[   48.108326] x7 : ffff800011e62f58 x6 : ffff0000c01c8ed8
[   48.108778] x5 : ffff0000c0098ec0 x4 : 0000000000000000
[   48.109223] x3 : 00000000001d4600 x2 : 0000000000000040
[   48.109656] x1 : 0000000000000001 x0 : ff0000c473548000
[   48.110104] Call trace:
[   48.110287]  __kmalloc_node+0x214/0x368
[   48.110493]  __vmalloc_node_range+0xc4/0x298
[   48.110805]  copy_process+0x2c8/0x15c8
[   48.111133]  kernel_clone+0x5c/0x3c0
[   48.111373]  kernel_thread+0x64/0x90
[   48.111604]  kthreadd+0x158/0x368
[   48.111810]  ret_from_fork+0x10/0x30
[   48.112336] Code: 17ffffe9 b9402a62 b94008a1 11000421 (f8626802)
[   48.112884] ---[ end trace d4890e21e75419d5 ]---

Signed-off-by: Barry Song 
Signed-off-by: Christoph Hellwig