* [PATCH] mlx4_en: fix allocation of CPU affinity reverse-map
@ 2013-02-23 5:14 Kleber Sacilotto de Souza
2013-02-23 7:07 ` Amir Vadai
2013-02-23 18:54 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Kleber Sacilotto de Souza @ 2013-02-23 5:14 UTC (permalink / raw)
To: davem; +Cc: Amir Vadai, netdev, Kleber Sacilotto de Souza
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>
---
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 5944dd6..5385474 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
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mlx4_en: fix allocation of CPU affinity reverse-map
2013-02-23 5:14 [PATCH] mlx4_en: fix allocation of CPU affinity reverse-map Kleber Sacilotto de Souza
@ 2013-02-23 7:07 ` Amir Vadai
2013-02-23 18:54 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Amir Vadai @ 2013-02-23 7:07 UTC (permalink / raw)
To: Kleber Sacilotto de Souza; +Cc: davem, netdev
On 23/02/2013 07:14, Kleber Sacilotto de Souza wrote:
> 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>
> ---
> 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 5944dd6..5385474 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
>
Acked-by: Amir Vadai <amirv@mellanox.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mlx4_en: fix allocation of CPU affinity reverse-map
2013-02-23 5:14 [PATCH] mlx4_en: fix allocation of CPU affinity reverse-map Kleber Sacilotto de Souza
2013-02-23 7:07 ` Amir Vadai
@ 2013-02-23 18:54 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2013-02-23 18:54 UTC (permalink / raw)
To: klebers; +Cc: amirv, netdev
From: Kleber Sacilotto de Souza <klebers@linux.vnet.ibm.com>
Date: Sat, 23 Feb 2013 02:14:52 -0300
> 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>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-02-23 18:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-23 5:14 [PATCH] mlx4_en: fix allocation of CPU affinity reverse-map Kleber Sacilotto de Souza
2013-02-23 7:07 ` Amir Vadai
2013-02-23 18:54 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).