diff options
author | Kleber Sacilotto de Souza <klebers@linux.vnet.ibm.com> | 2013-02-22 19:14:52 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-02-23 13:51:54 -0500 |
commit | 3770699675dd1b8fc1e86ff369eb3cce44e10082 (patch) | |
tree | 719c2d78748e8b1ed10b75800bb3cc48c091bf9d /drivers | |
parent | 427a96252d8eee7b9bbafce15bd37fa3387ede55 (diff) | |
download | blackbird-op-linux-3770699675dd1b8fc1e86ff369eb3cce44e10082.tar.gz blackbird-op-linux-3770699675dd1b8fc1e86ff369eb3cce44e10082.zip |
mlx4_en: fix allocation of CPU affinity reverse-map
The mlx4_en driver allocates the number of objects for the CPU affinity
reverse-map based on the number of rx rings of the device. However,
mlx4_assign_eq() calls irq_cpu_rmap_add() as many times as IRQ's are
assigned to EQ's, which can be as large as mlx4_dev->caps.comp_pool. If
caps.comp_pool is larger than rx_ring_num we will eventually hit the
BUG_ON() in cpu_rmap_add().
Fix this problem by allocating space for the maximum number of CPU
affinity reverse-map objects we might want to add.
Signed-off-by: Kleber Sacilotto de Souza <klebers@linux.vnet.ibm.com>
Acked-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index 5944dd60b9e3..5385474bb526 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -1829,7 +1829,7 @@ int mlx4_en_alloc_resources(struct mlx4_en_priv *priv) } #ifdef CONFIG_RFS_ACCEL - priv->dev->rx_cpu_rmap = alloc_irq_cpu_rmap(priv->rx_ring_num); + priv->dev->rx_cpu_rmap = alloc_irq_cpu_rmap(priv->mdev->dev->caps.comp_pool); if (!priv->dev->rx_cpu_rmap) goto err; #endif |