Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/59574/?format=api
{ "id": 59574, "url": "https://patches.dpdk.org/api/patches/59574/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20190923074448.7847-3-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": "<20190923074448.7847-3-qi.z.zhang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190923074448.7847-3-qi.z.zhang@intel.com", "date": "2019-09-23T07:44:20", "name": "[v5,02/30] net/ice/base: add support for tunnel packets", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "5ea7fde38f120da04aca73abe2ab662a87a48d01", "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/20190923074448.7847-3-qi.z.zhang@intel.com/mbox/", "series": [ { "id": 6483, "url": "https://patches.dpdk.org/api/series/6483/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=6483", "date": "2019-09-23T07:44:18", "name": "net/ice/base: share code update secend batch.", "version": 5, "mbox": "https://patches.dpdk.org/series/6483/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/59574/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/59574/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 748261BE96;\n\tMon, 23 Sep 2019 09:42:09 +0200 (CEST)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby dpdk.org (Postfix) with ESMTP id 904581BE8A\n\tfor <dev@dpdk.org>; Mon, 23 Sep 2019 09:42:00 +0200 (CEST)", "from orsmga008.jf.intel.com ([10.7.209.65])\n\tby fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t23 Sep 2019 00:42:00 -0700", "from dpdk51.sh.intel.com ([10.67.110.245])\n\tby orsmga008.jf.intel.com with ESMTP; 23 Sep 2019 00:41:58 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.64,539,1559545200\"; d=\"scan'208\";a=\"182445487\"", "From": "Qi Zhang <qi.z.zhang@intel.com>", "To": "wenzhuo.lu@intel.com,\n\tqiming.yang@intel.com", "Cc": "dev@dpdk.org, xiaolong.ye@intel.com, Qi Zhang <qi.z.zhang@intel.com>,\n\tHenry Tieman <henry.w.tieman@intel.com>,\n\tPaul M Stillwell Jr <paul.m.stillwell.jr@intel.com>", "Date": "Mon, 23 Sep 2019 15:44:20 +0800", "Message-Id": "<20190923074448.7847-3-qi.z.zhang@intel.com>", "X-Mailer": "git-send-email 2.13.6", "In-Reply-To": "<20190923074448.7847-1-qi.z.zhang@intel.com>", "References": "<20190902035551.16852-1-qi.z.zhang@intel.com>\n\t<20190923074448.7847-1-qi.z.zhang@intel.com>", "Subject": "[dpdk-dev] [PATCH v5 02/30] net/ice/base: add support for tunnel\n\tpackets", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Add VXLAN tunnel training packets to flow director and change the\ninterface to support tunnel packets.\n\nSigned-off-by: Henry Tieman <henry.w.tieman@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_fdir.c | 266 ++++++++++++++++++++++++++++++++--------\n drivers/net/ice/base/ice_fdir.h | 8 +-\n drivers/net/ice/base/ice_type.h | 10 +-\n 3 files changed, 228 insertions(+), 56 deletions(-)", "diff": "diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c\nindex 9ef91b3b8..b92603e10 100644\n--- a/drivers/net/ice/base/ice_fdir.c\n+++ b/drivers/net/ice/base/ice_fdir.c\n@@ -5,7 +5,7 @@\n #include \"ice_common.h\"\n #include \"ice_fdir.h\"\n \n-/* These are dummy packet headers used to program flow director filters. */\n+/* These are training packet headers used to program flow director filters. */\n static const u8 ice_fdir_tcpv4_pkt[] = {\n \t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n@@ -88,47 +88,177 @@ static const u8 ice_fdir_ipv6_pkt[] = {\n \t0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n };\n \n-/* Flow Director dummy packet table */\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+\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, 0x08, 0x00,\n+\t0x45, 0x00, 0x00, 0x28, 0x00, 0x00, 0x40, 0x00,\n+\t0x40, 0x06, 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+\t0x50, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00,\n+};\n+\n+static const u8 ice_fdir_udp4_tun_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n+\t0x00, 0x4e, 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, 0x08, 0x00,\n+\t0x45, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x40, 0x00,\n+\t0x40, 0x11, 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_sctp4_tun_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n+\t0x00, 0x52, 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, 0x08, 0x00,\n+\t0x45, 0x00, 0x00, 0x20, 0x00, 0x01, 0x00, 0x00,\n+\t0x40, 0x84, 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_ip4_tun_pkt[] = {\n+\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,\n+\t0x00, 0x46, 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, 0x08, 0x00,\n+\t0x45, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00,\n+\t0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\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 \t\tICE_FLTR_PTYPE_NONF_IPV4_TCP,\n-\t\tsizeof(ice_fdir_tcpv4_pkt),\n-\t\tice_fdir_tcpv4_pkt,\n+\t\tsizeof(ice_fdir_tcpv4_pkt), ice_fdir_tcpv4_pkt,\n+\t\tsizeof(ice_fdir_tcp4_tun_pkt), ice_fdir_tcp4_tun_pkt,\n \t},\n \t{\n \t\tICE_FLTR_PTYPE_NONF_IPV4_UDP,\n-\t\tsizeof(ice_fdir_udpv4_pkt),\n-\t\tice_fdir_udpv4_pkt,\n+\t\tsizeof(ice_fdir_udpv4_pkt), ice_fdir_udpv4_pkt,\n+\t\tsizeof(ice_fdir_udp4_tun_pkt), ice_fdir_udp4_tun_pkt,\n \t},\n \t{\n \t\tICE_FLTR_PTYPE_NONF_IPV4_SCTP,\n-\t\tsizeof(ice_fdir_sctpv4_pkt),\n-\t\tice_fdir_sctpv4_pkt,\n+\t\tsizeof(ice_fdir_sctpv4_pkt), ice_fdir_sctpv4_pkt,\n+\t\tsizeof(ice_fdir_sctp4_tun_pkt), ice_fdir_sctp4_tun_pkt,\n \t},\n \t{\n \t\tICE_FLTR_PTYPE_NONF_IPV4_OTHER,\n-\t\tsizeof(ice_fdir_ipv4_pkt),\n-\t\tice_fdir_ipv4_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),\n-\t\tice_fdir_tcpv6_pkt,\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),\n-\t\tice_fdir_udpv6_pkt,\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),\n-\t\tice_fdir_sctpv6_pkt,\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),\n-\t\tice_fdir_ipv6_pkt,\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@@ -377,15 +507,20 @@ static void ice_pkt_insert_u32(u8 *pkt, int offset, __be32 data)\n }\n \n /**\n- * ice_fdir_get_prgm_pkt - generate a dummy packet\n+ * ice_fdir_get_gen_prgm_pkt - generate a training packet\n+ * @hw: pointer to the hardware structure\n * @input: flow director filter data structure\n * @pkt: pointer to return filter packet\n * @frag: generate a fragment packet\n+ * @tun: true implies generate a tunnel packet\n */\n enum ice_status\n-ice_fdir_get_prgm_pkt(struct ice_fdir_fltr *input, u8 *pkt, bool frag)\n+ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,\n+\t\t\t u8 *pkt, bool frag, bool tun)\n {\n \tenum ice_fltr_ptype flow;\n+\tu16 tnl_port;\n+\tu8 *loc;\n \tu16 idx;\n \n \tif (input->flow_type == ICE_FLTR_PTYPE_NONF_IPV4_OTHER) {\n@@ -431,83 +566,96 @@ ice_fdir_get_prgm_pkt(struct ice_fdir_fltr *input, u8 *pkt, bool frag)\n \t\t\tbreak;\n \tif (idx == ICE_FDIR_NUM_PKT)\n \t\treturn ICE_ERR_PARAM;\n-\tice_memcpy(pkt, ice_fdir_pkt[idx].pkt, ice_fdir_pkt[idx].pkt_len,\n-\t\t ICE_NONDMA_TO_NONDMA);\n+\tif (!tun) {\n+\t\tice_memcpy(pkt, ice_fdir_pkt[idx].pkt,\n+\t\t\t ice_fdir_pkt[idx].pkt_len, ICE_NONDMA_TO_NONDMA);\n+\t\tloc = pkt;\n+\t} else {\n+\t\tif (!ice_get_open_tunnel_port(hw, TNL_ALL, &tnl_port))\n+\t\t\treturn ICE_ERR_DOES_NOT_EXIST;\n+\t\tif (!ice_fdir_pkt[idx].tun_pkt)\n+\t\t\treturn ICE_ERR_PARAM;\n+\t\tice_memcpy(pkt, ice_fdir_pkt[idx].tun_pkt,\n+\t\t\t ice_fdir_pkt[idx].tun_pkt_len, ICE_NONDMA_TO_NONDMA);\n+\t\tice_pkt_insert_u16(pkt, ICE_IPV4_UDP_DST_PORT_OFFSET,\n+\t\t\t\t HTONS(tnl_port));\n+\t\tloc = &pkt[ICE_FDIR_TUN_PKT_OFF];\n+\t}\n \n \tswitch (flow) {\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_TCP:\n-\t\tice_pkt_insert_u32(pkt, ICE_IPV4_DST_ADDR_OFFSET,\n+\t\tice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,\n \t\t\t\t input->ip.v4.dst_ip);\n-\t\tice_pkt_insert_u16(pkt, ICE_IPV4_TCP_DST_PORT_OFFSET,\n+\t\tice_pkt_insert_u16(loc, ICE_IPV4_TCP_DST_PORT_OFFSET,\n \t\t\t\t input->ip.v4.dst_port);\n-\t\tice_pkt_insert_u32(pkt, ICE_IPV4_SRC_ADDR_OFFSET,\n+\t\tice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET,\n \t\t\t\t input->ip.v4.src_ip);\n-\t\tice_pkt_insert_u16(pkt, ICE_IPV4_TCP_SRC_PORT_OFFSET,\n+\t\tice_pkt_insert_u16(loc, ICE_IPV4_TCP_SRC_PORT_OFFSET,\n \t\t\t\t input->ip.v4.src_port);\n \t\tif (frag)\n-\t\t\tpkt[20] = ICE_FDIR_IPV4_PKT_FLAG_DF;\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(pkt, ICE_IPV4_DST_ADDR_OFFSET,\n+\t\tice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,\n \t\t\t\t input->ip.v4.dst_ip);\n-\t\tice_pkt_insert_u16(pkt, ICE_IPV4_UDP_DST_PORT_OFFSET,\n+\t\tice_pkt_insert_u16(loc, ICE_IPV4_UDP_DST_PORT_OFFSET,\n \t\t\t\t input->ip.v4.dst_port);\n-\t\tice_pkt_insert_u32(pkt, ICE_IPV4_SRC_ADDR_OFFSET,\n+\t\tice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET,\n \t\t\t\t input->ip.v4.src_ip);\n-\t\tice_pkt_insert_u16(pkt, ICE_IPV4_UDP_SRC_PORT_OFFSET,\n+\t\tice_pkt_insert_u16(loc, ICE_IPV4_UDP_SRC_PORT_OFFSET,\n \t\t\t\t input->ip.v4.src_port);\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_SCTP:\n-\t\tice_pkt_insert_u32(pkt, ICE_IPV4_DST_ADDR_OFFSET,\n+\t\tice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,\n \t\t\t\t input->ip.v4.dst_ip);\n-\t\tice_pkt_insert_u16(pkt, ICE_IPV4_SCTP_DST_PORT_OFFSET,\n+\t\tice_pkt_insert_u16(loc, ICE_IPV4_SCTP_DST_PORT_OFFSET,\n \t\t\t\t input->ip.v4.dst_port);\n-\t\tice_pkt_insert_u32(pkt, ICE_IPV4_SRC_ADDR_OFFSET,\n+\t\tice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET,\n \t\t\t\t input->ip.v4.src_ip);\n-\t\tice_pkt_insert_u16(pkt, ICE_IPV4_SCTP_SRC_PORT_OFFSET,\n+\t\tice_pkt_insert_u16(loc, ICE_IPV4_SCTP_SRC_PORT_OFFSET,\n \t\t\t\t input->ip.v4.src_port);\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_OTHER:\n-\t\tice_pkt_insert_u32(pkt, ICE_IPV4_DST_ADDR_OFFSET,\n+\t\tice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,\n \t\t\t\t input->ip.v4.dst_ip);\n-\t\tice_pkt_insert_u32(pkt, ICE_IPV4_SRC_ADDR_OFFSET,\n+\t\tice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET,\n \t\t\t\t input->ip.v4.src_ip);\n-\t\tice_pkt_insert_u16(pkt, ICE_IPV4_PROTO_OFFSET, 0);\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(pkt, ICE_IPV6_DST_ADDR_OFFSET,\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET,\n \t\t\t\t\t input->ip.v6.dst_ip);\n-\t\tice_pkt_insert_ipv6_addr(pkt, ICE_IPV6_SRC_ADDR_OFFSET,\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET,\n \t\t\t\t\t input->ip.v6.src_ip);\n-\t\tice_pkt_insert_u16(pkt, ICE_IPV6_TCP_DST_PORT_OFFSET,\n+\t\tice_pkt_insert_u16(loc, ICE_IPV6_TCP_DST_PORT_OFFSET,\n \t\t\t\t input->ip.v6.dst_port);\n-\t\tice_pkt_insert_u16(pkt, ICE_IPV6_TCP_SRC_PORT_OFFSET,\n+\t\tice_pkt_insert_u16(loc, ICE_IPV6_TCP_SRC_PORT_OFFSET,\n \t\t\t\t input->ip.v6.src_port);\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV6_UDP:\n-\t\tice_pkt_insert_ipv6_addr(pkt, ICE_IPV6_DST_ADDR_OFFSET,\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET,\n \t\t\t\t\t input->ip.v6.dst_ip);\n-\t\tice_pkt_insert_ipv6_addr(pkt, ICE_IPV6_SRC_ADDR_OFFSET,\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET,\n \t\t\t\t\t input->ip.v6.src_ip);\n-\t\tice_pkt_insert_u16(pkt, ICE_IPV6_UDP_DST_PORT_OFFSET,\n+\t\tice_pkt_insert_u16(loc, ICE_IPV6_UDP_DST_PORT_OFFSET,\n \t\t\t\t input->ip.v6.dst_port);\n-\t\tice_pkt_insert_u16(pkt, ICE_IPV6_UDP_SRC_PORT_OFFSET,\n+\t\tice_pkt_insert_u16(loc, ICE_IPV6_UDP_SRC_PORT_OFFSET,\n \t\t\t\t input->ip.v6.src_port);\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV6_SCTP:\n-\t\tice_pkt_insert_ipv6_addr(pkt, ICE_IPV6_DST_ADDR_OFFSET,\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET,\n \t\t\t\t\t input->ip.v6.dst_ip);\n-\t\tice_pkt_insert_ipv6_addr(pkt, ICE_IPV6_SRC_ADDR_OFFSET,\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET,\n \t\t\t\t\t input->ip.v6.src_ip);\n-\t\tice_pkt_insert_u16(pkt, ICE_IPV6_SCTP_DST_PORT_OFFSET,\n+\t\tice_pkt_insert_u16(loc, ICE_IPV6_SCTP_DST_PORT_OFFSET,\n \t\t\t\t input->ip.v6.dst_port);\n-\t\tice_pkt_insert_u16(pkt, ICE_IPV6_SCTP_SRC_PORT_OFFSET,\n+\t\tice_pkt_insert_u16(loc, ICE_IPV6_SCTP_SRC_PORT_OFFSET,\n \t\t\t\t input->ip.v6.src_port);\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV6_OTHER:\n-\t\tice_pkt_insert_ipv6_addr(pkt, ICE_IPV6_DST_ADDR_OFFSET,\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET,\n \t\t\t\t\t input->ip.v6.dst_ip);\n-\t\tice_pkt_insert_ipv6_addr(pkt, ICE_IPV6_SRC_ADDR_OFFSET,\n+\t\tice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET,\n \t\t\t\t\t input->ip.v6.src_ip);\n \t\tbreak;\n \tdefault:\n@@ -515,12 +663,24 @@ ice_fdir_get_prgm_pkt(struct ice_fdir_fltr *input, u8 *pkt, bool frag)\n \t}\n \n \tif (input->flex_fltr)\n-\t\tice_pkt_insert_u16(pkt, input->flex_offset, input->flex_word);\n+\t\tice_pkt_insert_u16(loc, input->flex_offset, input->flex_word);\n \n \treturn ICE_SUCCESS;\n }\n \n /**\n+ * ice_fdir_get_prgm_pkt - generate a training packet\n+ * @input: flow director filter data structure\n+ * @pkt: pointer to return filter packet\n+ * @frag: generate a fragment packet\n+ */\n+enum ice_status\n+ice_fdir_get_prgm_pkt(struct ice_fdir_fltr *input, u8 *pkt, bool frag)\n+{\n+\treturn ice_fdir_get_gen_prgm_pkt(NULL, input, pkt, frag, false);\n+}\n+\n+/**\n * ice_fdir_has_frag - does flow type have 2 ptypes\n * @flow: flow ptype\n *\ndiff --git a/drivers/net/ice/base/ice_fdir.h b/drivers/net/ice/base/ice_fdir.h\nindex 8490fac61..9e7e22033 100644\n--- a/drivers/net/ice/base/ice_fdir.h\n+++ b/drivers/net/ice/base/ice_fdir.h\n@@ -58,7 +58,8 @@ enum ice_status ice_clear_pf_fd_table(struct ice_hw *hw);\n #define ICE_IP_PROTO_IP\t\t\t0\n #define ICE_IP_PROTO_ESP\t\t50\n \n-#define ICE_FDIR_MAX_RAW_PKT_SIZE\t512\n+#define ICE_FDIR_TUN_PKT_OFF\t\t50\n+#define ICE_FDIR_MAX_RAW_PKT_SIZE\t(512 + ICE_FDIR_TUN_PKT_OFF)\n #define ICE_FDIR_BUF_FULL_MARGIN\t10\n #define ICE_FDIR_BUF_HEAD_ROOM\t\t32\n \n@@ -175,12 +176,17 @@ struct ice_fdir_base_pkt {\n \tenum ice_fltr_ptype flow;\n \tu16 pkt_len;\n \tconst u8 *pkt;\n+\tu16 tun_pkt_len;\n+\tconst u8 *tun_pkt;\n };\n \n void\n ice_fdir_get_prgm_desc(struct ice_hw *hw, struct ice_fdir_fltr *input,\n \t\t struct ice_fltr_desc *fdesc, bool add);\n enum ice_status\n+ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,\n+\t\t\t u8 *pkt, bool frag, bool tun);\n+enum ice_status\n ice_fdir_get_prgm_pkt(struct ice_fdir_fltr *input, u8 *pkt, bool frag);\n enum ice_status\n ice_add_del_fdir(struct ice_hw *hw, struct ice_fdir_fltr *input, bool add);\ndiff --git a/drivers/net/ice/base/ice_type.h b/drivers/net/ice/base/ice_type.h\nindex 150b4c5c5..7d0a4f63f 100644\n--- a/drivers/net/ice/base/ice_type.h\n+++ b/drivers/net/ice/base/ice_type.h\n@@ -296,13 +296,19 @@ enum ice_fltr_ptype {\n \tICE_FLTR_PTYPE_MAX,\n };\n \n+enum ice_fd_hw_seg {\n+\tICE_FD_HW_SEG_NON_TUN = 0,\n+\tICE_FD_HW_SEG_TUN,\n+\tICE_FD_HW_SEG_MAX,\n+};\n+\n /* 2 VSI = 1 ICE_VSI_PF + 1 ICE_VSI_CTRL */\n #define ICE_MAX_FDIR_VSI_PER_FILTER\t2\n \n struct ice_fd_hw_prof {\n-\tstruct ice_flow_seg_info *fdir_seg;\n+\tstruct ice_flow_seg_info *fdir_seg[ICE_FD_HW_SEG_MAX];\n \tint cnt;\n-\tu64 entry_h[ICE_MAX_FDIR_VSI_PER_FILTER];\n+\tu64 entry_h[ICE_MAX_FDIR_VSI_PER_FILTER][ICE_FD_HW_SEG_MAX];\n \tu16 vsi_h[ICE_MAX_FDIR_VSI_PER_FILTER];\n };\n \n", "prefixes": [ "v5", "02/30" ] }