Commit 092d992b authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-updates-2022-03-18' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2022-03-18

1) XDP multi buffer support

This series enables XDP on non-linear legacy RQ in multi buffer mode.

When XDP is enabled, fragmentation scheme on non-linear legacy RQ is
adjusted to comply to limitations of XDP multi buffer (fragments of the
same size). DMA addresses of fragments are stored in struct page for the
completion handler to be able to unmap them. XDP_TX is supported.

XDP_REDIRECT is not yet supported, the XDP core blocks it for multi
buffer packets at the moment.

2) Trivial cleanups
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 62f65554 5dc2b581

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

+1 −1
Original line number Diff line number Diff line
@@ -1720,7 +1720,7 @@ static void mlx5_cmd_comp_handler(struct mlx5_core_dev *dev, u64 vec, bool force 
	}

}



void mlx5_cmd_trigger_completions(struct mlx5_core_dev *dev)

static void mlx5_cmd_trigger_completions(struct mlx5_core_dev *dev)

{

	struct mlx5_cmd *cmd = &dev->cmd;

	unsigned long bitmask;

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

+3 −2
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ enum { 
	MLX5E_SQ_STATE_VLAN_NEED_L2_INLINE,

	MLX5E_SQ_STATE_PENDING_XSK_TX,

	MLX5E_SQ_STATE_PENDING_TLS_RX_RESYNC,

	MLX5E_SQ_STATE_XDP_MULTIBUF,

};



struct mlx5e_tx_mpwqe {
@@ -515,7 +516,7 @@ struct mlx5e_xdp_info { 
		} frame;

		struct {

			struct mlx5e_rq *rq;

			struct mlx5e_dma_info di;

			struct page *page;

		} page;

	};

};
@@ -537,7 +538,7 @@ 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 *,

					struct skb_shared_info *,

					int);



struct mlx5e_xdpsq {

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

+23 −11
Original line number Diff line number Diff line
@@ -398,8 +398,12 @@ void mlx5e_build_create_cq_param(struct mlx5e_create_cq_param *ccp, struct mlx5e 
	};

}



static int mlx5e_max_nonlinear_mtu(int first_frag_size, int frag_size)

static int mlx5e_max_nonlinear_mtu(int first_frag_size, int frag_size, bool xdp)

{

	if (xdp)

		/* XDP requires all fragments to be of the same size. */

		return first_frag_size + (MLX5E_MAX_RX_FRAGS - 1) * frag_size;



	/* Optimization for small packets: the last fragment is bigger than the others. */

	return first_frag_size + (MLX5E_MAX_RX_FRAGS - 2) * frag_size + PAGE_SIZE;

}
@@ -438,12 +442,14 @@ static int mlx5e_build_rq_frags_info(struct mlx5_core_dev *mdev, 
	headroom = mlx5e_get_linear_rq_headroom(params, xsk);

	first_frag_size_max = SKB_WITH_OVERHEAD(frag_size_max - headroom);



	max_mtu = mlx5e_max_nonlinear_mtu(first_frag_size_max, frag_size_max);

	if (byte_count > max_mtu) {

	max_mtu = mlx5e_max_nonlinear_mtu(first_frag_size_max, frag_size_max,

					  params->xdp_prog);

	if (byte_count > max_mtu || params->xdp_prog) {

		frag_size_max = PAGE_SIZE;

		first_frag_size_max = SKB_WITH_OVERHEAD(frag_size_max - headroom);



		max_mtu = mlx5e_max_nonlinear_mtu(first_frag_size_max, frag_size_max);

		max_mtu = mlx5e_max_nonlinear_mtu(first_frag_size_max, frag_size_max,

						  params->xdp_prog);

		if (byte_count > max_mtu) {

			mlx5_core_err(mdev, "MTU %u is too big for non-linear legacy RQ (max %d)\n",

				      params->sw_mtu, max_mtu);
@@ -463,13 +469,17 @@ static int mlx5e_build_rq_frags_info(struct mlx5_core_dev *mdev, 
		info->arr[i].frag_size = frag_size;

		buf_size += frag_size;



		if (params->xdp_prog) {

			/* XDP multi buffer expects fragments of the same size. */

			info->arr[i].frag_stride = frag_size_max;

		} else {

			if (i == 0) {

				/* Ensure that headroom and tailroom are included. */

				frag_size += headroom;

				frag_size += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));

			}



			info->arr[i].frag_stride = roundup_pow_of_two(frag_size);

		}



		i++;

	}
@@ -833,6 +843,7 @@ static void mlx5e_build_async_icosq_param(struct mlx5_core_dev *mdev, 


void mlx5e_build_xdpsq_param(struct mlx5_core_dev *mdev,

			     struct mlx5e_params *params,

			     struct mlx5e_xsk_param *xsk,

			     struct mlx5e_sq_param *param)

{

	void *sqc = param->sqc;
@@ -841,6 +852,7 @@ void mlx5e_build_xdpsq_param(struct mlx5_core_dev *mdev, 
	mlx5e_build_sq_param_common(mdev, param);

	MLX5_SET(wq, wq, log_wq_sz, params->log_sq_size);

	param->is_mpw = MLX5E_GET_PFLAG(params, MLX5E_PFLAG_XDP_TX_MPWQE);

	param->is_xdp_mb = !mlx5e_rx_is_linear_skb(params, xsk);

	mlx5e_build_tx_cq_param(mdev, params, &param->cqp);

}
@@ -860,7 +872,7 @@ int mlx5e_build_channel_param(struct mlx5_core_dev *mdev, 
	async_icosq_log_wq_sz = mlx5e_build_async_icosq_log_wq_sz(mdev);



	mlx5e_build_sq_param(mdev, params, &cparam->txq_sq);

	mlx5e_build_xdpsq_param(mdev, params, &cparam->xdp_sq);

	mlx5e_build_xdpsq_param(mdev, params, NULL, &cparam->xdp_sq);

	mlx5e_build_icosq_param(mdev, icosq_log_wq_sz, &cparam->icosq);

	mlx5e_build_async_icosq_param(mdev, async_icosq_log_wq_sz, &cparam->async_icosq);

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

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ struct mlx5e_sq_param { 
	struct mlx5_wq_param       wq;

	bool                       is_mpw;

	bool                       is_tls;

	bool                       is_xdp_mb;

	u16                        stop_room;

};
@@ -155,6 +156,7 @@ void mlx5e_build_tx_cq_param(struct mlx5_core_dev *mdev, 
			     struct mlx5e_cq_param *param);

void mlx5e_build_xdpsq_param(struct mlx5_core_dev *mdev,

			     struct mlx5e_params *params,

			     struct mlx5e_xsk_param *xsk,

			     struct mlx5e_sq_param *param);

int mlx5e_build_channel_param(struct mlx5_core_dev *mdev,

			      struct mlx5e_params *params,

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

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ int mlx5e_qos_cur_leaf_nodes(struct mlx5e_priv *priv); 


/* TX datapath API */

int mlx5e_get_txq_by_classid(struct mlx5e_priv *priv, u16 classid);

struct mlx5e_txqsq *mlx5e_get_sq(struct mlx5e_priv *priv, int qid);



/* SQ lifecycle */

int mlx5e_qos_open_queues(struct mlx5e_priv *priv, struct mlx5e_channels *chs);