Commit 3f5fe0b2 authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Jakub Kicinski
Browse files

net/mlx5e: xsk: Use partial batches in legacy RQ with XSK 



The previous commit allowed allocating WQE batches in legacy RQ
partially, however, XSK still checks whether there are enough frames in
the fill ring. Remove this check to allow to allocate batches partially
also with XSK.

Signed-off-by: default avatarMaxim Mikityanskiy <maximmi@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 42847fed

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

+1 −13
Original line number Diff line number Diff line
@@ -429,17 +429,6 @@ static int mlx5e_alloc_rx_wqes(struct mlx5e_rq *rq, u16 ix, u8 wqe_bulk) 
	struct mlx5_wq_cyc *wq = &rq->wqe.wq;

	int i;



	if (rq->xsk_pool) {

		int pages_desired = wqe_bulk << rq->wqe.info.log_num_frags;



		/* Check in advance that we have enough frames, instead of

		 * allocating one-by-one, failing and moving frames to the

		 * Reuse Ring.

		 */

		if (unlikely(!xsk_buff_can_alloc(rq->xsk_pool, pages_desired)))

			return -ENOMEM;

	}



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

		int j = mlx5_wq_cyc_ctr2ix(wq, ix + i);

		struct mlx5e_rx_wqe_cyc *wqe;
@@ -841,7 +830,6 @@ INDIRECT_CALLABLE_SCOPE bool mlx5e_post_rx_wqes(struct mlx5e_rq *rq) 
		bulk = wqe_bulk - ((head + wqe_bulk) & rq->wqe.info.wqe_index_mask);



		count = mlx5e_alloc_rx_wqes(rq, head, bulk);

		if (likely(count > 0))

		mlx5_wq_cyc_push_n(wq, count);

		if (unlikely(count != bulk)) {

			rq->stats->buff_alloc_err++;