Skip to content

Commit 0486a06

Browse files
Ivan Veceradavem330
Ivan Vecera
authored andcommitted
tg3: prevent ifup/ifdown during PCI error recovery
The patch fixes race conditions between PCI error recovery callbacks and potential ifup/ifdown. First, if ifup (tg3_open) is called between tg3_io_error_detected() and tg3_io_resume() then tp->timer is armed twice before expiry. Once during tg3_open() and again during tg3_io_resume(). This results in BUG at kernel/time/timer.c:945. Second, if ifdown (tg3_close) is called between tg3_io_error_detected() and tg3_io_resume() then tg3_napi_disable() is called twice without a tg3_napi_enable between. Once during tg3_io_error_detected() and again during tg3_close(). The tg3_io_resume() then hangs on rtnl_lock(). v2: Added logging messages per Prashant's request Cc: Prashant Sreedharan <prashant@broadcom.com> Cc: Michael Chan <mchan@broadcom.com> Signed-off-by: Ivan Vecera <ivecera@redhat.com> Acked-by: Prashant Sreedharan <prashant@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 88e4194 commit 0486a06

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

Diff for: drivers/net/ethernet/broadcom/tg3.c

+16
Original file line numberDiff line numberDiff line change
@@ -11617,6 +11617,12 @@ static int tg3_open(struct net_device *dev)
1161711617
struct tg3 *tp = netdev_priv(dev);
1161811618
int err;
1161911619

11620+
if (tp->pcierr_recovery) {
11621+
netdev_err(dev, "Failed to open device. PCI error recovery "
11622+
"in progress\n");
11623+
return -EAGAIN;
11624+
}
11625+
1162011626
if (tp->fw_needed) {
1162111627
err = tg3_request_firmware(tp);
1162211628
if (tg3_asic_rev(tp) == ASIC_REV_57766) {
@@ -11674,6 +11680,12 @@ static int tg3_close(struct net_device *dev)
1167411680
{
1167511681
struct tg3 *tp = netdev_priv(dev);
1167611682

11683+
if (tp->pcierr_recovery) {
11684+
netdev_err(dev, "Failed to close device. PCI error recovery "
11685+
"in progress\n");
11686+
return -EAGAIN;
11687+
}
11688+
1167711689
tg3_ptp_fini(tp);
1167811690

1167911691
tg3_stop(tp);
@@ -17561,6 +17573,7 @@ static int tg3_init_one(struct pci_dev *pdev,
1756117573
tp->rx_mode = TG3_DEF_RX_MODE;
1756217574
tp->tx_mode = TG3_DEF_TX_MODE;
1756317575
tp->irq_sync = 1;
17576+
tp->pcierr_recovery = false;
1756417577

1756517578
if (tg3_debug > 0)
1756617579
tp->msg_enable = tg3_debug;
@@ -18071,6 +18084,8 @@ static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev,
1807118084

1807218085
rtnl_lock();
1807318086

18087+
tp->pcierr_recovery = true;
18088+
1807418089
/* We probably don't have netdev yet */
1807518090
if (!netdev || !netif_running(netdev))
1807618091
goto done;
@@ -18195,6 +18210,7 @@ static void tg3_io_resume(struct pci_dev *pdev)
1819518210
tg3_phy_start(tp);
1819618211

1819718212
done:
18213+
tp->pcierr_recovery = false;
1819818214
rtnl_unlock();
1819918215
}
1820018216

Diff for: drivers/net/ethernet/broadcom/tg3.h

+1
Original file line numberDiff line numberDiff line change
@@ -3407,6 +3407,7 @@ struct tg3 {
34073407

34083408
struct device *hwmon_dev;
34093409
bool link_up;
3410+
bool pcierr_recovery;
34103411
};
34113412

34123413
/* Accessor macros for chip and asic attributes

0 commit comments

Comments
 (0)