From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 67DE9A0525 for ; Mon, 20 Jan 2020 07:54:47 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3F97A1559; Mon, 20 Jan 2020 07:54:47 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id F24C3FFA; Mon, 20 Jan 2020 07:54:43 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Jan 2020 22:54:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,340,1574150400"; d="scan'208";a="228271441" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga006.jf.intel.com with ESMTP; 19 Jan 2020 22:54:42 -0800 Received: from shsmsx605.ccr.corp.intel.com (10.109.6.215) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 19 Jan 2020 22:54:41 -0800 Received: from shsmsx606.ccr.corp.intel.com (10.109.6.216) by SHSMSX605.ccr.corp.intel.com (10.109.6.215) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 20 Jan 2020 14:54:40 +0800 Received: from shsmsx606.ccr.corp.intel.com ([10.109.6.216]) by SHSMSX606.ccr.corp.intel.com ([10.109.6.216]) with mapi id 15.01.1713.004; Mon, 20 Jan 2020 14:54:40 +0800 From: "Cao, Yahui" To: "Zhang, Qi Z" , "Xing, Beilei" CC: "Sun, Chenmin" , "dev@dpdk.org" , "stable@dpdk.org" Thread-Topic: [PATCH] net/ice: fix fdir GTP-U pattern Thread-Index: AQHVz08pS+A1hQn2GEa6wqrdyLUJTKfzHaOw Date: Mon, 20 Jan 2020 06:54:40 +0000 Message-ID: <053c9d2be41e474dbdcd2403e8a7f0f3@intel.com> References: <20200120050822.7533-1-qi.z.zhang@intel.com> In-Reply-To: <20200120050822.7533-1-qi.z.zhang@intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.2.0.6 x-originating-ip: [10.239.127.36] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-stable] [PATCH] net/ice: fix fdir GTP-U pattern X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Suggest to rename ICE_FDIR_INSET_GTPU_IPV4 to ICE_FDIR_INSET_GTPU, and ren= ame ICE_FDIR_INSET_GTPU_EH_IPV4 to ICE_FDIR_INSET_GTPU_EH Thanks. Yahui. -----Original Message----- From: Zhang, Qi Z =20 Sent: Monday, January 20, 2020 1:08 PM To: Cao, Yahui ; Xing, Beilei Cc: Sun, Chenmin ; dev@dpdk.org; Zhang, Qi Z ; stable@dpdk.org Subject: [PATCH] net/ice: fix fdir GTP-U pattern Base on current fdir implementation for GTP-U, inner specification is not s= upported, issue a rule for eth/ipv4/gtpu/ipv4 will also match eth/ipv4/gtpu= /ipv6, the patch add new pattern list to align with exist implementation. Fixes: efc16c621415 ("net/ice: support flow director GTPU tunnel") Cc: stable@dpdk.org Signed-off-by: Qi Zhang --- drivers/net/ice/ice_fdir_filter.c | 5 ++--- drivers/net/ice/ice_generic= _flow.c | 15 +++++++++++++++ drivers/net/ice/ice_generic_flow.h | 2 ++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_f= ilter.c index 4c5ddfbdb..fcf37f650 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -125,9 +125,8 @@ static struct ice_pattern_match_item ice_fdir_pattern_c= omms[] =3D { ICE_FDIR_INSET_VXLAN_IPV4_TCP, ICE_INSET_NONE}, {pattern_eth_ipv4_udp_vxlan_eth_ipv4_sctp, ICE_FDIR_INSET_VXLAN_IPV4_SCTP, ICE_INSET_NONE}, - {pattern_eth_ipv4_gtpu_ipv4, ICE_FDIR_INSET_GTPU_IPV4, ICE_= INSET_NONE}, - {pattern_eth_ipv4_gtpu_eh_ipv4, - ICE_FDIR_INSET_GTPU_EH_IPV4, ICE_INSET_NONE}, + {pattern_eth_ipv4_gtpu, ICE_FDIR_INSET_GTPU_IPV4, ICE_= INSET_NONE}, + {pattern_eth_ipv4_gtpu_eh, ICE_FDIR_INSET_GTPU_EH_IPV4, ICE_= INSET_NONE}, }; =20 static struct ice_flow_parser ice_fdir_parser_os; diff --git a/drivers/net= /ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c index c9efa8356..38ac799d8 100644 --- a/drivers/net/ice/ice_generic_flow.c +++ b/drivers/net/ice/ice_generic_flow.c @@ -1034,6 +1034,13 @@ enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_i= pv6_icmp6[] =3D { }; =20 /* GTPU */ +enum rte_flow_item_type pattern_eth_ipv4_gtpu[] =3D { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_END, +}; enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[] =3D { RTE_FLOW_ITEM_TYPE_ETH, RTE_FLOW_ITEM_TYPE_IPV4, @@ -1042,6 +1049,14 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[]= =3D { RTE_FLOW_ITEM_TYPE_IPV4, RTE_FLOW_ITEM_TYPE_END, }; +enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh[] =3D { + RTE_FLOW_ITEM_TYPE_ETH, + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_UDP, + RTE_FLOW_ITEM_TYPE_GTPU, + RTE_FLOW_ITEM_TYPE_GTP_PSC, + RTE_FLOW_ITEM_TYPE_END, +}; enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[] =3D { RTE_FLOW_ITEM_TYPE_ETH, RTE_FLOW_ITEM_TYPE_IPV4, diff --git a/drivers/net/ice/ice_generic_flow.h b/drivers/net/ice/ice_gener= ic_flow.h index ac085b47f..adc30ee2a 100644 --- a/drivers/net/ice/ice_generic_flow.h +++ b/drivers/net/ice/ice_generic_flow.h @@ -336,7 +336,9 @@ extern enum rte_flow_item_type pattern_eth_ipv6_nvgre_e= th_ipv6_sctp[]; extern enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_icmp6[]; =20 /* GTPU */ +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu[]; extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[]; +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh[]; extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[]; extern en= um rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[]; extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_tcp[]; -- 2.13.6