Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c98235cb authored by Chris Mason's avatar Chris Mason Committed by David S. Miller
Browse files

mlx4_en: don't use napi_synchronize inside mlx4_en_netpoll 



The mlx4 driver is triggering schedules while atomic inside
mlx4_en_netpoll:

	spin_lock_irqsave(&cq->lock, flags);
	napi_synchronize(&cq->napi);
		^^^^^ msleep here
	mlx4_en_process_rx_cq(dev, cq, 0);
	spin_unlock_irqrestore(&cq->lock, flags);

This was part of a patch by Alexander Guller from Mellanox in 2011,
but it still isn't upstream.

Signed-off-by: default avatarChris Mason <clm@fb.com>
cc: stable@vger.kernel.org
Acked-By: default avatarAmir Vadai <amirv@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b07afe07

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

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ int mlx4_en_create_cq(struct mlx4_en_priv *priv, 


	cq->ring = ring;

	cq->is_tx = mode;

	spin_lock_init(&cq->lock);



	/* Allocate HW buffers on provided NUMA node.

	 * dev->numa_node is used in mtt range allocation flow.

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

+1 −5
Original line number Diff line number Diff line
@@ -1304,15 +1304,11 @@ static void mlx4_en_netpoll(struct net_device *dev) 
{

	struct mlx4_en_priv *priv = netdev_priv(dev);

	struct mlx4_en_cq *cq;

	unsigned long flags;

	int i;



	for (i = 0; i < priv->rx_ring_num; i++) {

		cq = priv->rx_cq[i];

		spin_lock_irqsave(&cq->lock, flags);

		napi_synchronize(&cq->napi);

		mlx4_en_process_rx_cq(dev, cq, 0);

		spin_unlock_irqrestore(&cq->lock, flags);

		napi_schedule(&cq->napi);

	}

}

#endif

drivers/net/ethernet/mellanox/mlx4/mlx4_en.h

+0 −1
Original line number Diff line number Diff line
@@ -319,7 +319,6 @@ struct mlx4_en_cq { 
	struct mlx4_cq          mcq;

	struct mlx4_hwq_resources wqres;

	int                     ring;

	spinlock_t              lock;

	struct net_device      *dev;

	struct napi_struct	napi;

	int size;