FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-08 02:21:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mlx4_en: don't use napi_synchronize inside mlx4_en_netpoll

Browse Source 
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>
cc: stable@vger.kernel.org
Acked-By: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Chris Mason 2014-04-15 18:09:24 -04:00 committed by David S. Miller
parent b07afe07b1
commit c98235cb85
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/mellanox/mlx4/en_cq.c
View File

@ -66,7 +66,6 @@ int mlx4_en_create_cq(struct mlx4_en_priv *priv,
cq->ring = ring; cq->ring = ring;
cq->is_tx = mode; cq->is_tx = mode;
spin_lock_init(&cq->lock);
/* Allocate HW buffers on provided NUMA node. /* Allocate HW buffers on provided NUMA node.
* dev->numa_node is used in mtt range allocation flow. * dev->numa_node is used in mtt range allocation flow.

6
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
View File

@ -1304,15 +1304,11 @@ static void mlx4_en_netpoll(struct net_device *dev)
{ {
struct mlx4_en_priv *priv = netdev_priv(dev); struct mlx4_en_priv *priv = netdev_priv(dev);
struct mlx4_en_cq *cq; struct mlx4_en_cq *cq;
unsigned long flags;
int i; int i;
for (i = 0; i < priv->rx_ring_num; i++) { for (i = 0; i < priv->rx_ring_num; i++) {
cq = priv->rx_cq[i]; cq = priv->rx_cq[i];
spin_lock_irqsave(&cq->lock, flags); napi_schedule(&cq->napi);
napi_synchronize(&cq->napi);
mlx4_en_process_rx_cq(dev, cq, 0);
spin_unlock_irqrestore(&cq->lock, flags);
} }
} }
#endif #endif

1
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
View File

@ -319,7 +319,6 @@ struct mlx4_en_cq {
struct mlx4_cq mcq; struct mlx4_cq mcq;
struct mlx4_hwq_resources wqres; struct mlx4_hwq_resources wqres;
int ring; int ring;
spinlock_t lock;
struct net_device *dev; struct net_device *dev;
struct napi_struct napi; struct napi_struct napi;
int size; int size;