Commit 563476ae authored by Shay Drory's avatar Shay Drory Committed by Saeed Mahameed
Browse files

net/mlx5: Synchronize correct IRQ when destroying CQ 



The CQ destroy is performed based on the IRQ number that is stored in
cq->irqn. That number wasn't set explicitly during CQ creation and as
expected some of the API users of mlx5_core_create_cq() forgot to update
it.

This caused to wrong synchronization call of the wrong IRQ with a number
0 instead of the real one.

As a fix, set the IRQ number directly in the mlx5_core_create_cq() and
update all users accordingly.

Fixes: 1a86b377 ("vdpa/mlx5: Add VDPA driver for supported mlx5 devices")
Fixes: ef1659ad ("IB/mlx5: Add DEVX support for CQ events")
Signed-off-by: default avatarShay Drory <shayd@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 88bbd7b2

drivers/infiniband/hw/mlx5/cq.c

+1 −3
Original line number Diff line number Diff line
@@ -945,7 +945,6 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, 
	u32 *cqb = NULL;

	void *cqc;

	int cqe_size;

	unsigned int irqn;

	int eqn;

	int err;
@@ -984,7 +983,7 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, 
		INIT_WORK(&cq->notify_work, notify_soft_wc_handler);

	}



	err = mlx5_vector2eqn(dev->mdev, vector, &eqn, &irqn);

	err = mlx5_vector2eqn(dev->mdev, vector, &eqn);

	if (err)

		goto err_cqb;
@@ -1007,7 +1006,6 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, 
		goto err_cqb;



	mlx5_ib_dbg(dev, "cqn 0x%x\n", cq->mcq.cqn);

	cq->mcq.irqn = irqn;

	if (udata)

		cq->mcq.tasklet_ctx.comp = mlx5_ib_cq_comp;

	else

drivers/infiniband/hw/mlx5/devx.c

+1 −2
Original line number Diff line number Diff line
@@ -975,7 +975,6 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_QUERY_EQN)( 
	struct mlx5_ib_dev *dev;

	int user_vector;

	int dev_eqn;

	unsigned int irqn;

	int err;



	if (uverbs_copy_from(&user_vector, attrs,
@@ -987,7 +986,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_QUERY_EQN)( 
		return PTR_ERR(c);

	dev = to_mdev(c->ibucontext.device);



	err = mlx5_vector2eqn(dev->mdev, user_vector, &dev_eqn, &irqn);

	err = mlx5_vector2eqn(dev->mdev, user_vector, &dev_eqn);

	if (err < 0)

		return err;

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

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ int mlx5_core_create_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq, 
			      cq->cqn);



	cq->uar = dev->priv.uar;

	cq->irqn = eq->core.irqn;



	return 0;

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

+2 −11
Original line number Diff line number Diff line
@@ -1535,15 +1535,9 @@ static int mlx5e_alloc_cq_common(struct mlx5e_priv *priv, 
{

	struct mlx5_core_dev *mdev = priv->mdev;

	struct mlx5_core_cq *mcq = &cq->mcq;

	int eqn_not_used;

	unsigned int irqn;

	int err;

	u32 i;



	err = mlx5_vector2eqn(mdev, param->eq_ix, &eqn_not_used, &irqn);

	if (err)

		return err;



	err = mlx5_cqwq_create(mdev, &param->wq, param->cqc, &cq->wq,

			       &cq->wq_ctrl);

	if (err)
@@ -1557,7 +1551,6 @@ static int mlx5e_alloc_cq_common(struct mlx5e_priv *priv, 
	mcq->vector     = param->eq_ix;

	mcq->comp       = mlx5e_completion_event;

	mcq->event      = mlx5e_cq_error_event;

	mcq->irqn       = irqn;



	for (i = 0; i < mlx5_cqwq_get_size(&cq->wq); i++) {

		struct mlx5_cqe64 *cqe = mlx5_cqwq_get_wqe(&cq->wq, i);
@@ -1605,11 +1598,10 @@ static int mlx5e_create_cq(struct mlx5e_cq *cq, struct mlx5e_cq_param *param) 
	void *in;

	void *cqc;

	int inlen;

	unsigned int irqn_not_used;

	int eqn;

	int err;



	err = mlx5_vector2eqn(mdev, param->eq_ix, &eqn, &irqn_not_used);

	err = mlx5_vector2eqn(mdev, param->eq_ix, &eqn);

	if (err)

		return err;
@@ -1983,9 +1975,8 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix, 
	struct mlx5e_channel *c;

	unsigned int irq;

	int err;

	int eqn;



	err = mlx5_vector2eqn(priv->mdev, ix, &eqn, &irq);

	err = mlx5_vector2irqn(priv->mdev, ix, &irq);

	if (err)

		return err;

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

+16 −4
Original line number Diff line number Diff line
@@ -855,7 +855,7 @@ static int create_comp_eqs(struct mlx5_core_dev *dev) 
	return err;

}



int mlx5_vector2eqn(struct mlx5_core_dev *dev, int vector, int *eqn,

static int vector2eqnirqn(struct mlx5_core_dev *dev, int vector, int *eqn,

			  unsigned int *irqn)

{

	struct mlx5_eq_table *table = dev->priv.eq_table;
@@ -865,8 +865,10 @@ int mlx5_vector2eqn(struct mlx5_core_dev *dev, int vector, int *eqn, 


	list_for_each_entry_safe(eq, n, &table->comp_eqs_list, list) {

		if (i++ == vector) {

			*eqn = eq->core.eqn;

			if (irqn)

				*irqn = eq->core.irqn;

			if (eqn)

				*eqn = eq->core.eqn;

			err = 0;

			break;

		}
@@ -874,8 +876,18 @@ int mlx5_vector2eqn(struct mlx5_core_dev *dev, int vector, int *eqn, 


	return err;

}



int mlx5_vector2eqn(struct mlx5_core_dev *dev, int vector, int *eqn)

{

	return vector2eqnirqn(dev, vector, eqn, NULL);

}

EXPORT_SYMBOL(mlx5_vector2eqn);



int mlx5_vector2irqn(struct mlx5_core_dev *dev, int vector, unsigned int *irqn)

{

	return vector2eqnirqn(dev, vector, NULL, irqn);

}



unsigned int mlx5_comp_vectors_count(struct mlx5_core_dev *dev)

{

	return dev->priv.eq_table->num_comp_eqs;