You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
136 lines
4.5 KiB
136 lines
4.5 KiB
From 7afc70d063523d563f11360b6e8174d809efd3fc Mon Sep 17 00:00:00 2001
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
|
Date: Sun, 10 May 2020 14:52:17 -0400
|
|
Subject: [PATCH 045/312] [netdrv] net/mlx5e: Support RSS for IP-in-IP and IPv6
|
|
tunneled packets
|
|
|
|
Message-id: <20200510145245.10054-55-ahleihel@redhat.com>
|
|
Patchwork-id: 306595
|
|
Patchwork-instance: patchwork
|
|
O-Subject: [RHEL8.3 BZ 1789378 v2 54/82] net/mlx5e: Support RSS for IP-in-IP and IPv6 tunneled packets
|
|
Bugzilla: 1789378
|
|
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com>
|
|
|
|
Bugzilla: http://bugzilla.redhat.com/1789378
|
|
Upstream: v5.4-rc1
|
|
|
|
commit a795d8db2a6d3c6f80e7002dd6357e6736dad1b6
|
|
Author: Aya Levin <ayal@mellanox.com>
|
|
Date: Mon Apr 29 17:45:52 2019 +0300
|
|
|
|
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: Aya Levin <ayal@mellanox.com>
|
|
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>
|
|
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
|
|
|
|
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
|
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
|
---
|
|
drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 4 +++
|
|
drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 46 ++++++++++++++++++++++++-
|
|
2 files changed, 49 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/fs.h b/drivers/net/ethernet/mellanox/mlx5/core/en/fs.h
|
|
index 5acd982ff228..5aae3a7a5497 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/fs.h
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/fs.h
|
|
@@ -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,
|
|
};
|
|
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
|
|
index a8340e4fb0b9..b99b17957543 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
|
|
@@ -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);
|
|
--
|
|
2.13.6
|
|
|