mlx4_en: don't use napi_synchronize inside mlx4_en_netpoll
commit c98235cb8584a72e95786e17d695a8e5fafcd766 upstream. 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: Chris Mason <clm@fb.com> Acked-By: Amir Vadai <amirv@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Masoud Sharbiani <msharbiani@twitter.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
4f80c6c182
commit
868c257ab2
|
@ -55,7 +55,6 @@ int mlx4_en_create_cq(struct mlx4_en_priv *priv,
|
|||
|
||||
cq->ring = ring;
|
||||
cq->is_tx = mode;
|
||||
spin_lock_init(&cq->lock);
|
||||
|
||||
err = mlx4_alloc_hwq_res(mdev->dev, &cq->wqres,
|
||||
cq->buf_size, 2 * PAGE_SIZE);
|
||||
|
|
|
@ -1190,15 +1190,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
|
||||
|
|
|
@ -299,7 +299,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;
|
||||
|
|
Loading…
Reference in New Issue