leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/mlx4_core: Capping number of requested MSIXs to MAX_MSIX

Browse Source 
We currently manage IRQs in pool_bm which is a bit field
of MAX_MSIX bits. Thus, allocating more than MAX_MSIX
interrupts can't be managed in pool_bm.
Fixing this by capping number of requested MSIXs to
MAX_MSIX.

Signed-off-by: Matan Barak <matanb@mellanox.com>
Signed-off-by: Carol L Soto <clsoto@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Carol L Soto 2015-08-27 14:43:25 -05:00 committed by David S. Miller
parent b22fbf22f8
commit 9293267a3e
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/mellanox/mlx4/main.c
View File

@ -2669,9 +2669,14 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
if (msi_x) { if (msi_x) {
int nreq = dev->caps.num_ports * num_online_cpus() + 1; int nreq = dev->caps.num_ports * num_online_cpus() + 1;
bool shared_ports = false;
nreq = min_t(int, dev->caps.num_eqs - dev->caps.reserved_eqs, nreq = min_t(int, dev->caps.num_eqs - dev->caps.reserved_eqs,
nreq); nreq);
if (nreq > MAX_MSIX) {
nreq = MAX_MSIX;
shared_ports = true;
}
entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL); entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL);
if (!entries) if (!entries)
@ -2694,6 +2699,9 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
bitmap_zero(priv->eq_table.eq[MLX4_EQ_ASYNC].actv_ports.ports, bitmap_zero(priv->eq_table.eq[MLX4_EQ_ASYNC].actv_ports.ports,
dev->caps.num_ports); dev->caps.num_ports);
if (MLX4_IS_LEGACY_EQ_MODE(dev->caps))
shared_ports = true;
for (i = 0; i < dev->caps.num_comp_vectors + 1; i++) { for (i = 0; i < dev->caps.num_comp_vectors + 1; i++) {
if (i == MLX4_EQ_ASYNC) if (i == MLX4_EQ_ASYNC)
continue; continue;
@ -2701,7 +2709,7 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
priv->eq_table.eq[i].irq = priv->eq_table.eq[i].irq =
entries[i + 1 - !!(i > MLX4_EQ_ASYNC)].vector; entries[i + 1 - !!(i > MLX4_EQ_ASYNC)].vector;
if (MLX4_IS_LEGACY_EQ_MODE(dev->caps)) { if (shared_ports) {
bitmap_fill(priv->eq_table.eq[i].actv_ports.ports, bitmap_fill(priv->eq_table.eq[i].actv_ports.ports,
dev->caps.num_ports); dev->caps.num_ports);
/* We don't set affinity hint when there /* We don't set affinity hint when there