Commit 2d0765f7 authored Sep 29, 2022 by Maxim Mikityanskiy Committed by Jakub Kicinski Sep 30, 2022

net/mlx5e: xsk: Remove mlx5e_xsk_page_alloc_pool



mlx5e_xsk_page_alloc_pool became a thin wrapper around xsk_buff_alloc.
Drop it and call xsk_buff_alloc directly.

Signed-off-by: Maxim Mikityanskiy <maximmi@nvidia.com>
Reviewed-by: Saeed Mahameed <saeedm@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parent 672db024

drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.h

+0 −10

Original line number	Diff line number	Diff line
		@@ -18,16 +18,6 @@ struct sk_buff mlx5e_xsk_skb_from_cqe_linear(struct mlx5e_rq rq,
		struct mlx5e_wqe_frag_info *wi,
		u32 cqe_bcnt);

		static inline int mlx5e_xsk_page_alloc_pool(struct mlx5e_rq *rq,
		union mlx5e_alloc_unit *au)
		{
		au->xsk = xsk_buff_alloc(rq->xsk_pool);
		if (!au->xsk)
		return -ENOMEM;

		return 0;
		}

		static inline bool mlx5e_xsk_update_rx_wakeup(struct mlx5e_rq *rq, bool alloc_err)
		{
		if (!xsk_uses_need_wakeup(rq->xsk_pool))

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -302,11 +302,13 @@ static inline int mlx5e_page_alloc_pool(struct mlx5e_rq *rq, union mlx5e_alloc_u

		static inline int mlx5e_page_alloc(struct mlx5e_rq rq, union mlx5e_alloc_unit au)
		{
		if (rq->xsk_pool)
		return mlx5e_xsk_page_alloc_pool(rq, au);
		else
		if (rq->xsk_pool) {
		au->xsk = xsk_buff_alloc(rq->xsk_pool);
		return likely(au->xsk) ? 0 : -ENOMEM;
		} else {
		return mlx5e_page_alloc_pool(rq, au);
		}
		}

		void mlx5e_page_dma_unmap(struct mlx5e_rq rq, struct page page)
		{