From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id E0E3DAAEB for ; Mon, 21 May 2018 12:10:18 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2018 03:10:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,426,1520924400"; d="scan'208";a="57653611" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga001.jf.intel.com with ESMTP; 21 May 2018 03:10:16 -0700 Received: from fmsmsx123.amr.corp.intel.com (10.18.125.38) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 21 May 2018 03:10:16 -0700 Received: from bgsmsx154.gar.corp.intel.com (10.224.48.47) by fmsmsx123.amr.corp.intel.com (10.18.125.38) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 21 May 2018 03:10:15 -0700 Received: from bgsmsx101.gar.corp.intel.com ([169.254.1.244]) by BGSMSX154.gar.corp.intel.com ([169.254.7.86]) with mapi id 14.03.0319.002; Mon, 21 May 2018 15:40:12 +0530 From: "Varghese, Vipin" To: "Van Haaren, Harry" , "dev@dpdk.org" CC: "Lu, Wenzhuo" , "Zhang, Helin" Thread-Topic: [PATCH] net/e1000 igb: fix compile issue with log register Thread-Index: AQHT8OaX8wmXVGjwTU+sc7Qe7e99b6Q59ebg Date: Mon, 21 May 2018 10:10:11 +0000 Message-ID: <4C9E0AB70F954A408CC4ADDBF0F8FA7D4D1F7BA4@BGSMSX101.gar.corp.intel.com> References: <1526895101-146792-1-git-send-email-harry.van.haaren@intel.com> In-Reply-To: <1526895101-146792-1-git-send-email-harry.van.haaren@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOTQ2M2Q2YTEtNmRhYS00YjM0LThkMWItM2JkMWYwZjdiMWMzIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiRHU4ZUhzaVVGUm5DdkFjTlBIMVJlb2xIYkw2QnFhN1k5b2doakhaNVB4MEI5amtXZGR1ZHdMM3ZiSGF3ZkcrNiJ9 dlp-product: dlpe-windows dlp-version: 11.0.200.100 dlp-reaction: no-action x-originating-ip: [10.223.10.10] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH] net/e1000 igb: fix compile issue with log register 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: , X-List-Received-Date: Mon, 21 May 2018 10:10:19 -0000 Acked-by: Vipin Varghese > -----Original Message----- > From: Van Haaren, Harry > Sent: Monday, May 21, 2018 3:02 PM > To: dev@dpdk.org > Cc: Van Haaren, Harry ; Varghese, Vipin > ; Lu, Wenzhuo ; Zhang, > Helin > Subject: [PATCH] net/e1000 igb: fix compile issue with log register >=20 > This commit fixes a compilation error if EM_PMD is not defined, bug IGB_P= MD > is. The root cause of the issue was that log init variables are declared = as extern > in a header file, while the definition of the variables was in e1000_ethd= ev.c. > Hence, the definitions were not available if the e1000 PMD is disabled. >=20 > To fix this, a new file is added e1000_logs.c, which matches the e1000_lo= gs.h > header. The log variables are always compiled in, but the PMD logs are on= ly > registered if a PMD is enabled in the configuration. Extra checks are add= ed in > order to avoid duplicate registering. >=20 > Fixes: ed5bbb767c3e ("net/e1000: implement dynamic logging") >=20 > Reported-by: Vipin Varghese > Signed-off-by: Harry van Haaren >=20 > --- >=20 > Cc: vipin.varghese@intel.com > Cc: wenzhuo.lu@intel.com > Cc: helin.zhang@intel.com > --- > drivers/net/e1000/Makefile | 1 + > drivers/net/e1000/e1000_logs.c | 26 ++++++++++++++++++++++++++ > drivers/net/e1000/e1000_logs.h | 6 ++++++ drivers/net/e1000/em_ethdev.c= | > 16 ++++------------ drivers/net/e1000/igb_ethdev.c | 8 ++++++++ > drivers/net/e1000/meson.build | 1 + > 6 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 > drivers/net/e1000/e1000_logs.c >=20 > diff --git a/drivers/net/e1000/Makefile b/drivers/net/e1000/Makefile inde= x > 87cfb26..9c87e88 100644 > --- a/drivers/net/e1000/Makefile > +++ b/drivers/net/e1000/Makefile > @@ -62,6 +62,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) +=3D > e1000_82575.c > SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) +=3D e1000_i210.c > SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) +=3D e1000_api.c > SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) +=3D e1000_ich8lan.c > +SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) +=3D e1000_logs.c > SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) +=3D e1000_mac.c > SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) +=3D e1000_manage.c > SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) +=3D e1000_mbx.c diff --git > a/drivers/net/e1000/e1000_logs.c b/drivers/net/e1000/e1000_logs.c new fil= e > mode 100644 index 0000000..2217393 > --- /dev/null > +++ b/drivers/net/e1000/e1000_logs.c > @@ -0,0 +1,26 @@ > +/* SPDX-License-Identifier: BSD-3-Clause > + * Copyright(c) 2018 Intel Corporation > + */ > + > +#include "e1000_logs.h" > + > +/* declared as extern in e1000_logs.h */ int e1000_logtype_init; int > +e1000_logtype_driver; > + > +/* avoids double registering of logs if EM and IGB drivers are in use > +*/ static int e1000_log_initialized; > + > +void > +e1000_igb_init_log(void) > +{ > + if (!e1000_log_initialized) { > + e1000_logtype_init =3D rte_log_register("pmd.net.e1000.init"); > + if (e1000_logtype_init >=3D 0) > + rte_log_set_level(e1000_logtype_init, > RTE_LOG_NOTICE); > + e1000_logtype_driver =3D > rte_log_register("pmd.net.e1000.driver"); > + if (e1000_logtype_driver >=3D 0) > + rte_log_set_level(e1000_logtype_driver, > RTE_LOG_NOTICE); > + e1000_log_initialized =3D 1; > + } > +} > diff --git a/drivers/net/e1000/e1000_logs.h b/drivers/net/e1000/e1000_log= s.h > index 50348e9..69d3d31 100644 > --- a/drivers/net/e1000/e1000_logs.h > +++ b/drivers/net/e1000/e1000_logs.h > @@ -5,6 +5,8 @@ > #ifndef _E1000_LOGS_H_ > #define _E1000_LOGS_H_ >=20 > +#include > + > extern int e1000_logtype_init; > #define PMD_INIT_LOG(level, fmt, args...) \ > rte_log(RTE_LOG_ ## level, e1000_logtype_init, \ @@ -41,4 +43,8 @@ > extern int e1000_logtype_driver; #define PMD_DRV_LOG(level, fmt, args...= ) \ > PMD_DRV_LOG_RAW(level, fmt "\n", ## args) >=20 > + > +/* log init function shared by e1000 and igb drivers */ void > +e1000_igb_init_log(void); > + > #endif /* _E1000_LOGS_H_ */ > diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.= c > index 4e890ad..7039dc1 100644 > --- a/drivers/net/e1000/em_ethdev.c > +++ b/drivers/net/e1000/em_ethdev.c > @@ -11,7 +11,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -106,9 +105,6 @@ static int eth_em_set_mc_addr_list(struct rte_eth_dev > *dev, >=20 > static enum e1000_fc_mode em_fc_setting =3D e1000_fc_full; >=20 > -int e1000_logtype_init; > -int e1000_logtype_driver; > - > /* > * The set of PCI devices this driver supports > */ > @@ -1826,14 +1822,10 @@ RTE_PMD_REGISTER_PCI(net_e1000_em, > rte_em_pmd); RTE_PMD_REGISTER_PCI_TABLE(net_e1000_em, > pci_id_em_map); RTE_PMD_REGISTER_KMOD_DEP(net_e1000_em, "* igb_uio > | uio_pci_generic | vfio-pci"); >=20 > -RTE_INIT(e1000_init_log); > +/* see e1000_logs.c */ > +RTE_INIT(igb_init_log); > static void > -e1000_init_log(void) > +igb_init_log(void) > { > - e1000_logtype_init =3D rte_log_register("pmd.net.e1000.init"); > - if (e1000_logtype_init >=3D 0) > - rte_log_set_level(e1000_logtype_init, RTE_LOG_NOTICE); > - e1000_logtype_driver =3D rte_log_register("pmd.net.e1000.driver"); > - if (e1000_logtype_driver >=3D 0) > - rte_log_set_level(e1000_logtype_driver, RTE_LOG_NOTICE); > + e1000_igb_init_log(); > } > diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethde= v.c > index 04d34bd..edc7be3 100644 > --- a/drivers/net/e1000/igb_ethdev.c > +++ b/drivers/net/e1000/igb_ethdev.c > @@ -5681,3 +5681,11 @@ RTE_PMD_REGISTER_KMOD_DEP(net_e1000_igb, > "* igb_uio | uio_pci_generic | vfio-pci > RTE_PMD_REGISTER_PCI(net_e1000_igb_vf, rte_igbvf_pmd); > RTE_PMD_REGISTER_PCI_TABLE(net_e1000_igb_vf, pci_id_igbvf_map); > RTE_PMD_REGISTER_KMOD_DEP(net_e1000_igb_vf, "* igb_uio | vfio-pci"); > + > +/* see e1000_logs.c */ > +RTE_INIT(e1000_init_log); > +static void > +e1000_init_log(void) > +{ > + e1000_igb_init_log(); > +} > diff --git a/drivers/net/e1000/meson.build b/drivers/net/e1000/meson.buil= d > index 3a1bf5a..cf45699 100644 > --- a/drivers/net/e1000/meson.build > +++ b/drivers/net/e1000/meson.build > @@ -5,6 +5,7 @@ subdir('base') > objs =3D [base_objs] >=20 > sources =3D files( > + 'e1000_logs.c', > 'em_ethdev.c', > 'em_rxtx.c', > 'igb_ethdev.c', > -- > 2.7.4