From: Sasha Levin Date: Tue, 24 Jan 2023 22:55:44 +0000 (-0500) Subject: Fixes for 5.15 X-Git-Tag: v5.10.166~86 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=20d334434794950cb66542a02a8f2db5e4f032cf;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.15 Signed-off-by: Sasha Levin --- diff --git a/queue-5.15/octeontx2-pf-avoid-use-of-gfp_kernel-in-atomic-conte.patch-18459 b/queue-5.15/octeontx2-pf-avoid-use-of-gfp_kernel-in-atomic-conte.patch-18459 new file mode 100644 index 00000000000..6c7fb1e9a4f --- /dev/null +++ b/queue-5.15/octeontx2-pf-avoid-use-of-gfp_kernel-in-atomic-conte.patch-18459 @@ -0,0 +1,62 @@ +From 472df187bd4eb6cdb891182b0014b890235ac3ce Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 23 Jan 2023 06:47:34 +0800 +Subject: octeontx2-pf: Avoid use of GFP_KERNEL in atomic context + +From: Geetha sowjanya + +commit 87b93b678e95c7d93fe6a55b0e0fbda26d8c7760 upstream. + +Using GFP_KERNEL in preemption disable context, causing below warning +when CONFIG_DEBUG_ATOMIC_SLEEP is enabled. + +[ 32.542271] BUG: sleeping function called from invalid context at include/linux/sched/mm.h:274 +[ 32.550883] in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 1, name: swapper/0 +[ 32.558707] preempt_count: 1, expected: 0 +[ 32.562710] RCU nest depth: 0, expected: 0 +[ 32.566800] CPU: 3 PID: 1 Comm: swapper/0 Tainted: G W 6.2.0-rc2-00269-gae9dcb91c606 #7 +[ 32.576188] Hardware name: Marvell CN106XX board (DT) +[ 32.581232] Call trace: +[ 32.583670] dump_backtrace.part.0+0xe0/0xf0 +[ 32.587937] show_stack+0x18/0x30 +[ 32.591245] dump_stack_lvl+0x68/0x84 +[ 32.594900] dump_stack+0x18/0x34 +[ 32.598206] __might_resched+0x12c/0x160 +[ 32.602122] __might_sleep+0x48/0xa0 +[ 32.605689] __kmem_cache_alloc_node+0x2b8/0x2e0 +[ 32.610301] __kmalloc+0x58/0x190 +[ 32.613610] otx2_sq_aura_pool_init+0x1a8/0x314 +[ 32.618134] otx2_open+0x1d4/0x9d0 + +To avoid use of GFP_ATOMIC for memory allocation, disable preemption +after all memory allocation is done. + +Fixes: 4af1b64f80fb ("octeontx2-pf: Fix lmtst ID used in aura free") +Signed-off-by: Geetha sowjanya +Signed-off-by: Sunil Kovvuri Goutham +Reviewed-by: Leon Romanovsky +Signed-off-by: David S. Miller +[Kevin: Fix the conflict due to the context change in v5.15] +Signed-off-by: Kevin Hao +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +index 2e225309de9c..651e778241e8 100644 +--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c ++++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +@@ -1331,7 +1331,9 @@ int otx2_sq_aura_pool_init(struct otx2_nic *pfvf) + err = otx2_alloc_rbuf(pfvf, pool, &bufptr); + if (err) + goto err_mem; ++ get_cpu(); + pfvf->hw_ops->aura_freeptr(pfvf, pool_id, bufptr); ++ put_cpu(); + sq->sqb_ptrs[sq->sqb_count++] = (u64)bufptr; + } + } +-- +2.39.0 + diff --git a/queue-5.15/octeontx2-pf-fix-the-use-of-gfp_kernel-in-atomic-con.patch-8230 b/queue-5.15/octeontx2-pf-fix-the-use-of-gfp_kernel-in-atomic-con.patch-8230 new file mode 100644 index 00000000000..cca0fb6147e --- /dev/null +++ b/queue-5.15/octeontx2-pf-fix-the-use-of-gfp_kernel-in-atomic-con.patch-8230 @@ -0,0 +1,91 @@ +From 158e585d21b663377ceb0076a5cf203400241793 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 23 Jan 2023 06:47:35 +0800 +Subject: octeontx2-pf: Fix the use of GFP_KERNEL in atomic context on rt + +From: Kevin Hao + +commit 55ba18dc62deff5910c0fa64486dea1ff20832ff upstream. + +The commit 4af1b64f80fb ("octeontx2-pf: Fix lmtst ID used in aura +free") uses the get/put_cpu() to protect the usage of percpu pointer +in ->aura_freeptr() callback, but it also unnecessarily disable the +preemption for the blockable memory allocation. The commit 87b93b678e95 +("octeontx2-pf: Avoid use of GFP_KERNEL in atomic context") tried to +fix these sleep inside atomic warnings. But it only fix the one for +the non-rt kernel. For the rt kernel, we still get the similar warnings +like below. + BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:46 + in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 1, name: swapper/0 + preempt_count: 1, expected: 0 + RCU nest depth: 0, expected: 0 + 3 locks held by swapper/0/1: + #0: ffff800009fc5fe8 (rtnl_mutex){+.+.}-{3:3}, at: rtnl_lock+0x24/0x30 + #1: ffff000100c276c0 (&mbox->lock){+.+.}-{3:3}, at: otx2_init_hw_resources+0x8c/0x3a4 + #2: ffffffbfef6537e0 (&cpu_rcache->lock){+.+.}-{2:2}, at: alloc_iova_fast+0x1ac/0x2ac + Preemption disabled at: + [] otx2_rq_aura_pool_init+0x14c/0x284 + CPU: 20 PID: 1 Comm: swapper/0 Tainted: G W 6.2.0-rc3-rt1-yocto-preempt-rt #1 + Hardware name: Marvell OcteonTX CN96XX board (DT) + Call trace: + dump_backtrace.part.0+0xe8/0xf4 + show_stack+0x20/0x30 + dump_stack_lvl+0x9c/0xd8 + dump_stack+0x18/0x34 + __might_resched+0x188/0x224 + rt_spin_lock+0x64/0x110 + alloc_iova_fast+0x1ac/0x2ac + iommu_dma_alloc_iova+0xd4/0x110 + __iommu_dma_map+0x80/0x144 + iommu_dma_map_page+0xe8/0x260 + dma_map_page_attrs+0xb4/0xc0 + __otx2_alloc_rbuf+0x90/0x150 + otx2_rq_aura_pool_init+0x1c8/0x284 + otx2_init_hw_resources+0xe4/0x3a4 + otx2_open+0xf0/0x610 + __dev_open+0x104/0x224 + __dev_change_flags+0x1e4/0x274 + dev_change_flags+0x2c/0x7c + ic_open_devs+0x124/0x2f8 + ip_auto_config+0x180/0x42c + do_one_initcall+0x90/0x4dc + do_basic_setup+0x10c/0x14c + kernel_init_freeable+0x10c/0x13c + kernel_init+0x2c/0x140 + ret_from_fork+0x10/0x20 + +Of course, we can shuffle the get/put_cpu() to only wrap the invocation +of ->aura_freeptr() as what commit 87b93b678e95 does. But there are only +two ->aura_freeptr() callbacks, otx2_aura_freeptr() and +cn10k_aura_freeptr(). There is no usage of perpcu variable in the +otx2_aura_freeptr() at all, so the get/put_cpu() seems redundant to it. +We can move the get/put_cpu() into the corresponding callback which +really has the percpu variable usage and avoid the sprinkling of +get/put_cpu() in several places. + +Fixes: 4af1b64f80fb ("octeontx2-pf: Fix lmtst ID used in aura free") +Signed-off-by: Kevin Hao +Link: https://lore.kernel.org/r/20230118071300.3271125-1-haokexin@gmail.com +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +index 651e778241e8..2e225309de9c 100644 +--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c ++++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +@@ -1331,9 +1331,7 @@ int otx2_sq_aura_pool_init(struct otx2_nic *pfvf) + err = otx2_alloc_rbuf(pfvf, pool, &bufptr); + if (err) + goto err_mem; +- get_cpu(); + pfvf->hw_ops->aura_freeptr(pfvf, pool_id, bufptr); +- put_cpu(); + sq->sqb_ptrs[sq->sqb_count++] = (u64)bufptr; + } + } +-- +2.39.0 + diff --git a/queue-5.15/series b/queue-5.15/series index 20627c113c6..5420c0d27d1 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -119,3 +119,5 @@ lockref-stop-doing-cpu_relax-in-the-cmpxchg-loop.patch firmware-coreboot-check-size-of-table-entry-and-use-.patch drm-i915-allow-switching-away-via-vga-switcheroo-if-.patch revert-selftests-bpf-check-null-propagation-only-nei.patch +octeontx2-pf-avoid-use-of-gfp_kernel-in-atomic-conte.patch-18459 +octeontx2-pf-fix-the-use-of-gfp_kernel-in-atomic-con.patch-8230