From patchwork Mon Aug 28 13:26:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ferruh Yigit X-Patchwork-Id: 28034 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 13E3B2BEF; Mon, 28 Aug 2017 15:26:43 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id EFD7B11C5 for ; Mon, 28 Aug 2017 15:26:41 +0200 (CEST) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Aug 2017 06:26:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,441,1498546800"; d="scan'208";a="123251063" Received: from fyigit-mobl1.ger.corp.intel.com (HELO [10.237.220.57]) ([10.237.220.57]) by orsmga004.jf.intel.com with ESMTP; 28 Aug 2017 06:26:39 -0700 To: David Harton , konstantin.ananyev@intel.com Cc: dev@dpdk.org References: <20170825192104.37699-1-dharton@cisco.com> From: Ferruh Yigit Message-ID: Date: Mon, 28 Aug 2017 14:26:38 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <20170825192104.37699-1-dharton@cisco.com> Content-Language: en-US Subject: Re: [dpdk-dev] [PATCH] ixgbe: eliminate duplicate filterlist symbols 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 8/25/2017 8:21 PM, David Harton wrote: > Some compilers generate warnings for duplicate symbols for the > set of filter lists current defined in ixgbe_ethdev.h. > This commits moves the defintion and declaration to the source > file that actually uses them and provides a function to > initialize the values akin to its flush function. > > Signed-off-by: David Harton > --- > drivers/net/ixgbe/ixgbe_ethdev.c | 8 ++------ > drivers/net/ixgbe/ixgbe_ethdev.h | 7 +------ > drivers/net/ixgbe/ixgbe_flow.c | 18 ++++++++++++++++++ > 3 files changed, 21 insertions(+), 12 deletions(-) > > diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c > index 1ec5aaf..ed21af5 100644 > --- a/drivers/net/ixgbe/ixgbe_ethdev.c > +++ b/drivers/net/ixgbe/ixgbe_ethdev.c > @@ -1332,12 +1332,8 @@ struct rte_ixgbe_xstats_name_off { > /* initialize l2 tunnel filter list & hash */ > ixgbe_l2_tn_filter_init(eth_dev); > > - TAILQ_INIT(&filter_ntuple_list); > - TAILQ_INIT(&filter_ethertype_list); > - TAILQ_INIT(&filter_syn_list); > - TAILQ_INIT(&filter_fdir_list); > - TAILQ_INIT(&filter_l2_tunnel_list); > - TAILQ_INIT(&ixgbe_flow_list); > + /* initialize flow filter lists */ > + ixgbe_filterlist_init(); Will it work if list initialization converted to the static initialization? That would remove requirement of this function call. something like: diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c index c8645f056..6184eb4af 100644 --- a/drivers/net/ixgbe/ixgbe_flow.c +++ b/drivers/net/ixgbe/ixgbe_flow.c @@ -79,6 +79,24 @@ #define IXGBE_MAX_N_TUPLE_PRIO 7 #define IXGBE_MAX_FLX_SOURCE_OFF 62 +static TAILQ_HEAD(ixgbe_ntuple_filter_list, ixgbe_ntuple_filter_ele) + filter_ntuple_list = TAILQ_HEAD_INITIALIZER(filter_ntuple_list); + +static TAILQ_HEAD(ixgbe_ethertype_filter_list, ixgbe_ethertype_filter_ele) + filter_ethertype_list = TAILQ_HEAD_INITIALIZER(filter_ethertype_list); + +static TAILQ_HEAD(ixgbe_syn_filter_list, ixgbe_eth_syn_filter_ele) + filter_syn_list = TAILQ_HEAD_INITIALIZER(filter_syn_list); + +static TAILQ_HEAD(ixgbe_fdir_rule_filter_list, ixgbe_fdir_rule_ele) + filter_fdir_list = TAILQ_HEAD_INITIALIZER(filter_fdir_list); + +static TAILQ_HEAD(ixgbe_l2_tunnel_filter_list, ixgbe_eth_l2_tunnel_conf_ele) + filter_l2_tunnel_list = TAILQ_HEAD_INITIALIZER(filter_l2_tunnel_list); + +static TAILQ_HEAD(ixgbe_flow_mem_list, ixgbe_flow_mem) + ixgbe_flow_list = TAILQ_HEAD_INITIALIZER(ixgbe_flow_list); +