diff options
| author |   Benjamin Poirier <bpoirier@suse.com> | 2019-07-18 10:42:18 +0900 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-07-21 13:22:03 -0700 |
| commit | ffd342e087d5c56882c232f6a1812b5e3d89b37b (patch) | |
| tree | 934c641ef15283f9689d8e671667e11d0e1874f7 /drivers/net/ethernet/emulex | |
| parent | bnx2x: Prevent load reordering in tx completion processing (diff) | |
| download | linux-dev-ffd342e087d5c56882c232f6a1812b5e3d89b37b.tar.xz linux-dev-ffd342e087d5c56882c232f6a1812b5e3d89b37b.zip | |
be2net: Synchronize be_update_queues with dev_watchdog
As pointed out by Firo Yang, a netdev tx timeout may trigger just before an
ethtool set_channels operation is started. be_tx_timeout(), which dumps
some queue structures, is not written to run concurrently with
be_update_queues(), which frees/allocates those queues structures. Add some
synchronization between the two.
Message-id: <CH2PR18MB31898E033896F9760D36BFF288C90@CH2PR18MB3189.namprd18.prod.outlook.com>
Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/emulex')
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index b7a246b33599..2edb86ec9fe9 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -4698,8 +4698,13 @@ int be_update_queues(struct be_adapter *adapter) int status; if (netif_running(netdev)) { + /* be_tx_timeout() must not run concurrently with this + * function, synchronize with an already-running dev_watchdog + */ + netif_tx_lock_bh(netdev); /* device cannot transmit now, avoid dev_watchdog timeouts */ netif_carrier_off(netdev); + netif_tx_unlock_bh(netdev); be_close(netdev); } |