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

net/mlx5e: XDP, Improve Striding RQ check with XDP 



Non-linear mem scheme of Striding RQ does not yet support XDP at this
point. Take the check where it belongs, inside the params validation
function mlx5e_params_validate_xdp().

Reviewed-by: default avatarGal Pressman <gal@nvidia.com>
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 c1783e74

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

+9 −14
Original line number Diff line number Diff line
@@ -4261,8 +4261,16 @@ static bool mlx5e_params_validate_xdp(struct net_device *netdev, 
	/* No XSK params: AF_XDP can't be enabled yet at the point of setting

	 * the XDP program.

	 */

	is_linear = mlx5e_rx_is_linear_skb(mdev, params, NULL);

	is_linear = params->rq_wq_type == MLX5_WQ_TYPE_CYCLIC ?

		mlx5e_rx_is_linear_skb(mdev, params, NULL) :

		mlx5e_rx_mpwqe_is_linear_skb(mdev, params, NULL);



	/* XDP affects striding RQ parameters. Block XDP if striding RQ won't be

	 * supported with the new parameters: if PAGE_SIZE is bigger than

	 * MLX5_MPWQE_LOG_STRIDE_SZ_MAX, striding RQ can't be used, even though

	 * the MTU is small enough for the linear mode, because XDP uses strides

	 * of PAGE_SIZE on regular RQs.

	 */

	if (!is_linear && params->rq_wq_type != MLX5_WQ_TYPE_CYCLIC) {

		netdev_warn(netdev, "XDP is not allowed with striding RQ and MTU(%d) > %d\n",

			    params->sw_mtu,
@@ -4817,19 +4825,6 @@ static int mlx5e_xdp_set(struct net_device *netdev, struct bpf_prog *prog) 
	new_params = priv->channels.params;

	new_params.xdp_prog = prog;



	/* XDP affects striding RQ parameters. Block XDP if striding RQ won't be

	 * supported with the new parameters: if PAGE_SIZE is bigger than

	 * MLX5_MPWQE_LOG_STRIDE_SZ_MAX, striding RQ can't be used, even though

	 * the MTU is small enough for the linear mode, because XDP uses strides

	 * of PAGE_SIZE on regular RQs.

	 */

	if (reset && MLX5E_GET_PFLAG(&new_params, MLX5E_PFLAG_RX_STRIDING_RQ)) {

		/* Checking for regular RQs here; XSK RQs were checked on XSK bind. */

		err = mlx5e_mpwrq_validate_regular(priv->mdev, &new_params);

		if (err)

			goto unlock;

	}



	old_prog = priv->channels.params.xdp_prog;



	err = mlx5e_safe_switch_params(priv, &new_params, NULL, NULL, reset);