From patchwork Thu Jun 18 05:43:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junfeng Guo X-Patchwork-Id: 71709 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id EE3DDA04A5; Thu, 18 Jun 2020 07:44:50 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 134725F2F; Thu, 18 Jun 2020 07:44:45 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id D52204C9D for ; Thu, 18 Jun 2020 07:44:41 +0200 (CEST) IronPort-SDR: XYhnlOeAUJ1b7gjHnzOAUmP+Xx91xQAsL9I0jWoyQP5suF6MYZWY/lnOZHVa6dqIgoVJpxoyiE py1JnWQiOISw== X-IronPort-AV: E=McAfee;i="6000,8403,9655"; a="139952670" X-IronPort-AV: E=Sophos;i="5.73,525,1583222400"; d="scan'208";a="139952670" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jun 2020 22:44:41 -0700 IronPort-SDR: d3BK3Gfbr/lmrz5omjroYv1LWbIc6Mp7Z9fEDZQYyKrmPEaEPaoN7rk84N0pW4g37I+Lhn4Kc/ CvvoMe7Kyqtg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,525,1583222400"; d="scan'208";a="421390828" Received: from dpdk-junfengguo-v3.sh.intel.com ([10.67.119.102]) by orsmga004.jf.intel.com with ESMTP; 17 Jun 2020 22:44:39 -0700 From: Junfeng Guo To: qi.z.zhang@intel.com, xiaolong.ye@intel.com, beilei.xing@intel.com Cc: dev@dpdk.org, jia.guo@intel.com, junfeng.guo@intel.com, simei.su@intel.com Date: Thu, 18 Jun 2020 13:43:04 +0800 Message-Id: <20200618054305.8097-2-junfeng.guo@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200618054305.8097-1-junfeng.guo@intel.com> References: <20200618044825.19656-1-junfeng.guo@intel.com> <20200618054305.8097-1-junfeng.guo@intel.com> Subject: [dpdk-dev] [PATCH v4 1/2] net/ice: add RSS support for ipv4 ipv6 mix of GTP X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" RSS for GTP with outer & inner ipv4 & ipv6 combination are supported in this patch, so that we can process RSS based on inner 5 tuples or 3 tuples of all the cases below of GTP packets: 1. ipv4 (outer) + ipv4 (inner) 2. ipv4 (outer) + ipv6 (inner) 3. ipv6 (outer) + ipv4 (inner) 4. ipv6 (outer) + ipv6 (inner) Signed-off-by: Junfeng Guo --- drivers/net/ice/ice_generic_flow.c | 368 +++++++++++++++++++++++++++++ drivers/net/ice/ice_generic_flow.h | 47 ++++ drivers/net/ice/ice_hash.c | 100 ++++++++ 3 files changed, 515 insertions(+) diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c index 9f83a428d..3b588b4ee 100644 --- a/drivers/net/ice/ice_generic_flow.c +++ b/drivers/net/ice/ice_generic_flow.c @@ -1079,6 +1079,196 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[] = { RTE_FLOW_ITEM_TYPE_END, }; +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_udp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_tcp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_TCP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_sctp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_SCTP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_icmp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_ICMP, + RTE_FLOW_ITEM_TYPE_END, +}; + +/*IPv4 GTPU IPv6 */ +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_udp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_tcp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_TCP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_sctp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_SCTP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_icmp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_ICMP, + RTE_FLOW_ITEM_TYPE_END, +}; + +/*IPv6 GTPU IPv4 */ +enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_udp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_tcp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_TCP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_sctp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_SCTP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_icmp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_ICMP, + RTE_FLOW_ITEM_TYPE_END, +}; + +/*IPv6 GTPU IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_udp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_tcp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_TCP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_sctp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_SCTP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_icmp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_ICMP, + RTE_FLOW_ITEM_TYPE_END, +}; + /*IPv4 GTPU EH IPv4 */ enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[] = { RTE_FLOW_ITEM_TYPE_ETH, @@ -1089,6 +1279,7 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[] = { RTE_FLOW_ITEM_TYPE_IPV4, RTE_FLOW_ITEM_TYPE_END, }; + enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[] = { RTE_FLOW_ITEM_TYPE_ETH, RTE_FLOW_ITEM_TYPE_IPV4, @@ -1099,6 +1290,7 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[] = { RTE_FLOW_ITEM_TYPE_UDP, RTE_FLOW_ITEM_TYPE_END, }; + enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_tcp[] = { RTE_FLOW_ITEM_TYPE_ETH, RTE_FLOW_ITEM_TYPE_IPV4, @@ -1108,8 +1300,19 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_tcp[] = { RTE_FLOW_ITEM_TYPE_IPV4, RTE_FLOW_ITEM_TYPE_TCP, RTE_FLOW_ITEM_TYPE_END, +}; +enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_sctp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_SCTP, + RTE_FLOW_ITEM_TYPE_END, }; + enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = { RTE_FLOW_ITEM_TYPE_ETH, RTE_FLOW_ITEM_TYPE_IPV4, @@ -1121,6 +1324,171 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = { RTE_FLOW_ITEM_TYPE_END, }; +/*IPv4 GTPU EH IPv6 */ +enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_udp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_tcp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_TCP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_sctp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_SCTP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_icmp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_ICMP, + RTE_FLOW_ITEM_TYPE_END, +}; + +/*IPv6 GTPU EH IPv4 */ +enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_udp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_tcp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_TCP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_sctp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_SCTP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_icmp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_ICMP, + RTE_FLOW_ITEM_TYPE_END, +}; + +/*IPv6 GTPU EH IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_udp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_tcp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_TCP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_sctp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_SCTP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_icmp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_ICMP, + RTE_FLOW_ITEM_TYPE_END, +}; + /* PPPoE */ enum rte_flow_item_type pattern_eth_pppoed[] = { RTE_FLOW_ITEM_TYPE_ETH, diff --git a/drivers/net/ice/ice_generic_flow.h b/drivers/net/ice/ice_generic_flow.h index 3ce9a1f27..2054d814e 100644 --- a/drivers/net/ice/ice_generic_flow.h +++ b/drivers/net/ice/ice_generic_flow.h @@ -371,13 +371,60 @@ extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh[]; /* IPv4 GTPU IPv4 */ extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[]; +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_udp[]; +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_tcp[]; +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_sctp[]; +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_icmp[]; + +/* IPv4 GTPU IPv6 */ +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6[]; +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_udp[]; +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_tcp[]; +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_sctp[]; +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv6_icmp[]; + +/* IPv6 GTPU IPv4 */ +extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4[]; +extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_udp[]; +extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_tcp[]; +extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_sctp[]; +extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv4_icmp[]; + +/* IPv6 GTPU IPv6 */ +extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6[]; +extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_udp[]; +extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_tcp[]; +extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_sctp[]; +extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_ipv6_icmp[]; /* IPv4 GTPU EH IPv4 */ extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[]; extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[]; extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_tcp[]; +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_sctp[]; extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_icmp[]; +/* IPv4 GTPU EH IPv6 */ +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6[]; +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_udp[]; +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_tcp[]; +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_sctp[]; +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv6_icmp[]; + +/* IPv6 GTPU EH IPv4 */ +extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4[]; +extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_udp[]; +extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_tcp[]; +extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_sctp[]; +extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv4_icmp[]; + +/* IPv6 GTPU EH IPv6 */ +extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6[]; +extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_udp[]; +extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_tcp[]; +extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_sctp[]; +extern enum rte_flow_item_type pattern_eth_ipv6_gtpu_eh_ipv6_icmp[]; + /* PPPoE */ extern enum rte_flow_item_type pattern_eth_pppoed[]; extern enum rte_flow_item_type pattern_eth_vlan_pppoed[]; diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c index 628d3e184..c976285dd 100644 --- a/drivers/net/ice/ice_hash.c +++ b/drivers/net/ice/ice_hash.c @@ -99,6 +99,39 @@ struct rss_type_match_hdr hint_eth_ipv4_sctp = { struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4 = { ICE_FLOW_SEG_HDR_GTPU_IP, ETH_RSS_GTPU | ETH_RSS_IPV4}; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4_udp = { + ICE_FLOW_SEG_HDR_GTPU_IP, + ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP}; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4_tcp = { + ICE_FLOW_SEG_HDR_GTPU_IP, + ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP}; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6 = { + ICE_FLOW_SEG_HDR_GTPU_IP, + ETH_RSS_GTPU | ETH_RSS_IPV6}; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6_udp = { + ICE_FLOW_SEG_HDR_GTPU_IP, + ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP}; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6_tcp = { + ICE_FLOW_SEG_HDR_GTPU_IP, + ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP}; +struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4 = { + ICE_FLOW_SEG_HDR_GTPU_IP, + ETH_RSS_GTPU | ETH_RSS_IPV4}; +struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4_udp = { + ICE_FLOW_SEG_HDR_GTPU_IP, + ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP}; +struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4_tcp = { + ICE_FLOW_SEG_HDR_GTPU_IP, + ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP}; +struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6 = { + ICE_FLOW_SEG_HDR_GTPU_IP, + ETH_RSS_GTPU | ETH_RSS_IPV6}; +struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6_udp = { + ICE_FLOW_SEG_HDR_GTPU_IP, + ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP}; +struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6_tcp = { + ICE_FLOW_SEG_HDR_GTPU_IP, + ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP}; struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4 = { ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_GTPU | ETH_RSS_IPV4}; @@ -108,6 +141,33 @@ struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_udp = { struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_tcp = { ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP}; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6 = { + ICE_FLOW_SEG_HDR_GTPU_EH, + ETH_RSS_GTPU | ETH_RSS_IPV6}; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6_udp = { + ICE_FLOW_SEG_HDR_GTPU_EH, + ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP}; +struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6_tcp = { + ICE_FLOW_SEG_HDR_GTPU_EH, + ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP}; +struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4 = { + ICE_FLOW_SEG_HDR_GTPU_EH, + ETH_RSS_GTPU | ETH_RSS_IPV4}; +struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4_udp = { + ICE_FLOW_SEG_HDR_GTPU_EH, + ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP}; +struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4_tcp = { + ICE_FLOW_SEG_HDR_GTPU_EH, + ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP}; +struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6 = { + ICE_FLOW_SEG_HDR_GTPU_EH, + ETH_RSS_GTPU | ETH_RSS_IPV6}; +struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6_udp = { + ICE_FLOW_SEG_HDR_GTPU_EH, + ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP}; +struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6_tcp = { + ICE_FLOW_SEG_HDR_GTPU_EH, + ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP}; struct rss_type_match_hdr hint_eth_pppoes_ipv4 = { ICE_FLOW_SEG_HDR_PPPOE, ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_IPV4}; @@ -226,12 +286,52 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = { &hint_eth_ipv4_sctp}, {pattern_eth_ipv4_gtpu_ipv4, ICE_INSET_NONE, &hint_eth_ipv4_gtpu_ipv4}, + {pattern_eth_ipv4_gtpu_ipv4_udp, ICE_INSET_NONE, + &hint_eth_ipv4_gtpu_ipv4_udp}, + {pattern_eth_ipv4_gtpu_ipv4_tcp, ICE_INSET_NONE, + &hint_eth_ipv4_gtpu_ipv4_tcp}, + {pattern_eth_ipv4_gtpu_ipv6, ICE_INSET_NONE, + &hint_eth_ipv4_gtpu_ipv6}, + {pattern_eth_ipv4_gtpu_ipv6_udp, ICE_INSET_NONE, + &hint_eth_ipv4_gtpu_ipv6_udp}, + {pattern_eth_ipv4_gtpu_ipv6_tcp, ICE_INSET_NONE, + &hint_eth_ipv4_gtpu_ipv6_tcp}, + {pattern_eth_ipv6_gtpu_ipv4, ICE_INSET_NONE, + &hint_eth_ipv6_gtpu_ipv4}, + {pattern_eth_ipv6_gtpu_ipv4_udp, ICE_INSET_NONE, + &hint_eth_ipv6_gtpu_ipv4_udp}, + {pattern_eth_ipv6_gtpu_ipv4_tcp, ICE_INSET_NONE, + &hint_eth_ipv6_gtpu_ipv4_tcp}, + {pattern_eth_ipv6_gtpu_ipv6, ICE_INSET_NONE, + &hint_eth_ipv6_gtpu_ipv6}, + {pattern_eth_ipv6_gtpu_ipv6_udp, ICE_INSET_NONE, + &hint_eth_ipv6_gtpu_ipv6_udp}, + {pattern_eth_ipv6_gtpu_ipv6_tcp, ICE_INSET_NONE, + &hint_eth_ipv6_gtpu_ipv6_tcp}, {pattern_eth_ipv4_gtpu_eh_ipv4, ICE_INSET_NONE, &hint_eth_ipv4_gtpu_eh_ipv4}, {pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE, &hint_eth_ipv4_gtpu_eh_ipv4_udp}, {pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE, &hint_eth_ipv4_gtpu_eh_ipv4_tcp}, + {pattern_eth_ipv4_gtpu_eh_ipv6, ICE_INSET_NONE, + &hint_eth_ipv4_gtpu_eh_ipv6}, + {pattern_eth_ipv4_gtpu_eh_ipv6_udp, ICE_INSET_NONE, + &hint_eth_ipv4_gtpu_eh_ipv6_udp}, + {pattern_eth_ipv4_gtpu_eh_ipv6_tcp, ICE_INSET_NONE, + &hint_eth_ipv4_gtpu_eh_ipv6_tcp}, + {pattern_eth_ipv6_gtpu_eh_ipv4, ICE_INSET_NONE, + &hint_eth_ipv6_gtpu_eh_ipv4}, + {pattern_eth_ipv6_gtpu_eh_ipv4_udp, ICE_INSET_NONE, + &hint_eth_ipv6_gtpu_eh_ipv4_udp}, + {pattern_eth_ipv6_gtpu_eh_ipv4_tcp, ICE_INSET_NONE, + &hint_eth_ipv6_gtpu_eh_ipv4_tcp}, + {pattern_eth_ipv6_gtpu_eh_ipv6, ICE_INSET_NONE, + &hint_eth_ipv6_gtpu_eh_ipv6}, + {pattern_eth_ipv6_gtpu_eh_ipv6_udp, ICE_INSET_NONE, + &hint_eth_ipv6_gtpu_eh_ipv6_udp}, + {pattern_eth_ipv6_gtpu_eh_ipv6_tcp, ICE_INSET_NONE, + &hint_eth_ipv6_gtpu_eh_ipv6_tcp}, {pattern_eth_pppoes_ipv4, ICE_INSET_NONE, &hint_eth_pppoes_ipv4}, {pattern_eth_pppoes_ipv4_udp, ICE_INSET_NONE, From patchwork Thu Jun 18 05:43:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junfeng Guo X-Patchwork-Id: 71710 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 131F0A04A5; Thu, 18 Jun 2020 07:45:00 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4C7381B203; Thu, 18 Jun 2020 07:44:49 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 342901B13C for ; Thu, 18 Jun 2020 07:44:47 +0200 (CEST) IronPort-SDR: uVfrPVlF1IPp7sJFmeAVxMshd5+biVJ4aWV/RaB4gMZyYQqTc0h0UfTcrZVtoNkLe8l8jlvIyF nzeadpQe6k6Q== X-IronPort-AV: E=McAfee;i="6000,8403,9655"; a="139952708" X-IronPort-AV: E=Sophos;i="5.73,525,1583222400"; d="scan'208";a="139952708" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jun 2020 22:44:45 -0700 IronPort-SDR: kauAnnLABikcvlAR5hSlbcFMFJjHELtIQ3doBOnH2binnAY9jDCQc5SGl3nTsh1QbeoFbHTE/L qnkqLinQkUyQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,525,1583222400"; d="scan'208";a="421390842" Received: from dpdk-junfengguo-v3.sh.intel.com ([10.67.119.102]) by orsmga004.jf.intel.com with ESMTP; 17 Jun 2020 22:44:42 -0700 From: Junfeng Guo To: qi.z.zhang@intel.com, xiaolong.ye@intel.com, beilei.xing@intel.com Cc: dev@dpdk.org, jia.guo@intel.com, junfeng.guo@intel.com, simei.su@intel.com Date: Thu, 18 Jun 2020 13:43:05 +0800 Message-Id: <20200618054305.8097-3-junfeng.guo@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200618054305.8097-1-junfeng.guo@intel.com> References: <20200618044825.19656-1-junfeng.guo@intel.com> <20200618054305.8097-1-junfeng.guo@intel.com> Subject: [dpdk-dev] [PATCH v4 2/2] net/iavf: add RSS support for ipv4 ipv6 mix of GTP X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" RSS for GTP with outer & inner ipv4 & ipv6 combination are supported in this patch, so that we can process RSS based on inner 5 tuples or 3 tuples of all the cases below of GTP packets: 1. ipv4 (outer) + ipv4 (inner) 2. ipv4 (outer) + ipv6 (inner) 3. ipv6 (outer) + ipv4 (inner) 4. ipv6 (outer) + ipv6 (inner) Signed-off-by: Junfeng Guo --- drivers/net/iavf/iavf_generic_flow.c | 365 ++++++++ drivers/net/iavf/iavf_generic_flow.h | 47 + drivers/net/iavf/iavf_hash.c | 1286 ++++++++++++++++++++++++-- 3 files changed, 1646 insertions(+), 52 deletions(-) diff --git a/drivers/net/iavf/iavf_generic_flow.c b/drivers/net/iavf/iavf_generic_flow.c index c6d48f081..286d046dd 100644 --- a/drivers/net/iavf/iavf_generic_flow.c +++ b/drivers/net/iavf/iavf_generic_flow.c @@ -361,6 +361,196 @@ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4[] = { RTE_FLOW_ITEM_TYPE_END, }; +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_udp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_tcp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_TCP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_sctp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_SCTP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_icmp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_ICMP, + RTE_FLOW_ITEM_TYPE_END, +}; + +/* IPV4 GTPU IPv6 */ +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6_udp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6_tcp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_TCP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6_sctp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_SCTP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6_icmp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_ICMP, + RTE_FLOW_ITEM_TYPE_END, +}; + +/* IPV6 GTPU IPv4 */ +enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4_udp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4_tcp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_TCP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4_sctp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_SCTP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4_icmp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_ICMP, + RTE_FLOW_ITEM_TYPE_END, +}; + +/* IPV6 GTPU IPv6 */ +enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6_udp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6_tcp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_TCP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6_sctp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_SCTP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6_icmp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_ICMP, + RTE_FLOW_ITEM_TYPE_END, +}; + /* IPV4 GTPU EH IPv4 */ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4[] = { RTE_FLOW_ITEM_TYPE_ETH, @@ -392,7 +582,17 @@ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_tcp[] = { RTE_FLOW_ITEM_TYPE_IPV4, RTE_FLOW_ITEM_TYPE_TCP, RTE_FLOW_ITEM_TYPE_END, +}; +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_sctp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_SCTP, + RTE_FLOW_ITEM_TYPE_END, }; enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = { @@ -406,6 +606,171 @@ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = { RTE_FLOW_ITEM_TYPE_END, }; +/* IPV4 GTPU EH IPv6 */ +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6_udp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6_tcp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_TCP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6_sctp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_SCTP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6_icmp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_ICMP, + RTE_FLOW_ITEM_TYPE_END, +}; + +/* IPV6 GTPU EH IPv4 */ +enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4_udp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4_tcp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_TCP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4_sctp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_SCTP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4_icmp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_ICMP, + RTE_FLOW_ITEM_TYPE_END, +}; + +/* IPV6 GTPU EH IPv6 */ +enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6_udp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6_tcp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_TCP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6_sctp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_SCTP, + RTE_FLOW_ITEM_TYPE_END, +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6_icmp[] = { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_IPV6, + RTE_FLOW_ITEM_TYPE_ICMP, + RTE_FLOW_ITEM_TYPE_END, +}; + /* ESP */ enum rte_flow_item_type iavf_pattern_eth_ipv4_esp[] = { RTE_FLOW_ITEM_TYPE_ETH, diff --git a/drivers/net/iavf/iavf_generic_flow.h b/drivers/net/iavf/iavf_generic_flow.h index 8a6687542..9e640fb43 100644 --- a/drivers/net/iavf/iavf_generic_flow.h +++ b/drivers/net/iavf/iavf_generic_flow.h @@ -192,13 +192,60 @@ extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh[]; /* IPv4 GTPU IPv4 */ extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_udp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_tcp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_sctp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4_icmp[]; + +/* IPv4 GTPU IPv6 */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6_udp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6_tcp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6_sctp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv6_icmp[]; + +/* IPv6 GTPU IPv4 */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4_udp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4_tcp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4_sctp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv4_icmp[]; + +/* IPv6 GTPU IPv6 */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6_udp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6_tcp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6_sctp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_ipv6_icmp[]; /* IPv4 GTPU EH IPv4 */ extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4[]; extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_udp[]; extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_tcp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_sctp[]; extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_icmp[]; +/* IPv4 GTPU EH IPv6 */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6_udp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6_tcp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6_sctp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv6_icmp[]; + +/* IPv6 GTPU EH IPv4 */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4_udp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4_tcp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4_sctp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv4_icmp[]; + +/* IPv6 GTPU EH IPv6 */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6_udp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6_tcp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6_sctp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh_ipv6_icmp[]; + /* ESP */ extern enum rte_flow_item_type iavf_pattern_eth_ipv4_esp[]; extern enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_esp[]; diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c index f8ff82d32..2749dfa6b 100644 --- a/drivers/net/iavf/iavf_hash.c +++ b/drivers/net/iavf/iavf_hash.c @@ -39,6 +39,10 @@ enum iavf_pattern_hint_type { IAVF_PHINT_IPV4_GTPU_EH = 0x00000800, IAVF_PHINT_IPV4_GTPU_EH_DWNLINK = 0x00001000, IAVF_PHINT_IPV4_GTPU_EH_UPLINK = 0x00002000, + IAVF_PHINT_IPV6_GTPU_IP = 0x00004000, + IAVF_PHINT_IPV6_GTPU_EH = 0x00008000, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK = 0x00010000, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK = 0x00020000, }; #define IAVF_GTPU_EH_DWNLINK 0 @@ -97,12 +101,52 @@ static struct iavf_pattern_match_type phint_eth_ipv4_sctp = { IAVF_PHINT_IPV4_SCTP}; static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv4 = { IAVF_PHINT_IPV4}; +static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv4_udp = { + IAVF_PHINT_IPV4_UDP}; +static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv4_tcp = { + IAVF_PHINT_IPV4_TCP}; +static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv6 = { + IAVF_PHINT_IPV6}; +static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv6_udp = { + IAVF_PHINT_IPV6_UDP}; +static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_ipv6_tcp = { + IAVF_PHINT_IPV6_TCP}; +static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv4 = { + IAVF_PHINT_IPV4}; +static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv4_udp = { + IAVF_PHINT_IPV4_UDP}; +static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv4_tcp = { + IAVF_PHINT_IPV4_TCP}; +static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv6 = { + IAVF_PHINT_IPV6}; +static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv6_udp = { + IAVF_PHINT_IPV6_UDP}; +static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_ipv6_tcp = { + IAVF_PHINT_IPV6_TCP}; static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4 = { IAVF_PHINT_IPV4}; static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4_udp = { IAVF_PHINT_IPV4_UDP}; static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4_tcp = { IAVF_PHINT_IPV4_TCP}; +static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv6 = { + IAVF_PHINT_IPV6}; +static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv6_udp = { + IAVF_PHINT_IPV6_UDP}; +static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv6_tcp = { + IAVF_PHINT_IPV6_TCP}; +static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv4 = { + IAVF_PHINT_IPV4}; +static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv4_udp = { + IAVF_PHINT_IPV4_UDP}; +static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv4_tcp = { + IAVF_PHINT_IPV4_TCP}; +static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv6 = { + IAVF_PHINT_IPV6}; +static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv6_udp = { + IAVF_PHINT_IPV6_UDP}; +static struct iavf_pattern_match_type phint_eth_ipv6_gtpu_eh_ipv6_tcp = { + IAVF_PHINT_IPV6_TCP}; static struct iavf_pattern_match_type phint_eth_ipv4_esp = { IAVF_PHINT_IPV4}; static struct iavf_pattern_match_type phint_eth_ipv4_udp_esp = { @@ -149,12 +193,52 @@ static struct iavf_pattern_match_item iavf_hash_pattern_list[] = { {iavf_pattern_eth_ipv4_sctp, IAVF_INSET_NONE, &phint_eth_ipv4_sctp}, {iavf_pattern_eth_ipv4_gtpu_ipv4, IAVF_INSET_NONE, &phint_eth_ipv4_gtpu_ipv4}, + {iavf_pattern_eth_ipv4_gtpu_ipv4_udp, IAVF_INSET_NONE, + &phint_eth_ipv4_gtpu_ipv4_udp}, + {iavf_pattern_eth_ipv4_gtpu_ipv4_tcp, IAVF_INSET_NONE, + &phint_eth_ipv4_gtpu_ipv4_tcp}, + {iavf_pattern_eth_ipv4_gtpu_ipv6, IAVF_INSET_NONE, + &phint_eth_ipv4_gtpu_ipv6}, + {iavf_pattern_eth_ipv4_gtpu_ipv6_udp, IAVF_INSET_NONE, + &phint_eth_ipv4_gtpu_ipv6_udp}, + {iavf_pattern_eth_ipv4_gtpu_ipv6_tcp, IAVF_INSET_NONE, + &phint_eth_ipv4_gtpu_ipv6_tcp}, + {iavf_pattern_eth_ipv6_gtpu_ipv4, IAVF_INSET_NONE, + &phint_eth_ipv6_gtpu_ipv4}, + {iavf_pattern_eth_ipv6_gtpu_ipv4_udp, IAVF_INSET_NONE, + &phint_eth_ipv6_gtpu_ipv4_udp}, + {iavf_pattern_eth_ipv6_gtpu_ipv4_tcp, IAVF_INSET_NONE, + &phint_eth_ipv6_gtpu_ipv4_tcp}, + {iavf_pattern_eth_ipv6_gtpu_ipv6, IAVF_INSET_NONE, + &phint_eth_ipv6_gtpu_ipv6}, + {iavf_pattern_eth_ipv6_gtpu_ipv6_udp, IAVF_INSET_NONE, + &phint_eth_ipv6_gtpu_ipv6_udp}, + {iavf_pattern_eth_ipv6_gtpu_ipv6_tcp, IAVF_INSET_NONE, + &phint_eth_ipv6_gtpu_ipv6_tcp}, {iavf_pattern_eth_ipv4_gtpu_eh_ipv4, IAVF_INSET_NONE, &phint_eth_ipv4_gtpu_eh_ipv4}, {iavf_pattern_eth_ipv4_gtpu_eh_ipv4_udp, IAVF_INSET_NONE, &phint_eth_ipv4_gtpu_eh_ipv4_udp}, {iavf_pattern_eth_ipv4_gtpu_eh_ipv4_tcp, IAVF_INSET_NONE, &phint_eth_ipv4_gtpu_eh_ipv4_tcp}, + {iavf_pattern_eth_ipv4_gtpu_eh_ipv6, IAVF_INSET_NONE, + &phint_eth_ipv4_gtpu_eh_ipv6}, + {iavf_pattern_eth_ipv4_gtpu_eh_ipv6_udp, IAVF_INSET_NONE, + &phint_eth_ipv4_gtpu_eh_ipv6_udp}, + {iavf_pattern_eth_ipv4_gtpu_eh_ipv6_tcp, IAVF_INSET_NONE, + &phint_eth_ipv4_gtpu_eh_ipv6_tcp}, + {iavf_pattern_eth_ipv6_gtpu_eh_ipv4, IAVF_INSET_NONE, + &phint_eth_ipv6_gtpu_eh_ipv4}, + {iavf_pattern_eth_ipv6_gtpu_eh_ipv4_udp, IAVF_INSET_NONE, + &phint_eth_ipv6_gtpu_eh_ipv4_udp}, + {iavf_pattern_eth_ipv6_gtpu_eh_ipv4_tcp, IAVF_INSET_NONE, + &phint_eth_ipv6_gtpu_eh_ipv4_tcp}, + {iavf_pattern_eth_ipv6_gtpu_eh_ipv6, IAVF_INSET_NONE, + &phint_eth_ipv6_gtpu_eh_ipv6}, + {iavf_pattern_eth_ipv6_gtpu_eh_ipv6_udp, IAVF_INSET_NONE, + &phint_eth_ipv6_gtpu_eh_ipv6_udp}, + {iavf_pattern_eth_ipv6_gtpu_eh_ipv6_tcp, IAVF_INSET_NONE, + &phint_eth_ipv6_gtpu_eh_ipv6_tcp}, {iavf_pattern_eth_ipv4_esp, IAVF_INSET_NONE, &phint_eth_ipv4_esp}, {iavf_pattern_eth_ipv4_udp_esp, IAVF_INSET_NONE, &phint_eth_ipv4_udp_esp}, @@ -541,7 +625,8 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_esp = { proto_hint_udp_only, proto_hint_esp } }; -/* GTPU IP */ +/* IPv4 GTPU IP */ + struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_gtpu_ip = { TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_only, proto_hint_ipv4_src } @@ -561,7 +646,24 @@ struct virtchnl_proto_hdrs hdrs_hint_teid_gtpu_ip = { TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_teid} }; -/* GTPU EH */ +/* IPv6 GTPU IP */ + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_gtpu_ip = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_only, + proto_hint_ipv6_src } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_gtpu_ip = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_only, + proto_hint_ipv6_dst } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_ip = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_ip_only, + proto_hint_ipv6 } +}; + +/* IPv4 GTPU EH */ struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_eh = { TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, @@ -648,7 +750,94 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_eh = { proto_hint_ipv4, proto_hint_tcp} }; -/* GTPU UP */ +/* IPv6 GTPU EH */ + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv6_only_prot, proto_hint_udp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_dst_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv6_only_prot, proto_hint_udp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_src_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv6_only_prot, proto_hint_tcp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_dst_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv6_only_prot, proto_hint_tcp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only, + proto_hint_ipv6_src } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_src_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv6_src_prot, proto_hint_udp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_dst_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv6_src_prot, proto_hint_udp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_src_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv6_src_prot, proto_hint_tcp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_dst_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv6_src_prot, proto_hint_tcp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only, + proto_hint_ipv6_dst } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only, + proto_hint_ipv6 } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_src_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv6_dst_prot, proto_hint_udp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_dst_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv6_dst_prot, proto_hint_udp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_src_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv6_dst_prot, proto_hint_tcp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_dst_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv6_dst_prot, proto_hint_tcp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv6, proto_hint_udp} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv6, proto_hint_tcp} +}; + +/* IPv4 GTPU UP */ struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_up = { TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, @@ -735,7 +924,94 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_up = { proto_hint_ipv4, proto_hint_tcp} }; -/* GTPU DWN */ +/* IPv6 GTPU UP */ + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv6_only_prot, proto_hint_udp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_dst_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv6_only_prot, proto_hint_udp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_src_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv6_only_prot, proto_hint_tcp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_dst_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv6_only_prot, proto_hint_tcp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only, + proto_hint_ipv6_src } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_src_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv6_src_prot, proto_hint_udp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_dst_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv6_src_prot, proto_hint_udp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_src_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv6_src_prot, proto_hint_tcp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_dst_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv6_src_prot, proto_hint_tcp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only, + proto_hint_ipv6_dst } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only, + proto_hint_ipv6 } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_src_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv6_dst_prot, proto_hint_udp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_dst_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv6_dst_prot, proto_hint_udp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_src_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv6_dst_prot, proto_hint_tcp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_dst_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv6_dst_prot, proto_hint_tcp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv6, proto_hint_udp} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv6, proto_hint_tcp} +}; + +/* IPv4 GTPU DWN */ struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_dwn = { TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, @@ -822,6 +1098,93 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_dwn = { proto_hint_ipv4, proto_hint_tcp} }; +/* IPv6 GTPU DWN */ + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6_only_prot, proto_hint_udp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_dst_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6_only_prot, proto_hint_udp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_src_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6_only_prot, proto_hint_tcp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_dst_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6_only_prot, proto_hint_tcp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6_src } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_src_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6_src_prot, proto_hint_udp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_dst_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6_src_prot, proto_hint_udp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_src_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6_src_prot, proto_hint_tcp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_dst_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6_src_prot, proto_hint_tcp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6_dst } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6 } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_src_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6_dst_prot, proto_hint_udp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_dst_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6_dst_prot, proto_hint_udp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_src_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6_dst_prot, proto_hint_tcp_src_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_dst_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6_dst_prot, proto_hint_tcp_dst_port} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6, proto_hint_udp} +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6, proto_hint_tcp} +}; + /* IPV6 */ struct virtchnl_proto_hdrs hdrs_hint_ipv6_src = { @@ -1277,7 +1640,7 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { /* GTPU */ /* GTPU IP */ - /* GTPU IPV4*/ + /* IPv4 GTPU IPv4*/ {ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4}, @@ -1298,8 +1661,53 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { {ETH_RSS_GTPU, &hdrs_hint_teid_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4}, + /* IPv4 GTPU IPv6*/ + {ETH_RSS_IPV6 | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv4_src_gtpu_ip, + IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6}, + {ETH_RSS_IPV6 | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv4_dst_gtpu_ip, + IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6}, + {ETH_RSS_IPV6, + &hdrs_hint_ipv4_gtpu_ip, + IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6}, + {ETH_RSS_GTPU, + &hdrs_hint_teid_gtpu_ip, + IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6}, + /* IPv6 GTPU IPv4*/ + {ETH_RSS_IPV4 | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv6_src_gtpu_ip, + IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4}, + {ETH_RSS_IPV4 | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv6_dst_gtpu_ip, + IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4}, + {ETH_RSS_IPV4, + &hdrs_hint_ipv6_gtpu_ip, + IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4}, + {ETH_RSS_GTPU, + &hdrs_hint_teid_gtpu_ip, + IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4}, + /* IPv6 GTPU IPv6*/ + {ETH_RSS_IPV6 | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv6_src_gtpu_ip, + IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6}, + {ETH_RSS_IPV6 | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv6_dst_gtpu_ip, + IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6}, + {ETH_RSS_IPV6, + &hdrs_hint_ipv6_gtpu_ip, + IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6}, + {ETH_RSS_GTPU, + &hdrs_hint_teid_gtpu_ip, + IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6}, /* GTPU EH */ - /* Inner IPV4 */ + /* IPv4 GTPU EH IPv4 */ {ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src_gtpu_eh, IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4}, @@ -1317,7 +1725,43 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { {ETH_RSS_IPV4, &hdrs_hint_ipv4_gtpu_eh, IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4}, - /* Inner IPV4->UDP */ + /* IPv4 GTPU EH IPv6 */ + {ETH_RSS_IPV6 | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv4_src_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6}, + {ETH_RSS_IPV6 | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv4_dst_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6}, + {ETH_RSS_IPV6, + &hdrs_hint_ipv4_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6}, + /* IPv6 GTPU EH IPv4 */ + {ETH_RSS_IPV4 | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv6_src_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4}, + {ETH_RSS_IPV4 | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv6_dst_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4}, + {ETH_RSS_IPV4, + &hdrs_hint_ipv6_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4}, + /* IPv6 GTPU EH IPv6 */ + {ETH_RSS_IPV6 | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv6_src_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6}, + {ETH_RSS_IPV6 | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv6_dst_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6}, + {ETH_RSS_IPV6, + &hdrs_hint_ipv6_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6}, + /* IPv4 GTPU EH IPv4 UDP */ {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_src_udp_src_gtpu_eh, @@ -1381,40 +1825,148 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { {ETH_RSS_NONFRAG_IPV4_UDP, &hdrs_hint_ipv4_udp_gtpu_eh, IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP}, - /* Inner IPV4->TCP */ - {ETH_RSS_L3_SRC_ONLY | - ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_src_tcp_src_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_SRC_ONLY | - ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_src_tcp_dst_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_tcp_src_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_DST_ONLY | - ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_dst_tcp_src_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_DST_ONLY | - ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_tcp_dst_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_NONFRAG_IPV4_TCP | + /* IPv4 GTPU EH IPv6 UDP */ + {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_src_tcp_src_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_NONFRAG_IPV4_TCP | + &hdrs_hint_ipv4_src_udp_src_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_src_udp_dst_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv4_src_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_udp_src_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_dst_udp_src_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_dst_udp_dst_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv4_dst_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_udp_dst_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP, + &hdrs_hint_ipv4_udp_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP}, + /* IPv6 GTPU EH IPv4 UDP */ + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_src_udp_src_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_src_udp_dst_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv6_src_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_udp_src_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_dst_udp_src_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_dst_udp_dst_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv6_dst_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_udp_dst_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP, + &hdrs_hint_ipv6_udp_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP}, + /* IPv6 GTPU EH IPv6 UDP */ + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_src_udp_src_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_src_udp_dst_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv6_src_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_udp_src_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_dst_udp_src_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_dst_udp_dst_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv6_dst_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_udp_dst_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP, + &hdrs_hint_ipv6_udp_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP}, + /* IPv4 GTPU EH IPv4 TCP */ + {ETH_RSS_L3_SRC_ONLY | + ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_src_tcp_src_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_L3_SRC_ONLY | + ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_src_tcp_dst_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv4_src_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_tcp_src_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_L3_DST_ONLY | + ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_dst_tcp_src_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_L3_DST_ONLY | + ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv4_dst_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_tcp_dst_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_src_tcp_src_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv4_src_tcp_dst_gtpu_eh, IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, @@ -1445,8 +1997,116 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { {ETH_RSS_NONFRAG_IPV4_TCP, &hdrs_hint_ipv4_tcp_gtpu_eh, IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, + /* IPv4 GTPU EH IPv6 TCP */ + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_src_tcp_src_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_src_tcp_dst_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv4_src_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_tcp_src_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_dst_tcp_src_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv4_dst_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_tcp_dst_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP, + &hdrs_hint_ipv4_tcp_gtpu_eh, + IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP}, + /* IPv6 GTPU EH IPv4 TCP */ + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_src_tcp_src_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_src_tcp_dst_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv6_src_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_tcp_src_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_dst_tcp_src_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_dst_tcp_dst_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv6_dst_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_tcp_dst_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP, + &hdrs_hint_ipv6_tcp_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP}, + /* IPv6 GTPU EH IPv6 TCP */ + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_src_tcp_src_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_src_tcp_dst_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv6_src_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_tcp_src_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_dst_tcp_src_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_dst_tcp_dst_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv6_dst_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_tcp_dst_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP, + &hdrs_hint_ipv6_tcp_gtpu_eh, + IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP}, /* GTPU EH UP */ - /* Inner IPV4 */ + /* IPv4 GTPU EH UP IPv4 */ {ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src_gtpu_up, IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4}, @@ -1464,7 +2124,43 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { {ETH_RSS_IPV4, &hdrs_hint_ipv4_gtpu_up, IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4}, - /* Inner IPV4->UDP */ + /* IPv4 GTPU EH UP IPv6 */ + {ETH_RSS_IPV6 | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv4_src_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6}, + {ETH_RSS_IPV6 | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv4_dst_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6}, + {ETH_RSS_IPV6, + &hdrs_hint_ipv4_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6}, + /* IPv6 GTPU EH UP IPv4 */ + {ETH_RSS_IPV4 | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv6_src_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4}, + {ETH_RSS_IPV4 | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv6_dst_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4}, + {ETH_RSS_IPV4, + &hdrs_hint_ipv6_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4}, + /* IPv6 GTPU EH UP IPv6 */ + {ETH_RSS_IPV6 | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv6_src_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6}, + {ETH_RSS_IPV6 | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv6_dst_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6}, + {ETH_RSS_IPV6, + &hdrs_hint_ipv6_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6}, + /* IPv4 GTPU EH UP IPv4 UDP */ {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_src_udp_src_gtpu_up, @@ -1528,7 +2224,115 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { {ETH_RSS_NONFRAG_IPV4_UDP, &hdrs_hint_ipv4_udp_gtpu_up, IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, - /* Inner IPV4->TCP */ + /* IPv4 GTPU EH UP IPv6 UDP */ + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_src_udp_src_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_src_udp_dst_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv4_src_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_udp_src_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_dst_udp_src_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_dst_udp_dst_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv4_dst_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_udp_dst_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP, + &hdrs_hint_ipv4_udp_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, + /* IPv6 GTPU EH UP IPv4 UDP */ + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_src_udp_src_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_src_udp_dst_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv6_src_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_udp_src_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_dst_udp_src_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_dst_udp_dst_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv6_dst_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_udp_dst_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP, + &hdrs_hint_ipv6_udp_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, + /* IPv6 GTPU EH UP IPv6 UDP */ + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_src_udp_src_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_src_udp_dst_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv6_src_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_udp_src_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_dst_udp_src_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_dst_udp_dst_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv6_dst_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_udp_dst_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP, + &hdrs_hint_ipv6_udp_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, + /* IPv4 GTPU EH UP IPv4 TCP */ {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_src_tcp_src_gtpu_up, @@ -1592,8 +2396,116 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { {ETH_RSS_NONFRAG_IPV4_TCP, &hdrs_hint_ipv4_tcp_gtpu_up, IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, + /* IPv4 GTPU EH UP IPv6 TCP */ + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_src_tcp_src_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_src_tcp_dst_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv4_src_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_tcp_src_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_dst_tcp_src_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_dst_tcp_dst_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv4_dst_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_tcp_dst_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP, + &hdrs_hint_ipv4_tcp_gtpu_up, + IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, + /* IPv6 GTPU EH UP IPv4 TCP */ + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_src_tcp_src_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_src_tcp_dst_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv6_src_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_tcp_src_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_dst_tcp_src_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_dst_tcp_dst_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv6_dst_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_tcp_dst_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP, + &hdrs_hint_ipv6_tcp_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, + /* IPv6 GTPU EH UP IPv6 TCP */ + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_src_tcp_src_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_src_tcp_dst_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv6_src_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_tcp_src_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_dst_tcp_src_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_dst_tcp_dst_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv6_dst_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_tcp_dst_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP, + &hdrs_hint_ipv6_tcp_gtpu_up, + IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, /* GTPU EH DWN */ - /* Inner IPV4 */ + /* IPv4 GTPU EH DWN IPv4 */ {ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src_gtpu_dwn, IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4}, @@ -1611,7 +2523,43 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { {ETH_RSS_IPV4, &hdrs_hint_ipv4_gtpu_dwn, IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4}, - /* Inner IPV4->UDP */ + /* IPv4 GTPU EH DWN IPv6 */ + {ETH_RSS_IPV6 | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv4_src_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6}, + {ETH_RSS_IPV6 | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv4_dst_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6}, + {ETH_RSS_IPV6, + &hdrs_hint_ipv4_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6}, + /* IPv6 GTPU EH DWN IPv4 */ + {ETH_RSS_IPV4 | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv6_src_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4}, + {ETH_RSS_IPV4 | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv6_dst_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4}, + {ETH_RSS_IPV4, + &hdrs_hint_ipv6_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4}, + /* IPv6 GTPU EH DWN IPv6 */ + {ETH_RSS_IPV6 | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv6_src_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6}, + {ETH_RSS_IPV6 | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv6_dst_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6}, + {ETH_RSS_IPV6, + &hdrs_hint_ipv6_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6}, + /* IPv4 GTPU EH DWN IPv4 UDP */ {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_src_udp_src_gtpu_dwn, @@ -1675,7 +2623,115 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { {ETH_RSS_NONFRAG_IPV4_UDP, &hdrs_hint_ipv4_udp_gtpu_dwn, IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, - /* Inner IPV4->TCP */ + /* IPv4 GTPU EH DWN IPv6 UDP */ + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_src_udp_src_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_src_udp_dst_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv4_src_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_udp_src_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_dst_udp_src_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_dst_udp_dst_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv4_dst_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_udp_dst_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP, + &hdrs_hint_ipv4_udp_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, + /* IPv6 GTPU EH DWN IPv4 UDP */ + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_src_udp_src_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_src_udp_dst_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv6_src_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_udp_src_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_dst_udp_src_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_dst_udp_dst_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv6_dst_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_udp_dst_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, + {ETH_RSS_NONFRAG_IPV4_UDP, + &hdrs_hint_ipv6_udp_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, + /* IPv6 GTPU EH DWN IPv6 UDP */ + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_src_udp_src_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_src_udp_dst_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv6_src_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_udp_src_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_dst_udp_src_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_dst_udp_dst_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv6_dst_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_udp_dst_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, + {ETH_RSS_NONFRAG_IPV6_UDP, + &hdrs_hint_ipv6_udp_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, + /* IPv4 GTPU EH DWN IPv4 TCP */ {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_src_tcp_src_gtpu_dwn, @@ -1739,6 +2795,114 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { {ETH_RSS_NONFRAG_IPV4_TCP, &hdrs_hint_ipv4_udp_gtpu_dwn, IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, + /* IPv4 GTPU EH DWN IPv6 TCP */ + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_src_tcp_src_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_src_tcp_dst_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv4_src_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_tcp_src_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv4_dst_tcp_src_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_dst_tcp_dst_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv4_dst_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv4_tcp_dst_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP, + &hdrs_hint_ipv4_udp_gtpu_dwn, + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, + /* IPv6 GTPU EH DWN IPv4 TCP */ + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_src_tcp_src_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_src_tcp_dst_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv6_src_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_tcp_src_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_dst_tcp_src_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_dst_tcp_dst_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv6_dst_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_tcp_dst_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, + {ETH_RSS_NONFRAG_IPV4_TCP, + &hdrs_hint_ipv6_udp_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, + /* IPv6 GTPU EH DWN IPv6 TCP */ + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_src_tcp_src_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_src_tcp_dst_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_SRC_ONLY, + &hdrs_hint_ipv6_src_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_tcp_src_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, + &hdrs_hint_ipv6_dst_tcp_src_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_dst_tcp_dst_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_DST_ONLY, + &hdrs_hint_ipv6_dst_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L4_DST_ONLY, + &hdrs_hint_ipv6_tcp_dst_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, + {ETH_RSS_NONFRAG_IPV6_TCP, + &hdrs_hint_ipv6_udp_gtpu_dwn, + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, }; struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = { @@ -1842,6 +3006,7 @@ iavf_hash_parse_pattern(struct iavf_pattern_match_item *pattern_match_item, { const struct rte_flow_item *item = pattern; const struct rte_flow_item_gtp_psc *psc; + u8 outer_ipv6 = 0; for (item = pattern; item->type != RTE_FLOW_ITEM_TYPE_END; item++) { if (item->last) { @@ -1852,18 +3017,31 @@ iavf_hash_parse_pattern(struct iavf_pattern_match_item *pattern_match_item, } switch (item->type) { + case RTE_FLOW_ITEM_TYPE_IPV6: + outer_ipv6 = 1; + break; case RTE_FLOW_ITEM_TYPE_GTPU: - *phint |= IAVF_PHINT_IPV4_GTPU_IP; + *phint |= (outer_ipv6) ? + IAVF_PHINT_IPV6_GTPU_IP : + IAVF_PHINT_IPV4_GTPU_IP; break; case RTE_FLOW_ITEM_TYPE_GTP_PSC: psc = item->spec; - *phint &= ~IAVF_PHINT_IPV4_GTPU_IP; + *phint &= (outer_ipv6) ? + ~IAVF_PHINT_IPV6_GTPU_IP : + ~IAVF_PHINT_IPV4_GTPU_IP; if (!psc) - *phint |= IAVF_PHINT_IPV4_GTPU_EH; + *phint |= (outer_ipv6) ? + IAVF_PHINT_IPV6_GTPU_EH : + IAVF_PHINT_IPV4_GTPU_EH; else if (psc->pdu_type == IAVF_GTPU_EH_UPLINK) - *phint |= IAVF_PHINT_IPV4_GTPU_EH_UPLINK; + *phint |= (outer_ipv6) ? + IAVF_PHINT_IPV6_GTPU_EH_UPLINK : + IAVF_PHINT_IPV4_GTPU_EH_UPLINK; else if (psc->pdu_type == IAVF_GTPU_EH_DWNLINK) - *phint |= IAVF_PHINT_IPV4_GTPU_EH_DWNLINK; + *phint |= (outer_ipv6) ? + IAVF_PHINT_IPV6_GTPU_EH_DWNLINK : + IAVF_PHINT_IPV4_GTPU_EH_DWNLINK; break; default: break; @@ -1938,7 +3116,11 @@ iavf_hash_parse_action(const struct rte_flow_action actions[], if ((pattern_hint & IAVF_PHINT_IPV4_GTPU_IP) || (pattern_hint & IAVF_PHINT_IPV4_GTPU_EH) || (pattern_hint & IAVF_PHINT_IPV4_GTPU_EH_UPLINK) || - (pattern_hint & IAVF_PHINT_IPV4_GTPU_EH_DWNLINK)) { + (pattern_hint & IAVF_PHINT_IPV4_GTPU_EH_DWNLINK) || + (pattern_hint & IAVF_PHINT_IPV6_GTPU_IP) || + (pattern_hint & IAVF_PHINT_IPV6_GTPU_EH) || + (pattern_hint & IAVF_PHINT_IPV6_GTPU_EH_UPLINK) || + (pattern_hint & IAVF_PHINT_IPV6_GTPU_EH_DWNLINK)) { hash_map_list = iavf_gtpu_hash_map_list; mlist_len = RTE_DIM(iavf_gtpu_hash_map_list); } else {