Commit aebc62d3 authored by Tariq Toukan's avatar Tariq Toukan Committed by David S. Miller
Browse files

net/mlx5e: Move XDP struct and enum to XDP header 



Move struct mlx5e_xdp_info and enum mlx5e_xdp_xmit_mode from the generic
en.h to the XDP header, where they belong.

Reviewed-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 14cac662

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

+0 −35
Original line number Diff line number Diff line
@@ -475,41 +475,6 @@ struct mlx5e_txqsq { 
	cqe_ts_to_ns               ptp_cyc2time;

} ____cacheline_aligned_in_smp;



/* XDP packets can be transmitted in different ways. On completion, we need to

 * distinguish between them to clean up things in a proper way.

 */

enum mlx5e_xdp_xmit_mode {

	/* An xdp_frame was transmitted due to either XDP_REDIRECT from another

	 * device or XDP_TX from an XSK RQ. The frame has to be unmapped and

	 * returned.

	 */

	MLX5E_XDP_XMIT_MODE_FRAME,



	/* The xdp_frame was created in place as a result of XDP_TX from a

	 * regular RQ. No DMA remapping happened, and the page belongs to us.

	 */

	MLX5E_XDP_XMIT_MODE_PAGE,



	/* No xdp_frame was created at all, the transmit happened from a UMEM

	 * page. The UMEM Completion Ring producer pointer has to be increased.

	 */

	MLX5E_XDP_XMIT_MODE_XSK,

};



struct mlx5e_xdp_info {

	enum mlx5e_xdp_xmit_mode mode;

	union {

		struct {

			struct xdp_frame *xdpf;

			dma_addr_t dma_addr;

		} frame;

		struct {

			struct mlx5e_rq *rq;

			struct page *page;

		} page;

	};

};



struct mlx5e_xmit_data {

	dma_addr_t  dma_addr;

	void       *data;

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

+35 −0
Original line number Diff line number Diff line
@@ -50,6 +50,41 @@ struct mlx5e_xdp_buff { 
	struct mlx5e_rq *rq;

};



/* XDP packets can be transmitted in different ways. On completion, we need to

 * distinguish between them to clean up things in a proper way.

 */

enum mlx5e_xdp_xmit_mode {

	/* An xdp_frame was transmitted due to either XDP_REDIRECT from another

	 * device or XDP_TX from an XSK RQ. The frame has to be unmapped and

	 * returned.

	 */

	MLX5E_XDP_XMIT_MODE_FRAME,



	/* The xdp_frame was created in place as a result of XDP_TX from a

	 * regular RQ. No DMA remapping happened, and the page belongs to us.

	 */

	MLX5E_XDP_XMIT_MODE_PAGE,



	/* No xdp_frame was created at all, the transmit happened from a UMEM

	 * page. The UMEM Completion Ring producer pointer has to be increased.

	 */

	MLX5E_XDP_XMIT_MODE_XSK,

};



struct mlx5e_xdp_info {

	enum mlx5e_xdp_xmit_mode mode;

	union {

		struct {

			struct xdp_frame *xdpf;

			dma_addr_t dma_addr;

		} frame;

		struct {

			struct mlx5e_rq *rq;

			struct page *page;

		} page;

	};

};



struct mlx5e_xsk_param;

int mlx5e_xdp_max_mtu(struct mlx5e_params *params, struct mlx5e_xsk_param *xsk);

bool mlx5e_xdp_handle(struct mlx5e_rq *rq,