Commit 49529a17 authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Saeed Mahameed
Browse files

net/mlx5e: Move mlx5e_xdpi_fifo_push out of xmit_xdp_frame 



The implementations of xmit_xdp_frame get the xdpi parameter of type
struct mlx5e_xdp_info for the sole purpose of calling
mlx5e_xdpi_fifo_push() on success.

This commit moves this call outside of xmit_xdp_frame, shifting this
responsibility to the caller. It will allow more fine-grained handling
of XDP info for cases when an xdp_frame is fragmented.

Signed-off-by: default avatarMaxim Mikityanskiy <maximmi@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent ddc87e7d

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

+0 −1
Original line number Diff line number Diff line
@@ -537,7 +537,6 @@ struct mlx5e_xdpsq; 
typedef int (*mlx5e_fp_xmit_xdp_frame_check)(struct mlx5e_xdpsq *);

typedef bool (*mlx5e_fp_xmit_xdp_frame)(struct mlx5e_xdpsq *,

					struct mlx5e_xmit_data *,

					struct mlx5e_xdp_info *,

					int);



struct mlx5e_xdpsq {

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

+10 −7
Original line number Diff line number Diff line
@@ -119,8 +119,12 @@ mlx5e_xmit_xdp_buff(struct mlx5e_xdpsq *sq, struct mlx5e_rq *rq, 
		xdpi.page.page = page;

	}



	return INDIRECT_CALL_2(sq->xmit_xdp_frame, mlx5e_xmit_xdp_frame_mpwqe,

			       mlx5e_xmit_xdp_frame, sq, &xdptxd, &xdpi, 0);

	if (unlikely(!INDIRECT_CALL_2(sq->xmit_xdp_frame, mlx5e_xmit_xdp_frame_mpwqe,

				      mlx5e_xmit_xdp_frame, sq, &xdptxd, 0)))

		return false;



	mlx5e_xdpi_fifo_push(&sq->db.xdpi_fifo, &xdpi);

	return true;

}



/* returns true if packet was consumed by xdp */
@@ -261,7 +265,7 @@ INDIRECT_CALLABLE_SCOPE int mlx5e_xmit_xdp_frame_check_mpwqe(struct mlx5e_xdpsq 


INDIRECT_CALLABLE_SCOPE bool

mlx5e_xmit_xdp_frame_mpwqe(struct mlx5e_xdpsq *sq, struct mlx5e_xmit_data *xdptxd,

			   struct mlx5e_xdp_info *xdpi, int check_result)

			   int check_result)

{

	struct mlx5e_tx_mpwqe *session = &sq->mpwqe;

	struct mlx5e_xdpsq_stats *stats = sq->stats;
@@ -289,7 +293,6 @@ mlx5e_xmit_xdp_frame_mpwqe(struct mlx5e_xdpsq *sq, struct mlx5e_xmit_data *xdptx 
	if (unlikely(mlx5e_xdp_mpqwe_is_full(session, sq->max_sq_mpw_wqebbs)))

		mlx5e_xdp_mpwqe_complete(sq);



	mlx5e_xdpi_fifo_push(&sq->db.xdpi_fifo, xdpi);

	stats->xmit++;

	return true;

}
@@ -308,7 +311,7 @@ INDIRECT_CALLABLE_SCOPE int mlx5e_xmit_xdp_frame_check(struct mlx5e_xdpsq *sq) 


INDIRECT_CALLABLE_SCOPE bool

mlx5e_xmit_xdp_frame(struct mlx5e_xdpsq *sq, struct mlx5e_xmit_data *xdptxd,

		     struct mlx5e_xdp_info *xdpi, int check_result)

		     int check_result)

{

	struct mlx5_wq_cyc       *wq   = &sq->wq;

	u16                       pi   = mlx5_wq_cyc_ctr2ix(wq, sq->pc);
@@ -358,7 +361,6 @@ mlx5e_xmit_xdp_frame(struct mlx5e_xdpsq *sq, struct mlx5e_xmit_data *xdptxd, 


	sq->doorbell_cseg = cseg;



	mlx5e_xdpi_fifo_push(&sq->db.xdpi_fifo, xdpi);

	stats->xmit++;

	return true;

}
@@ -537,12 +539,13 @@ int mlx5e_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames, 
		xdpi.frame.dma_addr = xdptxd.dma_addr;



		ret = INDIRECT_CALL_2(sq->xmit_xdp_frame, mlx5e_xmit_xdp_frame_mpwqe,

				      mlx5e_xmit_xdp_frame, sq, &xdptxd, &xdpi, 0);

				      mlx5e_xmit_xdp_frame, sq, &xdptxd, 0);

		if (unlikely(!ret)) {

			dma_unmap_single(sq->pdev, xdptxd.dma_addr,

					 xdptxd.len, DMA_TO_DEVICE);

			break;

		}

		mlx5e_xdpi_fifo_push(&sq->db.xdpi_fifo, &xdpi);

		nxmit++;

	}

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

+0 −2
Original line number Diff line number Diff line
@@ -59,11 +59,9 @@ int mlx5e_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames, 


INDIRECT_CALLABLE_DECLARE(bool mlx5e_xmit_xdp_frame_mpwqe(struct mlx5e_xdpsq *sq,

							  struct mlx5e_xmit_data *xdptxd,

							  struct mlx5e_xdp_info *xdpi,

							  int check_result));

INDIRECT_CALLABLE_DECLARE(bool mlx5e_xmit_xdp_frame(struct mlx5e_xdpsq *sq,

						    struct mlx5e_xmit_data *xdptxd,

						    struct mlx5e_xdp_info *xdpi,

						    int check_result));

INDIRECT_CALLABLE_DECLARE(int mlx5e_xmit_xdp_frame_check_mpwqe(struct mlx5e_xdpsq *sq));

INDIRECT_CALLABLE_DECLARE(int mlx5e_xmit_xdp_frame_check(struct mlx5e_xdpsq *sq));

drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.c

+3 −1
Original line number Diff line number Diff line
@@ -103,12 +103,14 @@ bool mlx5e_xsk_tx(struct mlx5e_xdpsq *sq, unsigned int budget) 
		xsk_buff_raw_dma_sync_for_device(pool, xdptxd.dma_addr, xdptxd.len);



		ret = INDIRECT_CALL_2(sq->xmit_xdp_frame, mlx5e_xmit_xdp_frame_mpwqe,

				      mlx5e_xmit_xdp_frame, sq, &xdptxd, &xdpi, check_result);

				      mlx5e_xmit_xdp_frame, sq, &xdptxd, check_result);

		if (unlikely(!ret)) {

			if (sq->mpwqe.wqe)

				mlx5e_xdp_mpwqe_complete(sq);



			mlx5e_xsk_tx_post_err(sq, &xdpi);

		} else {

			mlx5e_xdpi_fifo_push(&sq->db.xdpi_fifo, &xdpi);

		}



		flush = true;