From 1506c90029c037db3542fbe2764e522b98ad823b Mon Sep 17 00:00:00 2001 From: Alvin Zhang Date: Tue, 19 Oct 2021 09:53:48 +0800 Subject: [PATCH] net/i40e: fix IPv6 fragment RSS offload type in flow To keep flow format uniform with ice, this patch adds support for this RSS rule: flow create 0 ingress pattern eth / ipv6 / ipv6_frag_ext / end \ actions rss types ipv6-frag end queues end queues end / end Fixes: ef4c16fd9148 ("net/i40e: refactor RSS flow") Cc: stable@dpdk.org Signed-off-by: Alvin Zhang Acked-by: Qi Zhang --- doc/guides/nics/features/i40e.ini | 1 + drivers/net/i40e/i40e_hash.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/doc/guides/nics/features/i40e.ini b/doc/guides/nics/features/i40e.ini index ccfc5f1495..e3a575f891 100644 --- a/doc/guides/nics/features/i40e.ini +++ b/doc/guides/nics/features/i40e.ini @@ -61,6 +61,7 @@ gtpc = Y gtpu = Y ipv4 = Y ipv6 = Y +ipv6_frag_ext = P l2tpv3oip = Y mpls = Y nvgre = Y diff --git a/drivers/net/i40e/i40e_hash.c b/drivers/net/i40e/i40e_hash.c index 6579b1a00b..5da3d18707 100644 --- a/drivers/net/i40e/i40e_hash.c +++ b/drivers/net/i40e/i40e_hash.c @@ -28,6 +28,7 @@ #define I40E_HASH_HDR_ETH 0x01ULL #define I40E_HASH_HDR_IPV4 0x10ULL #define I40E_HASH_HDR_IPV6 0x20ULL +#define I40E_HASH_HDR_IPV6_FRAG 0x40ULL #define I40E_HASH_HDR_TCP 0x100ULL #define I40E_HASH_HDR_UDP 0x200ULL #define I40E_HASH_HDR_SCTP 0x400ULL @@ -54,6 +55,8 @@ /* IPv6 */ #define I40E_PHINT_IPV6 (I40E_HASH_HDR_ETH | I40E_HASH_HDR_IPV6) +#define I40E_PHINT_IPV6_FRAG (I40E_PHINT_IPV6 | \ + I40E_HASH_HDR_IPV6_FRAG) #define I40E_PHINT_IPV6_TCP (I40E_PHINT_IPV6 | I40E_HASH_HDR_TCP) #define I40E_PHINT_IPV6_UDP (I40E_PHINT_IPV6 | I40E_HASH_HDR_UDP) #define I40E_PHINT_IPV6_SCTP (I40E_PHINT_IPV6 | I40E_HASH_HDR_SCTP) @@ -158,6 +161,9 @@ const struct i40e_hash_map_rss_inset i40e_hash_rss_inset[] = { BIT_ULL(RTE_FLOW_ITEM_TYPE_L2TPV3OIP) |\ BIT_ULL(RTE_FLOW_ITEM_TYPE_AH)) +#define I40E_HASH_IPV6_NEXT_ALLOW (I40E_HASH_IP_NEXT_ALLOW | \ + BIT_ULL(RTE_FLOW_ITEM_TYPE_IPV6_FRAG_EXT)) + #define I40E_HASH_UDP_NEXT_ALLOW (BIT_ULL(RTE_FLOW_ITEM_TYPE_GTPU) | \ BIT_ULL(RTE_FLOW_ITEM_TYPE_GTPC)) @@ -168,7 +174,7 @@ static const uint64_t pattern_next_allow_items[] = { [RTE_FLOW_ITEM_TYPE_VOID] = I40E_HASH_VOID_NEXT_ALLOW, [RTE_FLOW_ITEM_TYPE_ETH] = I40E_HASH_ETH_NEXT_ALLOW, [RTE_FLOW_ITEM_TYPE_IPV4] = I40E_HASH_IP_NEXT_ALLOW, - [RTE_FLOW_ITEM_TYPE_IPV6] = I40E_HASH_IP_NEXT_ALLOW, + [RTE_FLOW_ITEM_TYPE_IPV6] = I40E_HASH_IPV6_NEXT_ALLOW, [RTE_FLOW_ITEM_TYPE_UDP] = I40E_HASH_UDP_NEXT_ALLOW, [RTE_FLOW_ITEM_TYPE_GTPU] = I40E_HASH_GTPU_NEXT_ALLOW, }; @@ -177,6 +183,7 @@ static const uint64_t pattern_item_header[] = { [RTE_FLOW_ITEM_TYPE_ETH] = I40E_HASH_HDR_ETH, [RTE_FLOW_ITEM_TYPE_IPV4] = I40E_HASH_HDR_IPV4, [RTE_FLOW_ITEM_TYPE_IPV6] = I40E_HASH_HDR_IPV6, + [RTE_FLOW_ITEM_TYPE_IPV6_FRAG_EXT] = I40E_HASH_HDR_IPV6_FRAG, [RTE_FLOW_ITEM_TYPE_TCP] = I40E_HASH_HDR_TCP, [RTE_FLOW_ITEM_TYPE_UDP] = I40E_HASH_HDR_UDP, [RTE_FLOW_ITEM_TYPE_SCTP] = I40E_HASH_HDR_SCTP, @@ -270,6 +277,10 @@ static const struct i40e_hash_match_pattern match_patterns[] = { I40E_HASH_IPV6_L23_RSS_MASK, I40E_FILTER_PCTYPE_NONF_IPV6_OTHER), + I40E_HASH_MAP_PATTERN(I40E_PHINT_IPV6_FRAG, + ETH_RSS_FRAG_IPV6 | I40E_HASH_L23_RSS_MASK, + I40E_FILTER_PCTYPE_FRAG_IPV6), + I40E_HASH_MAP_PATTERN(I40E_PHINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP | I40E_HASH_IPV6_L234_RSS_MASK, -- 2.20.1