| Message ID | 20230130201328.132063-2-maxtram95@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | xdp_rxq_info_reg fixes for mlx5e | expand |
On 30/01/2023 22:13, Maxim Mikityanskiy wrote: > 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: ea5d49bdae8b ("net/mlx5e: Add XDP multi buffer support to the non-linear legacy RQ") > Fixes: 9cb9482ef10e ("net/mlx5e: Use fragments of the same size in non-linear legacy RQ with XDP") > Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com> > Cc: Tariq Toukan <tariqt@nvidia.com> > --- > drivers/net/ethernet/mellanox/mlx5/core/en/params.c | 9 +++++++-- > drivers/net/ethernet/mellanox/mlx5/core/en/params.h | 1 + > drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 7 ++++--- > 3 files changed, 12 insertions(+), 5 deletions(-) > Patch is much cleaner now. > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/params.c b/drivers/net/ethernet/mellanox/mlx5/core/en/params.c > index 4ad19c981294..151585302cd1 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/en/params.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/params.c > @@ -662,7 +662,8 @@ static int mlx5e_max_nonlinear_mtu(int first_frag_size, int frag_size, bool xdp) > 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) Even when returning success, this function does not always provide value for xdp_frag_size. It means that the responsibility of initializing this param is on the caller side. But then it gets no indication whether the function overwrote it or not. It works, but I prefer a different caller/callee communication. I suggest that the function should provide value for xdp_frag_size on every successful flow. Suggestion: --- a/drivers/net/ethernet/mellanox/mlx5/core/en/params.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/params.c @@ -782,6 +782,9 @@ 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; } > { > u32 byte_count = MLX5E_SW2HW_MTU(params, params->sw_mtu); > int frag_size_max = DEFAULT_FRAG_SIZE; > @@ -737,6 +738,9 @@ static int mlx5e_build_rq_frags_info(struct mlx5_core_dev *mdev, > } > info->num_frags = i; > > + if (info->num_frags > 1 && params->xdp_prog) > + *xdp_frag_size = PAGE_SIZE; > + > /* The last fragment of WQE with index 2*N may share the page with the > * first fragment of WQE with index 2*N+1 in certain cases. If WQE 2*N+1 > * is not completed yet, WQE 2*N must not be allocated, as it's > @@ -917,7 +921,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, ¶m->frags_info); > + err = mlx5e_build_rq_frags_info(mdev, params, xsk, ¶m->frags_info, > + ¶m->xdp_frag_size); > if (err) > return err; > ndsegs = param->frags_info.num_frags; > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/params.h b/drivers/net/ethernet/mellanox/mlx5/core/en/params.h > index c9be6eb88012..e5930fe752e5 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/en/params.h > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/params.h > @@ -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 { > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c > index abcc614b6191..d02af93035b2 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c > @@ -576,7 +576,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; > @@ -599,7 +599,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, > @@ -2214,7 +2215,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; >
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/params.c b/drivers/net/ethernet/mellanox/mlx5/core/en/params.c index 4ad19c981294..151585302cd1 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/params.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/params.c @@ -662,7 +662,8 @@ static int mlx5e_max_nonlinear_mtu(int first_frag_size, int frag_size, bool xdp) 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; @@ -737,6 +738,9 @@ static int mlx5e_build_rq_frags_info(struct mlx5_core_dev *mdev, } info->num_frags = i; + if (info->num_frags > 1 && params->xdp_prog) + *xdp_frag_size = PAGE_SIZE; + /* The last fragment of WQE with index 2*N may share the page with the * first fragment of WQE with index 2*N+1 in certain cases. If WQE 2*N+1 * is not completed yet, WQE 2*N must not be allocated, as it's @@ -917,7 +921,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, ¶m->frags_info); + err = mlx5e_build_rq_frags_info(mdev, params, xsk, ¶m->frags_info, + ¶m->xdp_frag_size); if (err) return err; ndsegs = param->frags_info.num_frags; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/params.h b/drivers/net/ethernet/mellanox/mlx5/core/en/params.h index c9be6eb88012..e5930fe752e5 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/params.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/params.h @@ -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 { diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index abcc614b6191..d02af93035b2 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -576,7 +576,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; @@ -599,7 +599,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, @@ -2214,7 +2215,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;
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: ea5d49bdae8b ("net/mlx5e: Add XDP multi buffer support to the non-linear legacy RQ") Fixes: 9cb9482ef10e ("net/mlx5e: Use fragments of the same size in non-linear legacy RQ with XDP") Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com> Cc: Tariq Toukan <tariqt@nvidia.com> --- drivers/net/ethernet/mellanox/mlx5/core/en/params.c | 9 +++++++-- drivers/net/ethernet/mellanox/mlx5/core/en/params.h | 1 + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 7 ++++--- 3 files changed, 12 insertions(+), 5 deletions(-)