Skip to content

Commit 38611e5

Browse files
Saurabh Sengarkuba-moo
authored andcommitted
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 <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent deb105f commit 38611e5

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

drivers/net/ethernet/microsoft/mana/mana_en.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2145,10 +2145,8 @@ static void mana_destroy_txq(struct mana_port_context *apc)
21452145
napi = &apc->tx_qp[i].tx_cq.napi;
21462146
if (apc->tx_qp[i].txq.napi_initialized) {
21472147
napi_synchronize(napi);
2148-
netdev_lock_ops_to_full(napi->dev);
21492148
napi_disable_locked(napi);
21502149
netif_napi_del_locked(napi);
2151-
netdev_unlock_full_to_ops(napi->dev);
21522150
apc->tx_qp[i].txq.napi_initialized = false;
21532151
}
21542152
mana_destroy_wq_obj(apc, GDMA_SQ, apc->tx_qp[i].tx_object);
@@ -2301,10 +2299,8 @@ static int mana_create_txq(struct mana_port_context *apc,
23012299
mana_create_txq_debugfs(apc, i);
23022300

23032301
set_bit(NAPI_STATE_NO_BUSY_POLL, &cq->napi.state);
2304-
netdev_lock_ops_to_full(net);
23052302
netif_napi_add_locked(net, &cq->napi, mana_poll);
23062303
napi_enable_locked(&cq->napi);
2307-
netdev_unlock_full_to_ops(net);
23082304
txq->napi_initialized = true;
23092305

23102306
mana_gd_ring_cq(cq->gdma_cq, SET_ARM_BIT);
@@ -2340,10 +2336,8 @@ static void mana_destroy_rxq(struct mana_port_context *apc,
23402336
if (napi_initialized) {
23412337
napi_synchronize(napi);
23422338

2343-
netdev_lock_ops_to_full(napi->dev);
23442339
napi_disable_locked(napi);
23452340
netif_napi_del_locked(napi);
2346-
netdev_unlock_full_to_ops(napi->dev);
23472341
}
23482342
xdp_rxq_info_unreg(&rxq->xdp_rxq);
23492343

@@ -2604,18 +2598,14 @@ static struct mana_rxq *mana_create_rxq(struct mana_port_context *apc,
26042598

26052599
gc->cq_table[cq->gdma_id] = cq->gdma_cq;
26062600

2607-
netdev_lock_ops_to_full(ndev);
26082601
netif_napi_add_weight_locked(ndev, &cq->napi, mana_poll, 1);
2609-
netdev_unlock_full_to_ops(ndev);
26102602

26112603
WARN_ON(xdp_rxq_info_reg(&rxq->xdp_rxq, ndev, rxq_idx,
26122604
cq->napi.napi_id));
26132605
WARN_ON(xdp_rxq_info_reg_mem_model(&rxq->xdp_rxq, MEM_TYPE_PAGE_POOL,
26142606
rxq->page_pool));
26152607

2616-
netdev_lock_ops_to_full(ndev);
26172608
napi_enable_locked(&cq->napi);
2618-
netdev_unlock_full_to_ops(ndev);
26192609

26202610
mana_gd_ring_cq(cq->gdma_cq, SET_ARM_BIT);
26212611
out:

0 commit comments

Comments
 (0)