Commit 5d0bb3ba authored by Saeed Mahameed's avatar Saeed Mahameed
Browse files

net/mlx5e: XDP, Avoid checksum complete when XDP prog is loaded 



XDP programs might change packets data contents which will make the
reported skb checksum (checksum complete) invalid.

When XDP programs are loaded/unloaded set/clear rx RQs
MLX5E_RQ_STATE_NO_CSUM_COMPLETE flag.

Fixes: 86994156 ("net/mlx5e: XDP fast RX drop bpf programs support")
Reviewed-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 484c1ada

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

+2 −1
Original line number Diff line number Diff line
@@ -1768,7 +1768,8 @@ static int set_pflag_rx_no_csum_complete(struct net_device *netdev, bool enable) 
	struct mlx5e_channel *c;

	int i;



	if (!test_bit(MLX5E_STATE_OPENED, &priv->state))

	if (!test_bit(MLX5E_STATE_OPENED, &priv->state) ||

	    priv->channels.params.xdp_prog)

		return 0;



	for (i = 0; i < channels->num; i++) {

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

+5 −1
Original line number Diff line number Diff line
@@ -951,7 +951,11 @@ static int mlx5e_open_rq(struct mlx5e_channel *c, 
	if (params->rx_dim_enabled)

		__set_bit(MLX5E_RQ_STATE_AM, &c->rq.state);



	if (MLX5E_GET_PFLAG(params, MLX5E_PFLAG_RX_NO_CSUM_COMPLETE))

	/* We disable csum_complete when XDP is enabled since

	 * XDP programs might manipulate packets which will render

	 * skb->checksum incorrect.

	 */

	if (MLX5E_GET_PFLAG(params, MLX5E_PFLAG_RX_NO_CSUM_COMPLETE) || c->xdp)

		__set_bit(MLX5E_RQ_STATE_NO_CSUM_COMPLETE, &c->rq.state);



	return 0;

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

+2 −1
Original line number Diff line number Diff line
@@ -752,7 +752,8 @@ static inline void mlx5e_handle_csum(struct net_device *netdev, 
		return;

	}



	if (unlikely(test_bit(MLX5E_RQ_STATE_NO_CSUM_COMPLETE, &rq->state)))

	/* True when explicitly set via priv flag, or XDP prog is loaded */

	if (test_bit(MLX5E_RQ_STATE_NO_CSUM_COMPLETE, &rq->state))

		goto csum_unnecessary;



	/* CQE csum doesn't cover padding octets in short ethernet

CRA Git | Maintained and supported by SUSTech CRA and CCSE