diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-01-13 08:39:24 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-04 09:47:09 +0100 |
| commit | 77ce30dc4df48696a5b3bf8512cc2d38918116c5 (patch) | |
| tree | 78e0df6f215977e7f3416909313919241c015954 /drivers/net | |
| parent | 18767acb7b67b27ec4355ca623cbaa209edc8f13 (diff) | |
| download | linux-rpi3-77ce30dc4df48696a5b3bf8512cc2d38918116c5.tar.gz linux-rpi3-77ce30dc4df48696a5b3bf8512cc2d38918116c5.tar.bz2 linux-rpi3-77ce30dc4df48696a5b3bf8512cc2d38918116c5.zip | |
mlx4: do not call napi_schedule() without care
[ Upstream commit 8cf699ec849f4ca1413cea01289bd7d37dbcc626 ]
Disable BH around the call to napi_schedule() to avoid following warning
[ 52.095499] NOHZ: local_softirq_pending 08
[ 52.421291] NOHZ: local_softirq_pending 08
[ 52.608313] NOHZ: local_softirq_pending 08
Fixes: 8d59de8f7bb3 ("net/mlx4_en: Process all completions in RX rings after port goes up")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Erez Shitrit <erezsh@mellanox.com>
Cc: Eugenia Emantayev <eugenia@mellanox.com>
Cc: Tariq Toukan <tariqt@mellanox.com>
Acked-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index fb8bb027b69c..d223e7cb68ba 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -1740,8 +1740,11 @@ int mlx4_en_start_port(struct net_device *dev) /* Process all completions if exist to prevent * the queues freezing if they are full */ - for (i = 0; i < priv->rx_ring_num; i++) + for (i = 0; i < priv->rx_ring_num; i++) { + local_bh_disable(); napi_schedule(&priv->rx_cq[i]->napi); + local_bh_enable(); + } netif_tx_start_all_queues(dev); netif_device_attach(dev); |