Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1288151/?format=api
{ "id": 1288151, "url": "http://patchwork.ozlabs.org/api/patches/1288151/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200512010146.41303-4-anthony.l.nguyen@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20200512010146.41303-4-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2020-05-12T01:01:43", "name": "[S42,4/7] ice: Support IPv6 Flow Director filters", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "4eb9b739a29f593c4f1c1c9298d88fa63aaa7183", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200512010146.41303-4-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 176248, "url": "http://patchwork.ozlabs.org/api/series/176248/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=176248", "date": "2020-05-12T01:01:45", "name": "[S42,1/7] ice: Initialize Flow Director resources", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/176248/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1288151/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1288151/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=140.211.166.136; helo=silver.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=<UNKNOWN>)", "ozlabs.org;\n dmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 49Lfj65MXQz9sRf\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 12 May 2020 11:04:42 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 72C5C29437;\n\tTue, 12 May 2020 01:04:40 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id q4atjdJDFdvj; Tue, 12 May 2020 01:04:28 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 3D10225CF1;\n\tTue, 12 May 2020 01:04:28 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n by ash.osuosl.org (Postfix) with ESMTP id 5D4B51BF841\n for <intel-wired-lan@lists.osuosl.org>; Tue, 12 May 2020 01:04:26 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by whitealder.osuosl.org (Postfix) with ESMTP id 59A01869F8\n for <intel-wired-lan@lists.osuosl.org>; Tue, 12 May 2020 01:04:26 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n with ESMTP id ONVBVTRWEbZF for <intel-wired-lan@lists.osuosl.org>;\n Tue, 12 May 2020 01:04:20 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n by whitealder.osuosl.org (Postfix) with ESMTPS id 9119486819\n for <intel-wired-lan@lists.osuosl.org>; Tue, 12 May 2020 01:04:20 +0000 (UTC)", "from orsmga004.jf.intel.com ([10.7.209.38])\n by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 11 May 2020 18:04:19 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.241.65])\n by orsmga004.jf.intel.com with ESMTP; 11 May 2020 18:04:19 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "IronPort-SDR": [ "\n GdyXNyPpnPQD+NPQTn7d27UkHb/Sk+D6DNAaPzfYy8WdFC7IuEOCPQ6Nn5Horv7jO2T3kzT8NY\n OX2r7dUgXpjQ==", "\n 9lCgj0cs3KOzLZ37ltmWq5uW1mnTf/Fi7nL3nIX1FTaKBFsYFZTSSdasF8Ef3u7CPe2COnjClf\n zP9fDnGcCSKw==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.73,381,1583222400\"; d=\"scan'208\";a=\"409116467\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 11 May 2020 18:01:43 -0700", "Message-Id": "<20200512010146.41303-4-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200512010146.41303-1-anthony.l.nguyen@intel.com>", "References": "<20200512010146.41303-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S42 4/7] ice: Support IPv6 Flow Director\n filters", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Henry Tieman <henry.w.tieman@intel.com>\n\nExtend supported filters to allow for IPv6 filters.\n\nSupported fields are: src-ip, dst-ip, src-port, and dst-port\nSupported flow-types are: tcp6, udp6, sctp6, ip6\n\nExample usage:\n\nethtool -N eth0 flow-type tcp6 src-port 12 dst-port 13 \\\nsrc-ip fce0::1:34 dst-ip fce0::1:35 action 32\n\nSigned-off-by: Henry Tieman <henry.w.tieman@intel.com>\nSigned-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>\n---\n .../net/ethernet/intel/ice/ice_ethtool_fdir.c | 391 +++++++++++++++---\n drivers/net/ethernet/intel/ice/ice_fdir.c | 303 ++++++++++++--\n drivers/net/ethernet/intel/ice/ice_fdir.h | 19 +-\n .../net/ethernet/intel/ice/ice_flex_pipe.c | 6 +\n drivers/net/ethernet/intel/ice/ice_type.h | 4 +\n 5 files changed, 642 insertions(+), 81 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c b/drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c\nindex b584b7a03f10..5b7774aabe3c 100644\n--- a/drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c\n+++ b/drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c\n@@ -7,6 +7,24 @@\n #include \"ice_lib.h\"\n #include \"ice_flow.h\"\n \n+static struct in6_addr full_ipv6_addr_mask = {\n+\t.in6_u = {\n+\t\t.u6_addr8 = {\n+\t\t\t0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,\n+\t\t\t0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,\n+\t\t}\n+\t}\n+};\n+\n+static struct in6_addr zero_ipv6_addr_mask = {\n+\t.in6_u = {\n+\t\t.u6_addr8 = {\n+\t\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t}\n+\t}\n+};\n+\n /* calls to ice_flow_add_prof require the number of segments in the array\n * for segs_cnt. In this code that is one more than the index.\n */\n@@ -30,6 +48,14 @@ static int ice_fltr_to_ethtool_flow(enum ice_fltr_ptype flow)\n \t\treturn SCTP_V4_FLOW;\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_OTHER:\n \t\treturn IPV4_USER_FLOW;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV6_TCP:\n+\t\treturn TCP_V6_FLOW;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV6_UDP:\n+\t\treturn UDP_V6_FLOW;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV6_SCTP:\n+\t\treturn SCTP_V6_FLOW;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV6_OTHER:\n+\t\treturn IPV6_USER_FLOW;\n \tdefault:\n \t\t/* 0 is undefined ethtool flow */\n \t\treturn 0;\n@@ -53,6 +79,14 @@ static enum ice_fltr_ptype ice_ethtool_flow_to_fltr(int eth)\n \t\treturn ICE_FLTR_PTYPE_NONF_IPV4_SCTP;\n \tcase IPV4_USER_FLOW:\n \t\treturn ICE_FLTR_PTYPE_NONF_IPV4_OTHER;\n+\tcase TCP_V6_FLOW:\n+\t\treturn ICE_FLTR_PTYPE_NONF_IPV6_TCP;\n+\tcase UDP_V6_FLOW:\n+\t\treturn ICE_FLTR_PTYPE_NONF_IPV6_UDP;\n+\tcase SCTP_V6_FLOW:\n+\t\treturn ICE_FLTR_PTYPE_NONF_IPV6_SCTP;\n+\tcase IPV6_USER_FLOW:\n+\t\treturn ICE_FLTR_PTYPE_NONF_IPV6_OTHER;\n \tdefault:\n \t\treturn ICE_FLTR_PTYPE_NONF_NONE;\n \t}\n@@ -92,28 +126,64 @@ int ice_get_ethtool_fdir_entry(struct ice_hw *hw, struct ethtool_rxnfc *cmd)\n \tcase IPV4_USER_FLOW:\n \t\tfsp->h_u.usr_ip4_spec.ip_ver = ETH_RX_NFC_IP4;\n \t\tfsp->h_u.usr_ip4_spec.proto = 0;\n-\t\tfsp->h_u.usr_ip4_spec.l4_4_bytes = rule->ip.l4_header;\n-\t\tfsp->h_u.usr_ip4_spec.tos = rule->ip.tos;\n-\t\tfsp->h_u.usr_ip4_spec.ip4src = rule->ip.src_ip;\n-\t\tfsp->h_u.usr_ip4_spec.ip4dst = rule->ip.dst_ip;\n-\t\tfsp->m_u.usr_ip4_spec.ip4src = rule->mask.src_ip;\n-\t\tfsp->m_u.usr_ip4_spec.ip4dst = rule->mask.dst_ip;\n+\t\tfsp->h_u.usr_ip4_spec.l4_4_bytes = rule->ip.v4.l4_header;\n+\t\tfsp->h_u.usr_ip4_spec.tos = rule->ip.v4.tos;\n+\t\tfsp->h_u.usr_ip4_spec.ip4src = rule->ip.v4.src_ip;\n+\t\tfsp->h_u.usr_ip4_spec.ip4dst = rule->ip.v4.dst_ip;\n+\t\tfsp->m_u.usr_ip4_spec.ip4src = rule->mask.v4.src_ip;\n+\t\tfsp->m_u.usr_ip4_spec.ip4dst = rule->mask.v4.dst_ip;\n \t\tfsp->m_u.usr_ip4_spec.ip_ver = 0xFF;\n \t\tfsp->m_u.usr_ip4_spec.proto = 0;\n-\t\tfsp->m_u.usr_ip4_spec.l4_4_bytes = rule->mask.l4_header;\n-\t\tfsp->m_u.usr_ip4_spec.tos = rule->mask.tos;\n+\t\tfsp->m_u.usr_ip4_spec.l4_4_bytes = rule->mask.v4.l4_header;\n+\t\tfsp->m_u.usr_ip4_spec.tos = rule->mask.v4.tos;\n \t\tbreak;\n \tcase TCP_V4_FLOW:\n \tcase UDP_V4_FLOW:\n \tcase SCTP_V4_FLOW:\n-\t\tfsp->h_u.tcp_ip4_spec.psrc = rule->ip.src_port;\n-\t\tfsp->h_u.tcp_ip4_spec.pdst = rule->ip.dst_port;\n-\t\tfsp->h_u.tcp_ip4_spec.ip4src = rule->ip.src_ip;\n-\t\tfsp->h_u.tcp_ip4_spec.ip4dst = rule->ip.dst_ip;\n-\t\tfsp->m_u.tcp_ip4_spec.psrc = rule->mask.src_port;\n-\t\tfsp->m_u.tcp_ip4_spec.pdst = rule->mask.dst_port;\n-\t\tfsp->m_u.tcp_ip4_spec.ip4src = rule->mask.src_ip;\n-\t\tfsp->m_u.tcp_ip4_spec.ip4dst = rule->mask.dst_ip;\n+\t\tfsp->h_u.tcp_ip4_spec.psrc = rule->ip.v4.src_port;\n+\t\tfsp->h_u.tcp_ip4_spec.pdst = rule->ip.v4.dst_port;\n+\t\tfsp->h_u.tcp_ip4_spec.ip4src = rule->ip.v4.src_ip;\n+\t\tfsp->h_u.tcp_ip4_spec.ip4dst = rule->ip.v4.dst_ip;\n+\t\tfsp->m_u.tcp_ip4_spec.psrc = rule->mask.v4.src_port;\n+\t\tfsp->m_u.tcp_ip4_spec.pdst = rule->mask.v4.dst_port;\n+\t\tfsp->m_u.tcp_ip4_spec.ip4src = rule->mask.v4.src_ip;\n+\t\tfsp->m_u.tcp_ip4_spec.ip4dst = rule->mask.v4.dst_ip;\n+\t\tbreak;\n+\tcase IPV6_USER_FLOW:\n+\t\tfsp->h_u.usr_ip6_spec.l4_4_bytes = rule->ip.v6.l4_header;\n+\t\tfsp->h_u.usr_ip6_spec.tclass = rule->ip.v6.tc;\n+\t\tfsp->h_u.usr_ip6_spec.l4_proto = rule->ip.v6.proto;\n+\t\tmemcpy(fsp->h_u.tcp_ip6_spec.ip6src, rule->ip.v6.src_ip,\n+\t\t sizeof(struct in6_addr));\n+\t\tmemcpy(fsp->h_u.tcp_ip6_spec.ip6dst, rule->ip.v6.dst_ip,\n+\t\t sizeof(struct in6_addr));\n+\t\tmemcpy(fsp->m_u.tcp_ip6_spec.ip6src, rule->mask.v6.src_ip,\n+\t\t sizeof(struct in6_addr));\n+\t\tmemcpy(fsp->m_u.tcp_ip6_spec.ip6dst, rule->mask.v6.dst_ip,\n+\t\t sizeof(struct in6_addr));\n+\t\tfsp->m_u.usr_ip6_spec.l4_4_bytes = rule->mask.v6.l4_header;\n+\t\tfsp->m_u.usr_ip6_spec.tclass = rule->mask.v6.tc;\n+\t\tfsp->m_u.usr_ip6_spec.l4_proto = rule->mask.v6.proto;\n+\t\tbreak;\n+\tcase TCP_V6_FLOW:\n+\tcase UDP_V6_FLOW:\n+\tcase SCTP_V6_FLOW:\n+\t\tmemcpy(fsp->h_u.tcp_ip6_spec.ip6src, rule->ip.v6.src_ip,\n+\t\t sizeof(struct in6_addr));\n+\t\tmemcpy(fsp->h_u.tcp_ip6_spec.ip6dst, rule->ip.v6.dst_ip,\n+\t\t sizeof(struct in6_addr));\n+\t\tfsp->h_u.tcp_ip6_spec.psrc = rule->ip.v6.src_port;\n+\t\tfsp->h_u.tcp_ip6_spec.pdst = rule->ip.v6.dst_port;\n+\t\tmemcpy(fsp->m_u.tcp_ip6_spec.ip6src,\n+\t\t rule->mask.v6.src_ip,\n+\t\t sizeof(struct in6_addr));\n+\t\tmemcpy(fsp->m_u.tcp_ip6_spec.ip6dst,\n+\t\t rule->mask.v6.dst_ip,\n+\t\t sizeof(struct in6_addr));\n+\t\tfsp->m_u.tcp_ip6_spec.psrc = rule->mask.v6.src_port;\n+\t\tfsp->m_u.tcp_ip6_spec.pdst = rule->mask.v6.dst_port;\n+\t\tfsp->h_u.tcp_ip6_spec.tclass = rule->ip.v6.tc;\n+\t\tfsp->m_u.tcp_ip6_spec.tclass = rule->mask.v6.tc;\n \t\tbreak;\n \tdefault:\n \t\tbreak;\n@@ -441,6 +511,7 @@ ice_fdir_set_hw_fltr_rule(struct ice_pf *pf, struct ice_flow_seg_info *seg,\n /**\n * ice_set_init_fdir_seg\n * @seg: flow segment for programming\n+ * @l3_proto: ICE_FLOW_SEG_HDR_IPV4 or ICE_FLOW_SEG_HDR_IPV6\n * @l4_proto: ICE_FLOW_SEG_HDR_TCP or ICE_FLOW_SEG_HDR_UDP\n *\n * Set the configuration for perfect filters to the provided flow segment for\n@@ -449,13 +520,24 @@ ice_fdir_set_hw_fltr_rule(struct ice_pf *pf, struct ice_flow_seg_info *seg,\n */\n static int\n ice_set_init_fdir_seg(struct ice_flow_seg_info *seg,\n+\t\t enum ice_flow_seg_hdr l3_proto,\n \t\t enum ice_flow_seg_hdr l4_proto)\n {\n-\tenum ice_flow_field src_port, dst_port;\n+\tenum ice_flow_field src_addr, dst_addr, src_port, dst_port;\n \n \tif (!seg)\n \t\treturn -EINVAL;\n \n+\tif (l3_proto == ICE_FLOW_SEG_HDR_IPV4) {\n+\t\tsrc_addr = ICE_FLOW_FIELD_IDX_IPV4_SA;\n+\t\tdst_addr = ICE_FLOW_FIELD_IDX_IPV4_DA;\n+\t} else if (l3_proto == ICE_FLOW_SEG_HDR_IPV6) {\n+\t\tsrc_addr = ICE_FLOW_FIELD_IDX_IPV6_SA;\n+\t\tdst_addr = ICE_FLOW_FIELD_IDX_IPV6_DA;\n+\t} else {\n+\t\treturn -EINVAL;\n+\t}\n+\n \tif (l4_proto == ICE_FLOW_SEG_HDR_TCP) {\n \t\tsrc_port = ICE_FLOW_FIELD_IDX_TCP_SRC_PORT;\n \t\tdst_port = ICE_FLOW_FIELD_IDX_TCP_DST_PORT;\n@@ -466,17 +548,15 @@ ice_set_init_fdir_seg(struct ice_flow_seg_info *seg,\n \t\treturn -EINVAL;\n \t}\n \n-\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_IPV4 | l4_proto);\n+\tICE_FLOW_SET_HDRS(seg, l3_proto | l4_proto);\n \n \t/* IP source address */\n-\tice_flow_set_fld(seg, ICE_FLOW_FIELD_IDX_IPV4_SA,\n-\t\t\t ICE_FLOW_FLD_OFF_INVAL, ICE_FLOW_FLD_OFF_INVAL,\n-\t\t\t ICE_FLOW_FLD_OFF_INVAL, false);\n+\tice_flow_set_fld(seg, src_addr, ICE_FLOW_FLD_OFF_INVAL,\n+\t\t\t ICE_FLOW_FLD_OFF_INVAL, ICE_FLOW_FLD_OFF_INVAL, false);\n \n \t/* IP destination address */\n-\tice_flow_set_fld(seg, ICE_FLOW_FIELD_IDX_IPV4_DA,\n-\t\t\t ICE_FLOW_FLD_OFF_INVAL, ICE_FLOW_FLD_OFF_INVAL,\n-\t\t\t ICE_FLOW_FLD_OFF_INVAL, false);\n+\tice_flow_set_fld(seg, dst_addr, ICE_FLOW_FLD_OFF_INVAL,\n+\t\t\t ICE_FLOW_FLD_OFF_INVAL, ICE_FLOW_FLD_OFF_INVAL, false);\n \n \t/* Layer 4 source port */\n \tice_flow_set_fld(seg, src_port, ICE_FLOW_FLD_OFF_INVAL,\n@@ -521,9 +601,17 @@ ice_create_init_fdir_rule(struct ice_pf *pf, enum ice_fltr_ptype flow)\n \t}\n \n \tif (flow == ICE_FLTR_PTYPE_NONF_IPV4_TCP)\n-\t\tret = ice_set_init_fdir_seg(seg, ICE_FLOW_SEG_HDR_TCP);\n+\t\tret = ice_set_init_fdir_seg(seg, ICE_FLOW_SEG_HDR_IPV4,\n+\t\t\t\t\t ICE_FLOW_SEG_HDR_TCP);\n \telse if (flow == ICE_FLTR_PTYPE_NONF_IPV4_UDP)\n-\t\tret = ice_set_init_fdir_seg(seg, ICE_FLOW_SEG_HDR_UDP);\n+\t\tret = ice_set_init_fdir_seg(seg, ICE_FLOW_SEG_HDR_IPV4,\n+\t\t\t\t\t ICE_FLOW_SEG_HDR_UDP);\n+\telse if (flow == ICE_FLTR_PTYPE_NONF_IPV6_TCP)\n+\t\tret = ice_set_init_fdir_seg(seg, ICE_FLOW_SEG_HDR_IPV6,\n+\t\t\t\t\t ICE_FLOW_SEG_HDR_TCP);\n+\telse if (flow == ICE_FLTR_PTYPE_NONF_IPV6_UDP)\n+\t\tret = ice_set_init_fdir_seg(seg, ICE_FLOW_SEG_HDR_IPV6,\n+\t\t\t\t\t ICE_FLOW_SEG_HDR_UDP);\n \telse\n \t\tret = -EINVAL;\n \tif (ret)\n@@ -694,6 +782,156 @@ ice_set_fdir_ip4_usr_seg(struct ice_flow_seg_info *seg,\n \treturn 0;\n }\n \n+/**\n+ * ice_set_fdir_ip6_seg\n+ * @seg: flow segment for programming\n+ * @tcp_ip6_spec: mask data from ethtool\n+ * @l4_proto: Layer 4 protocol to program\n+ * @perfect_fltr: only valid on success; returns true if perfect filter,\n+ *\t\t false if not\n+ *\n+ * Set the mask data into the flow segment to be used to program HW\n+ * table based on provided L4 protocol for IPv6\n+ */\n+static int\n+ice_set_fdir_ip6_seg(struct ice_flow_seg_info *seg,\n+\t\t struct ethtool_tcpip6_spec *tcp_ip6_spec,\n+\t\t enum ice_flow_seg_hdr l4_proto, bool *perfect_fltr)\n+{\n+\tenum ice_flow_field src_port, dst_port;\n+\n+\t/* make sure we don't have any empty rule */\n+\tif (!memcmp(tcp_ip6_spec->ip6src, &zero_ipv6_addr_mask,\n+\t\t sizeof(struct in6_addr)) &&\n+\t !memcmp(tcp_ip6_spec->ip6dst, &zero_ipv6_addr_mask,\n+\t\t sizeof(struct in6_addr)) &&\n+\t !tcp_ip6_spec->psrc && !tcp_ip6_spec->pdst)\n+\t\treturn -EINVAL;\n+\n+\t/* filtering on TC not supported */\n+\tif (tcp_ip6_spec->tclass)\n+\t\treturn -EOPNOTSUPP;\n+\n+\tif (l4_proto == ICE_FLOW_SEG_HDR_TCP) {\n+\t\tsrc_port = ICE_FLOW_FIELD_IDX_TCP_SRC_PORT;\n+\t\tdst_port = ICE_FLOW_FIELD_IDX_TCP_DST_PORT;\n+\t} else if (l4_proto == ICE_FLOW_SEG_HDR_UDP) {\n+\t\tsrc_port = ICE_FLOW_FIELD_IDX_UDP_SRC_PORT;\n+\t\tdst_port = ICE_FLOW_FIELD_IDX_UDP_DST_PORT;\n+\t} else if (l4_proto == ICE_FLOW_SEG_HDR_SCTP) {\n+\t\tsrc_port = ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT;\n+\t\tdst_port = ICE_FLOW_FIELD_IDX_SCTP_DST_PORT;\n+\t} else {\n+\t\treturn -EINVAL;\n+\t}\n+\n+\t*perfect_fltr = true;\n+\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_IPV6 | l4_proto);\n+\n+\tif (!memcmp(tcp_ip6_spec->ip6src, &full_ipv6_addr_mask,\n+\t\t sizeof(struct in6_addr)))\n+\t\tice_flow_set_fld(seg, ICE_FLOW_FIELD_IDX_IPV6_SA,\n+\t\t\t\t ICE_FLOW_FLD_OFF_INVAL, ICE_FLOW_FLD_OFF_INVAL,\n+\t\t\t\t ICE_FLOW_FLD_OFF_INVAL, false);\n+\telse if (!memcmp(tcp_ip6_spec->ip6src, &zero_ipv6_addr_mask,\n+\t\t\t sizeof(struct in6_addr)))\n+\t\t*perfect_fltr = false;\n+\telse\n+\t\treturn -EOPNOTSUPP;\n+\n+\tif (!memcmp(tcp_ip6_spec->ip6dst, &full_ipv6_addr_mask,\n+\t\t sizeof(struct in6_addr)))\n+\t\tice_flow_set_fld(seg, ICE_FLOW_FIELD_IDX_IPV6_DA,\n+\t\t\t\t ICE_FLOW_FLD_OFF_INVAL, ICE_FLOW_FLD_OFF_INVAL,\n+\t\t\t\t ICE_FLOW_FLD_OFF_INVAL, false);\n+\telse if (!memcmp(tcp_ip6_spec->ip6dst, &zero_ipv6_addr_mask,\n+\t\t\t sizeof(struct in6_addr)))\n+\t\t*perfect_fltr = false;\n+\telse\n+\t\treturn -EOPNOTSUPP;\n+\n+\t/* Layer 4 source port */\n+\tif (tcp_ip6_spec->psrc == htons(0xFFFF))\n+\t\tice_flow_set_fld(seg, src_port, ICE_FLOW_FLD_OFF_INVAL,\n+\t\t\t\t ICE_FLOW_FLD_OFF_INVAL, ICE_FLOW_FLD_OFF_INVAL,\n+\t\t\t\t false);\n+\telse if (!tcp_ip6_spec->psrc)\n+\t\t*perfect_fltr = false;\n+\telse\n+\t\treturn -EOPNOTSUPP;\n+\n+\t/* Layer 4 destination port */\n+\tif (tcp_ip6_spec->pdst == htons(0xFFFF))\n+\t\tice_flow_set_fld(seg, dst_port, ICE_FLOW_FLD_OFF_INVAL,\n+\t\t\t\t ICE_FLOW_FLD_OFF_INVAL, ICE_FLOW_FLD_OFF_INVAL,\n+\t\t\t\t false);\n+\telse if (!tcp_ip6_spec->pdst)\n+\t\t*perfect_fltr = false;\n+\telse\n+\t\treturn -EOPNOTSUPP;\n+\n+\treturn 0;\n+}\n+\n+/**\n+ * ice_set_fdir_ip6_usr_seg\n+ * @seg: flow segment for programming\n+ * @usr_ip6_spec: ethtool userdef packet offset\n+ * @perfect_fltr: only valid on success; returns true if perfect filter,\n+ *\t\t false if not\n+ *\n+ * Set the offset data into the flow segment to be used to program HW\n+ * table for IPv6\n+ */\n+static int\n+ice_set_fdir_ip6_usr_seg(struct ice_flow_seg_info *seg,\n+\t\t\t struct ethtool_usrip6_spec *usr_ip6_spec,\n+\t\t\t bool *perfect_fltr)\n+{\n+\t/* filtering on Layer 4 bytes not supported */\n+\tif (usr_ip6_spec->l4_4_bytes)\n+\t\treturn -EOPNOTSUPP;\n+\t/* filtering on TC not supported */\n+\tif (usr_ip6_spec->tclass)\n+\t\treturn -EOPNOTSUPP;\n+\t/* filtering on Layer 4 protocol not supported */\n+\tif (usr_ip6_spec->l4_proto)\n+\t\treturn -EOPNOTSUPP;\n+\t/* empty rules are not valid */\n+\tif (!memcmp(usr_ip6_spec->ip6src, &zero_ipv6_addr_mask,\n+\t\t sizeof(struct in6_addr)) &&\n+\t !memcmp(usr_ip6_spec->ip6dst, &zero_ipv6_addr_mask,\n+\t\t sizeof(struct in6_addr)))\n+\t\treturn -EINVAL;\n+\n+\t*perfect_fltr = true;\n+\tICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_IPV6);\n+\n+\tif (!memcmp(usr_ip6_spec->ip6src, &full_ipv6_addr_mask,\n+\t\t sizeof(struct in6_addr)))\n+\t\tice_flow_set_fld(seg, ICE_FLOW_FIELD_IDX_IPV6_SA,\n+\t\t\t\t ICE_FLOW_FLD_OFF_INVAL, ICE_FLOW_FLD_OFF_INVAL,\n+\t\t\t\t ICE_FLOW_FLD_OFF_INVAL, false);\n+\telse if (!memcmp(usr_ip6_spec->ip6src, &zero_ipv6_addr_mask,\n+\t\t\t sizeof(struct in6_addr)))\n+\t\t*perfect_fltr = false;\n+\telse\n+\t\treturn -EOPNOTSUPP;\n+\n+\tif (!memcmp(usr_ip6_spec->ip6dst, &full_ipv6_addr_mask,\n+\t\t sizeof(struct in6_addr)))\n+\t\tice_flow_set_fld(seg, ICE_FLOW_FIELD_IDX_IPV6_DA,\n+\t\t\t\t ICE_FLOW_FLD_OFF_INVAL, ICE_FLOW_FLD_OFF_INVAL,\n+\t\t\t\t ICE_FLOW_FLD_OFF_INVAL, false);\n+\telse if (!memcmp(usr_ip6_spec->ip6dst, &zero_ipv6_addr_mask,\n+\t\t\t sizeof(struct in6_addr)))\n+\t\t*perfect_fltr = false;\n+\telse\n+\t\treturn -EOPNOTSUPP;\n+\n+\treturn 0;\n+}\n+\n /**\n * ice_cfg_fdir_xtrct_seq - Configure extraction sequence for the given filter\n * @pf: PF structure\n@@ -742,6 +980,25 @@ ice_cfg_fdir_xtrct_seq(struct ice_pf *pf, struct ethtool_rx_flow_spec *fsp)\n \t\tret = ice_set_fdir_ip4_usr_seg(seg, &fsp->m_u.usr_ip4_spec,\n \t\t\t\t\t &perfect_filter);\n \t\tbreak;\n+\tcase TCP_V6_FLOW:\n+\t\tret = ice_set_fdir_ip6_seg(seg, &fsp->m_u.tcp_ip6_spec,\n+\t\t\t\t\t ICE_FLOW_SEG_HDR_TCP,\n+\t\t\t\t\t &perfect_filter);\n+\t\tbreak;\n+\tcase UDP_V6_FLOW:\n+\t\tret = ice_set_fdir_ip6_seg(seg, &fsp->m_u.tcp_ip6_spec,\n+\t\t\t\t\t ICE_FLOW_SEG_HDR_UDP,\n+\t\t\t\t\t &perfect_filter);\n+\t\tbreak;\n+\tcase SCTP_V6_FLOW:\n+\t\tret = ice_set_fdir_ip6_seg(seg, &fsp->m_u.tcp_ip6_spec,\n+\t\t\t\t\t ICE_FLOW_SEG_HDR_SCTP,\n+\t\t\t\t\t &perfect_filter);\n+\t\tbreak;\n+\tcase IPV6_USER_FLOW:\n+\t\tret = ice_set_fdir_ip6_usr_seg(seg, &fsp->m_u.usr_ip6_spec,\n+\t\t\t\t\t &perfect_filter);\n+\t\tbreak;\n \tdefault:\n \t\tret = -EINVAL;\n \t}\n@@ -910,6 +1167,14 @@ int ice_fdir_create_dflt_rules(struct ice_pf *pf)\n \t\treturn err;\n \n \terr = ice_create_init_fdir_rule(pf, ICE_FLTR_PTYPE_NONF_IPV4_UDP);\n+\tif (err)\n+\t\treturn err;\n+\n+\terr = ice_create_init_fdir_rule(pf, ICE_FLTR_PTYPE_NONF_IPV6_TCP);\n+\tif (err)\n+\t\treturn err;\n+\n+\terr = ice_create_init_fdir_rule(pf, ICE_FLTR_PTYPE_NONF_IPV6_UDP);\n \n \treturn err;\n }\n@@ -1094,28 +1359,62 @@ ice_set_fdir_input_set(struct ice_vsi *vsi, struct ethtool_rx_flow_spec *fsp,\n \tcase TCP_V4_FLOW:\n \tcase UDP_V4_FLOW:\n \tcase SCTP_V4_FLOW:\n-\t\tinput->ip.dst_port = fsp->h_u.tcp_ip4_spec.pdst;\n-\t\tinput->ip.src_port = fsp->h_u.tcp_ip4_spec.psrc;\n-\t\tinput->ip.dst_ip = fsp->h_u.tcp_ip4_spec.ip4dst;\n-\t\tinput->ip.src_ip = fsp->h_u.tcp_ip4_spec.ip4src;\n-\t\tinput->mask.dst_port = fsp->m_u.tcp_ip4_spec.pdst;\n-\t\tinput->mask.src_port = fsp->m_u.tcp_ip4_spec.psrc;\n-\t\tinput->mask.dst_ip = fsp->m_u.tcp_ip4_spec.ip4dst;\n-\t\tinput->mask.src_ip = fsp->m_u.tcp_ip4_spec.ip4src;\n+\t\tinput->ip.v4.dst_port = fsp->h_u.tcp_ip4_spec.pdst;\n+\t\tinput->ip.v4.src_port = fsp->h_u.tcp_ip4_spec.psrc;\n+\t\tinput->ip.v4.dst_ip = fsp->h_u.tcp_ip4_spec.ip4dst;\n+\t\tinput->ip.v4.src_ip = fsp->h_u.tcp_ip4_spec.ip4src;\n+\t\tinput->mask.v4.dst_port = fsp->m_u.tcp_ip4_spec.pdst;\n+\t\tinput->mask.v4.src_port = fsp->m_u.tcp_ip4_spec.psrc;\n+\t\tinput->mask.v4.dst_ip = fsp->m_u.tcp_ip4_spec.ip4dst;\n+\t\tinput->mask.v4.src_ip = fsp->m_u.tcp_ip4_spec.ip4src;\n \t\tbreak;\n \tcase IPV4_USER_FLOW:\n-\t\tinput->ip.dst_ip = fsp->h_u.usr_ip4_spec.ip4dst;\n-\t\tinput->ip.src_ip = fsp->h_u.usr_ip4_spec.ip4src;\n-\t\tinput->ip.l4_header = fsp->h_u.usr_ip4_spec.l4_4_bytes;\n-\t\tinput->ip.proto = fsp->h_u.usr_ip4_spec.proto;\n-\t\tinput->ip.ip_ver = fsp->h_u.usr_ip4_spec.ip_ver;\n-\t\tinput->ip.tos = fsp->h_u.usr_ip4_spec.tos;\n-\t\tinput->mask.dst_ip = fsp->m_u.usr_ip4_spec.ip4dst;\n-\t\tinput->mask.src_ip = fsp->m_u.usr_ip4_spec.ip4src;\n-\t\tinput->mask.l4_header = fsp->m_u.usr_ip4_spec.l4_4_bytes;\n-\t\tinput->mask.proto = fsp->m_u.usr_ip4_spec.proto;\n-\t\tinput->mask.ip_ver = fsp->m_u.usr_ip4_spec.ip_ver;\n-\t\tinput->mask.tos = fsp->m_u.usr_ip4_spec.tos;\n+\t\tinput->ip.v4.dst_ip = fsp->h_u.usr_ip4_spec.ip4dst;\n+\t\tinput->ip.v4.src_ip = fsp->h_u.usr_ip4_spec.ip4src;\n+\t\tinput->ip.v4.l4_header = fsp->h_u.usr_ip4_spec.l4_4_bytes;\n+\t\tinput->ip.v4.proto = fsp->h_u.usr_ip4_spec.proto;\n+\t\tinput->ip.v4.ip_ver = fsp->h_u.usr_ip4_spec.ip_ver;\n+\t\tinput->ip.v4.tos = fsp->h_u.usr_ip4_spec.tos;\n+\t\tinput->mask.v4.dst_ip = fsp->m_u.usr_ip4_spec.ip4dst;\n+\t\tinput->mask.v4.src_ip = fsp->m_u.usr_ip4_spec.ip4src;\n+\t\tinput->mask.v4.l4_header = fsp->m_u.usr_ip4_spec.l4_4_bytes;\n+\t\tinput->mask.v4.proto = fsp->m_u.usr_ip4_spec.proto;\n+\t\tinput->mask.v4.ip_ver = fsp->m_u.usr_ip4_spec.ip_ver;\n+\t\tinput->mask.v4.tos = fsp->m_u.usr_ip4_spec.tos;\n+\t\tbreak;\n+\tcase TCP_V6_FLOW:\n+\tcase UDP_V6_FLOW:\n+\tcase SCTP_V6_FLOW:\n+\t\tmemcpy(input->ip.v6.dst_ip, fsp->h_u.usr_ip6_spec.ip6dst,\n+\t\t sizeof(struct in6_addr));\n+\t\tmemcpy(input->ip.v6.src_ip, fsp->h_u.usr_ip6_spec.ip6src,\n+\t\t sizeof(struct in6_addr));\n+\t\tinput->ip.v6.dst_port = fsp->h_u.tcp_ip6_spec.pdst;\n+\t\tinput->ip.v6.src_port = fsp->h_u.tcp_ip6_spec.psrc;\n+\t\tinput->ip.v6.tc = fsp->h_u.tcp_ip6_spec.tclass;\n+\t\tmemcpy(input->mask.v6.dst_ip, fsp->m_u.tcp_ip6_spec.ip6dst,\n+\t\t sizeof(struct in6_addr));\n+\t\tmemcpy(input->mask.v6.src_ip, fsp->m_u.tcp_ip6_spec.ip6src,\n+\t\t sizeof(struct in6_addr));\n+\t\tinput->mask.v6.dst_port = fsp->m_u.tcp_ip6_spec.pdst;\n+\t\tinput->mask.v6.src_port = fsp->m_u.tcp_ip6_spec.psrc;\n+\t\tinput->mask.v6.tc = fsp->m_u.tcp_ip6_spec.tclass;\n+\t\tbreak;\n+\tcase IPV6_USER_FLOW:\n+\t\tmemcpy(input->ip.v6.dst_ip, fsp->h_u.usr_ip6_spec.ip6dst,\n+\t\t sizeof(struct in6_addr));\n+\t\tmemcpy(input->ip.v6.src_ip, fsp->h_u.usr_ip6_spec.ip6src,\n+\t\t sizeof(struct in6_addr));\n+\t\tinput->ip.v6.l4_header = fsp->h_u.usr_ip6_spec.l4_4_bytes;\n+\t\tinput->ip.v6.tc = fsp->h_u.usr_ip6_spec.tclass;\n+\t\tinput->ip.v6.proto = fsp->h_u.usr_ip6_spec.l4_proto;\n+\t\tmemcpy(input->mask.v6.dst_ip, fsp->m_u.usr_ip6_spec.ip6dst,\n+\t\t sizeof(struct in6_addr));\n+\t\tmemcpy(input->mask.v6.src_ip, fsp->m_u.usr_ip6_spec.ip6src,\n+\t\t sizeof(struct in6_addr));\n+\t\tinput->mask.v6.l4_header = fsp->m_u.usr_ip6_spec.l4_4_bytes;\n+\t\tinput->mask.v6.tc = fsp->m_u.usr_ip6_spec.tclass;\n+\t\tinput->mask.v6.proto = fsp->m_u.usr_ip6_spec.l4_proto;\n \t\tbreak;\n \tdefault:\n \t\t/* not doing un-parsed flow types */\ndiff --git a/drivers/net/ethernet/intel/ice/ice_fdir.c b/drivers/net/ethernet/intel/ice/ice_fdir.c\nindex 505017c9f1e8..e94277dc9cdc 100644\n--- a/drivers/net/ethernet/intel/ice/ice_fdir.c\n+++ b/drivers/net/ethernet/intel/ice/ice_fdir.c\n@@ -40,6 +40,52 @@ static const u8 ice_fdir_ipv4_pkt[] = {\n \t0x00, 0x00\n };\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+\t0x00, 0x00, 0x00, 0x14, 0x06, 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, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x50, 0x00, 0x20, 0x00, 0x00, 0x00,\n+\t0x00, 0x00,\n+};\n+\n+static const u8 ice_fdir_udpv6_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,\n+\t0x00, 0x00, 0x00, 0x08, 0x11, 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, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x08, 0x00, 0x00,\n+};\n+\n+static const u8 ice_fdir_sctpv6_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,\n+\t0x00, 0x00, 0x00, 0x0C, 0x84, 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, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00,\n+};\n+\n+static const u8 ice_fdir_ipv6_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x3B, 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,\n+};\n+\n static const u8 ice_fdir_tcp4_tun_pkt[] = {\n \t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n@@ -100,6 +146,76 @@ static const u8 ice_fdir_ip4_tun_pkt[] = {\n \t0x00, 0x00, 0x00, 0x00,\n };\n \n+static const u8 ice_fdir_tcp6_tun_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n+\t0x00, 0x6e, 0x00, 0x00, 0x40, 0x00, 0x40, 0x11,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x04, 0x00, 0x00, 0x03, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86, 0xdd,\n+\t0x60, 0x00, 0x00, 0x00, 0x00, 0x14, 0x06, 0x40,\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, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x50, 0x00, 0x20, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+};\n+\n+static const u8 ice_fdir_udp6_tun_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n+\t0x00, 0x62, 0x00, 0x00, 0x40, 0x00, 0x40, 0x11,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x04, 0x00, 0x00, 0x03, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86, 0xdd,\n+\t0x60, 0x00, 0x00, 0x00, 0x00, 0x08, 0x11, 0x40,\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, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+};\n+\n+static const u8 ice_fdir_sctp6_tun_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n+\t0x00, 0x66, 0x00, 0x00, 0x40, 0x00, 0x40, 0x11,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x04, 0x00, 0x00, 0x03, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86, 0xdd,\n+\t0x60, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x84, 0x40,\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, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+};\n+\n+static const u8 ice_fdir_ip6_tun_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n+\t0x00, 0x5a, 0x00, 0x00, 0x40, 0x00, 0x40, 0x11,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x04, 0x00, 0x00, 0x03, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86, 0xdd,\n+\t0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x40,\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, 0x00, 0x00,\n+};\n+\n /* Flow Director no-op training packet table */\n static const struct ice_fdir_base_pkt ice_fdir_pkt[] = {\n \t{\n@@ -122,6 +238,26 @@ 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_NONF_IPV6_TCP,\n+\t\tsizeof(ice_fdir_tcpv6_pkt), ice_fdir_tcpv6_pkt,\n+\t\tsizeof(ice_fdir_tcp6_tun_pkt), ice_fdir_tcp6_tun_pkt,\n+\t},\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV6_UDP,\n+\t\tsizeof(ice_fdir_udpv6_pkt), ice_fdir_udpv6_pkt,\n+\t\tsizeof(ice_fdir_udp6_tun_pkt), ice_fdir_udp6_tun_pkt,\n+\t},\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV6_SCTP,\n+\t\tsizeof(ice_fdir_sctpv6_pkt), ice_fdir_sctpv6_pkt,\n+\t\tsizeof(ice_fdir_sctp6_tun_pkt), ice_fdir_sctp6_tun_pkt,\n+\t},\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV6_OTHER,\n+\t\tsizeof(ice_fdir_ipv6_pkt), ice_fdir_ipv6_pkt,\n+\t\tsizeof(ice_fdir_ip6_tun_pkt), ice_fdir_ip6_tun_pkt,\n+\t},\n };\n \n #define ICE_FDIR_NUM_PKT ARRAY_SIZE(ice_fdir_pkt)\n@@ -319,6 +455,21 @@ int ice_get_fdir_cnt_all(struct ice_hw *hw)\n \treturn hw->func_caps.fd_fltr_guar + hw->func_caps.fd_fltr_best_effort;\n }\n \n+/**\n+ * ice_pkt_insert_ipv6_addr - insert a be32 IPv6 address into a memory buffer.\n+ * @pkt: packet buffer\n+ * @offset: offset into buffer\n+ * @addr: IPv6 address to convert and insert into pkt at offset\n+ */\n+static void ice_pkt_insert_ipv6_addr(u8 *pkt, int offset, __be32 *addr)\n+{\n+\tint idx;\n+\n+\tfor (idx = 0; idx < ICE_IPV6_ADDR_LEN_AS_U32; idx++)\n+\t\tmemcpy(pkt + offset + idx * sizeof(*addr), &addr[idx],\n+\t\t sizeof(*addr));\n+}\n+\n /**\n * ice_pkt_insert_u16 - insert a be16 value into a memory buffer.\n * @pkt: packet buffer\n@@ -359,7 +510,7 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,\n \tu16 idx;\n \n \tif (input->flow_type == ICE_FLTR_PTYPE_NONF_IPV4_OTHER) {\n-\t\tswitch (input->ip.proto) {\n+\t\tswitch (input->ip.v4.proto) {\n \t\tcase IPPROTO_TCP:\n \t\t\tflow = ICE_FLTR_PTYPE_NONF_IPV4_TCP;\n \t\t\tbreak;\n@@ -375,6 +526,23 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,\n \t\tdefault:\n \t\t\treturn ICE_ERR_PARAM;\n \t\t}\n+\t} else if (input->flow_type == ICE_FLTR_PTYPE_NONF_IPV6_OTHER) {\n+\t\tswitch (input->ip.v6.proto) {\n+\t\tcase IPPROTO_TCP:\n+\t\t\tflow = ICE_FLTR_PTYPE_NONF_IPV6_TCP;\n+\t\t\tbreak;\n+\t\tcase IPPROTO_UDP:\n+\t\t\tflow = ICE_FLTR_PTYPE_NONF_IPV6_UDP;\n+\t\t\tbreak;\n+\t\tcase IPPROTO_SCTP:\n+\t\t\tflow = ICE_FLTR_PTYPE_NONF_IPV6_SCTP;\n+\t\t\tbreak;\n+\t\tcase IPPROTO_IP:\n+\t\t\tflow = ICE_FLTR_PTYPE_NONF_IPV6_OTHER;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\treturn ICE_ERR_PARAM;\n+\t\t}\n \t} else {\n \t\tflow = input->flow_type;\n \t}\n@@ -405,43 +573,79 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,\n \tswitch (flow) {\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_TCP:\n \t\tice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,\n-\t\t\t\t input->ip.src_ip);\n+\t\t\t\t input->ip.v4.src_ip);\n \t\tice_pkt_insert_u16(loc, ICE_IPV4_TCP_DST_PORT_OFFSET,\n-\t\t\t\t input->ip.src_port);\n+\t\t\t\t input->ip.v4.src_port);\n \t\tice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET,\n-\t\t\t\t input->ip.dst_ip);\n+\t\t\t\t input->ip.v4.dst_ip);\n \t\tice_pkt_insert_u16(loc, ICE_IPV4_TCP_SRC_PORT_OFFSET,\n-\t\t\t\t input->ip.dst_port);\n+\t\t\t\t input->ip.v4.dst_port);\n \t\tif (frag)\n \t\t\tloc[20] = ICE_FDIR_IPV4_PKT_FLAG_DF;\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_UDP:\n \t\tice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,\n-\t\t\t\t input->ip.src_ip);\n+\t\t\t\t input->ip.v4.src_ip);\n \t\tice_pkt_insert_u16(loc, ICE_IPV4_UDP_DST_PORT_OFFSET,\n-\t\t\t\t input->ip.src_port);\n+\t\t\t\t input->ip.v4.src_port);\n \t\tice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET,\n-\t\t\t\t input->ip.dst_ip);\n+\t\t\t\t input->ip.v4.dst_ip);\n \t\tice_pkt_insert_u16(loc, ICE_IPV4_UDP_SRC_PORT_OFFSET,\n-\t\t\t\t input->ip.dst_port);\n+\t\t\t\t input->ip.v4.dst_port);\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_SCTP:\n \t\tice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,\n-\t\t\t\t input->ip.src_ip);\n+\t\t\t\t input->ip.v4.src_ip);\n \t\tice_pkt_insert_u16(loc, ICE_IPV4_SCTP_DST_PORT_OFFSET,\n-\t\t\t\t input->ip.src_port);\n+\t\t\t\t input->ip.v4.src_port);\n \t\tice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET,\n-\t\t\t\t input->ip.dst_ip);\n+\t\t\t\t input->ip.v4.dst_ip);\n \t\tice_pkt_insert_u16(loc, ICE_IPV4_SCTP_SRC_PORT_OFFSET,\n-\t\t\t\t input->ip.dst_port);\n+\t\t\t\t input->ip.v4.dst_port);\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_OTHER:\n \t\tice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,\n-\t\t\t\t input->ip.src_ip);\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.dst_ip);\n+\t\t\t\t input->ip.v4.dst_ip);\n \t\tice_pkt_insert_u16(loc, ICE_IPV4_PROTO_OFFSET, 0);\n \t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV6_TCP:\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET,\n+\t\t\t\t\t input->ip.v6.src_ip);\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET,\n+\t\t\t\t\t input->ip.v6.dst_ip);\n+\t\tice_pkt_insert_u16(loc, ICE_IPV6_TCP_DST_PORT_OFFSET,\n+\t\t\t\t input->ip.v6.src_port);\n+\t\tice_pkt_insert_u16(loc, ICE_IPV6_TCP_SRC_PORT_OFFSET,\n+\t\t\t\t input->ip.v6.dst_port);\n+\t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV6_UDP:\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET,\n+\t\t\t\t\t input->ip.v6.src_ip);\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET,\n+\t\t\t\t\t input->ip.v6.dst_ip);\n+\t\tice_pkt_insert_u16(loc, ICE_IPV6_UDP_DST_PORT_OFFSET,\n+\t\t\t\t input->ip.v6.src_port);\n+\t\tice_pkt_insert_u16(loc, ICE_IPV6_UDP_SRC_PORT_OFFSET,\n+\t\t\t\t input->ip.v6.dst_port);\n+\t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV6_SCTP:\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET,\n+\t\t\t\t\t input->ip.v6.src_ip);\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET,\n+\t\t\t\t\t input->ip.v6.dst_ip);\n+\t\tice_pkt_insert_u16(loc, ICE_IPV6_SCTP_DST_PORT_OFFSET,\n+\t\t\t\t input->ip.v6.src_port);\n+\t\tice_pkt_insert_u16(loc, ICE_IPV6_SCTP_SRC_PORT_OFFSET,\n+\t\t\t\t input->ip.v6.dst_port);\n+\t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV6_OTHER:\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET,\n+\t\t\t\t\t input->ip.v6.src_ip);\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET,\n+\t\t\t\t\t input->ip.v6.dst_ip);\n+\t\tbreak;\n \tdefault:\n \t\treturn ICE_ERR_PARAM;\n \t}\n@@ -527,37 +731,68 @@ ice_fdir_update_cntrs(struct ice_hw *hw, enum ice_fltr_ptype flow, bool add)\n \t\thw->fdir_fltr_cnt[flow] += incr;\n }\n \n+/**\n+ * ice_cmp_ipv6_addr - compare 2 IP v6 addresses\n+ * @a: IP v6 address\n+ * @b: IP v6 address\n+ *\n+ * Returns 0 on equal, returns non-0 if different\n+ */\n+static int ice_cmp_ipv6_addr(__be32 *a, __be32 *b)\n+{\n+\treturn memcmp(a, b, 4 * sizeof(__be32));\n+}\n+\n /**\n * ice_fdir_comp_rules - compare 2 filters\n * @a: a Flow Director filter data structure\n * @b: a Flow Director filter data structure\n+ * @v6: bool true if v6 filter\n *\n * Returns true if the filters match\n */\n static bool\n-ice_fdir_comp_rules(struct ice_fdir_fltr *a, struct ice_fdir_fltr *b)\n+ice_fdir_comp_rules(struct ice_fdir_fltr *a, struct ice_fdir_fltr *b, bool v6)\n {\n \tenum ice_fltr_ptype flow_type = a->flow_type;\n \n \t/* The calling function already checks that the two filters have the\n \t * same flow_type.\n \t */\n-\tif (flow_type == ICE_FLTR_PTYPE_NONF_IPV4_TCP ||\n-\t flow_type == ICE_FLTR_PTYPE_NONF_IPV4_UDP ||\n-\t flow_type == ICE_FLTR_PTYPE_NONF_IPV4_SCTP) {\n-\t\tif (a->ip.dst_ip == b->ip.dst_ip &&\n-\t\t a->ip.src_ip == b->ip.src_ip &&\n-\t\t a->ip.dst_port == b->ip.dst_port &&\n-\t\t a->ip.src_port == b->ip.src_port)\n-\t\t\treturn true;\n-\t} else if (flow_type == ICE_FLTR_PTYPE_NONF_IPV4_OTHER) {\n-\t\tif (a->ip.dst_ip == b->ip.dst_ip &&\n-\t\t a->ip.src_ip == b->ip.src_ip &&\n-\t\t a->ip.l4_header == b->ip.l4_header &&\n-\t\t a->ip.proto == b->ip.proto &&\n-\t\t a->ip.ip_ver == b->ip.ip_ver &&\n-\t\t a->ip.tos == b->ip.tos)\n-\t\t\treturn true;\n+\tif (!v6) {\n+\t\tif (flow_type == ICE_FLTR_PTYPE_NONF_IPV4_TCP ||\n+\t\t flow_type == ICE_FLTR_PTYPE_NONF_IPV4_UDP ||\n+\t\t flow_type == ICE_FLTR_PTYPE_NONF_IPV4_SCTP) {\n+\t\t\tif (a->ip.v4.dst_ip == b->ip.v4.dst_ip &&\n+\t\t\t a->ip.v4.src_ip == b->ip.v4.src_ip &&\n+\t\t\t a->ip.v4.dst_port == b->ip.v4.dst_port &&\n+\t\t\t a->ip.v4.src_port == b->ip.v4.src_port)\n+\t\t\t\treturn true;\n+\t\t} else if (flow_type == ICE_FLTR_PTYPE_NONF_IPV4_OTHER) {\n+\t\t\tif (a->ip.v4.dst_ip == b->ip.v4.dst_ip &&\n+\t\t\t a->ip.v4.src_ip == b->ip.v4.src_ip &&\n+\t\t\t a->ip.v4.l4_header == b->ip.v4.l4_header &&\n+\t\t\t a->ip.v4.proto == b->ip.v4.proto &&\n+\t\t\t a->ip.v4.ip_ver == b->ip.v4.ip_ver &&\n+\t\t\t a->ip.v4.tos == b->ip.v4.tos)\n+\t\t\t\treturn true;\n+\t\t}\n+\t} else {\n+\t\tif (flow_type == ICE_FLTR_PTYPE_NONF_IPV6_UDP ||\n+\t\t flow_type == ICE_FLTR_PTYPE_NONF_IPV6_TCP ||\n+\t\t flow_type == ICE_FLTR_PTYPE_NONF_IPV6_SCTP) {\n+\t\t\tif (a->ip.v6.dst_port == b->ip.v6.dst_port &&\n+\t\t\t a->ip.v6.src_port == b->ip.v6.src_port &&\n+\t\t\t !ice_cmp_ipv6_addr(a->ip.v6.dst_ip,\n+\t\t\t\t\t b->ip.v6.dst_ip) &&\n+\t\t\t !ice_cmp_ipv6_addr(a->ip.v6.src_ip,\n+\t\t\t\t\t b->ip.v6.src_ip))\n+\t\t\t\treturn true;\n+\t\t} else if (flow_type == ICE_FLTR_PTYPE_NONF_IPV6_OTHER) {\n+\t\t\tif (a->ip.v6.dst_port == b->ip.v6.dst_port &&\n+\t\t\t a->ip.v6.src_port == b->ip.v6.src_port)\n+\t\t\t\treturn true;\n+\t\t}\n \t}\n \n \treturn false;\n@@ -586,7 +821,9 @@ bool ice_fdir_is_dup_fltr(struct ice_hw *hw, struct ice_fdir_fltr *input)\n \t\t flow_type == ICE_FLTR_PTYPE_NONF_IPV4_UDP ||\n \t\t flow_type == ICE_FLTR_PTYPE_NONF_IPV4_SCTP ||\n \t\t flow_type == ICE_FLTR_PTYPE_NONF_IPV4_OTHER)\n-\t\t\tret = ice_fdir_comp_rules(rule, input);\n+\t\t\tret = ice_fdir_comp_rules(rule, input, false);\n+\t\telse\n+\t\t\tret = ice_fdir_comp_rules(rule, input, true);\n \t\tif (ret) {\n \t\t\tif (rule->fltr_id == input->fltr_id &&\n \t\t\t rule->q_index != input->q_index)\ndiff --git a/drivers/net/ethernet/intel/ice/ice_fdir.h b/drivers/net/ethernet/intel/ice/ice_fdir.h\nindex cd02ba59603c..1a47420d67b2 100644\n--- a/drivers/net/ethernet/intel/ice/ice_fdir.h\n+++ b/drivers/net/ethernet/intel/ice/ice_fdir.h\n@@ -80,6 +80,19 @@ struct ice_fdir_v4 {\n \tu8 proto;\n };\n \n+#define ICE_IPV6_ADDR_LEN_AS_U32\t\t4\n+\n+struct ice_fdir_v6 {\n+\t__be32 dst_ip[ICE_IPV6_ADDR_LEN_AS_U32];\n+\t__be32 src_ip[ICE_IPV6_ADDR_LEN_AS_U32];\n+\t__be16 dst_port;\n+\t__be16 src_port;\n+\t__be32 l4_header; /* next header */\n+\t__be32 sec_parm_idx; /* security parameter index */\n+\tu8 tc;\n+\tu8 proto;\n+};\n+\n struct ice_fdir_extra {\n \tu8 dst_mac[ETH_ALEN];\t/* dest MAC address */\n \tu32 usr_def[2];\t\t/* user data */\n@@ -91,8 +104,10 @@ struct ice_fdir_fltr {\n \tstruct list_head fltr_node;\n \tenum ice_fltr_ptype flow_type;\n \n-\tstruct ice_fdir_v4 ip;\n-\tstruct ice_fdir_v4 mask;\n+\tunion {\n+\t\tstruct ice_fdir_v4 v4;\n+\t\tstruct ice_fdir_v6 v6;\n+\t} ip, mask;\n \n \tstruct ice_fdir_extra ext_data;\n \tstruct ice_fdir_extra ext_mask;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_flex_pipe.c b/drivers/net/ethernet/intel/ice/ice_flex_pipe.c\nindex 16d2f599bd70..da82783d1571 100644\n--- a/drivers/net/ethernet/intel/ice/ice_flex_pipe.c\n+++ b/drivers/net/ethernet/intel/ice/ice_flex_pipe.c\n@@ -3518,6 +3518,12 @@ static const struct ice_fd_src_dst_pair ice_fd_pairs[] = {\n \t{ ICE_PROT_IPV4_IL, 2, 12 },\n \t{ ICE_PROT_IPV4_IL, 2, 16 },\n \n+\t{ ICE_PROT_IPV6_OF_OR_S, 8, 8 },\n+\t{ ICE_PROT_IPV6_OF_OR_S, 8, 24 },\n+\n+\t{ ICE_PROT_IPV6_IL, 8, 8 },\n+\t{ ICE_PROT_IPV6_IL, 8, 24 },\n+\n \t{ ICE_PROT_TCP_IL, 1, 0 },\n \t{ ICE_PROT_TCP_IL, 1, 2 },\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_type.h b/drivers/net/ethernet/intel/ice/ice_type.h\nindex 6d574ddb2b1e..88a729e20fe4 100644\n--- a/drivers/net/ethernet/intel/ice/ice_type.h\n+++ b/drivers/net/ethernet/intel/ice/ice_type.h\n@@ -172,6 +172,10 @@ enum ice_fltr_ptype {\n \tICE_FLTR_PTYPE_NONF_IPV4_SCTP,\n \tICE_FLTR_PTYPE_NONF_IPV4_OTHER,\n \tICE_FLTR_PTYPE_FRAG_IPV4,\n+\tICE_FLTR_PTYPE_NONF_IPV6_UDP,\n+\tICE_FLTR_PTYPE_NONF_IPV6_TCP,\n+\tICE_FLTR_PTYPE_NONF_IPV6_SCTP,\n+\tICE_FLTR_PTYPE_NONF_IPV6_OTHER,\n \tICE_FLTR_PTYPE_MAX,\n };\n \n", "prefixes": [ "S42", "4/7" ] }