Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 70814,
    "url": "https://patches.dpdk.org/api/patches/70814/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200603024016.30636-53-qi.z.zhang@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": "<20200603024016.30636-53-qi.z.zhang@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20200603024016.30636-53-qi.z.zhang@intel.com",
    "date": "2020-06-03T02:40:16",
    "name": "[52/52] net/ice/base: update IPV4 and IPV6 flow ptype masks",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "58b3fe8fe3f54213c8942ad60f062c7a618620a4",
    "submitter": {
        "id": 504,
        "url": "https://patches.dpdk.org/api/people/504/?format=api",
        "name": "Qi Zhang",
        "email": "qi.z.zhang@intel.com"
    },
    "delegate": {
        "id": 31221,
        "url": "https://patches.dpdk.org/api/users/31221/?format=api",
        "username": "yexl",
        "first_name": "xiaolong",
        "last_name": "ye",
        "email": "xiaolong.ye@intel.com"
    },
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/20200603024016.30636-53-qi.z.zhang@intel.com/mbox/",
    "series": [
        {
            "id": 10300,
            "url": "https://patches.dpdk.org/api/series/10300/?format=api",
            "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=10300",
            "date": "2020-06-03T02:39:24",
            "name": "net/ice: base code update",
            "version": 1,
            "mbox": "https://patches.dpdk.org/series/10300/mbox/"
        }
    ],
    "comments": "https://patches.dpdk.org/api/patches/70814/comments/",
    "check": "success",
    "checks": "https://patches.dpdk.org/api/patches/70814/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 41C37A04EF;\n\tWed,  3 Jun 2020 04:45:15 +0200 (CEST)",
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 26A321C0B4;\n\tWed,  3 Jun 2020 04:38:11 +0200 (CEST)",
            "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n by dpdk.org (Postfix) with ESMTP id DB9D41C239\n for <dev@dpdk.org>; Wed,  3 Jun 2020 04:38:08 +0200 (CEST)",
            "from orsmga001.jf.intel.com ([10.7.209.18])\n by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 02 Jun 2020 19:38:08 -0700",
            "from dpdk51.sh.intel.com ([10.67.111.82])\n by orsmga001.jf.intel.com with ESMTP; 02 Jun 2020 19:38:06 -0700"
        ],
        "IronPort-SDR": [
            "\n Gs2/hkr9MnhJ/kgBCZEF2SIrbeY2XPg7QKhLsg0ntO8aDYVcME/lT/tJMbQVlDxdQGqKcznm+a\n eWHAUaH/j7Ug==",
            "\n AZN4Dh2LjsPInaVe3ugTAnqei3NsQZS/ti9jWhFSlWw/xZ6lW3YsYmEH0j6VU/pydydutClMj0\n kjLYQGoJD28g=="
        ],
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "X-Amp-File-Uploaded": "False",
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.73,466,1583222400\"; d=\"scan'208\";a=\"347614373\"",
        "From": "Qi Zhang <qi.z.zhang@intel.com>",
        "To": "qiming.yang@intel.com",
        "Cc": "dev@dpdk.org, xiaolong.ye@intel.com, Qi Zhang <qi.z.zhang@intel.com>,\n Dan Nowlin <dan.nowlin@intel.com>,\n \"Paul M . Stillwell Jr\" <paul.m.stillwell.jr@intel.com>",
        "Date": "Wed,  3 Jun 2020 10:40:16 +0800",
        "Message-Id": "<20200603024016.30636-53-qi.z.zhang@intel.com>",
        "X-Mailer": "git-send-email 2.13.6",
        "In-Reply-To": "<20200603024016.30636-1-qi.z.zhang@intel.com>",
        "References": "<20200603024016.30636-1-qi.z.zhang@intel.com>",
        "Subject": "[dpdk-dev] [PATCH 52/52] net/ice/base: update IPV4 and IPV6 flow\n\tptype masks",
        "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": "In the flow API, add ability to add IPV4/IPV6 rules that match on\npackets with or without inner L4 protocols.\n\nAlso, remove PPPOD packet from PPPOE bitmap.\n\nSigned-off-by: Dan Nowlin <dan.nowlin@intel.com>\nSigned-off-by: Paul M. Stillwell Jr <paul.m.stillwell.jr@intel.com>\nSigned-off-by: Qi Zhang <qi.z.zhang@intel.com>\n---\n drivers/net/ice/base/ice_flow.c   | 166 ++++++++++++++++++++++++++++++--------\n drivers/net/ice/base/ice_flow.h   |   4 +\n drivers/net/ice/ice_fdir_filter.c |  30 ++++---\n drivers/net/ice/ice_hash.c        |  22 +++--\n 4 files changed, 170 insertions(+), 52 deletions(-)",
    "diff": "diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c\nindex 744b2805f..615f1719a 100644\n--- a/drivers/net/ice/base/ice_flow.c\n+++ b/drivers/net/ice/base/ice_flow.c\n@@ -218,10 +218,26 @@ static const u32 ice_ptypes_macvlan_il[] = {\n \t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n };\n \n-/* Packet types for packets with an Outer/First/Single IPv4 header */\n+/* Packet types for packets with an Outer/First/Single IPv4 header, does NOT\n+ * include IPV4 other PTYPEs\n+ */\n static const u32 ice_ptypes_ipv4_ofos[] = {\n \t0x1DC00000, 0x04000800, 0x00000000, 0x00000000,\n \t0x00000000, 0x00000155, 0x00000000, 0x00000000,\n+\t0x00000000, 0x000FC000, 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 packets with an Outer/First/Single IPv4 header, includes\n+ * IPV4 other PTYPEs\n+ */\n+static const u32 ice_ptypes_ipv4_ofos_all[] = {\n+\t0x1DC00000, 0x04000800, 0x00000000, 0x00000000,\n+\t0x00000000, 0x00000155, 0x00000000, 0x00000000,\n \t0x00000000, 0x000FC000, 0x83E0F800, 0x00000101,\n \t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n \t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n@@ -242,10 +258,26 @@ static const u32 ice_ptypes_ipv4_il[] = {\n \t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n };\n \n-/* Packet types for packets with an Outer/First/Single IPv6 header */\n+/* Packet types for packets with an Outer/First/Single IPv6 header, does NOT\n+ * include IVP6 other PTYPEs\n+ */\n static const u32 ice_ptypes_ipv6_ofos[] = {\n \t0x00000000, 0x00000000, 0x77000000, 0x10002000,\n \t0x00000000, 0x000002AA, 0x00000000, 0x00000000,\n+\t0x00000000, 0x03F00000, 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 packets with an Outer/First/Single IPv6 header, includes\n+ * IPV6 other PTYPEs\n+ */\n+static const u32 ice_ptypes_ipv6_ofos_all[] = {\n+\t0x00000000, 0x00000000, 0x77000000, 0x10002000,\n+\t0x00000000, 0x000002AA, 0x00000000, 0x00000000,\n \t0x00080F00, 0x03F00000, 0x7C1F0000, 0x00000206,\n \t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n \t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n@@ -266,6 +298,54 @@ static const u32 ice_ptypes_ipv6_il[] = {\n \t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n };\n \n+/* Packet types for packets with an Outer/First/Single IPv4 header - no L4 */\n+static const u32 ice_ipv4_ofos_no_l4[] = {\n+\t0x10C00000, 0x04000800, 0x00000000, 0x00000000,\n+\t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n+\t0x00000000, 0x000cc000, 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 packets with an Innermost/Last IPv4 header - no L4 */\n+static const u32 ice_ipv4_il_no_l4[] = {\n+\t0x60000000, 0x18043008, 0x80000002, 0x6010c021,\n+\t0x00000008, 0x00000000, 0x00000000, 0x00000000,\n+\t0x00000000, 0x00000000, 0x00139800, 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 packets with an Outer/First/Single IPv6 header - no L4 */\n+static const u32 ice_ipv6_ofos_no_l4[] = {\n+\t0x00000000, 0x00000000, 0x43000000, 0x10002000,\n+\t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n+\t0x00000000, 0x02300000, 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 packets with an Innermost/Last IPv6 header - no L4 */\n+static const u32 ice_ipv6_il_no_l4[] = {\n+\t0x00000000, 0x02180430, 0x0000010c, 0x086010c0,\n+\t0x00000430, 0x00000000, 0x00000000, 0x00000000,\n+\t0x00000000, 0x00000000, 0x4e600000, 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 packets with an Outermost/First ARP header */\n static const u32 ice_ptypes_arp_of[] = {\n \t0x00000800, 0x00000000, 0x00000000, 0x00000000,\n@@ -473,7 +553,7 @@ static const u32 ice_ptypes_gtpu[] = {\n static const u32 ice_ptypes_pppoe[] = {\n \t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n \t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n-\t0x00000000, 0x03FFF000, 0x00000000, 0x00000000,\n+\t0x00000000, 0x03ffe000, 0x00000000, 0x00000000,\n \t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n \t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n \t0x00000000, 0x00000000, 0x00000000, 0x00000000,\n@@ -598,6 +678,9 @@ struct ice_flow_prof_params {\n #define ICE_FLOW_SEG_HDRS_L4_MASK\t\\\n \t(ICE_FLOW_SEG_HDR_ICMP | ICE_FLOW_SEG_HDR_TCP | ICE_FLOW_SEG_HDR_UDP | \\\n \t ICE_FLOW_SEG_HDR_SCTP)\n+/* mask for L4 protocols that are NOT part of IPV4/6 OTHER PTYPE groups */\n+#define ICE_FLOW_SEG_HDRS_L4_MASK_NO_OTHER\t\\\n+\t(ICE_FLOW_SEG_HDR_TCP | ICE_FLOW_SEG_HDR_UDP | ICE_FLOW_SEG_HDR_SCTP)\n \n /**\n  * ice_flow_val_hdrs - validates packet segments for valid protocol headers\n@@ -715,46 +798,47 @@ ice_flow_proc_seg_hdrs(struct ice_flow_prof_params *params)\n \t\t\t\t       ICE_FLOW_PTYPE_MAX);\n \t\t}\n \n-\t\tif (hdrs & ICE_FLOW_SEG_HDR_IPV4) {\n+\t\tif (hdrs & ICE_FLOW_SEG_HDR_PPPOE) {\n+\t\t\tsrc = (const ice_bitmap_t *)ice_ptypes_pppoe;\n+\t\t\tice_and_bitmap(params->ptypes, params->ptypes, src,\n+\t\t\t\t       ICE_FLOW_PTYPE_MAX);\n+\t\t}\n+\t\tif ((hdrs & ICE_FLOW_SEG_HDR_IPV4) &&\n+\t\t    (hdrs & ICE_FLOW_SEG_HDR_IPV_OTHER)) {\n+\t\t\tsrc = !i ?\n+\t\t\t\t(const ice_bitmap_t *)ice_ptypes_ipv4_ofos_all :\n+\t\t\t\t(const ice_bitmap_t *)ice_ptypes_ipv4_il;\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_OTHER)) {\n+\t\t\tsrc = !i ?\n+\t\t\t\t(const ice_bitmap_t *)ice_ptypes_ipv6_ofos_all :\n+\t\t\t\t(const ice_bitmap_t *)ice_ptypes_ipv6_il;\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_ipv4_ofos_no_l4 :\n+\t\t\t\t(const ice_bitmap_t *)ice_ipv4_il_no_l4;\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\tsrc = !i ? (const ice_bitmap_t *)ice_ptypes_ipv4_ofos :\n \t\t\t\t(const ice_bitmap_t *)ice_ptypes_ipv4_il;\n \t\t\tice_and_bitmap(params->ptypes, params->ptypes, src,\n \t\t\t\t       ICE_FLOW_PTYPE_MAX);\n-\t\t\tif (hdrs & ICE_FLOW_SEG_HDR_UDP) {\n-\t\t\t\tsrc = (const ice_bitmap_t *)ice_ptypes_udp_il;\n-\t\t\t\tice_and_bitmap(params->ptypes,\n-\t\t\t\t\t\tparams->ptypes, src,\n-\t\t\t\t\t       ICE_FLOW_PTYPE_MAX);\n-\t\t\t} else if (hdrs & ICE_FLOW_SEG_HDR_TCP) {\n-\t\t\t\tice_and_bitmap(params->ptypes, params->ptypes,\n-\t\t\t\t\t       (const ice_bitmap_t *)\n-\t\t\t\t\t       ice_ptypes_tcp_il,\n-\t\t\t\t\t       ICE_FLOW_PTYPE_MAX);\n-\t\t\t} else if (hdrs & ICE_FLOW_SEG_HDR_SCTP) {\n-\t\t\t\tsrc = (const ice_bitmap_t *)ice_ptypes_sctp_il;\n-\t\t\t\tice_and_bitmap(params->ptypes, params->ptypes,\n-\t\t\t\t\t       src, ICE_FLOW_PTYPE_MAX);\n-\t\t\t}\n+\t\t} else if ((hdrs & ICE_FLOW_SEG_HDR_IPV6) &&\n+\t\t\t   !(hdrs & ICE_FLOW_SEG_HDRS_L4_MASK_NO_OTHER)) {\n+\t\t\tsrc = !i ? (const ice_bitmap_t *)ice_ipv6_ofos_no_l4 :\n+\t\t\t\t(const ice_bitmap_t *)ice_ipv6_il_no_l4;\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\tsrc = !i ? (const ice_bitmap_t *)ice_ptypes_ipv6_ofos :\n \t\t\t\t(const ice_bitmap_t *)ice_ptypes_ipv6_il;\n \t\t\tice_and_bitmap(params->ptypes, params->ptypes, src,\n \t\t\t\t       ICE_FLOW_PTYPE_MAX);\n-\t\t\tif (hdrs & ICE_FLOW_SEG_HDR_UDP) {\n-\t\t\t\tsrc = (const ice_bitmap_t *)ice_ptypes_udp_il;\n-\t\t\t\tice_and_bitmap(params->ptypes,\n-\t\t\t\t\t\tparams->ptypes, src,\n-\t\t\t\t\t       ICE_FLOW_PTYPE_MAX);\n-\t\t\t} else if (hdrs & ICE_FLOW_SEG_HDR_TCP) {\n-\t\t\t\tice_and_bitmap(params->ptypes, params->ptypes,\n-\t\t\t\t\t       (const ice_bitmap_t *)\n-\t\t\t\t\t       ice_ptypes_tcp_il,\n-\t\t\t\t\t       ICE_FLOW_PTYPE_MAX);\n-\t\t\t} else if (hdrs & ICE_FLOW_SEG_HDR_SCTP) {\n-\t\t\t\tsrc = (const ice_bitmap_t *)ice_ptypes_sctp_il;\n-\t\t\t\tice_and_bitmap(params->ptypes, params->ptypes,\n-\t\t\t\t\t       src, ICE_FLOW_PTYPE_MAX);\n-\t\t\t}\n \t\t}\n \n \t\tif (hdrs & ICE_FLOW_SEG_HDR_ETH_NON_IP) {\n@@ -771,6 +855,20 @@ ice_flow_proc_seg_hdrs(struct ice_flow_prof_params *params)\n \t\t\t\t\t  ICE_FLOW_PTYPE_MAX);\n \t\t}\n \n+\t\tif (hdrs & ICE_FLOW_SEG_HDR_UDP) {\n+\t\t\tsrc = (const ice_bitmap_t *)ice_ptypes_udp_il;\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_TCP) {\n+\t\t\tice_and_bitmap(params->ptypes, params->ptypes,\n+\t\t\t\t       (const ice_bitmap_t *)ice_ptypes_tcp_il,\n+\t\t\t\t       ICE_FLOW_PTYPE_MAX);\n+\t\t} else if (hdrs & ICE_FLOW_SEG_HDR_SCTP) {\n+\t\t\tsrc = (const ice_bitmap_t *)ice_ptypes_sctp_il;\n+\t\t\tice_and_bitmap(params->ptypes, params->ptypes, src,\n+\t\t\t\t       ICE_FLOW_PTYPE_MAX);\n+\t\t}\n+\n \t\tif (hdrs & ICE_FLOW_SEG_HDR_ICMP) {\n \t\t\tsrc = !i ? (const ice_bitmap_t *)ice_ptypes_icmp_of :\n \t\t\t\t(const ice_bitmap_t *)ice_ptypes_icmp_il;\ndiff --git a/drivers/net/ice/base/ice_flow.h b/drivers/net/ice/base/ice_flow.h\nindex 6e4257123..92987664e 100644\n--- a/drivers/net/ice/base/ice_flow.h\n+++ b/drivers/net/ice/base/ice_flow.h\n@@ -178,6 +178,10 @@ enum ice_flow_seg_hdr {\n \tICE_FLOW_SEG_HDR_AH\t\t= 0x00200000,\n \tICE_FLOW_SEG_HDR_NAT_T_ESP\t= 0x00400000,\n \tICE_FLOW_SEG_HDR_ETH_NON_IP\t= 0x00800000,\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 };\n \n /* These segements all have the same PTYPES, but are otherwise distinguished by\ndiff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c\nindex 77e2da9fc..c3f23a019 100644\n--- a/drivers/net/ice/ice_fdir_filter.c\n+++ b/drivers/net/ice/ice_fdir_filter.c\n@@ -956,33 +956,41 @@ ice_fdir_input_set_conf(struct ice_pf *pf, enum ice_fltr_ptype flow,\n \tswitch (flow) {\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_UDP:\n \t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_UDP |\n-\t\t\t\t  ICE_FLOW_SEG_HDR_IPV4);\n+\t\t\t\t  ICE_FLOW_SEG_HDR_IPV4 |\n+\t\t\t\t  ICE_FLOW_SEG_HDR_IPV_OTHER);\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_TCP:\n \t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_TCP |\n-\t\t\t\t  ICE_FLOW_SEG_HDR_IPV4);\n+\t\t\t\t  ICE_FLOW_SEG_HDR_IPV4 |\n+\t\t\t\t  ICE_FLOW_SEG_HDR_IPV_OTHER);\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_SCTP:\n \t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_SCTP |\n-\t\t\t\t  ICE_FLOW_SEG_HDR_IPV4);\n+\t\t\t\t  ICE_FLOW_SEG_HDR_IPV4 |\n+\t\t\t\t  ICE_FLOW_SEG_HDR_IPV_OTHER);\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_OTHER:\n-\t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_IPV4);\n+\t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_IPV4 |\n+\t\t\t\t  ICE_FLOW_SEG_HDR_IPV_OTHER);\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV6_UDP:\n \t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_UDP |\n-\t\t\t\t  ICE_FLOW_SEG_HDR_IPV6);\n+\t\t\t\t  ICE_FLOW_SEG_HDR_IPV6 |\n+\t\t\t\t  ICE_FLOW_SEG_HDR_IPV_OTHER);\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV6_TCP:\n \t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_TCP |\n-\t\t\t\t  ICE_FLOW_SEG_HDR_IPV6);\n+\t\t\t\t  ICE_FLOW_SEG_HDR_IPV6 |\n+\t\t\t\t  ICE_FLOW_SEG_HDR_IPV_OTHER);\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV6_SCTP:\n \t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_SCTP |\n-\t\t\t\t  ICE_FLOW_SEG_HDR_IPV6);\n+\t\t\t\t  ICE_FLOW_SEG_HDR_IPV6 |\n+\t\t\t\t  ICE_FLOW_SEG_HDR_IPV_OTHER);\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV6_OTHER:\n-\t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_IPV6);\n+\t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_IPV6 |\n+\t\t\t\t  ICE_FLOW_SEG_HDR_IPV_OTHER);\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_UDP:\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_TCP:\n@@ -990,11 +998,13 @@ ice_fdir_input_set_conf(struct ice_pf *pf, enum ice_fltr_ptype flow,\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER:\n \t\tif (ttype == ICE_FDIR_TUNNEL_TYPE_GTPU)\n \t\t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_GTPU_IP |\n-\t\t\t\t\t  ICE_FLOW_SEG_HDR_IPV4);\n+\t\t\t\t\t  ICE_FLOW_SEG_HDR_IPV4 |\n+\t\t\t\t\t  ICE_FLOW_SEG_HDR_IPV_OTHER);\n \t\telse if (ttype == ICE_FDIR_TUNNEL_TYPE_GTPU_EH)\n \t\t\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_GTPU_EH |\n \t\t\t\t\t  ICE_FLOW_SEG_HDR_GTPU_IP |\n-\t\t\t\t\t  ICE_FLOW_SEG_HDR_IPV4);\n+\t\t\t\t\t  ICE_FLOW_SEG_HDR_IPV4 |\n+\t\t\t\t\t  ICE_FLOW_SEG_HDR_IPV_OTHER);\n \t\telse\n \t\t\tPMD_DRV_LOG(ERR, \"not supported tunnel type.\");\n \t\tbreak;\ndiff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c\nindex 11435cbfb..3d58b7184 100644\n--- a/drivers/net/ice/ice_hash.c\n+++ b/drivers/net/ice/ice_hash.c\n@@ -79,21 +79,27 @@ ice_hash_parse_pattern_action(struct ice_adapter *ad,\n struct rss_type_match_hdr hint_0 = {\n \tICE_FLOW_SEG_HDR_NONE,\t0};\n struct rss_type_match_hdr hint_1 = {\n-\tICE_FLOW_SEG_HDR_IPV4,\tETH_RSS_IPV4};\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, ETH_RSS_NONFRAG_IPV4_UDP};\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, ETH_RSS_NONFRAG_IPV4_TCP};\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, ETH_RSS_NONFRAG_IPV4_SCTP};\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,\tETH_RSS_IPV6};\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, ETH_RSS_NONFRAG_IPV6_UDP};\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, ETH_RSS_NONFRAG_IPV6_TCP};\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, ETH_RSS_NONFRAG_IPV6_SCTP};\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",
    "prefixes": [
        "52/52"
    ]
}