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 CC8BFA052F; Sun, 26 Jan 2020 10:05:39 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0AF0F397D; Sun, 26 Jan 2020 10:05:39 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id B26F31DB9; Sun, 26 Jan 2020 10:05:36 +0100 (CET) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jan 2020 01:05:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,365,1574150400"; d="scan'208";a="375892049" Received: from yexl-server.sh.intel.com (HELO localhost) ([10.67.117.17]) by orsmga004.jf.intel.com with ESMTP; 26 Jan 2020 01:05:33 -0800 Date: Sun, 26 Jan 2020 17:04:58 +0800 From: Ye Xiaolong To: Qi Zhang Cc: yahui.cao@intel.com, beilei.xing@intel.com, chenmin.sun@intel.com, dev@dpdk.org, stable@dpdk.org Message-ID: <20200126090458.GA49698@intel.com> References: <20200121013048.8640-1-qi.z.zhang@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200121013048.8640-1-qi.z.zhang@intel.com> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [dpdk-dev] [PATCH v2] net/ice: fix fdir GTP-U pattern 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" On 01/21, Qi Zhang wrote: >Base on current fdir implementation for GTP-U, inner specification is >not supported, 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 >--- > >v2: >- rename ICE_FDIR_INSET_GTPU_IPV4 to ICE_FDIR_INSET_GTPU >- rename ICE_FDIR_INSET_GTPU_EH_IPV4 to ICE_FDIR_INSET_GTPU_EH > > drivers/net/ice/ice_fdir_filter.c | 9 ++++----- > drivers/net/ice/ice_generic_flow.c | 15 +++++++++++++++ > drivers/net/ice/ice_generic_flow.h | 2 ++ > 3 files changed, 21 insertions(+), 5 deletions(-) > >diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c >index 4c5ddfbdb..8a7212675 100644 >--- a/drivers/net/ice/ice_fdir_filter.c >+++ b/drivers/net/ice/ice_fdir_filter.c >@@ -67,10 +67,10 @@ > ICE_FDIR_INSET_VXLAN_IPV4 | \ > ICE_INSET_TUN_SCTP_SRC_PORT | ICE_INSET_TUN_SCTP_DST_PORT) > >-#define ICE_FDIR_INSET_GTPU_IPV4 (\ >+#define ICE_FDIR_INSET_GTPU (\ > ICE_INSET_GTPU_TEID) > >-#define ICE_FDIR_INSET_GTPU_EH_IPV4 (\ >+#define ICE_FDIR_INSET_GTPU_EH (\ > ICE_INSET_GTPU_TEID | ICE_INSET_GTPU_QFI) > > static struct ice_pattern_match_item ice_fdir_pattern_os[] = { >@@ -125,9 +125,8 @@ static struct ice_pattern_match_item ice_fdir_pattern_comms[] = { > 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, ICE_INSET_NONE}, >+ {pattern_eth_ipv4_gtpu_eh, ICE_FDIR_INSET_GTPU_EH, ICE_INSET_NONE}, > }; > > 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_ipv6_icmp6[] = { > }; > > /* GTPU */ >+enum rte_flow_item_type pattern_eth_ipv4_gtpu[] = { >+ 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[] = { > RTE_FLOW_ITEM_TYPE_ETH, > RTE_FLOW_ITEM_TYPE_IPV4, >@@ -1042,6 +1049,14 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[] = { > RTE_FLOW_ITEM_TYPE_IPV4, > RTE_FLOW_ITEM_TYPE_END, > }; >+enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh[] = { >+ 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[] = { > 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_generic_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_eth_ipv6_sctp[]; > extern enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_icmp6[]; > > /* 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 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[]; >-- >2.13.6 > Acked-by: Xiaolong Ye Applied to dpdk-next-net-intel, Thanks.