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 17254A04C1; Wed, 20 Nov 2019 10:17:36 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 367502E8F; Wed, 20 Nov 2019 10:17:35 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 429042C36 for ; Wed, 20 Nov 2019 10:17:32 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Nov 2019 01:17:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,221,1571727600"; d="scan'208";a="231863803" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga004.fm.intel.com with ESMTP; 20 Nov 2019 01:17:31 -0800 Received: from fmsmsx116.amr.corp.intel.com (10.18.116.20) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 20 Nov 2019 01:17:31 -0800 Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by fmsmsx116.amr.corp.intel.com (10.18.116.20) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 20 Nov 2019 01:17:30 -0800 Received: from shsmsx105.ccr.corp.intel.com ([169.254.11.225]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.41]) with mapi id 14.03.0439.000; Wed, 20 Nov 2019 17:17:29 +0800 From: "Zhang, Qi Z" To: "Cao, Yahui" , "Yang, Qiming" , "Lu, Wenzhuo" CC: "dev@dpdk.org" , "Ye, Xiaolong" , "Wang, Ying A" , "Su, Simei" , "Sun, Chenmin" Thread-Topic: [PATCH v2 1/2] net/ice: fix GTPU extension header renaming Thread-Index: AQHVn3M+YV+3iNkKGU63DI+k7yqDX6eTxL1Q Date: Wed, 20 Nov 2019 09:17:28 +0000 Message-ID: <039ED4275CED7440929022BC67E7061153DCDD46@SHSMSX105.ccr.corp.intel.com> References: <20191120132836.75142-1-yahui.cao@intel.com> <20191120150549.54533-1-yahui.cao@intel.com> <20191120150549.54533-2-yahui.cao@intel.com> In-Reply-To: <20191120150549.54533-2-yahui.cao@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNmFhODM5MzMtYzQ1MS00ZDlkLTg2ZDgtNGU4NTcxNmNmNTY5IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoicmRoOExxR2Jxc0JwVnFONXZWU3I4eUtKbjhuM2lDdUtFWkh4NHNCWFlsVVRxVHliaFBndVJcL0E2SzdSVXVUUmYifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v2 1/2] net/ice: fix GTPU extension header renaming X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" > -----Original Message----- > From: Cao, Yahui > Sent: Wednesday, November 20, 2019 11:06 PM > To: Yang, Qiming ; Lu, Wenzhuo > > Cc: dev@dpdk.org; Zhang, Qi Z ; Cao, Yahui > ; Ye, Xiaolong ; Wang, Ying A > ; Su, Simei ; Sun, Chenmin > > Subject: [PATCH v2 1/2] net/ice: fix GTPU extension header renaming How about "fix pattern name of GTPU with extension header"?=20 >=20 > GTP-U packet with extension header is GTP-U packet with GTP_PSC header > inserted between GTP-U header and inner payload. Pattern name of GTP-U flow with extension header should be xxx_gtp_eh_xxx so it will not conflict with the pattern name of a GTP-U flow that does not= contains extension header >=20 > Fixes: 3e4eab9c2192 ("net/ice: add pattern manifest") > Cc: ying.a.wang@intel.com >=20 > Signed-off-by: Yahui Cao > --- > drivers/net/ice/ice_fdir_filter.c | 5 +++-- > drivers/net/ice/ice_generic_flow.c | 8 ++++---- > drivers/net/ice/ice_generic_flow.h | 8 ++++---- > drivers/net/ice/ice_hash.c | 32 +++++++++++++++--------------- > 4 files changed, 27 insertions(+), 26 deletions(-) >=20 > diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir= _filter.c > index 9e251cee5..dc7a97acb 100644 > --- a/drivers/net/ice/ice_fdir_filter.c > +++ b/drivers/net/ice/ice_fdir_filter.c > @@ -67,7 +67,7 @@ > ICE_FDIR_INSET_VXLAN_IPV4 | \ > ICE_INSET_TUN_SCTP_SRC_PORT | ICE_INSET_TUN_SCTP_DST_PORT) >=20 > -#define ICE_FDIR_INSET_GTPU_IPV4 (\ > +#define ICE_FDIR_INSET_GTPU_EH_IPV4 (\ > ICE_INSET_GTPU_TEID | ICE_INSET_GTPU_QFI) >=20 > static struct ice_pattern_match_item ice_fdir_pattern_os[] =3D { @@ -122= ,7 > +122,8 @@ static struct ice_pattern_match_item ice_fdir_pattern_comms[] = =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}, > }; >=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 5594f8555..a235337ba 100644 > --- a/drivers/net/ice/ice_generic_flow.c > +++ b/drivers/net/ice/ice_generic_flow.c > @@ -1034,7 +1034,7 @@ enum rte_flow_item_type > pattern_eth_ipv6_nvgre_eth_ipv6_icmp6[] =3D { }; >=20 > /* GTPU */ > -enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[] =3D { > +enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[] =3D { > RTE_FLOW_ITEM_TYPE_ETH, > RTE_FLOW_ITEM_TYPE_IPV4, > RTE_FLOW_ITEM_TYPE_UDP, > @@ -1043,7 +1043,7 @@ 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_ipv4_udp[] =3D { > +enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[] =3D { > RTE_FLOW_ITEM_TYPE_ETH, > RTE_FLOW_ITEM_TYPE_IPV4, > RTE_FLOW_ITEM_TYPE_UDP, > @@ -1053,7 +1053,7 @@ enum rte_flow_item_type > pattern_eth_ipv4_gtpu_ipv4_udp[] =3D { > RTE_FLOW_ITEM_TYPE_UDP, > RTE_FLOW_ITEM_TYPE_END, > }; > -enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_tcp[] =3D { > +enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_tcp[] =3D { > RTE_FLOW_ITEM_TYPE_ETH, > RTE_FLOW_ITEM_TYPE_IPV4, > RTE_FLOW_ITEM_TYPE_UDP, > @@ -1064,7 +1064,7 @@ enum rte_flow_item_type > pattern_eth_ipv4_gtpu_ipv4_tcp[] =3D { > RTE_FLOW_ITEM_TYPE_END, >=20 > }; > -enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_icmp[] =3D { > +enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] =3D { > RTE_FLOW_ITEM_TYPE_ETH, > RTE_FLOW_ITEM_TYPE_IPV4, > RTE_FLOW_ITEM_TYPE_UDP, > diff --git a/drivers/net/ice/ice_generic_flow.h > b/drivers/net/ice/ice_generic_flow.h > index b6e4ed0e1..a598ceabc 100644 > --- a/drivers/net/ice/ice_generic_flow.h > +++ b/drivers/net/ice/ice_generic_flow.h > @@ -336,10 +336,10 @@ extern enum rte_flow_item_type > pattern_eth_ipv6_nvgre_eth_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_ipv4[]; -extern enu= m > rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_udp[]; -extern enum > rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_tcp[]; -extern enum > rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_icmp[]; > +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[]; extern > +enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[]; > +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_tcp[]; > +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_icmp[]; >=20 > /* PPPoE */ > extern enum rte_flow_item_type pattern_eth_pppoed[]; diff --git > a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c index > 2e9c1bc67..b145a3f0d 100644 > --- a/drivers/net/ice/ice_hash.c > +++ b/drivers/net/ice/ice_hash.c > @@ -120,22 +120,22 @@ static struct ice_pattern_match_item > ice_hash_pattern_list_os[] =3D { >=20 > /* Supported pattern for comms package. */ static struct > ice_pattern_match_item ice_hash_pattern_list_comms[] =3D { > - {pattern_eth_ipv4, ICE_INSET_NONE, &hint_1}, > - {pattern_eth_ipv4_udp, ICE_INSET_NONE, &hint_2}, > - {pattern_eth_ipv4_tcp, ICE_INSET_NONE, &hint_3}, > - {pattern_eth_ipv4_sctp, ICE_INSET_NONE, &hint_4}, > - {pattern_eth_ipv6, ICE_INSET_NONE, &hint_5}, > - {pattern_eth_ipv6_udp, ICE_INSET_NONE, &hint_6}, > - {pattern_eth_ipv6_tcp, ICE_INSET_NONE, &hint_7}, > - {pattern_eth_ipv6_sctp, ICE_INSET_NONE, &hint_8}, > - {pattern_empty, ICE_INSET_NONE, &hint_0}, > - {pattern_eth_ipv4_gtpu_ipv4, ICE_INSET_NONE, &hint_9}, > - {pattern_eth_ipv4_gtpu_ipv4_udp, ICE_INSET_NONE, &hint_9}, > - {pattern_eth_ipv4_gtpu_ipv4_tcp, ICE_INSET_NONE, &hint_9}, > - {pattern_eth_pppoes_ipv4, ICE_INSET_NONE, &hint_10}, > - {pattern_eth_pppoes_ipv4_udp, ICE_INSET_NONE, &hint_11}, > - {pattern_eth_pppoes_ipv4_tcp, ICE_INSET_NONE, &hint_12}, > - {pattern_eth_pppoes_ipv4_sctp, ICE_INSET_NONE, &hint_13}, > + {pattern_eth_ipv4, ICE_INSET_NONE, &hint_1}, > + {pattern_eth_ipv4_udp, ICE_INSET_NONE, &hint_2}, > + {pattern_eth_ipv4_tcp, ICE_INSET_NONE, &hint_3}, > + {pattern_eth_ipv4_sctp, ICE_INSET_NONE, &hint_4}, > + {pattern_eth_ipv6, ICE_INSET_NONE, &hint_5}, > + {pattern_eth_ipv6_udp, ICE_INSET_NONE, &hint_6}, > + {pattern_eth_ipv6_tcp, ICE_INSET_NONE, &hint_7}, > + {pattern_eth_ipv6_sctp, ICE_INSET_NONE, &hint_8}, > + {pattern_empty, ICE_INSET_NONE, &hint_0}, > + {pattern_eth_ipv4_gtpu_eh_ipv4, ICE_INSET_NONE, &hint_9}, > + {pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE, &hint_9}, > + {pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE, &hint_9}, > + {pattern_eth_pppoes_ipv4, ICE_INSET_NONE, &hint_10}, > + {pattern_eth_pppoes_ipv4_udp, ICE_INSET_NONE, &hint_11}, > + {pattern_eth_pppoes_ipv4_tcp, ICE_INSET_NONE, &hint_12}, > + {pattern_eth_pppoes_ipv4_sctp, ICE_INSET_NONE, &hint_13}, > }; >=20 > /** > -- > 2.17.1