Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a795d8db authored by Aya Levin's avatar Aya Levin Committed by Saeed Mahameed
Browse files

net/mlx5e: Support RSS for IP-in-IP and IPv6 tunneled packets 



Add support for inner header RSS on IP-in-IP and IPv6 tunneled packets.

Add rules to the steering table regarding outer IP header, with
IPv4/6->IP-in-IP. Tunneled packets with protocol numbers: 0x4 (IP-in-IP)
and 0x29 (IPv6) are RSS-ed on the inner IP header.
Separate FW dependencies between flow table inner IP capabilities and
GRE offload support. Allowing this feature even if GRE offload is not
supported.  Tested with multi stream TCP traffic tunneled with IPnIP.
Verified that:
Without this patch, only a single RX ring was processing the traffic.
With this patch, multiple RX rings were processing the traffic.
Verified with and without GRE offload support.

Signed-off-by: default avatarAya Levin <ayal@mellanox.com>
Reviewed-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent a49e1f31

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

+4 −0
Original line number Diff line number Diff line
@@ -95,6 +95,10 @@ struct mlx5e_tirc_config { 
enum mlx5e_tunnel_types {

	MLX5E_TT_IPV4_GRE,

	MLX5E_TT_IPV6_GRE,

	MLX5E_TT_IPV4_IPIP,

	MLX5E_TT_IPV6_IPIP,

	MLX5E_TT_IPV4_IPV6,

	MLX5E_TT_IPV6_IPV6,

	MLX5E_NUM_TUNNEL_TT,

};

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

+45 −1
Original line number Diff line number Diff line
@@ -747,11 +747,52 @@ static struct mlx5e_etype_proto ttc_tunnel_rules[] = { 
		.etype = ETH_P_IPV6,

		.proto = IPPROTO_GRE,

	},

	[MLX5E_TT_IPV4_IPIP] = {

		.etype = ETH_P_IP,

		.proto = IPPROTO_IPIP,

	},

	[MLX5E_TT_IPV6_IPIP] = {

		.etype = ETH_P_IPV6,

		.proto = IPPROTO_IPIP,

	},

	[MLX5E_TT_IPV4_IPV6] = {

		.etype = ETH_P_IP,

		.proto = IPPROTO_IPV6,

	},

	[MLX5E_TT_IPV6_IPV6] = {

		.etype = ETH_P_IPV6,

		.proto = IPPROTO_IPV6,

	},



};



static bool mlx5e_tunnel_proto_supported(struct mlx5_core_dev *mdev, u8 proto_type)

{

	switch (proto_type) {

	case IPPROTO_GRE:

		return MLX5_CAP_ETH(mdev, tunnel_stateless_gre);

	case IPPROTO_IPIP:

	case IPPROTO_IPV6:

		return MLX5_CAP_ETH(mdev, tunnel_stateless_ip_over_ip);

	default:

		return false;

	}

}



static bool mlx5e_any_tunnel_proto_supported(struct mlx5_core_dev *mdev)

{

	int tt;



	for (tt = 0; tt < MLX5E_NUM_TUNNEL_TT; tt++) {

		if (mlx5e_tunnel_proto_supported(mdev, ttc_tunnel_rules[tt].proto))

			return true;

	}

	return false;

}



bool mlx5e_tunnel_inner_ft_supported(struct mlx5_core_dev *mdev)

{

	return (MLX5_CAP_ETH(mdev, tunnel_stateless_gre) &&

	return (mlx5e_any_tunnel_proto_supported(mdev) &&

		MLX5_CAP_FLOWTABLE_NIC_RX(mdev, ft_field_support.inner_ip_version));

}
@@ -844,6 +885,9 @@ static int mlx5e_generate_ttc_table_rules(struct mlx5e_priv *priv, 
	dest.type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;

	dest.ft   = params->inner_ttc->ft.t;

	for (tt = 0; tt < MLX5E_NUM_TUNNEL_TT; tt++) {

		if (!mlx5e_tunnel_proto_supported(priv->mdev,

						  ttc_tunnel_rules[tt].proto))

			continue;

		rules[tt] = mlx5e_generate_ttc_rule(priv, ft, &dest,

						    ttc_tunnel_rules[tt].etype,

						    ttc_tunnel_rules[tt].proto);