Commit a4557b0b authored by Shay Drory's avatar Shay Drory Committed by Jakub Kicinski
Browse files

net/mlx5: Fix error handling in irq_pool_request_irq 



In case mlx5_irq_alloc fails, the previously allocated index remains
in the XArray, which could lead to inconsistencies.

Fix it by adding error handling that erases the allocated index
from the XArray if mlx5_irq_alloc returns an error.

Fixes: c36326d3 ("net/mlx5: Round-Robin EQs over IRQs")
Signed-off-by: default avatarShay Drory <shayd@nvidia.com>
Reviewed-by: default avatarMaher Sanalla <msanalla@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarWojciech Drewek <wojciech.drewek@intel.com>
Link: https://patch.msgid.link/20240730061638.1831002-3-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1b75da22

drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c

+7 −3
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ static struct mlx5_irq * 
irq_pool_request_irq(struct mlx5_irq_pool *pool, struct irq_affinity_desc *af_desc)

{

	struct irq_affinity_desc auto_desc = {};

	struct mlx5_irq *irq;

	u32 irq_index;

	int err;
@@ -64,9 +65,12 @@ irq_pool_request_irq(struct mlx5_irq_pool *pool, struct irq_affinity_desc *af_de 
		else

			cpu_get(pool, cpumask_first(&af_desc->mask));

	}

	return mlx5_irq_alloc(pool, irq_index,

	irq = mlx5_irq_alloc(pool, irq_index,

			     cpumask_empty(&auto_desc.mask) ? af_desc : &auto_desc,

			     NULL);

	if (IS_ERR(irq))

		xa_erase(&pool->irqs, irq_index);

	return irq;

}



/* Looking for the IRQ with the smallest refcount that fits req_mask.