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

Configure Feed

Select the types of activity you want to include in your feed.

net: mana: Remove redundant netdev_lock_ops_to_full() calls

NET_SHAPER is always selected for MANA driver. When NET_SHAPER is enabled,
netdev_lock_ops_to_full() reduces effectively to only an assert for lock,
which is always held in the path when NET_SHAPER is enabled.

Remove the redundant netdev_lock_ops_to_full() call.

Signed-off-by: Saurabh Sengar <ssengar@linux.microsoft.com>
Link: https://patch.msgid.link/1757393830-20837-1-git-send-email-ssengar@linux.microsoft.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Saurabh Sengar and committed by
Jakub Kicinski 38611e5a deb105f4

-10
-10
drivers/net/ethernet/microsoft/mana/mana_en.c
··· 2145 2145 napi = &apc->tx_qp[i].tx_cq.napi; 2146 2146 if (apc->tx_qp[i].txq.napi_initialized) { 2147 2147 napi_synchronize(napi); 2148 - netdev_lock_ops_to_full(napi->dev); 2149 2148 napi_disable_locked(napi); 2150 2149 netif_napi_del_locked(napi); 2151 - netdev_unlock_full_to_ops(napi->dev); 2152 2150 apc->tx_qp[i].txq.napi_initialized = false; 2153 2151 } 2154 2152 mana_destroy_wq_obj(apc, GDMA_SQ, apc->tx_qp[i].tx_object); ··· 2299 2301 mana_create_txq_debugfs(apc, i); 2300 2302 2301 2303 set_bit(NAPI_STATE_NO_BUSY_POLL, &cq->napi.state); 2302 - netdev_lock_ops_to_full(net); 2303 2304 netif_napi_add_locked(net, &cq->napi, mana_poll); 2304 2305 napi_enable_locked(&cq->napi); 2305 - netdev_unlock_full_to_ops(net); 2306 2306 txq->napi_initialized = true; 2307 2307 2308 2308 mana_gd_ring_cq(cq->gdma_cq, SET_ARM_BIT); ··· 2336 2340 if (napi_initialized) { 2337 2341 napi_synchronize(napi); 2338 2342 2339 - netdev_lock_ops_to_full(napi->dev); 2340 2343 napi_disable_locked(napi); 2341 2344 netif_napi_del_locked(napi); 2342 - netdev_unlock_full_to_ops(napi->dev); 2343 2345 } 2344 2346 xdp_rxq_info_unreg(&rxq->xdp_rxq); 2345 2347 ··· 2598 2604 2599 2605 gc->cq_table[cq->gdma_id] = cq->gdma_cq; 2600 2606 2601 - netdev_lock_ops_to_full(ndev); 2602 2607 netif_napi_add_weight_locked(ndev, &cq->napi, mana_poll, 1); 2603 - netdev_unlock_full_to_ops(ndev); 2604 2608 2605 2609 WARN_ON(xdp_rxq_info_reg(&rxq->xdp_rxq, ndev, rxq_idx, 2606 2610 cq->napi.napi_id)); 2607 2611 WARN_ON(xdp_rxq_info_reg_mem_model(&rxq->xdp_rxq, MEM_TYPE_PAGE_POOL, 2608 2612 rxq->page_pool)); 2609 2613 2610 - netdev_lock_ops_to_full(ndev); 2611 2614 napi_enable_locked(&cq->napi); 2612 - netdev_unlock_full_to_ops(ndev); 2613 2615 2614 2616 mana_gd_ring_cq(cq->gdma_cq, SET_ARM_BIT); 2615 2617 out: