Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

octeontx2-pf: Avoid use of GFP_KERNEL in atomic context

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 <gakula@marvell.com>
Signed-off-by: Sunil Kovvuri Goutham <sgoutham@marvell.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Geetha sowjanya and committed by
David S. Miller
87b93b67 4101971a

+2 -2
+2 -2
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
··· 1370 1370 if (err) 1371 1371 goto fail; 1372 1372 1373 - get_cpu(); 1374 1373 /* Allocate pointers and free them to aura/pool */ 1375 1374 for (qidx = 0; qidx < hw->tot_tx_queues; qidx++) { 1376 1375 pool_id = otx2_get_pool_idx(pfvf, AURA_NIX_SQ, qidx); ··· 1387 1388 err = otx2_alloc_rbuf(pfvf, pool, &bufptr); 1388 1389 if (err) 1389 1390 goto err_mem; 1391 + get_cpu(); 1390 1392 pfvf->hw_ops->aura_freeptr(pfvf, pool_id, bufptr); 1393 + put_cpu(); 1391 1394 sq->sqb_ptrs[sq->sqb_count++] = (u64)bufptr; 1392 1395 } 1393 1396 } 1394 1397 1395 1398 err_mem: 1396 - put_cpu(); 1397 1399 return err ? -ENOMEM : 0; 1398 1400 1399 1401 fail: