Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/96579/?format=api
{ "id": 96579, "url": "https://patches.dpdk.org/api/patches/96579/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210803083817.1243796-2-wenjun1.wu@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": "<20210803083817.1243796-2-wenjun1.wu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210803083817.1243796-2-wenjun1.wu@intel.com", "date": "2021-08-03T08:37:56", "name": "[01/22] net/ice: support RSS hash for IP fragment", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": true, "hash": "4403246aca0ce35ecac00386fc641b82edcc1c6c", "submitter": { "id": 2083, "url": "https://patches.dpdk.org/api/people/2083/?format=api", "name": "Wenjun Wu", "email": "wenjun1.wu@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/20210803083817.1243796-2-wenjun1.wu@intel.com/mbox/", "series": [ { "id": 18158, "url": "https://patches.dpdk.org/api/series/18158/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=18158", "date": "2021-08-03T08:37:55", "name": "backport feature support to DPDK 20.11", "version": 1, "mbox": "https://patches.dpdk.org/series/18158/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/96579/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/96579/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 77730A0C41;\n\tTue, 3 Aug 2021 10:57:12 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 5C656411B6;\n\tTue, 3 Aug 2021 10:57:12 +0200 (CEST)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n by mails.dpdk.org (Postfix) with ESMTP id A8DD540E32\n for <dev@dpdk.org>; Tue, 3 Aug 2021 10:57:09 +0200 (CEST)", "from fmsmga008.fm.intel.com ([10.253.24.58])\n by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 03 Aug 2021 01:56:47 -0700", "from wuwenjun.sh.intel.com ([10.67.110.197])\n by fmsmga008.fm.intel.com with ESMTP; 03 Aug 2021 01:56:46 -0700" ], "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,10064\"; a=\"211764352\"", "E=Sophos;i=\"5.84,291,1620716400\"; d=\"scan'208\";a=\"211764352\"", "E=Sophos;i=\"5.84,291,1620716400\"; d=\"scan'208\";a=\"479396554\"" ], "X-ExtLoop1": "1", "From": "Wenjun Wu <wenjun1.wu@intel.com>", "To": "dev@dpdk.org", "Date": "Tue, 3 Aug 2021 16:37:56 +0800", "Message-Id": "<20210803083817.1243796-2-wenjun1.wu@intel.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20210803083817.1243796-1-wenjun1.wu@intel.com>", "References": "<20210803083817.1243796-1-wenjun1.wu@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 01/22] net/ice: support RSS hash for IP fragment", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "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": "[ upstream commit f1ea76eb63944a65e9e0bbc32244bc7c8b4fbd1d ]\n[ upstream commit 664b8eb745b9b6249231cea2f2bc6ff4d4b6bc40 ]\n[ upstream commit 8434528175614f4cc8ab25fd28560848d8999605 ]\n\nNew pattern and RSS hash flow parsing are added to handle fragmented\nIPv4/IPv6 packet.\n\nThis patch is not for LTS upstream, just for customer to cherry-pick.\n\nSigned-off-by: Jeff Guo <jia.guo@intel.com>\nSigned-off-by: Ting Xu <ting.xu@intel.com>\nSigned-off-by: Qi Zhang <qi.z.zhang@intel.com>\nSigned-off-by: Wenjun Wu <wenjun1.wu@intel.com>\nAcked-by: Qi Zhang <qi.z.zhang@intel.com>\n---\n drivers/net/ice/base/ice_flow.c | 51 +++++++++++++++++++++++++++++-\n drivers/net/ice/base/ice_flow.h | 5 ++-\n drivers/net/ice/ice_generic_flow.c | 25 +++++++++++++++\n drivers/net/ice/ice_generic_flow.h | 7 ++++\n drivers/net/ice/ice_hash.c | 37 ++++++++++++++++++++--\n 5 files changed, 120 insertions(+), 5 deletions(-)", "diff": "diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c\nindex c75f58659c..049e2f0c26 100644\n--- a/drivers/net/ice/base/ice_flow.c\n+++ b/drivers/net/ice/base/ice_flow.c\n@@ -13,6 +13,8 @@\n #define ICE_FLOW_FLD_SZ_IPV6_PRE32_ADDR\t4\n #define ICE_FLOW_FLD_SZ_IPV6_PRE48_ADDR\t6\n #define ICE_FLOW_FLD_SZ_IPV6_PRE64_ADDR\t8\n+#define ICE_FLOW_FLD_SZ_IPV4_ID\t\t2\n+#define ICE_FLOW_FLD_SZ_IPV6_ID\t\t4\n #define ICE_FLOW_FLD_SZ_IP_DSCP\t\t1\n #define ICE_FLOW_FLD_SZ_IP_TTL\t\t1\n #define ICE_FLOW_FLD_SZ_IP_PROT\t\t1\n@@ -94,6 +96,12 @@ struct ice_flow_field_info ice_flds_info[ICE_FLOW_FIELD_IDX_MAX] = {\n \tICE_FLOW_FLD_INFO(ICE_FLOW_SEG_HDR_IPV6, 8, ICE_FLOW_FLD_SZ_IPV6_ADDR),\n \t/* ICE_FLOW_FIELD_IDX_IPV6_DA */\n \tICE_FLOW_FLD_INFO(ICE_FLOW_SEG_HDR_IPV6, 24, ICE_FLOW_FLD_SZ_IPV6_ADDR),\n+\t/* ICE_FLOW_FIELD_IDX_IPV4_FRAG */\n+\tICE_FLOW_FLD_INFO(ICE_FLOW_SEG_HDR_IPV_FRAG, 4,\n+\t\t\t ICE_FLOW_FLD_SZ_IPV4_ID),\n+\t/* ICE_FLOW_FIELD_IDX_IPV6_FRAG */\n+\tICE_FLOW_FLD_INFO(ICE_FLOW_SEG_HDR_IPV_FRAG, 4,\n+\t\t\t ICE_FLOW_FLD_SZ_IPV6_ID),\n \t/* ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA */\n \tICE_FLOW_FLD_INFO(ICE_FLOW_SEG_HDR_IPV6, 8,\n \t\t\t ICE_FLOW_FLD_SZ_IPV6_PRE32_ADDR),\n@@ -468,6 +476,28 @@ static const u32 ice_ptypes_gtpc_tid[] = {\n \t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n };\n \n+static const u32 ice_ptypes_ipv4_frag[] = {\n+\t0x00400000, 0x00000000, 0x00000000, 0x00000000,\n+\t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n+\t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n+\t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n+\t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n+\t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n+\t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n+\t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n+};\n+\n+static const u32 ice_ptypes_ipv6_frag[] = {\n+\t0x00000000, 0x00000000, 0x01000000, 0x00000000,\n+\t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n+\t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n+\t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n+\t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n+\t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n+\t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n+\t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n+};\n+\n /* Packet types for GTPU */\n static const struct ice_ptype_attributes ice_attr_gtpu_session[] = {\n \t{ ICE_MAC_IPV4_GTPU_IPV4_FRAG,\t ICE_PTYPE_ATTR_GTP_SESSION },\n@@ -851,6 +881,16 @@ ice_flow_proc_seg_hdrs(struct ice_flow_prof_params *params)\n \t\t\t\t(const ice_bitmap_t *)ice_ptypes_ipv6_ofos_all;\n \t\t\tice_and_bitmap(params->ptypes, params->ptypes, src,\n \t\t\t\t ICE_FLOW_PTYPE_MAX);\n+\t\t} else if ((hdrs & ICE_FLOW_SEG_HDR_IPV4) &&\n+\t\t\t (hdrs & ICE_FLOW_SEG_HDR_IPV_FRAG)) {\n+\t\t\tsrc = (const ice_bitmap_t *)ice_ptypes_ipv4_frag;\n+\t\t\tice_and_bitmap(params->ptypes, params->ptypes, src,\n+\t\t\t\t ICE_FLOW_PTYPE_MAX);\n+\t\t} else if ((hdrs & ICE_FLOW_SEG_HDR_IPV6) &&\n+\t\t\t (hdrs & ICE_FLOW_SEG_HDR_IPV_FRAG)) {\n+\t\t\tsrc = (const ice_bitmap_t *)ice_ptypes_ipv6_frag;\n+\t\t\tice_and_bitmap(params->ptypes, params->ptypes, src,\n+\t\t\t\t ICE_FLOW_PTYPE_MAX);\n \t\t} else if ((hdrs & ICE_FLOW_SEG_HDR_IPV4) &&\n \t\t\t !(hdrs & ICE_FLOW_SEG_HDRS_L4_MASK_NO_OTHER)) {\n \t\t\tsrc = !i ? (const ice_bitmap_t *)ice_ptypes_ipv4_ofos_no_l4 :\n@@ -1121,6 +1161,9 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct ice_flow_prof_params *params,\n \tcase ICE_FLOW_FIELD_IDX_IPV4_DA:\n \t\tprot_id = seg == 0 ? ICE_PROT_IPV4_OF_OR_S : ICE_PROT_IPV4_IL;\n \t\tbreak;\n+\tcase ICE_FLOW_FIELD_IDX_IPV4_ID:\n+\t\tprot_id = ICE_PROT_IPV4_OF_OR_S;\n+\t\tbreak;\n \tcase ICE_FLOW_FIELD_IDX_IPV6_SA:\n \tcase ICE_FLOW_FIELD_IDX_IPV6_DA:\n \tcase ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA:\n@@ -1131,6 +1174,9 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct ice_flow_prof_params *params,\n \tcase ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA:\n \t\tprot_id = seg == 0 ? ICE_PROT_IPV6_OF_OR_S : ICE_PROT_IPV6_IL;\n \t\tbreak;\n+\tcase ICE_FLOW_FIELD_IDX_IPV6_ID:\n+\t\tprot_id = ICE_PROT_IPV6_FRAG;\n+\t\tbreak;\n \tcase ICE_FLOW_FIELD_IDX_TCP_SRC_PORT:\n \tcase ICE_FLOW_FIELD_IDX_TCP_DST_PORT:\n \tcase ICE_FLOW_FIELD_IDX_TCP_FLAGS:\n@@ -3278,13 +3324,16 @@ ice_flow_set_rss_seg_info(struct ice_flow_seg_info *segs, u8 seg_cnt,\n \t/* set outer most header */\n \tif (cfg->hdr_type == ICE_RSS_INNER_HEADERS_W_OUTER_IPV4)\n \t\tsegs[ICE_RSS_OUTER_HEADERS].hdrs |= ICE_FLOW_SEG_HDR_IPV4 |\n+\t\t\t\t\t\t ICE_FLOW_SEG_HDR_IPV_FRAG |\n \t\t\t\t\t\t ICE_FLOW_SEG_HDR_IPV_OTHER;\n \telse if (cfg->hdr_type == ICE_RSS_INNER_HEADERS_W_OUTER_IPV6)\n \t\tsegs[ICE_RSS_OUTER_HEADERS].hdrs |= ICE_FLOW_SEG_HDR_IPV6 |\n+\t\t\t\t\t\t ICE_FLOW_SEG_HDR_IPV_FRAG |\n \t\t\t\t\t\t ICE_FLOW_SEG_HDR_IPV_OTHER;\n \n \tif (seg->hdrs & ~ICE_FLOW_RSS_SEG_HDR_VAL_MASKS &\n-\t ~ICE_FLOW_RSS_HDRS_INNER_MASK & ~ICE_FLOW_SEG_HDR_IPV_OTHER)\n+\t ~ICE_FLOW_RSS_HDRS_INNER_MASK & ~ICE_FLOW_SEG_HDR_IPV_OTHER &\n+\t ~ICE_FLOW_SEG_HDR_IPV_FRAG)\n \t\treturn ICE_ERR_PARAM;\n \n \tval = (u64)(seg->hdrs & ICE_FLOW_RSS_SEG_HDR_L3_MASKS);\ndiff --git a/drivers/net/ice/base/ice_flow.h b/drivers/net/ice/base/ice_flow.h\nindex 2a9ae66454..b503417b70 100644\n--- a/drivers/net/ice/base/ice_flow.h\n+++ b/drivers/net/ice/base/ice_flow.h\n@@ -182,7 +182,8 @@ enum ice_flow_seg_hdr {\n \t/* The following is an additive bit for ICE_FLOW_SEG_HDR_IPV4 and\n \t * ICE_FLOW_SEG_HDR_IPV6 which include the IPV4 other PTYPEs\n \t */\n-\tICE_FLOW_SEG_HDR_IPV_OTHER\t= 0x20000000,\n+\tICE_FLOW_SEG_HDR_IPV_FRAG\t= 0x20000000,\n+\tICE_FLOW_SEG_HDR_IPV_OTHER\t= 0x40000000,\n };\n \n /* These segements all have the same PTYPES, but are otherwise distinguished by\n@@ -219,6 +220,8 @@ enum ice_flow_field {\n \tICE_FLOW_FIELD_IDX_IPV4_DA,\n \tICE_FLOW_FIELD_IDX_IPV6_SA,\n \tICE_FLOW_FIELD_IDX_IPV6_DA,\n+\tICE_FLOW_FIELD_IDX_IPV4_ID,\n+\tICE_FLOW_FIELD_IDX_IPV6_ID,\n \tICE_FLOW_FIELD_IDX_IPV6_PRE32_SA,\n \tICE_FLOW_FIELD_IDX_IPV6_PRE32_DA,\n \tICE_FLOW_FIELD_IDX_IPV6_PRE48_SA,\ndiff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c\nindex 1429cbc3b6..bc4e0a5704 100644\n--- a/drivers/net/ice/ice_generic_flow.c\n+++ b/drivers/net/ice/ice_generic_flow.c\n@@ -212,6 +212,31 @@ enum rte_flow_item_type pattern_eth_qinq_ipv6[] = {\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n+\n+enum rte_flow_item_type pattern_eth_ipv6_frag_ext[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_IPV6_FRAG_EXT,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type pattern_eth_vlan_ipv6_frag_ext[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_VLAN,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_IPV6_FRAG_EXT,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type pattern_eth_qinq_ipv6_frag_ext[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_VLAN,\n+\tRTE_FLOW_ITEM_TYPE_VLAN,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_IPV6_FRAG_EXT,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n enum rte_flow_item_type pattern_eth_ipv6_udp[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\ndiff --git a/drivers/net/ice/ice_generic_flow.h b/drivers/net/ice/ice_generic_flow.h\nindex 434d2f425d..eb0368e280 100644\n--- a/drivers/net/ice/ice_generic_flow.h\n+++ b/drivers/net/ice/ice_generic_flow.h\n@@ -84,6 +84,8 @@\n \t(ICE_PROT_IPV4_OUTER | ICE_IP_PROTO)\n #define ICE_INSET_IPV4_TTL \\\n \t(ICE_PROT_IPV4_OUTER | ICE_IP_TTL)\n+#define ICE_INSET_IPV4_PKID \\\n+\t(ICE_PROT_IPV4 | ICE_IP_PK_ID)\n #define ICE_INSET_IPV6_SRC \\\n \t(ICE_PROT_IPV6_OUTER | ICE_IP_SRC)\n #define ICE_INSET_IPV6_DST \\\n@@ -94,6 +96,8 @@\n \t(ICE_PROT_IPV6_OUTER | ICE_IP_TTL)\n #define ICE_INSET_IPV6_TC \\\n \t(ICE_PROT_IPV6_OUTER | ICE_IP_TOS)\n+#define ICE_INSET_IPV6_PKID \\\n+\t(ICE_PROT_IPV6 | ICE_IP_PK_ID)\n \n #define ICE_INSET_TCP_SRC_PORT \\\n \t(ICE_PROT_TCP_OUTER | ICE_SPORT)\n@@ -236,6 +240,9 @@ extern enum rte_flow_item_type pattern_eth_qinq_ipv4_icmp[];\n extern enum rte_flow_item_type pattern_eth_ipv6[];\n extern enum rte_flow_item_type pattern_eth_vlan_ipv6[];\n extern enum rte_flow_item_type pattern_eth_qinq_ipv6[];\n+extern enum rte_flow_item_type pattern_eth_ipv6_frag_ext[];\n+extern enum rte_flow_item_type pattern_eth_vlan_ipv6_frag_ext[];\n+extern enum rte_flow_item_type pattern_eth_qinq_ipv6_frag_ext[];\n extern enum rte_flow_item_type pattern_eth_ipv6_udp[];\n extern enum rte_flow_item_type pattern_eth_vlan_ipv6_udp[];\n extern enum rte_flow_item_type pattern_eth_qinq_ipv6_udp[];\ndiff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c\nindex 1bb7d2c7c6..2b0a479c7e 100644\n--- a/drivers/net/ice/ice_hash.c\n+++ b/drivers/net/ice/ice_hash.c\n@@ -83,7 +83,7 @@ struct rss_type_match_hdr hint_empty = {\n \tICE_FLOW_SEG_HDR_NONE,\t0};\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+\tETH_RSS_ETH | ETH_RSS_IPV4 | ETH_RSS_FRAG_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@@ -227,7 +227,7 @@ struct rss_type_match_hdr hint_eth_ipv4_pfcp = {\n struct rss_type_match_hdr hint_eth_vlan_ipv4 = {\n \tICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV4 |\n \tICE_FLOW_SEG_HDR_IPV_OTHER,\n-\tETH_RSS_ETH | ETH_RSS_IPV4 | ETH_RSS_C_VLAN};\n+\tETH_RSS_ETH | ETH_RSS_IPV4 | ETH_RSS_FRAG_IPV4 | ETH_RSS_C_VLAN};\n struct rss_type_match_hdr hint_eth_vlan_ipv4_udp = {\n \tICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV4 |\n \tICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,\n@@ -246,6 +246,10 @@ struct rss_type_match_hdr hint_eth_vlan_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_frag_ext = {\n+\tICE_FLOW_SEG_HDR_ETH | ICE_FLOW_SEG_HDR_IPV6 |\n+\tICE_FLOW_SEG_HDR_IPV_FRAG,\n+\tETH_RSS_ETH | ETH_RSS_IPV6 | ETH_RSS_FRAG_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@@ -282,6 +286,10 @@ struct rss_type_match_hdr hint_eth_vlan_ipv6 = {\n \tICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV6 |\n \tICE_FLOW_SEG_HDR_IPV_OTHER,\n \tETH_RSS_ETH | ETH_RSS_IPV6 | ETH_RSS_C_VLAN};\n+struct rss_type_match_hdr hint_eth_vlan_ipv6_frag_ext = {\n+\tICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV6 |\n+\tICE_FLOW_SEG_HDR_IPV_FRAG,\n+\tETH_RSS_ETH | ETH_RSS_IPV6 | ETH_RSS_FRAG_IPV6 | ETH_RSS_C_VLAN};\n struct rss_type_match_hdr hint_eth_vlan_ipv6_udp = {\n \tICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV6 |\n \tICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,\n@@ -415,6 +423,8 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {\n \t\t&hint_eth_vlan_ipv4_sctp},\n \t{pattern_eth_ipv6,\t\t ICE_INSET_NONE,\n \t\t&hint_eth_ipv6},\n+\t{pattern_eth_ipv6_frag_ext,\t ICE_INSET_NONE,\n+\t\t&hint_eth_ipv6_frag_ext},\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@@ -433,6 +443,8 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {\n \t\t&hint_eth_ipv6_pfcp},\n \t{pattern_eth_vlan_ipv6,\t\t ICE_INSET_NONE,\n \t\t&hint_eth_vlan_ipv6},\n+\t{pattern_eth_vlan_ipv6_frag_ext, ICE_INSET_NONE,\n+\t\t&hint_eth_vlan_ipv6_frag_ext},\n \t{pattern_eth_vlan_ipv6_udp,\t ICE_INSET_NONE,\n \t\t&hint_eth_vlan_ipv6_udp},\n \t{pattern_eth_vlan_ipv6_tcp,\t ICE_INSET_NONE,\n@@ -492,6 +504,9 @@ struct ice_hash_match_type ice_hash_type_list[] = {\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_FRAG_IPV4,\n+\t\tICE_FLOW_HASH_IPV4 |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_ID)},\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@@ -591,6 +606,9 @@ struct ice_hash_match_type ice_hash_type_list[] = {\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_FRAG_IPV6,\n+\t\tICE_FLOW_HASH_IPV6 |\n+\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_ID)},\n \t{ETH_RSS_IPV6_PRE32 | ETH_RSS_L3_SRC_ONLY,\n \t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA)},\n \t{ETH_RSS_IPV6_PRE32 | ETH_RSS_L3_DST_ONLY,\n@@ -1087,10 +1105,12 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,\n \t\t\t\t\t RTE_ETH_RSS_L3_PRE64;\n \n \t\t\trss_attr_symm = ETH_RSS_IPV4 |\n+\t\t\t\t\tETH_RSS_FRAG_IPV4 |\n \t\t\t\t\tETH_RSS_NONFRAG_IPV4_UDP |\n \t\t\t\t\tETH_RSS_NONFRAG_IPV4_TCP |\n \t\t\t\t\tETH_RSS_NONFRAG_IPV4_SCTP |\n \t\t\t\t\tETH_RSS_IPV6 |\n+\t\t\t\t\tETH_RSS_FRAG_IPV6 |\n \t\t\t\t\tETH_RSS_NONFRAG_IPV6_UDP |\n \t\t\t\t\tETH_RSS_NONFRAG_IPV6_TCP |\n \t\t\t\t\tETH_RSS_NONFRAG_IPV6_SCTP;\n@@ -1144,6 +1164,14 @@ 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\"Not supported flow\");\n \t\t\t}\n+\t\t\t/* update hash field for ip fragment */\n+\t\t\tif (rss_type & ETH_RSS_FRAG_IPV4) {\n+\t\t\t\thash_meta->pkt_hdr |= ICE_FLOW_SEG_HDR_IPV_FRAG;\n+\t\t\t\thash_meta->pkt_hdr &=\n+\t\t\t\t~(ICE_FLOW_SEG_HDR_IPV_OTHER);\n+\t\t\t\thash_meta->hash_flds |=\n+\t\t\t\tBIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_ID);\n+\t\t\t}\n \n \t\t\t/* update hash field for eth-non-ip. */\n \t\t\tif (rss_type & ETH_RSS_ETH) {\n@@ -1293,7 +1321,10 @@ ice_hash_create(struct ice_adapter *ad,\n \t\tfilter_ptr->rss_cfg.hash.symm =\n \t\t\t(hash_function ==\n \t\t\t\tRTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ);\n-\t\tfilter_ptr->rss_cfg.hash.hdr_type = ICE_RSS_ANY_HEADERS;\n+\t\tif (headermask & ICE_FLOW_SEG_HDR_IPV_FRAG)\n+\t\t\tfilter_ptr->rss_cfg.hash.hdr_type = ICE_RSS_OUTER_HEADERS;\n+\t\telse\n+\t\t\tfilter_ptr->rss_cfg.hash.hdr_type = ICE_RSS_ANY_HEADERS;\n \n \t\tret = ice_add_rss_cfg_wrap(pf, vsi->idx,\n \t\t\t\t\t &filter_ptr->rss_cfg.hash);\n", "prefixes": [ "01/22" ] }