Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d49ce1e authored by Yishai Hadas's avatar Yishai Hadas Committed by Leon Romanovsky
Browse files

net/mlx5: Fix mlx5_core_destroy_cq() error flow 



The firmware command to destroy a CQ might fail when the object is
referenced by other object and the ref count is managed by the firmware.

To enable a second successful destruction post the first failure need to
change  mlx5_eq_del_cq() to be a void function.

As an error in mlx5_eq_del_cq() is quite fatal from the option to
recover, a debug message inside it should be good enougth and it was
changed to be void.

Signed-off-by: default avatarYishai Hadas <yishaih@mellanox.com>
Acked-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent 4a3929b2

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

+2 −7
Original line number Diff line number Diff line
@@ -158,13 +158,8 @@ int mlx5_core_destroy_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq) 
	u32 in[MLX5_ST_SZ_DW(destroy_cq_in)] = {0};

	int err;



	err = mlx5_eq_del_cq(mlx5_get_async_eq(dev), cq);

	if (err)

		return err;



	err = mlx5_eq_del_cq(&cq->eq->core, cq);

	if (err)

		return err;

	mlx5_eq_del_cq(mlx5_get_async_eq(dev), cq);

	mlx5_eq_del_cq(&cq->eq->core, cq);



	MLX5_SET(destroy_cq_in, in, opcode, MLX5_CMD_OP_DESTROY_CQ);

	MLX5_SET(destroy_cq_in, in, cqn, cq->cqn);

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

+7 −9
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ int mlx5_eq_add_cq(struct mlx5_eq *eq, struct mlx5_core_cq *cq) 
	return err;

}



int mlx5_eq_del_cq(struct mlx5_eq *eq, struct mlx5_core_cq *cq)

void mlx5_eq_del_cq(struct mlx5_eq *eq, struct mlx5_core_cq *cq)

{

	struct mlx5_cq_table *table = &eq->cq_table;

	struct mlx5_core_cq *tmp;
@@ -399,16 +399,14 @@ int mlx5_eq_del_cq(struct mlx5_eq *eq, struct mlx5_core_cq *cq) 
	spin_unlock(&table->lock);



	if (!tmp) {

		mlx5_core_warn(eq->dev, "cq 0x%x not found in eq 0x%x tree\n", eq->eqn, cq->cqn);

		return -ENOENT;

		mlx5_core_dbg(eq->dev, "cq 0x%x not found in eq 0x%x tree\n",

			      eq->eqn, cq->cqn);

		return;

	}



	if (tmp != cq) {

		mlx5_core_warn(eq->dev, "corruption on cqn 0x%x in eq 0x%x\n", eq->eqn, cq->cqn);

		return -EINVAL;

	}



	return 0;

	if (tmp != cq)

		mlx5_core_dbg(eq->dev, "corruption on cqn 0x%x in eq 0x%x\n",

			      eq->eqn, cq->cqn);

}



int mlx5_eq_table_init(struct mlx5_core_dev *dev)

drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ int mlx5_eq_table_create(struct mlx5_core_dev *dev); 
void mlx5_eq_table_destroy(struct mlx5_core_dev *dev);



int mlx5_eq_add_cq(struct mlx5_eq *eq, struct mlx5_core_cq *cq);

int mlx5_eq_del_cq(struct mlx5_eq *eq, struct mlx5_core_cq *cq);

void mlx5_eq_del_cq(struct mlx5_eq *eq, struct mlx5_core_cq *cq);

struct mlx5_eq_comp *mlx5_eqn2comp_eq(struct mlx5_core_dev *dev, int eqn);

struct mlx5_eq *mlx5_get_async_eq(struct mlx5_core_dev *dev);

void mlx5_cq_tasklet_cb(unsigned long data);