Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/91204/?format=api
{ "id": 91204, "url": "http://patches.dpdk.org/api/patches/91204/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210413075854.60130-2-jia.guo@intel.com/", "project": { "id": 1, "url": "http://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": "<20210413075854.60130-2-jia.guo@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210413075854.60130-2-jia.guo@intel.com", "date": "2021-04-13T07:58:52", "name": "[v4,1/3] net/ice/base: support IP fragment RSS and FDIR", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "1504265548e3c841024e42ba317136604c860dbd", "submitter": { "id": 507, "url": "http://patches.dpdk.org/api/people/507/?format=api", "name": "Guo, Jia", "email": "jia.guo@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210413075854.60130-2-jia.guo@intel.com/mbox/", "series": [ { "id": 16321, "url": "http://patches.dpdk.org/api/series/16321/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=16321", "date": "2021-04-13T07:58:51", "name": "support flow for IP fragment in ICE", "version": 4, "mbox": "http://patches.dpdk.org/series/16321/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/91204/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/91204/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 61E93A0524;\n\tTue, 13 Apr 2021 10:04:32 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id E700D160C12;\n\tTue, 13 Apr 2021 10:04:28 +0200 (CEST)", "from mga07.intel.com (mga07.intel.com [134.134.136.100])\n by mails.dpdk.org (Postfix) with ESMTP id 1F0A216098B\n for <dev@dpdk.org>; Tue, 13 Apr 2021 10:04:26 +0200 (CEST)", "from orsmga001.jf.intel.com ([10.7.209.18])\n by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 13 Apr 2021 01:04:26 -0700", "from npg-dpdk-cvl-jeffguo-01.sh.intel.com ([10.67.111.128])\n by orsmga001.jf.intel.com with ESMTP; 13 Apr 2021 01:04:23 -0700" ], "IronPort-SDR": [ "\n Mod0XEnxBropYaTrgYivbQ+qFGATORcaPKExBfUtMokWxf21VVuONxQOPv0IKvMxKK5BnedqvH\n C2S8sFECdfWQ==", "\n /A38jtYQfJcQaZvSAMGmce9/uxIPK7np2dx03ADDjplHFj/81aIwlimnKh3SGYdMMxPqe/AMZ2\n SAaulPtbo6hQ==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,9952\"; a=\"258338915\"", "E=Sophos;i=\"5.82,218,1613462400\"; d=\"scan'208\";a=\"258338915\"", "E=Sophos;i=\"5.82,218,1613462400\"; d=\"scan'208\";a=\"460495022\"" ], "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,\n\tting.xu@intel.com,\n\tjia.guo@intel.com", "Date": "Tue, 13 Apr 2021 15:58:52 +0800", "Message-Id": "<20210413075854.60130-2-jia.guo@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20210413075854.60130-1-jia.guo@intel.com>", "References": "<20210324135407.60637-1-jia.guo@intel.com>\n <20210413075854.60130-1-jia.guo@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v4 1/3] net/ice/base: support IP fragment RSS and\n FDIR", "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": "Add support for IP fragment RSS hash and FDIR according to packet ID.\nSeparate IP fragment and IP other packet types.\n\nSigned-off-by: Ting Xu <ting.xu@intel.com>\nSigned-off-by: Jeff Guo <jia.guo@intel.com>\n---\n drivers/net/ice/base/ice_fdir.c | 50 +++++++++++++++++++++++++++++++--\n drivers/net/ice/base/ice_fdir.h | 22 ++++++++++++---\n drivers/net/ice/base/ice_flow.c | 50 ++++++++++++++++++++++++++++++++-\n drivers/net/ice/base/ice_flow.h | 5 +++-\n drivers/net/ice/base/ice_type.h | 1 +\n 5 files changed, 120 insertions(+), 8 deletions(-)", "diff": "diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c\nindex 2b39c13127..0eb7cdd729 100644\n--- a/drivers/net/ice/base/ice_fdir.c\n+++ b/drivers/net/ice/base/ice_fdir.c\n@@ -518,6 +518,24 @@ static const u8 ice_fdir_ipv4_udp_ecpri_tp0_pkt[] = {\n \t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n };\n \n+static const u8 ice_fdir_ipv6_frag_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x2C, 0x40, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3B, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+};\n+\n+static const u8 ice_fdir_ipv4_frag_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n+\t0x00, 0x14, 0x00, 0x00, 0x20, 0x00, 0x40, 0x10,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00\n+};\n static const u8 ice_fdir_tcpv6_pkt[] = {\n \t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,\n@@ -716,6 +734,16 @@ static const struct ice_fdir_base_pkt ice_fdir_pkt[] = {\n \t\tsizeof(ice_fdir_ipv4_pkt), ice_fdir_ipv4_pkt,\n \t\tsizeof(ice_fdir_ip4_tun_pkt), ice_fdir_ip4_tun_pkt,\n \t},\n+\t{\n+\t\tICE_FLTR_PTYPE_FRAG_IPV4,\n+\t\tsizeof(ice_fdir_ipv4_pkt), ice_fdir_ipv4_frag_pkt,\n+\t\tsizeof(ice_fdir_ipv4_pkt), ice_fdir_ipv4_frag_pkt,\n+\t},\n+\t{\n+\t\tICE_FLTR_PTYPE_FRAG_IPV6,\n+\t\tsizeof(ice_fdir_ipv6_frag_pkt), ice_fdir_ipv6_frag_pkt,\n+\t\tsizeof(ice_fdir_ipv6_frag_pkt), ice_fdir_ipv6_frag_pkt,\n+\t},\n \t{\n \t\tICE_FLTR_PTYPE_NONF_IPV4_GTPU,\n \t\tsizeof(ice_fdir_ipv4_gtpu4_pkt),\n@@ -1505,7 +1533,7 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,\n \t\tice_pkt_insert_u8(loc, ICE_IPV4_TTL_OFFSET, input->ip.v4.ttl);\n \t\tice_pkt_insert_mac_addr(loc, input->ext_data.dst_mac);\n \t\tif (frag)\n-\t\t\tloc[20] = ICE_FDIR_IPV4_PKT_FLAG_DF;\n+\t\t\tloc[20] = ICE_FDIR_IPV4_PKT_FLAG_MF;\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_UDP:\n \t\tice_pkt_insert_mac_addr(pkt, input->ext_data_outer.dst_mac);\n@@ -1808,6 +1836,23 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,\n \t\t\t\t input->ip.v6.proto);\n \t\tice_pkt_insert_mac_addr(loc, input->ext_data.dst_mac);\n \t\tbreak;\n+\tcase ICE_FLTR_PTYPE_FRAG_IPV4:\n+\t\tice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,\n+\t\t\t\t input->ip.v4.src_ip);\n+\t\tice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET,\n+\t\t\t\t input->ip.v4.dst_ip);\n+\t\tice_pkt_insert_u8(loc, ICE_IPV4_TOS_OFFSET, input->ip.v4.tos);\n+\t\tice_pkt_insert_u16(loc, ICE_IPV4_ID_OFFSET,\n+\t\t\t\t input->ip.v4.packet_id);\n+\t\tice_pkt_insert_u8(loc, ICE_IPV4_TTL_OFFSET, input->ip.v4.ttl);\n+\t\tice_pkt_insert_u8(loc, ICE_IPV4_PROTO_OFFSET,\n+\t\t\t\t input->ip.v4.proto);\n+\t\tice_pkt_insert_mac_addr(loc, input->ext_data.dst_mac);\n+\t\tbreak;\n+\tcase ICE_FLTR_PTYPE_FRAG_IPV6:\n+\t\tice_pkt_insert_u32(loc, ICE_IPV6_ID_OFFSET,\n+\t\t\t\t input->ip.v6.packet_id);\n+\t\tbreak;\n \tdefault:\n \t\treturn ICE_ERR_PARAM;\n \t}\n@@ -1838,7 +1883,8 @@ ice_fdir_get_prgm_pkt(struct ice_fdir_fltr *input, u8 *pkt, bool frag)\n */\n bool ice_fdir_has_frag(enum ice_fltr_ptype flow)\n {\n-\tif (flow == ICE_FLTR_PTYPE_NONF_IPV4_OTHER)\n+\tif (flow == ICE_FLTR_PTYPE_FRAG_IPV4 ||\n+\t flow == ICE_FLTR_PTYPE_FRAG_IPV6)\n \t\treturn true;\n \telse\n \t\treturn false;\ndiff --git a/drivers/net/ice/base/ice_fdir.h b/drivers/net/ice/base/ice_fdir.h\nindex 6573f96bc1..2acc1d6f1b 100644\n--- a/drivers/net/ice/base/ice_fdir.h\n+++ b/drivers/net/ice/base/ice_fdir.h\n@@ -43,9 +43,11 @@\n #define ICE_MAC_ETHTYPE_OFFSET\t\t12\n #define ICE_IPV4_TOS_OFFSET\t\t15\n #define ICE_IPV4_TTL_OFFSET\t\t22\n+#define ICE_IPV4_ID_OFFSET\t\t18\n #define ICE_IPV6_TC_OFFSET\t\t14\n #define ICE_IPV6_HLIM_OFFSET\t\t21\n #define ICE_IPV6_PROTO_OFFSET\t\t20\n+#define ICE_IPV6_ID_OFFSET\t\t58\n /* For TUN inner (without inner MAC) */\n #define ICE_IPV4_NO_MAC_TOS_OFFSET\t1\n #define ICE_IPV4_NO_MAC_TTL_OFFSET\t8\n@@ -83,12 +85,22 @@\n \n #define ICE_FDIR_MAX_FLTRS\t\t16384\n \n-/* IP v4 has 2 flag bits that enable fragment processing: DF and MF. DF\n+/* IPv4 has 2 flag bits that enable fragment processing: DF and MF. DF\n * requests that the packet not be fragmented. MF indicates that a packet has\n- * been fragmented.\n+ * been fragmented, except that for the last fragment has a non-zero\n+ * Fragment Offset field with zero MF.\n */\n-#define ICE_FDIR_IPV4_PKT_FLAG_DF\t\t0x20\n-#define ICE_FDIR_IPV4_PKT_FLAG_MF\t\t0x40\n+#define ICE_FDIR_IPV4_PKT_FLAG_MF\t\t0x20\n+#define ICE_FDIR_IPV4_PKT_FLAG_MF_SHIFT\t8\n+#ifndef NO_UNUSED_PACKAGE_CODE\n+#define ICE_FDIR_IPV4_PKT_FLAG_DF\t\t0x40\n+#endif /* NO_UNUSED_PACKAGE_CODE */\n+\n+/* For IPv6 fragmented packets, all fragments except the last have\n+ * the MF flag set.\n+ */\n+#define ICE_FDIR_IPV6_PKT_FLAG_MF\t\t0x100\n+#define ICE_FDIR_IPV6_PKT_FLAG_MF_SHIFT\t8\n \n enum ice_fltr_prgm_desc_dest {\n \tICE_FLTR_PRGM_DESC_DEST_DROP_PKT,\n@@ -150,6 +162,7 @@ struct ice_fdir_v4 {\n \tu8 ip_ver;\n \tu8 proto;\n \tu8 ttl;\n+\t__be16 packet_id;\n };\n \n #define ICE_IPV6_ADDR_LEN_AS_U32\t\t4\n@@ -164,6 +177,7 @@ struct ice_fdir_v6 {\n \tu8 tc;\n \tu8 proto;\n \tu8 hlim;\n+\t__be32 packet_id;\n };\n \n struct ice_fdir_udp_gtp {\ndiff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c\nindex c12ddfa247..9dea881914 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@@ -96,6 +98,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@@ -725,6 +733,27 @@ static const u32 ice_ptypes_udp_ecpri_tp0[] = {\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 /* Manage parameters and info. used during the creation of a flow profile */\n struct ice_flow_prof_params {\n \tenum ice_block blk;\n@@ -899,6 +928,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@@ -1177,6 +1216,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@@ -1187,6 +1229,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@@ -3341,13 +3386,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 af15ecb0ff..d905b95b1c 100644\n--- a/drivers/net/ice/base/ice_flow.h\n+++ b/drivers/net/ice/base/ice_flow.h\n@@ -186,8 +186,9 @@ enum ice_flow_seg_hdr {\n \tICE_FLOW_SEG_HDR_ECPRI_TP0\t= 0x04000000,\n \tICE_FLOW_SEG_HDR_UDP_ECPRI_TP0\t= 0x08000000,\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 * ICE_FLOW_SEG_HDR_IPV6.\n \t */\n+\tICE_FLOW_SEG_HDR_IPV_FRAG\t= 0x10000000,\n \tICE_FLOW_SEG_HDR_IPV_OTHER\t= 0x20000000,\n };\n \n@@ -225,6 +226,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/base/ice_type.h b/drivers/net/ice/base/ice_type.h\nindex a6599363f9..5abe9dc9ea 100644\n--- a/drivers/net/ice/base/ice_type.h\n+++ b/drivers/net/ice/base/ice_type.h\n@@ -349,6 +349,7 @@ enum ice_fltr_ptype {\n \tICE_FLTR_PTYPE_NONF_ECPRI_TP0,\n \tICE_FLTR_PTYPE_NONF_IPV4_UDP_ECPRI_TP0,\n \tICE_FLTR_PTYPE_FRAG_IPV4,\n+\tICE_FLTR_PTYPE_FRAG_IPV6,\n \tICE_FLTR_PTYPE_NONF_IPV6_UDP,\n \tICE_FLTR_PTYPE_NONF_IPV6_TCP,\n \tICE_FLTR_PTYPE_NONF_IPV6_SCTP,\n", "prefixes": [ "v4", "1/3" ] }