Commit 4e7401fc authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Saeed Mahameed
Browse files

net/mlx5e: XDP, Allow growing tail for XDP multi buffer 



The cited commits missed passing frag_size to __xdp_rxq_info_reg, which
is required by bpf_xdp_adjust_tail to support growing the tail pointer
in fragmented packets. Pass the missing parameter when the current RQ
mode allows XDP multi buffer.

Fixes: ea5d49bd ("net/mlx5e: Add XDP multi buffer support to the non-linear legacy RQ")
Fixes: 9cb9482e ("net/mlx5e: Use fragments of the same size in non-linear legacy RQ with XDP")
Signed-off-by: default avatarMaxim Mikityanskiy <maxtram95@gmail.com>
Cc: Tariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent d4e06728

drivers/net/ethernet/mellanox/mlx5/core/en/params.c

+6 −2
Original line number Diff line number Diff line
@@ -732,7 +732,8 @@ static void mlx5e_rx_compute_wqe_bulk_params(struct mlx5e_params *params, 
static int mlx5e_build_rq_frags_info(struct mlx5_core_dev *mdev,

				     struct mlx5e_params *params,

				     struct mlx5e_xsk_param *xsk,

				     struct mlx5e_rq_frags_info *info)

				     struct mlx5e_rq_frags_info *info,

				     u32 *xdp_frag_size)

{

	u32 byte_count = MLX5E_SW2HW_MTU(params, params->sw_mtu);

	int frag_size_max = DEFAULT_FRAG_SIZE;
@@ -845,6 +846,8 @@ static int mlx5e_build_rq_frags_info(struct mlx5_core_dev *mdev, 


	info->log_num_frags = order_base_2(info->num_frags);



	*xdp_frag_size = info->num_frags > 1 && params->xdp_prog ? PAGE_SIZE : 0;



	return 0;

}
@@ -989,7 +992,8 @@ int mlx5e_build_rq_param(struct mlx5_core_dev *mdev, 
	}

	default: /* MLX5_WQ_TYPE_CYCLIC */

		MLX5_SET(wq, wq, log_wq_sz, params->log_rq_mtu_frames);

		err = mlx5e_build_rq_frags_info(mdev, params, xsk, &param->frags_info);

		err = mlx5e_build_rq_frags_info(mdev, params, xsk, &param->frags_info,

						&param->xdp_frag_size);

		if (err)

			return err;

		ndsegs = param->frags_info.num_frags;

drivers/net/ethernet/mellanox/mlx5/core/en/params.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ struct mlx5e_rq_param { 
	u32                        rqc[MLX5_ST_SZ_DW(rqc)];

	struct mlx5_wq_param       wq;

	struct mlx5e_rq_frags_info frags_info;

	u32                        xdp_frag_size;

};



struct mlx5e_sq_param {

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

+4 −3
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ static void mlx5e_free_mpwqe_rq_drop_page(struct mlx5e_rq *rq) 
}



static int mlx5e_init_rxq_rq(struct mlx5e_channel *c, struct mlx5e_params *params,

			     struct mlx5e_rq *rq)

			     u32 xdp_frag_size, struct mlx5e_rq *rq)

{

	struct mlx5_core_dev *mdev = c->mdev;

	int err;
@@ -665,7 +665,8 @@ static int mlx5e_init_rxq_rq(struct mlx5e_channel *c, struct mlx5e_params *param 
	if (err)

		return err;



	return xdp_rxq_info_reg(&rq->xdp_rxq, rq->netdev, rq->ix, c->napi.napi_id);

	return __xdp_rxq_info_reg(&rq->xdp_rxq, rq->netdev, rq->ix, c->napi.napi_id,

				  xdp_frag_size);

}



static int mlx5_rq_shampo_alloc(struct mlx5_core_dev *mdev,
@@ -2240,7 +2241,7 @@ static int mlx5e_open_rxq_rq(struct mlx5e_channel *c, struct mlx5e_params *param 
{

	int err;



	err = mlx5e_init_rxq_rq(c, params, &c->rq);

	err = mlx5e_init_rxq_rq(c, params, rq_params->xdp_frag_size, &c->rq);

	if (err)

		return err;