Skip to content

Commit 325eb21

Browse files
Michael Chankuba-moo
authored andcommitted
bnxt_en: bring back rtnl_lock() in the bnxt_open() path
Error recovery, PCIe AER, resume, and TX timeout will invoke bnxt_open() with netdev_lock only. This will cause RTNL assert failure in netif_set_real_num_tx_queues(), netif_set_real_num_tx_queues(), and netif_set_real_num_tx_queues(). Example error recovery assert: RTNL: assertion failed at net/core/dev.c (3178) WARNING: CPU: 3 PID: 3392 at net/core/dev.c:3178 netif_set_real_num_tx_queues+0x1fd/0x210 Call Trace: <TASK> ? __pfx_bnxt_msix+0x10/0x10 [bnxt_en] __bnxt_open_nic+0x1ef/0xb20 [bnxt_en] bnxt_open+0xda/0x130 [bnxt_en] bnxt_fw_reset_task+0x21f/0x780 [bnxt_en] process_scheduled_works+0x9d/0x400 For now, bring back rtnl_lock() in all these code paths that can invoke bnxt_open(). In the bnxt_queue_start() error path, we don't have rtnl_lock held so we just change it to call netif_close() instead of bnxt_reset_task() for simplicity. This error path is unlikely so it should be fine. Fixes: 004b500 ("eth: bnxt: remove most dependencies on RTNL") Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom.com> Reviewed-by: Andy Gospodarek <andrew.gospodarek@broadcom.com> Signed-off-by: Michael Chan <michael.chan@broadcom.com> Link: https://patch.msgid.link/20250514062908.2766677-1-michael.chan@broadcom.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 92ec485 commit 325eb21

File tree

1 file changed

+29
-7
lines changed
  • drivers/net/ethernet/broadcom/bnxt

1 file changed

+29
-7
lines changed

drivers/net/ethernet/broadcom/bnxt/bnxt.c

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14013,23 +14013,38 @@ static void bnxt_unlock_sp(struct bnxt *bp)
1401314013
netdev_unlock(bp->dev);
1401414014
}
1401514015

14016+
/* Same as bnxt_lock_sp() with additional rtnl_lock */
14017+
static void bnxt_rtnl_lock_sp(struct bnxt *bp)
14018+
{
14019+
clear_bit(BNXT_STATE_IN_SP_TASK, &bp->state);
14020+
rtnl_lock();
14021+
netdev_lock(bp->dev);
14022+
}
14023+
14024+
static void bnxt_rtnl_unlock_sp(struct bnxt *bp)
14025+
{
14026+
set_bit(BNXT_STATE_IN_SP_TASK, &bp->state);
14027+
netdev_unlock(bp->dev);
14028+
rtnl_unlock();
14029+
}
14030+
1401614031
/* Only called from bnxt_sp_task() */
1401714032
static void bnxt_reset(struct bnxt *bp, bool silent)
1401814033
{
14019-
bnxt_lock_sp(bp);
14034+
bnxt_rtnl_lock_sp(bp);
1402014035
if (test_bit(BNXT_STATE_OPEN, &bp->state))
1402114036
bnxt_reset_task(bp, silent);
14022-
bnxt_unlock_sp(bp);
14037+
bnxt_rtnl_unlock_sp(bp);
1402314038
}
1402414039

1402514040
/* Only called from bnxt_sp_task() */
1402614041
static void bnxt_rx_ring_reset(struct bnxt *bp)
1402714042
{
1402814043
int i;
1402914044

14030-
bnxt_lock_sp(bp);
14045+
bnxt_rtnl_lock_sp(bp);
1403114046
if (!test_bit(BNXT_STATE_OPEN, &bp->state)) {
14032-
bnxt_unlock_sp(bp);
14047+
bnxt_rtnl_unlock_sp(bp);
1403314048
return;
1403414049
}
1403514050
/* Disable and flush TPA before resetting the RX ring */
@@ -14068,7 +14083,7 @@ static void bnxt_rx_ring_reset(struct bnxt *bp)
1406814083
}
1406914084
if (bp->flags & BNXT_FLAG_TPA)
1407014085
bnxt_set_tpa(bp, true);
14071-
bnxt_unlock_sp(bp);
14086+
bnxt_rtnl_unlock_sp(bp);
1407214087
}
1407314088

1407414089
static void bnxt_fw_fatal_close(struct bnxt *bp)
@@ -14960,15 +14975,17 @@ static void bnxt_fw_reset_task(struct work_struct *work)
1496014975
bp->fw_reset_state = BNXT_FW_RESET_STATE_OPENING;
1496114976
fallthrough;
1496214977
case BNXT_FW_RESET_STATE_OPENING:
14963-
while (!netdev_trylock(bp->dev)) {
14978+
while (!rtnl_trylock()) {
1496414979
bnxt_queue_fw_reset_work(bp, HZ / 10);
1496514980
return;
1496614981
}
14982+
netdev_lock(bp->dev);
1496714983
rc = bnxt_open(bp->dev);
1496814984
if (rc) {
1496914985
netdev_err(bp->dev, "bnxt_open() failed during FW reset\n");
1497014986
bnxt_fw_reset_abort(bp, rc);
1497114987
netdev_unlock(bp->dev);
14988+
rtnl_unlock();
1497214989
goto ulp_start;
1497314990
}
1497414991

@@ -14988,6 +15005,7 @@ static void bnxt_fw_reset_task(struct work_struct *work)
1498815005
bnxt_dl_health_fw_status_update(bp, true);
1498915006
}
1499015007
netdev_unlock(bp->dev);
15008+
rtnl_unlock();
1499115009
bnxt_ulp_start(bp, 0);
1499215010
bnxt_reenable_sriov(bp);
1499315011
netdev_lock(bp->dev);
@@ -15936,7 +15954,7 @@ static int bnxt_queue_start(struct net_device *dev, void *qmem, int idx)
1593615954
rc);
1593715955
napi_enable_locked(&bnapi->napi);
1593815956
bnxt_db_nq_arm(bp, &cpr->cp_db, cpr->cp_raw_cons);
15939-
bnxt_reset_task(bp, true);
15957+
netif_close(dev);
1594015958
return rc;
1594115959
}
1594215960

@@ -16752,6 +16770,7 @@ static int bnxt_resume(struct device *device)
1675216770
struct bnxt *bp = netdev_priv(dev);
1675316771
int rc = 0;
1675416772

16773+
rtnl_lock();
1675516774
netdev_lock(dev);
1675616775
rc = pci_enable_device(bp->pdev);
1675716776
if (rc) {
@@ -16796,6 +16815,7 @@ static int bnxt_resume(struct device *device)
1679616815

1679716816
resume_exit:
1679816817
netdev_unlock(bp->dev);
16818+
rtnl_unlock();
1679916819
bnxt_ulp_start(bp, rc);
1680016820
if (!rc)
1680116821
bnxt_reenable_sriov(bp);
@@ -16961,6 +16981,7 @@ static void bnxt_io_resume(struct pci_dev *pdev)
1696116981
int err;
1696216982

1696316983
netdev_info(bp->dev, "PCI Slot Resume\n");
16984+
rtnl_lock();
1696416985
netdev_lock(netdev);
1696516986

1696616987
err = bnxt_hwrm_func_qcaps(bp);
@@ -16978,6 +16999,7 @@ static void bnxt_io_resume(struct pci_dev *pdev)
1697816999
netif_device_attach(netdev);
1697917000

1698017001
netdev_unlock(netdev);
17002+
rtnl_unlock();
1698117003
bnxt_ulp_start(bp, err);
1698217004
if (!err)
1698317005
bnxt_reenable_sriov(bp);

0 commit comments

Comments
 (0)