| From bd4ce941c8d5b862b2f83364be5dbe8fc8ab48f8 Mon Sep 17 00:00:00 2001 |
| From: Benjamin Poirier <bpoirier@suse.com> |
| Date: Mon, 6 Feb 2017 10:14:31 -0800 |
| Subject: [PATCH] mlx4: Invoke softirqs after napi_reschedule |
| |
| commit bd4ce941c8d5b862b2f83364be5dbe8fc8ab48f8 upstream. |
| |
| mlx4 may schedule napi from a workqueue. Afterwards, softirqs are not run |
| in a deterministic time frame and the following message may be logged: |
| NOHZ: local_softirq_pending 08 |
| |
| The problem is the same as what was described in commit ec13ee80145c |
| ("virtio_net: invoke softirqs after __napi_schedule") and this patch |
| applies the same fix to mlx4. |
| |
| Fixes: 07841f9d94c1 ("net/mlx4_en: Schedule napi when RX buffers allocation fails") |
| Cc: Eric Dumazet <eric.dumazet@gmail.com> |
| Signed-off-by: Benjamin Poirier <bpoirier@suse.com> |
| Acked-by: Eric Dumazet <edumazet@google.com> |
| Reviewed-by: Tariq Toukan <tariqt@mellanox.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| |
| diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c |
| index eac527e25ec9..cc003fdf0ed9 100644 |
| --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c |
| +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c |
| @@ -514,8 +514,11 @@ void mlx4_en_recover_from_oom(struct mlx4_en_priv *priv) |
| return; |
| |
| for (ring = 0; ring < priv->rx_ring_num; ring++) { |
| - if (mlx4_en_is_ring_empty(priv->rx_ring[ring])) |
| + if (mlx4_en_is_ring_empty(priv->rx_ring[ring])) { |
| + local_bh_disable(); |
| napi_reschedule(&priv->rx_cq[ring]->napi); |
| + local_bh_enable(); |
| + } |
| } |
| } |
| |
| -- |
| 2.12.0 |
| |
