Skip to content

Commit bd4ce94

Browse files
gobenjidavem330
authored andcommitted
mlx4: Invoke softirqs after napi_reschedule
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 ec13ee8 ("virtio_net: invoke softirqs after __napi_schedule") and this patch applies the same fix to mlx4. Fixes: 07841f9 ("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>
1 parent 6962946 commit bd4ce94

File tree

1 file changed

+4
-1
lines changed
  • drivers/net/ethernet/mellanox/mlx4

1 file changed

+4
-1
lines changed

drivers/net/ethernet/mellanox/mlx4/en_rx.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -514,8 +514,11 @@ void mlx4_en_recover_from_oom(struct mlx4_en_priv *priv)
514514
return;
515515

516516
for (ring = 0; ring < priv->rx_ring_num; ring++) {
517-
if (mlx4_en_is_ring_empty(priv->rx_ring[ring]))
517+
if (mlx4_en_is_ring_empty(priv->rx_ring[ring])) {
518+
local_bh_disable();
518519
napi_reschedule(&priv->rx_cq[ring]->napi);
520+
local_bh_enable();
521+
}
519522
}
520523
}
521524

0 commit comments

Comments
 (0)