Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/94257/?format=api
{ "id": 94257, "url": "https://patches.dpdk.org/api/patches/94257/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210616012053.201105-1-dapengx.yu@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": "<20210616012053.201105-1-dapengx.yu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210616012053.201105-1-dapengx.yu@intel.com", "date": "2021-06-16T01:20:52", "name": "[1/2] net/ice/base: fix VXLAN flow director creation error", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "a9a52ed16f1fcedb9932bbc174615662c9644e28", "submitter": { "id": 2042, "url": "https://patches.dpdk.org/api/people/2042/?format=api", "name": "Yu, DapengX", "email": "dapengx.yu@intel.com" }, "delegate": { "id": 1540, "url": "https://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20210616012053.201105-1-dapengx.yu@intel.com/mbox/", "series": [ { "id": 17342, "url": "https://patches.dpdk.org/api/series/17342/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=17342", "date": "2021-06-16T01:20:52", "name": "[1/2] net/ice/base: fix VXLAN flow director creation error", "version": 1, "mbox": "https://patches.dpdk.org/series/17342/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/94257/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/94257/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 AE3F6A034F;\n\tWed, 16 Jun 2021 03:21:08 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 33EB14067A;\n\tWed, 16 Jun 2021 03:21:08 +0200 (CEST)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n by mails.dpdk.org (Postfix) with ESMTP id 387D140140;\n Wed, 16 Jun 2021 03:21:06 +0200 (CEST)", "from orsmga008.jf.intel.com ([10.7.209.65])\n by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 15 Jun 2021 18:21:04 -0700", "from unknown (HELO localhost.localdomain) ([10.240.183.93])\n by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 15 Jun 2021 18:21:02 -0700" ], "IronPort-SDR": [ "\n +klISETNHKzntlTnFVoULq8wRV+aXmjzFAIOm/8LmcTHRBAcNLhMrr//z17LwE3p5HnWbjzPPg\n 1zp0fPwlVq0A==", "\n IOa7dNcH7BSD5jJuQKk/c/XWpqStl6vHXcSpLDwTXzn1Ded6yiOCsGG/SfkY/NVnlh7JcF4MCv\n aNihdRBAUZug==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,10016\"; a=\"206133376\"", "E=Sophos;i=\"5.83,276,1616482800\"; d=\"scan'208\";a=\"206133376\"", "E=Sophos;i=\"5.83,276,1616482800\"; d=\"scan'208\";a=\"450447754\"" ], "From": "dapengx.yu@intel.com", "To": "Qiming Yang <qiming.yang@intel.com>,\n\tQi Zhang <qi.z.zhang@intel.com>", "Cc": "dev@dpdk.org, junfeng.guo@intel.com, zhirun.yan@intel.com,\n Dapeng Yu <dapengx.yu@intel.com>, stable@dpdk.org", "Date": "Wed, 16 Jun 2021 09:20:52 +0800", "Message-Id": "<20210616012053.201105-1-dapengx.yu@intel.com>", "X-Mailer": "git-send-email 2.27.0", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 1/2] net/ice/base: fix VXLAN flow director\n creation error", "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": "From: Dapeng Yu <dapengx.yu@intel.com>\n\nIn original implementation, error returned when creating VXLAN flow\ndirector with SCTP or TCP as layer 4 protocol of inner segment.\n\nThere are several root causes for the error:\n1. ice_fdir_udp4_vxlan_pkt[] is not adapted to the TCP and SCTP protocol.\nIts length cannot hold TCP header, only UDP protocol was supported in\noriginal implementation\n2. VXLAN VNI offset: 45 is inconsistent with IETF RFC 7348\n\nThis patch fixes those defects described above.\n\nFixes: 608cd0a5e283 (\"net/ice/base: support VXLAN VNI field in flow director\")\nCc: stable@dpdk.org\n\nSigned-off-by: Dapeng Yu <dapengx.yu@intel.com>\n---\n drivers/net/ice/base/ice_fdir.c | 99 +++++++++++++++++++++++++++++++++\n drivers/net/ice/base/ice_fdir.h | 2 +-\n drivers/net/ice/base/ice_type.h | 4 ++\n 3 files changed, 104 insertions(+), 1 deletion(-)", "diff": "diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c\nindex 180508243d..b94ade1c24 100644\n--- a/drivers/net/ice/base/ice_fdir.c\n+++ b/drivers/net/ice/base/ice_fdir.c\n@@ -1023,6 +1023,26 @@ static const struct ice_fdir_base_pkt ice_fdir_pkt[] = {\n \t\tsizeof(ice_fdir_udp4_vxlan_pkt), ice_fdir_udp4_vxlan_pkt,\n \t\tsizeof(ice_fdir_udp4_vxlan_pkt), ice_fdir_udp4_vxlan_pkt,\n \t},\n+\t{\n+\t\tICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_UDP,\n+\t\tsizeof(ice_fdir_udp4_tun_pkt), ice_fdir_udp4_tun_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_UDP_VXLAN_IPV4_TCP,\n+\t\tsizeof(ice_fdir_tcp4_tun_pkt), ice_fdir_tcp4_tun_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_VXLAN_IPV4_SCTP,\n+\t\tsizeof(ice_fdir_sctp4_tun_pkt), ice_fdir_sctp4_tun_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_UDP_VXLAN_IPV4_OTHER,\n+\t\tsizeof(ice_fdir_ip4_tun_pkt), ice_fdir_ip4_tun_pkt,\n+\t\tsizeof(ice_fdir_ip4_tun_pkt), ice_fdir_ip4_tun_pkt,\n+\t},\n \t{\n \t\tICE_FLTR_PTYPE_NONF_ECPRI_TP0,\n \t\tsizeof(ice_fdir_ecpri_tp0_pkt), ice_fdir_ecpri_tp0_pkt,\n@@ -1583,6 +1603,7 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,\n \t\tice_pkt_insert_mac_addr(loc, input->ext_data.dst_mac);\n \t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN:\n+\tcase ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_UDP:\n \t\tice_pkt_insert_mac_addr(pkt, input->ext_data_outer.dst_mac);\n \t\tice_pkt_insert_mac_addr(pkt + ETH_ALEN, input->ext_data_outer.src_mac);\n \t\tice_pkt_insert_u32(pkt, ICE_IPV4_SRC_ADDR_OFFSET,\n@@ -1605,6 +1626,84 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,\n \t\tice_pkt_insert_mac_addr(loc, input->ext_data.dst_mac);\n \t\tice_pkt_insert_mac_addr(loc + ETH_ALEN, input->ext_data.src_mac);\n \t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_TCP:\n+\t\tice_pkt_insert_mac_addr(pkt, input->ext_data_outer.dst_mac);\n+\t\tice_pkt_insert_mac_addr(pkt + ETH_ALEN,\n+\t\t\t\t\tinput->ext_data_outer.src_mac);\n+\t\tice_pkt_insert_u32(pkt, ICE_IPV4_SRC_ADDR_OFFSET,\n+\t\t\t\t input->ip_outer.v4.dst_ip);\n+\t\tice_pkt_insert_u32(pkt, ICE_IPV4_DST_ADDR_OFFSET,\n+\t\t\t\t input->ip_outer.v4.src_ip);\n+\t\tice_pkt_insert_u8(pkt, ICE_IPV4_TOS_OFFSET,\n+\t\t\t\t input->ip_outer.v4.tos);\n+\t\tice_pkt_insert_u32(pkt, ICE_IPV4_VXLAN_VNI_OFFSET,\n+\t\t\t\t input->vxlan_data.vni);\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_u16(loc, ICE_IPV4_TCP_DST_PORT_OFFSET,\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.v4.dst_ip);\n+\t\tice_pkt_insert_u16(loc, ICE_IPV4_TCP_SRC_PORT_OFFSET,\n+\t\t\t\t input->ip.v4.dst_port);\n+\t\tice_pkt_insert_u8(loc, ICE_IPV4_TOS_OFFSET, input->ip.v4.tos);\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\tice_pkt_insert_mac_addr(loc + ETH_ALEN,\n+\t\t\t\t\tinput->ext_data.src_mac);\n+\t\tif (frag)\n+\t\t\tloc[20] = ICE_FDIR_IPV4_PKT_FLAG_MF;\n+\t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_SCTP:\n+\t\tice_pkt_insert_mac_addr(pkt, input->ext_data_outer.dst_mac);\n+\t\tice_pkt_insert_mac_addr(pkt + ETH_ALEN,\n+\t\t\t\t\tinput->ext_data_outer.src_mac);\n+\t\tice_pkt_insert_u32(pkt, ICE_IPV4_SRC_ADDR_OFFSET,\n+\t\t\t\t input->ip_outer.v4.dst_ip);\n+\t\tice_pkt_insert_u32(pkt, ICE_IPV4_DST_ADDR_OFFSET,\n+\t\t\t\t input->ip_outer.v4.src_ip);\n+\t\tice_pkt_insert_u8(pkt, ICE_IPV4_TOS_OFFSET,\n+\t\t\t\t input->ip_outer.v4.tos);\n+\t\tice_pkt_insert_u32(pkt, ICE_IPV4_VXLAN_VNI_OFFSET,\n+\t\t\t\t input->vxlan_data.vni);\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_u16(loc, ICE_IPV4_SCTP_DST_PORT_OFFSET,\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.v4.dst_ip);\n+\t\tice_pkt_insert_u16(loc, ICE_IPV4_SCTP_SRC_PORT_OFFSET,\n+\t\t\t\t input->ip.v4.dst_port);\n+\t\tice_pkt_insert_u8(loc, ICE_IPV4_TOS_OFFSET, input->ip.v4.tos);\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\tice_pkt_insert_mac_addr(loc + ETH_ALEN,\n+\t\t\t\t\tinput->ext_data.src_mac);\n+\t\tbreak;\n+\tcase ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_OTHER:\n+\t\tice_pkt_insert_mac_addr(pkt, input->ext_data_outer.dst_mac);\n+\t\tice_pkt_insert_mac_addr(pkt + ETH_ALEN,\n+\t\t\t\t\tinput->ext_data_outer.src_mac);\n+\t\tice_pkt_insert_u32(pkt, ICE_IPV4_SRC_ADDR_OFFSET,\n+\t\t\t\t input->ip_outer.v4.dst_ip);\n+\t\tice_pkt_insert_u32(pkt, ICE_IPV4_DST_ADDR_OFFSET,\n+\t\t\t\t input->ip_outer.v4.src_ip);\n+\t\tice_pkt_insert_u8(pkt, ICE_IPV4_TOS_OFFSET,\n+\t\t\t\t input->ip_outer.v4.tos);\n+\t\tice_pkt_insert_u32(pkt, ICE_IPV4_VXLAN_VNI_OFFSET,\n+\t\t\t\t input->vxlan_data.vni);\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_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\tice_pkt_insert_mac_addr(loc + ETH_ALEN,\n+\t\t\t\t\tinput->ext_data.src_mac);\n+\t\tbreak;\n \tcase ICE_FLTR_PTYPE_NONF_IPV4_GTPU:\n \t\tice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET,\n \t\t\t\t input->ip.v4.src_ip);\ndiff --git a/drivers/net/ice/base/ice_fdir.h b/drivers/net/ice/base/ice_fdir.h\nindex 0ebf7f326c..1ba1084f38 100644\n--- a/drivers/net/ice/base/ice_fdir.h\n+++ b/drivers/net/ice/base/ice_fdir.h\n@@ -79,7 +79,7 @@\n #define ICE_IPV6_AH_SPI_OFFSET\t\t58\n #define ICE_IPV4_NAT_T_ESP_SPI_OFFSET\t42\n #define ICE_IPV6_NAT_T_ESP_SPI_OFFSET\t62\n-#define ICE_IPV4_VXLAN_VNI_OFFSET\t45\n+#define ICE_IPV4_VXLAN_VNI_OFFSET\t46\n #define ICE_ECPRI_TP0_PC_ID_OFFSET\t18\n #define ICE_IPV4_UDP_ECPRI_TP0_PC_ID_OFFSET\t\t\t46\n \ndiff --git a/drivers/net/ice/base/ice_type.h b/drivers/net/ice/base/ice_type.h\nindex ce508a02e5..2644d5db73 100644\n--- a/drivers/net/ice/base/ice_type.h\n+++ b/drivers/net/ice/base/ice_type.h\n@@ -353,6 +353,10 @@ enum ice_fltr_ptype {\n \tICE_FLTR_PTYPE_NONF_IPV6_SCTP,\n \tICE_FLTR_PTYPE_NONF_IPV6_OTHER,\n \tICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN,\n+\tICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_UDP,\n+\tICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_TCP,\n+\tICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_SCTP,\n+\tICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_OTHER,\n \tICE_FLTR_PTYPE_MAX,\n };\n \n", "prefixes": [ "1/2" ] }