Commit c0be5fec authored Apr 12, 2022 by Maxim Mikityanskiy Committed by Greg Kroah-Hartman May 25, 2022

net/mlx5e: Properly block LRO when XDP is enabled



[ Upstream commit cf6e34c8c22fba66bd21244b95ea47e235f68974 ]

LRO is incompatible and mutually exclusive with XDP. However, the needed
checks are only made when enabling XDP. If LRO is enabled when XDP is
already active, the command will succeed, and XDP will be skipped in the
data path, although still enabled.

This commit fixes the bug by checking the XDP status in
mlx5e_fix_features and disabling LRO if XDP is enabled.

Fixes: 86994156 ("net/mlx5e: XDP fast RX drop bpf programs support")
Signed-off-by: Maxim Mikityanskiy <maximmi@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 3277789f

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

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3980,6 +3980,13 @@ static netdev_features_t mlx5e_fix_features(struct net_device *netdev,
	}		}
	}		}

			if (params->xdp_prog) {
			if (features & NETIF_F_LRO) {
			netdev_warn(netdev, "LRO is incompatible with XDP\n");
			features &= ~NETIF_F_LRO;
			}
			}

	if (MLX5E_GET_PFLAG(params, MLX5E_PFLAG_RX_CQE_COMPRESS)) {		if (MLX5E_GET_PFLAG(params, MLX5E_PFLAG_RX_CQE_COMPRESS)) {
	features &= ~NETIF_F_RXHASH;		features &= ~NETIF_F_RXHASH;
	if (netdev->features & NETIF_F_RXHASH)		if (netdev->features & NETIF_F_RXHASH)