Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/73367/?format=api
{ "id": 73367, "url": "https://patches.dpdk.org/api/patches/73367/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200707052546.14151-2-jia.guo@intel.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20200707052546.14151-2-jia.guo@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200707052546.14151-2-jia.guo@intel.com", "date": "2020-07-07T05:25:43", "name": "[v5,1/4] net/ice: refactor for pf hash flow", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "0f0bb68fda7aa479dbae72ba215beff39b45e3ed", "submitter": { "id": 507, "url": "https://patches.dpdk.org/api/people/507/?format=api", "name": "Guo, Jia", "email": "jia.guo@intel.com" }, "delegate": { "id": 1540, "url": "https://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20200707052546.14151-2-jia.guo@intel.com/mbox/", "series": [ { "id": 10834, "url": "https://patches.dpdk.org/api/series/10834/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=10834", "date": "2020-07-07T05:25:42", "name": "enable new hash flow for pf", "version": 5, "mbox": "https://patches.dpdk.org/series/10834/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/73367/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/73367/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id D1D24A00BE;\n\tTue, 7 Jul 2020 07:26:46 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 1319A1DA7E;\n\tTue, 7 Jul 2020 07:26:40 +0200 (CEST)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n by dpdk.org (Postfix) with ESMTP id 7421E1D9D5\n for <dev@dpdk.org>; Tue, 7 Jul 2020 07:26:36 +0200 (CEST)", "from fmsmga007.fm.intel.com ([10.253.24.52])\n by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 06 Jul 2020 22:26:36 -0700", "from npg-dpdk-cvl-jeffguo-01.sh.intel.com ([10.67.111.128])\n by fmsmga007.fm.intel.com with ESMTP; 06 Jul 2020 22:26:33 -0700" ], "IronPort-SDR": [ "\n We8yr0oUNq73jEte6+xYxqiHGAZSiv1EAbTZVqsoERYyDDBBVb3USm7Dx1wB3wjP1MK9OECcj1\n ij5RPDb5gzbQ==", "\n L3ec0hpoRJTkKSqv+jDAfcziAXvI4Kdfi7QOYHLyioldEE3K/JyYYURXurP7KN5HtZWKQCobas\n eubt2ziKFziQ==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9674\"; a=\"145640335\"", "E=Sophos;i=\"5.75,321,1589266800\"; d=\"scan'208\";a=\"145640335\"", "E=Sophos;i=\"5.75,321,1589266800\"; d=\"scan'208\";a=\"266727841\"" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "Jeff Guo <jia.guo@intel.com>", "To": "qi.z.zhang@intel.com,\n\tqiming.yang@intel.com", "Cc": "dev@dpdk.org, jingjing.wu@intel.com, junfeng.guo@intel.com,\n beilei.xing@intel.com, simei.su@intel.com, jia.guo@intel.com", "Date": "Tue, 7 Jul 2020 13:25:43 +0800", "Message-Id": "<20200707052546.14151-2-jia.guo@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200707052546.14151-1-jia.guo@intel.com>", "References": "<20200621140927.20602-2-jia.guo@intel.com>\n <20200707052546.14151-1-jia.guo@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [dpdk-dev v5 1/4] net/ice: refactor for pf hash flow", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Refactor hash flow by change the action parser and clean some code.\n\nSigned-off-by: Jeff Guo <jia.guo@intel.com>\n---\nv5->v4:\nno change\n---\n drivers/net/ice/ice_hash.c | 562 +++++++++++++++++++++++--------------\n 1 file changed, 355 insertions(+), 207 deletions(-)", "diff": "diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c\nindex eaf6a35a1..c95bfffff 100644\n--- a/drivers/net/ice/ice_hash.c\n+++ b/drivers/net/ice/ice_hash.c\n@@ -76,91 +76,135 @@ ice_hash_parse_pattern_action(struct ice_adapter *ad,\n \t\t\tstruct rte_flow_error *error);\n \n /* The first member is protocol header, the second member is ETH_RSS_*. */\n-struct rss_type_match_hdr hint_0 = {\n+struct rss_type_match_hdr hint_empty = {\n \tICE_FLOW_SEG_HDR_NONE,\t0};\n-struct rss_type_match_hdr hint_1 = {\n-\tICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER, ETH_RSS_IPV4};\n-struct rss_type_match_hdr hint_2 = {\n-\tICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_UDP |\n-\tICE_FLOW_SEG_HDR_IPV_OTHER, ETH_RSS_NONFRAG_IPV4_UDP};\n-struct rss_type_match_hdr hint_3 = {\n-\tICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_TCP |\n-\tICE_FLOW_SEG_HDR_IPV_OTHER, ETH_RSS_NONFRAG_IPV4_TCP};\n-struct rss_type_match_hdr hint_4 = {\n-\tICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_SCTP |\n-\tICE_FLOW_SEG_HDR_IPV_OTHER, ETH_RSS_NONFRAG_IPV4_SCTP};\n-struct rss_type_match_hdr hint_5 = {\n-\tICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER, ETH_RSS_IPV6};\n-struct rss_type_match_hdr hint_6 = {\n-\tICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_UDP |\n-\tICE_FLOW_SEG_HDR_IPV_OTHER, ETH_RSS_NONFRAG_IPV6_UDP};\n-struct rss_type_match_hdr hint_7 = {\n-\tICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_TCP |\n-\tICE_FLOW_SEG_HDR_IPV_OTHER, ETH_RSS_NONFRAG_IPV6_TCP};\n-struct rss_type_match_hdr hint_8 = {\n-\tICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_SCTP |\n-\tICE_FLOW_SEG_HDR_IPV_OTHER, ETH_RSS_NONFRAG_IPV6_SCTP};\n-struct rss_type_match_hdr hint_9 = {\n-\tICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_IPV4};\n-struct rss_type_match_hdr hint_10 = {\n-\tICE_FLOW_SEG_HDR_PPPOE,\tETH_RSS_IPV4};\n-struct rss_type_match_hdr hint_11 = {\n-\tICE_FLOW_SEG_HDR_PPPOE,\tETH_RSS_NONFRAG_IPV4_UDP};\n-struct rss_type_match_hdr hint_12 = {\n-\tICE_FLOW_SEG_HDR_PPPOE,\tETH_RSS_NONFRAG_IPV4_TCP};\n-struct rss_type_match_hdr hint_13 = {\n-\tICE_FLOW_SEG_HDR_PPPOE,\tETH_RSS_NONFRAG_IPV4_SCTP};\n-struct rss_type_match_hdr hint_14 = {\n-\tICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_NONFRAG_IPV4_UDP};\n-struct rss_type_match_hdr hint_15 = {\n-\tICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_NONFRAG_IPV4_TCP};\n-struct rss_type_match_hdr hint_16 = {\n-\tICE_FLOW_SEG_HDR_PPPOE,\tETH_RSS_IPV6};\n-struct rss_type_match_hdr hint_17 = {\n-\tICE_FLOW_SEG_HDR_PPPOE,\tETH_RSS_NONFRAG_IPV6_UDP};\n-struct rss_type_match_hdr hint_18 = {\n-\tICE_FLOW_SEG_HDR_PPPOE,\tETH_RSS_NONFRAG_IPV6_TCP};\n-struct rss_type_match_hdr hint_19 = {\n-\tICE_FLOW_SEG_HDR_PPPOE,\tETH_RSS_NONFRAG_IPV6_SCTP};\n-struct rss_type_match_hdr hint_20 = {\n-\tICE_FLOW_SEG_HDR_PPPOE, ETH_RSS_ETH | ETH_RSS_PPPOE};\n+struct rss_type_match_hdr hint_eth_ipv4 = {\n+\tICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER,\n+\tETH_RSS_ETH | ETH_RSS_IPV4};\n+struct rss_type_match_hdr hint_eth_ipv4_udp = {\n+\tICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |\n+\tICE_FLOW_SEG_HDR_UDP,\n+\tETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_UDP};\n+struct rss_type_match_hdr hint_eth_ipv4_tcp = {\n+\tICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |\n+\tICE_FLOW_SEG_HDR_TCP,\n+\tETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_TCP};\n+struct rss_type_match_hdr hint_eth_ipv4_sctp = {\n+\tICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |\n+\tICE_FLOW_SEG_HDR_SCTP,\n+\tETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_SCTP};\n+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4 = {\n+\tICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV4 |\n+\tICE_FLOW_SEG_HDR_IPV_OTHER,\n+\tETH_RSS_GTPU | ETH_RSS_IPV4};\n+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_udp = {\n+\tICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV4 |\n+\tICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,\n+\tETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP};\n+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_tcp = {\n+\tICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV4 |\n+\tICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,\n+\tETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};\n+struct rss_type_match_hdr hint_eth_pppoes_ipv4 = {\n+\tICE_FLOW_SEG_HDR_PPPOE,\n+\tETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_IPV4};\n+struct rss_type_match_hdr hint_eth_pppoes_ipv4_udp = {\n+\tICE_FLOW_SEG_HDR_PPPOE,\n+\tETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV4_UDP};\n+struct rss_type_match_hdr hint_eth_pppoes_ipv4_tcp = {\n+\tICE_FLOW_SEG_HDR_PPPOE,\n+\tETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV4_TCP};\n+struct rss_type_match_hdr hint_eth_pppoes_ipv4_sctp = {\n+\tICE_FLOW_SEG_HDR_PPPOE,\n+\tETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV4_SCTP};\n+struct rss_type_match_hdr hint_eth_ipv6 = {\n+\tICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER,\n+\tETH_RSS_ETH | ETH_RSS_IPV6};\n+struct rss_type_match_hdr hint_eth_ipv6_udp = {\n+\tICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |\n+\tICE_FLOW_SEG_HDR_UDP,\n+\tETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_UDP};\n+struct rss_type_match_hdr hint_eth_ipv6_tcp = {\n+\tICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |\n+\tICE_FLOW_SEG_HDR_TCP,\n+\tETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_TCP};\n+struct rss_type_match_hdr hint_eth_ipv6_sctp = {\n+\tICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |\n+\tICE_FLOW_SEG_HDR_SCTP,\n+\tETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_SCTP};\n+struct rss_type_match_hdr hint_eth_pppoes_ipv6 = {\n+\tICE_FLOW_SEG_HDR_PPPOE,\n+\tETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_IPV6};\n+struct rss_type_match_hdr hint_eth_pppoes_ipv6_udp = {\n+\tICE_FLOW_SEG_HDR_PPPOE,\n+\tETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_UDP};\n+struct rss_type_match_hdr hint_eth_pppoes_ipv6_tcp = {\n+\tICE_FLOW_SEG_HDR_PPPOE,\n+\tETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_TCP};\n+struct rss_type_match_hdr hint_eth_pppoes_ipv6_sctp = {\n+\tICE_FLOW_SEG_HDR_PPPOE,\n+\tETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_SCTP};\n+struct rss_type_match_hdr hint_eth_pppoes = {\n+\tICE_FLOW_SEG_HDR_PPPOE,\n+\tETH_RSS_ETH | ETH_RSS_PPPOE};\n \n /* Supported pattern for os default package. */\n static struct ice_pattern_match_item ice_hash_pattern_list_os[] = {\n-\t{pattern_eth_ipv4,\tICE_INSET_NONE,\t&hint_1},\n-\t{pattern_eth_ipv4_udp,\tICE_INSET_NONE,\t&hint_2},\n-\t{pattern_eth_ipv4_tcp,\tICE_INSET_NONE,\t&hint_3},\n-\t{pattern_eth_ipv4_sctp,\tICE_INSET_NONE,\t&hint_4},\n-\t{pattern_eth_ipv6,\tICE_INSET_NONE,\t&hint_5},\n-\t{pattern_eth_ipv6_udp,\tICE_INSET_NONE,\t&hint_6},\n-\t{pattern_eth_ipv6_tcp,\tICE_INSET_NONE,\t&hint_7},\n-\t{pattern_eth_ipv6_sctp,\tICE_INSET_NONE,\t&hint_8},\n-\t{pattern_empty,\t\tICE_INSET_NONE,\t&hint_0},\n+\t{pattern_eth_ipv4,\tICE_INSET_NONE,\t&hint_eth_ipv4},\n+\t{pattern_eth_ipv4_udp,\tICE_INSET_NONE,\t&hint_eth_ipv4_udp},\n+\t{pattern_eth_ipv4_tcp,\tICE_INSET_NONE,\t&hint_eth_ipv4_tcp},\n+\t{pattern_eth_ipv4_sctp,\tICE_INSET_NONE,\t&hint_eth_ipv4_sctp},\n+\t{pattern_eth_ipv6,\tICE_INSET_NONE,\t&hint_eth_ipv6},\n+\t{pattern_eth_ipv6_udp,\tICE_INSET_NONE,\t&hint_eth_ipv6_udp},\n+\t{pattern_eth_ipv6_tcp,\tICE_INSET_NONE,\t&hint_eth_ipv6_tcp},\n+\t{pattern_eth_ipv6_sctp,\tICE_INSET_NONE,\t&hint_eth_ipv6_sctp},\n+\t{pattern_empty,\t\tICE_INSET_NONE,\t&hint_empty},\n };\n \n /* Supported pattern for comms package. */\n static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {\n-\t{pattern_eth_ipv4,\t\t ICE_INSET_NONE, &hint_1},\n-\t{pattern_eth_ipv4_udp,\t\t ICE_INSET_NONE, &hint_2},\n-\t{pattern_eth_ipv4_tcp,\t\t ICE_INSET_NONE, &hint_3},\n-\t{pattern_eth_ipv4_sctp,\t\t ICE_INSET_NONE, &hint_4},\n-\t{pattern_eth_ipv6,\t\t ICE_INSET_NONE, &hint_5},\n-\t{pattern_eth_ipv6_udp,\t\t ICE_INSET_NONE, &hint_6},\n-\t{pattern_eth_ipv6_tcp,\t\t ICE_INSET_NONE, &hint_7},\n-\t{pattern_eth_ipv6_sctp,\t\t ICE_INSET_NONE, &hint_8},\n-\t{pattern_empty,\t\t\t ICE_INSET_NONE, &hint_0},\n-\t{pattern_eth_ipv4_gtpu_eh_ipv4,\t ICE_INSET_NONE, &hint_9},\n-\t{pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE, &hint_14},\n-\t{pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE, &hint_15},\n-\t{pattern_eth_pppoes_ipv4,\t ICE_INSET_NONE, &hint_10},\n-\t{pattern_eth_pppoes_ipv4_udp,\t ICE_INSET_NONE, &hint_11},\n-\t{pattern_eth_pppoes_ipv4_tcp,\t ICE_INSET_NONE, &hint_12},\n-\t{pattern_eth_pppoes_ipv4_sctp,\t ICE_INSET_NONE, &hint_13},\n-\t{pattern_eth_pppoes_ipv6,\t ICE_INSET_NONE, &hint_16},\n-\t{pattern_eth_pppoes_ipv6_udp,\t ICE_INSET_NONE, &hint_17},\n-\t{pattern_eth_pppoes_ipv6_tcp,\t ICE_INSET_NONE, &hint_18},\n-\t{pattern_eth_pppoes_ipv6_sctp,\t ICE_INSET_NONE, &hint_19},\n-\t{pattern_eth_pppoes,\t\t ICE_INSET_NONE, &hint_20},\n+\t{pattern_empty,\t\t\t ICE_INSET_NONE,\n+\t\t&hint_empty},\n+\t{pattern_eth_ipv4,\t\t ICE_INSET_NONE,\n+\t\t&hint_eth_ipv4},\n+\t{pattern_eth_ipv4_udp,\t\t ICE_INSET_NONE,\n+\t\t&hint_eth_ipv4_udp},\n+\t{pattern_eth_ipv4_tcp,\t\t ICE_INSET_NONE,\n+\t\t&hint_eth_ipv4_tcp},\n+\t{pattern_eth_ipv4_sctp,\t\t ICE_INSET_NONE,\n+\t\t&hint_eth_ipv4_sctp},\n+\t{pattern_eth_ipv4_gtpu_eh_ipv4,\t ICE_INSET_NONE,\n+\t\t&hint_eth_ipv4_gtpu_eh_ipv4},\n+\t{pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE,\n+\t\t&hint_eth_ipv4_gtpu_eh_ipv4_udp},\n+\t{pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE,\n+\t\t&hint_eth_ipv4_gtpu_eh_ipv4_tcp},\n+\t{pattern_eth_pppoes_ipv4,\t ICE_INSET_NONE,\n+\t\t&hint_eth_pppoes_ipv4},\n+\t{pattern_eth_pppoes_ipv4_udp,\t ICE_INSET_NONE,\n+\t\t&hint_eth_pppoes_ipv4_udp},\n+\t{pattern_eth_pppoes_ipv4_tcp,\t ICE_INSET_NONE,\n+\t\t&hint_eth_pppoes_ipv4_tcp},\n+\t{pattern_eth_pppoes_ipv4_sctp,\t ICE_INSET_NONE,\n+\t\t&hint_eth_pppoes_ipv4_sctp},\n+\t{pattern_eth_ipv6,\t\t ICE_INSET_NONE,\n+\t\t&hint_eth_ipv6},\n+\t{pattern_eth_ipv6_udp,\t\t ICE_INSET_NONE,\n+\t\t&hint_eth_ipv6_udp},\n+\t{pattern_eth_ipv6_tcp,\t\t ICE_INSET_NONE,\n+\t\t&hint_eth_ipv6_tcp},\n+\t{pattern_eth_ipv6_sctp,\t\t ICE_INSET_NONE,\n+\t\t&hint_eth_ipv6_sctp},\n+\t{pattern_eth_pppoes_ipv6,\t ICE_INSET_NONE,\n+\t\t&hint_eth_pppoes_ipv6},\n+\t{pattern_eth_pppoes_ipv6_udp,\t ICE_INSET_NONE,\n+\t\t&hint_eth_pppoes_ipv6_udp},\n+\t{pattern_eth_pppoes_ipv6_tcp,\t ICE_INSET_NONE,\n+\t\t&hint_eth_pppoes_ipv6_tcp},\n+\t{pattern_eth_pppoes_ipv6_sctp,\t ICE_INSET_NONE,\n+\t\t&hint_eth_pppoes_ipv6_sctp},\n+\t{pattern_eth_pppoes,\t\t ICE_INSET_NONE,\n+\t\t&hint_eth_pppoes},\n };\n \n /**\n@@ -168,69 +212,199 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {\n * the second member is hash fields.\n */\n struct ice_hash_match_type ice_hash_type_list[] = {\n-\t{ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY,\t\t\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},\n-\t{ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY,\t\t\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},\n-\t{ETH_RSS_IPV4,\t\t\t\t\t\t\t\tICE_FLOW_HASH_IPV4},\n-\t{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},\n-\t{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},\n-\t{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV4_UDP,\t\t\t\t\t\tICE_HASH_UDP_IPV4},\n-\t{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},\n-\t{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},\n-\t{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV4_TCP,\t\t\t\t\t\tICE_HASH_TCP_IPV4},\n-\t{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},\n-\t{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},\n-\t{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_SRC_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_DST_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV4_SCTP,\t\t\t\t\t\tICE_HASH_SCTP_IPV4},\n-\t{ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY,\t\t\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},\n-\t{ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY,\t\t\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},\n-\t{ETH_RSS_IPV6,\t\t\t\t\t\t\t\tICE_FLOW_HASH_IPV6},\n-\t{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},\n-\t{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},\n-\t{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV6_UDP,\t\t\t\t\t\tICE_HASH_UDP_IPV6},\n-\t{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},\n-\t{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},\n-\t{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV6_TCP,\t\t\t\t\t\tICE_HASH_TCP_IPV6},\n-\t{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},\n-\t{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},\n-\t{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_SRC_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_DST_ONLY,\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},\n-\t{ETH_RSS_NONFRAG_IPV6_SCTP,\t\t\t\t\t\tICE_HASH_SCTP_IPV6},\n-\t{ETH_RSS_ETH | ETH_RSS_L2_SRC_ONLY,\t\t\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA)},\n-\t{ETH_RSS_PPPOE,\t\t\t\t\t\t\t\tICE_FLOW_HASH_PPPOE_SESS_ID},\n-\t{ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_L2_SRC_ONLY,\t\t\tICE_FLOW_HASH_PPPOE_SESS_ID | BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA)},\n+\t{ETH_RSS_PPPOE,\n+\t\tICE_FLOW_HASH_PPPOE_SESS_ID},\n+\t{ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_L2_SRC_ONLY,\n+\t\tICE_FLOW_HASH_PPPOE_SESS_ID |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA)},\n+\t/* IPV4 */\n+\t{ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},\n+\t{ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},\n+\t{ETH_RSS_IPV4, ICE_FLOW_HASH_IPV4},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP,\n+\t\tICE_HASH_UDP_IPV4 |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP,\n+\t\tICE_HASH_TCP_IPV4 |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)},\n+\t{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},\n+\t{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},\n+\t{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)},\n+\t{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)},\n+\t{ETH_RSS_NONFRAG_IPV4_SCTP,\n+\t\tICE_HASH_SCTP_IPV4 |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)},\n+\t/* IPV6 */\n+\t{ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},\n+\t{ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},\n+\t{ETH_RSS_IPV6, ICE_FLOW_HASH_IPV6},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_PFCP,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_PFCP_SEID)},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP,\n+\t\tICE_HASH_UDP_IPV6 |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP,\n+\t\tICE_HASH_TCP_IPV6 |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},\n+\t{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},\n+\t{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},\n+\t{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},\n+\t{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_SRC_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},\n+\t{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_DST_ONLY,\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT) |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},\n+\t{ETH_RSS_NONFRAG_IPV6_SCTP,\n+\t\tICE_HASH_SCTP_IPV6 |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},\n };\n \n static struct ice_flow_engine ice_hash_engine = {\n@@ -316,14 +490,14 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,\n \t\tvoid **meta,\n \t\tstruct rte_flow_error *error)\n {\n-\tconst struct rte_flow_action *action;\n-\tenum rte_flow_action_type action_type;\n-\tconst struct rte_flow_action_rss *rss;\n \tstruct rss_type_match_hdr *m = (struct rss_type_match_hdr *)\n \t\t\t\t(pattern_match_item->meta);\n+\tstruct rss_meta *hash_meta = (struct rss_meta *)*meta;\n \tuint32_t type_list_len = RTE_DIM(ice_hash_type_list);\n-\tstruct ice_hash_match_type *type_match_item;\n-\tuint64_t rss_hf;\n+\tenum rte_flow_action_type action_type;\n+\tconst struct rte_flow_action_rss *rss;\n+\tconst struct rte_flow_action *action;\n+\tuint64_t rss_type;\n \tuint16_t i;\n \n \t/* Supported action is RSS. */\n@@ -333,46 +507,24 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,\n \t\tswitch (action_type) {\n \t\tcase RTE_FLOW_ACTION_TYPE_RSS:\n \t\t\trss = action->conf;\n-\t\t\trss_hf = rss->types;\n-\n-\t\t\t/**\n-\t\t\t * Check simultaneous use of SRC_ONLY and DST_ONLY\n-\t\t\t * of the same level.\n-\t\t\t */\n-\t\t\trss_hf = rte_eth_rss_hf_refine(rss_hf);\n+\t\t\trss_type = rss->types;\n \n-\t\t\t/* Check if pattern is empty. */\n+\t\t\t/* Check hash function and save it to rss_meta. */\n \t\t\tif (pattern_match_item->pattern_list !=\n-\t\t\t\tpattern_empty && rss->func ==\n-\t\t\t\tRTE_ETH_HASH_FUNCTION_SIMPLE_XOR)\n+\t\t\t pattern_empty && rss->func ==\n+\t\t\t RTE_ETH_HASH_FUNCTION_SIMPLE_XOR) {\n \t\t\t\treturn rte_flow_error_set(error, ENOTSUP,\n \t\t\t\t\tRTE_FLOW_ERROR_TYPE_ACTION, action,\n \t\t\t\t\t\"Not supported flow\");\n-\n-\t\t\tif ((rss_hf & ETH_RSS_ETH) && (rss_hf & ~ETH_RSS_PPPOE))\n-\t\t\t\tm->eth_rss_hint = ETH_RSS_ETH;\n-\t\t\telse if ((rss_hf & ETH_RSS_PPPOE) && (rss_hf & ~ETH_RSS_ETH))\n-\t\t\t\tm->eth_rss_hint = ETH_RSS_PPPOE;\n-\t\t\telse if ((rss_hf & ETH_RSS_ETH) && (rss_hf & ETH_RSS_PPPOE))\n-\t\t\t\tm->eth_rss_hint = ETH_RSS_ETH | ETH_RSS_PPPOE;\n-\n-\t\t\t/* Check if rss types match pattern. */\n-\t\t\tif (rss->func != RTE_ETH_HASH_FUNCTION_SIMPLE_XOR) {\n-\t\t\t\tif (((rss_hf & ETH_RSS_IPV4) != m->eth_rss_hint) &&\n-\t\t\t\t((rss_hf & ETH_RSS_NONFRAG_IPV4_UDP) != m->eth_rss_hint) &&\n-\t\t\t\t((rss_hf & ETH_RSS_NONFRAG_IPV4_TCP) != m->eth_rss_hint) &&\n-\t\t\t\t((rss_hf & ETH_RSS_NONFRAG_IPV4_SCTP) != m->eth_rss_hint) &&\n-\t\t\t\t((rss_hf & ETH_RSS_IPV6) != m->eth_rss_hint) &&\n-\t\t\t\t((rss_hf & ETH_RSS_NONFRAG_IPV6_UDP) != m->eth_rss_hint) &&\n-\t\t\t\t((rss_hf & ETH_RSS_NONFRAG_IPV6_TCP) != m->eth_rss_hint) &&\n-\t\t\t\t((rss_hf & ETH_RSS_NONFRAG_IPV6_SCTP) != m->eth_rss_hint) &&\n-\t\t\t\t((rss_hf & ETH_RSS_ETH) != m->eth_rss_hint) &&\n-\t\t\t\t((rss_hf & ETH_RSS_PPPOE) != m->eth_rss_hint) &&\n-\t\t\t\t(((rss_hf & (ETH_RSS_ETH | ETH_RSS_PPPOE)) !=\n-\t\t\t\t\t\t\t\t\tm->eth_rss_hint)))\n-\t\t\t\t\treturn rte_flow_error_set(error,\n-\t\t\t\t\tENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION,\n-\t\t\t\t\taction, \"Not supported RSS types\");\n+\t\t\t} else if (rss->func ==\n+\t\t\t\t RTE_ETH_HASH_FUNCTION_SIMPLE_XOR){\n+\t\t\t\t((struct rss_meta *)*meta)->hash_function =\n+\t\t\t\tRTE_ETH_HASH_FUNCTION_SIMPLE_XOR;\n+\t\t\t\treturn 0;\n+\t\t\t} else if (rss->func ==\n+\t\t\t\t RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ) {\n+\t\t\t\t((struct rss_meta *)*meta)->hash_function =\n+\t\t\t\tRTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ;\n \t\t\t}\n \n \t\t\tif (rss->level)\n@@ -390,42 +542,38 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,\n \t\t\t\t\tRTE_FLOW_ERROR_TYPE_ACTION, action,\n \t\t\t\t\t\"a non-NULL RSS queue is not supported\");\n \n-\t\t\t/* Check hash function and save it to rss_meta. */\n-\t\t\tif (rss->func ==\n-\t\t\t\tRTE_ETH_HASH_FUNCTION_SIMPLE_XOR)\n-\t\t\t\t((struct rss_meta *)*meta)->hash_function =\n-\t\t\t\tRTE_ETH_HASH_FUNCTION_SIMPLE_XOR;\n+\t\t\t/**\n+\t\t\t * Check simultaneous use of SRC_ONLY and DST_ONLY\n+\t\t\t * of the same level.\n+\t\t\t */\n+\t\t\trss_type = rte_eth_rss_hf_refine(rss_type);\n \n-\t\t\tif (rss->func ==\n-\t\t\t\tRTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ)\n-\t\t\t\t((struct rss_meta *)*meta)->hash_function =\n-\t\t\t\tRTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ;\n+\t\t\tuint64_t combine_type = ETH_RSS_L2_SRC_ONLY |\n+\t\t\t\t\tETH_RSS_L2_DST_ONLY |\n+\t\t\t\t\tETH_RSS_L3_SRC_ONLY |\n+\t\t\t\t\tETH_RSS_L3_DST_ONLY |\n+\t\t\t\t\tETH_RSS_L4_SRC_ONLY |\n+\t\t\t\t\tETH_RSS_L4_DST_ONLY;\n \n-\t\t\ttype_match_item = rte_zmalloc(\"ice_type_match_item\",\n-\t\t\t\t\tsizeof(struct ice_hash_match_type), 0);\n-\t\t\tif (!type_match_item) {\n-\t\t\t\trte_flow_error_set(error, EINVAL,\n-\t\t\t\t\tRTE_FLOW_ERROR_TYPE_HANDLE, NULL,\n-\t\t\t\t\t\"No memory for type_match_item\");\n-\t\t\t\treturn -ENOMEM;\n+\t\t\t/* Check if rss types match pattern. */\n+\t\t\tif (rss_type & ~combine_type & ~m->eth_rss_hint) {\n+\t\t\t\treturn rte_flow_error_set(error,\n+\t\t\t\tENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION,\n+\t\t\t\taction, \"Not supported RSS types\");\n \t\t\t}\n \n \t\t\t/* Find matched hash fields according to hash type. */\n \t\t\tfor (i = 0; i < type_list_len; i++) {\n-\t\t\t\tif (rss_hf ==\n-\t\t\t\t\tice_hash_type_list[i].hash_type) {\n-\t\t\t\t\ttype_match_item->hash_type =\n-\t\t\t\t\t\tice_hash_type_list[i].hash_type;\n-\t\t\t\t\ttype_match_item->hash_flds =\n-\t\t\t\t\t\tice_hash_type_list[i].hash_flds;\n+\t\t\t\tstruct ice_hash_match_type *ht_map =\n+\t\t\t\t\t&ice_hash_type_list[i];\n+\n+\t\t\t\tif (rss_type == ht_map->hash_type) {\n+\t\t\t\t\thash_meta->hash_flds =\n+\t\t\t\t\t\t\tht_map->hash_flds;\n+\t\t\t\t\tbreak;\n \t\t\t\t}\n \t\t\t}\n \n-\t\t\t/* Save hash fileds to rss_meta. */\n-\t\t\t((struct rss_meta *)*meta)->hash_flds =\n-\t\t\t\t\ttype_match_item->hash_flds;\n-\n-\t\t\trte_free(type_match_item);\n \t\t\tbreak;\n \n \t\tcase RTE_FLOW_ACTION_TYPE_END:\n", "prefixes": [ "v5", "1/4" ] }