Commit 8f5ed1c1 authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Jakub Kicinski
Browse files

net/mlx5e: Clean up and fix error flows in mlx5e_alloc_rq 



Although mlx5e_rq_free_shampo can be called unconditionally, it belongs
to case MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ. Move it there to allow to
add more init/cleanup actions to the striding RQ case.

If xdp_rxq_info_reg_mem_model fails, don't forget to destroy the page
pool.

Signed-off-by: default avatarMaxim Mikityanskiy <maximmi@nvidia.com>
Reviewed-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e64d71d0

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

+7 −5
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ static int mlx5e_alloc_rq(struct mlx5e_params *params, 


		err = mlx5_rq_shampo_alloc(mdev, params, rqp, rq, &pool_size, node);

		if (err)

			goto err_free_by_rq_type;

			goto err_free_mpwqe_info;



		break;

	default: /* MLX5_WQ_TYPE_CYCLIC */
@@ -720,14 +720,14 @@ static int mlx5e_alloc_rq(struct mlx5e_params *params, 
		if (IS_ERR(rq->page_pool)) {

			err = PTR_ERR(rq->page_pool);

			rq->page_pool = NULL;

			goto err_free_shampo;

			goto err_free_by_rq_type;

		}

		if (xdp_rxq_info_is_reg(&rq->xdp_rxq))

			err = xdp_rxq_info_reg_mem_model(&rq->xdp_rxq,

							 MEM_TYPE_PAGE_POOL, rq->page_pool);

	}

	if (err)

		goto err_free_shampo;

		goto err_destroy_page_pool;



	for (i = 0; i < wq_sz; i++) {

		if (rq->wq_type == MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ) {
@@ -780,11 +780,13 @@ static int mlx5e_alloc_rq(struct mlx5e_params *params, 


	return 0;



err_free_shampo:

	mlx5e_rq_free_shampo(rq);

err_destroy_page_pool:

	page_pool_destroy(rq->page_pool);

err_free_by_rq_type:

	switch (rq->wq_type) {

	case MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ:

		mlx5e_rq_free_shampo(rq);

err_free_mpwqe_info:

		kvfree(rq->mpwqe.info);

err_rq_mkey:

		mlx5_core_destroy_mkey(mdev, be32_to_cpu(rq->mpwqe.umr_mkey_be));