Commit 32d2724d authored by Shay Drory's avatar Shay Drory Committed by Paolo Abeni
Browse files

net/mlx5: Fix incorrect IRQ pool usage when releasing IRQs 



mlx5_irq_pool_get() is a getter for completion IRQ pool only.
However, after the cited commit, mlx5_irq_pool_get() is called during
ctrl IRQ release flow to retrieve the pool, resulting in the use of an
incorrect IRQ pool.

Hence, use the newly introduced mlx5_irq_get_pool() getter to retrieve
the correct IRQ pool based on the IRQ itself. While at it, rename
mlx5_irq_pool_get() to mlx5_irq_table_get_comp_irq_pool() which
accurately reflects its purpose and improves code readability.

Fixes: 0477d516 ("net/mlx5: Expose SFs 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 avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Link: https://patch.msgid.link/1741644104-97767-4-git-send-email-tariqt@nvidia.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 52199233

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

+1 −1
Original line number Diff line number Diff line
@@ -871,8 +871,8 @@ static void comp_irq_release_sf(struct mlx5_core_dev *dev, u16 vecidx) 


static int comp_irq_request_sf(struct mlx5_core_dev *dev, u16 vecidx)

{

	struct mlx5_irq_pool *pool = mlx5_irq_table_get_comp_irq_pool(dev);

	struct mlx5_eq_table *table = dev->priv.eq_table;

	struct mlx5_irq_pool *pool = mlx5_irq_pool_get(dev);

	struct irq_affinity_desc af_desc = {};

	struct mlx5_irq *irq;

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

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ mlx5_irq_affinity_request(struct mlx5_core_dev *dev, struct mlx5_irq_pool *pool, 


void mlx5_irq_affinity_irq_release(struct mlx5_core_dev *dev, struct mlx5_irq *irq)

{

	struct mlx5_irq_pool *pool = mlx5_irq_pool_get(dev);

	struct mlx5_irq_pool *pool = mlx5_irq_get_pool(irq);

	int cpu;



	cpu = cpumask_first(mlx5_irq_get_affinity_mask(irq));

drivers/net/ethernet/mellanox/mlx5/core/mlx5_irq.h

+3 −1
Original line number Diff line number Diff line
@@ -10,12 +10,15 @@ 


struct mlx5_irq;

struct cpu_rmap;

struct mlx5_irq_pool;



int mlx5_irq_table_init(struct mlx5_core_dev *dev);

void mlx5_irq_table_cleanup(struct mlx5_core_dev *dev);

int mlx5_irq_table_create(struct mlx5_core_dev *dev);

void mlx5_irq_table_destroy(struct mlx5_core_dev *dev);

void mlx5_irq_table_free_irqs(struct mlx5_core_dev *dev);

struct mlx5_irq_pool *

mlx5_irq_table_get_comp_irq_pool(struct mlx5_core_dev *dev);

int mlx5_irq_table_get_num_comp(struct mlx5_irq_table *table);

int mlx5_irq_table_get_sfs_vec(struct mlx5_irq_table *table);

struct mlx5_irq_table *mlx5_irq_table_get(struct mlx5_core_dev *dev);
@@ -38,7 +41,6 @@ struct cpumask *mlx5_irq_get_affinity_mask(struct mlx5_irq *irq); 
int mlx5_irq_get_index(struct mlx5_irq *irq);

int mlx5_irq_get_irq(const struct mlx5_irq *irq);



struct mlx5_irq_pool;

#ifdef CONFIG_MLX5_SF

struct mlx5_irq *mlx5_irq_affinity_irq_request_auto(struct mlx5_core_dev *dev,

						    struct cpumask *used_cpus, u16 vecidx);

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

+10 −3
Original line number Diff line number Diff line
@@ -378,6 +378,11 @@ int mlx5_irq_get_index(struct mlx5_irq *irq) 
	return irq->map.index;

}



struct mlx5_irq_pool *mlx5_irq_get_pool(struct mlx5_irq *irq)

{

	return irq->pool;

}



/* irq_pool API */



/* requesting an irq from a given pool according to given index */
@@ -405,18 +410,20 @@ static struct mlx5_irq_pool *sf_ctrl_irq_pool_get(struct mlx5_irq_table *irq_tab 
	return irq_table->sf_ctrl_pool;

}



static struct mlx5_irq_pool *sf_irq_pool_get(struct mlx5_irq_table *irq_table)

static struct mlx5_irq_pool *

sf_comp_irq_pool_get(struct mlx5_irq_table *irq_table)

{

	return irq_table->sf_comp_pool;

}



struct mlx5_irq_pool *mlx5_irq_pool_get(struct mlx5_core_dev *dev)

struct mlx5_irq_pool *

mlx5_irq_table_get_comp_irq_pool(struct mlx5_core_dev *dev)

{

	struct mlx5_irq_table *irq_table = mlx5_irq_table_get(dev);

	struct mlx5_irq_pool *pool = NULL;



	if (mlx5_core_is_sf(dev))

		pool = sf_irq_pool_get(irq_table);

		pool = sf_comp_irq_pool_get(irq_table);



	/* In some configs, there won't be a pool of SFs IRQs. Hence, returning

	 * the PF IRQs pool in case the SF pool doesn't exist.

drivers/net/ethernet/mellanox/mlx5/core/pci_irq.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ struct mlx5_irq_pool { 
	struct mlx5_core_dev *dev;

};



struct mlx5_irq_pool *mlx5_irq_pool_get(struct mlx5_core_dev *dev);

static inline bool mlx5_irq_pool_is_sf_pool(struct mlx5_irq_pool *pool)

{

	return !strncmp("mlx5_sf", pool->name, strlen("mlx5_sf"));
@@ -40,5 +39,6 @@ struct mlx5_irq *mlx5_irq_alloc(struct mlx5_irq_pool *pool, int i, 
int mlx5_irq_get_locked(struct mlx5_irq *irq);

int mlx5_irq_read_locked(struct mlx5_irq *irq);

int mlx5_irq_put(struct mlx5_irq *irq);

struct mlx5_irq_pool *mlx5_irq_get_pool(struct mlx5_irq *irq);



#endif /* __PCI_IRQ_H__ */