From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CCB2AA0567; Wed, 10 Mar 2021 15:01:36 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4D00B22A487; Wed, 10 Mar 2021 15:01:18 +0100 (CET) Received: from new4-smtp.messagingengine.com (new4-smtp.messagingengine.com [66.111.4.230]) by mails.dpdk.org (Postfix) with ESMTP id 4205622A44E; Wed, 10 Mar 2021 15:01:17 +0100 (CET) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailnew.nyi.internal (Postfix) with ESMTP id 8959C580397; Wed, 10 Mar 2021 09:01:16 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Wed, 10 Mar 2021 09:01:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=fZhncdNwDe1zb L47Z3gAwvpvOjw8z9xu00UXnpGXxmw=; b=gER1gAfsMtl2bvCFzpUOHfJvxDQmo 5FxXnfMQbbx+R1ZtdmRYtSxbszH9H6Jk9KQKKNQv+TplCdMg4sAHcLPMgENX0CEA MFeYKooXPrm5aTLGvix5r2KgvklE3073iKb8p7pKaLrdXB/qU5qMJAEY5YLzh4Zn IVfT8vzmrxgrSdSUno4D1FkzWpOGTtVEiTqsyfA/iRFtg8P9Qz1q3oMNO94QAQ6/ oL9G2zxdx6pGFw10gBySPD9LZB0TWVASB60sUNOliPvrb6c0yZSHg4wedgVRRM/C nokEuUSITE+L6DmdcN+P2S2VOo99DPIyMMCg3lOWVKDYtlTI0H8y5w2sw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=fZhncdNwDe1zbL47Z3gAwvpvOjw8z9xu00UXnpGXxmw=; b=XcYPOALb 4k3OIXwkMkNIM6RBdB2tS4t1agqG39W7V71+Z9Fk8QEhyhVlnmLtr7uZrCpwxx9I QlYpltK1uGS7IZ880mAumyVxhegUSbGzFTwZbO7tWBefHaom73VCJolu9gE0VJ/C 9JBvj68iSeNd7CkRnwXYUWnWVF6uK62+t8KksZN+Ly+gGoCsFoYLAdiJffrIwuHb 06fSs/wJ5FaXCvzxEcsPoCqEyu9iD4Q+SYutokm0cTRHY9N+xBZb1J0NQxcYHF6L 9b8Fn777fek/us5TjYa4AlUm/h6RR4RmikvYeBqGHmUH+P3iG/RVhW1qjxdu3bwL 9D3gWnJxqheR2A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddukedgiedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg ftrfgrthhtvghrnhepheefieekleefieeljedtvdehgeejvdevfedufeetleejfeethfel gfffudektdeunecuffhomhgrihhnpehpmhgurdhnvghtnecukfhppeejjedrudefgedrvd dtfedrudekgeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhr ohhmpehthhhomhgrshesmhhonhhjrghlohhnrdhnvght X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 331571080066; Wed, 10 Mar 2021 09:01:14 -0500 (EST) From: Thomas Monjalon To: dev@dpdk.org Cc: stable@dpdk.org, Matan Azrad , Shahaf Shuler , Viacheslav Ovsiienko , Ajit Khaparde , Raveendra Padasalagi , Vikas Gupta , Jeff Guo , Haiyue Wang , Adam Dybkowski , Jerin Jacob , Akhil Goyal , Sachin Saxena Date: Wed, 10 Mar 2021 15:01:06 +0100 Message-Id: <20210310140107.2730088-3-thomas@monjalon.net> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210310140107.2730088-1-thomas@monjalon.net> References: <20210310140107.2730088-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 2/3] drivers: fix log level after loading X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" When compiled as a shared object, and loaded at runtime as a plugin, the drivers should get the log level set earlier at EAL init by the user through --log-level option. The function for applying the log level setting is rte_log_register_type_and_pick_level(). It is called by most drivers via RTE_LOG_REGISTER(). The drivers common/mlx5, bcmfs and e1000 were missing, so the user-specified log level was not applied when those drivers were loaded as plugins. The macro RTE_LOG_REGISTER() is used for those drivers. The unnecessary protection for double registration is removed from e1000. Fixes: 9c99878aa1b1 ("log: introduce logtype register macro") Fixes: c8e79da7c676 ("crypto/bcmfs: introduce BCMFS driver") Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon --- drivers/common/mlx5/mlx5_common.c | 9 +----- drivers/crypto/bcmfs/bcmfs_logs.c | 17 ++--------- drivers/net/e1000/e1000_logs.c | 49 ++++--------------------------- drivers/net/e1000/em_ethdev.c | 6 ---- drivers/net/e1000/igb_ethdev.c | 6 ---- 5 files changed, 8 insertions(+), 79 deletions(-) diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c index c26a2cfa30..f92f05bda5 100644 --- a/drivers/common/mlx5/mlx5_common.c +++ b/drivers/common/mlx5/mlx5_common.c @@ -14,8 +14,6 @@ #include "mlx5_common_utils.h" #include "mlx5_common_pci.h" -int mlx5_common_logtype; - uint8_t haswell_broadwell_cpu; /* In case this is an x86_64 intel processor to check if @@ -41,12 +39,7 @@ static inline void mlx5_cpu_id(unsigned int level, } #endif -RTE_INIT_PRIO(mlx5_log_init, LOG) -{ - mlx5_common_logtype = rte_log_register("pmd.common.mlx5"); - if (mlx5_common_logtype >= 0) - rte_log_set_level(mlx5_common_logtype, RTE_LOG_NOTICE); -} +RTE_LOG_REGISTER(mlx5_common_logtype, pmd.common.mlx5, NOTICE) static bool mlx5_common_initialized; diff --git a/drivers/crypto/bcmfs/bcmfs_logs.c b/drivers/crypto/bcmfs/bcmfs_logs.c index 86f4ff3b53..701da9ecf3 100644 --- a/drivers/crypto/bcmfs/bcmfs_logs.c +++ b/drivers/crypto/bcmfs/bcmfs_logs.c @@ -8,9 +8,6 @@ #include "bcmfs_logs.h" -int bcmfs_conf_logtype; -int bcmfs_dp_logtype; - int bcmfs_hexdump_log(uint32_t level, uint32_t logtype, const char *title, const void *buf, unsigned int len) @@ -24,15 +21,5 @@ bcmfs_hexdump_log(uint32_t level, uint32_t logtype, const char *title, return 0; } -RTE_INIT(bcmfs_device_init_log) -{ - /* Configuration and general logs */ - bcmfs_conf_logtype = rte_log_register("pmd.bcmfs_config"); - if (bcmfs_conf_logtype >= 0) - rte_log_set_level(bcmfs_conf_logtype, RTE_LOG_NOTICE); - - /* data-path logs */ - bcmfs_dp_logtype = rte_log_register("pmd.bcmfs_fp"); - if (bcmfs_dp_logtype >= 0) - rte_log_set_level(bcmfs_dp_logtype, RTE_LOG_NOTICE); -} +RTE_LOG_REGISTER(bcmfs_conf_logtype, pmd.bcmfs_config, NOTICE) +RTE_LOG_REGISTER(bcmfs_dp_logtype, pmd.bcmfs_fp, NOTICE) diff --git a/drivers/net/e1000/e1000_logs.c b/drivers/net/e1000/e1000_logs.c index 231f5c03ef..d9b8a4672f 100644 --- a/drivers/net/e1000/e1000_logs.c +++ b/drivers/net/e1000/e1000_logs.c @@ -4,53 +4,14 @@ #include "e1000_logs.h" -/* declared as extern in e1000_logs.h */ -int e1000_logtype_init; -int e1000_logtype_driver; - +RTE_LOG_REGISTER(e1000_logtype_init, pmd.net.e1000.init, NOTICE) +RTE_LOG_REGISTER(e1000_logtype_driver, pmd.net.e1000.driver, NOTICE) #ifdef RTE_LIBRTE_E1000_DEBUG_RX -int e1000_logtype_rx; +RTE_LOG_REGISTER(e1000_logtype_rx, pmd.net.e1000.rx, DEBUG) #endif #ifdef RTE_LIBRTE_E1000_DEBUG_TX -int e1000_logtype_tx; +RTE_LOG_REGISTER(e1000_logtype_tx, pmd.net.e1000.tx, DEBUG) #endif #ifdef RTE_LIBRTE_E1000_DEBUG_TX_FREE -int e1000_logtype_tx_free; +RTE_LOG_REGISTER(e1000_logtype_tx_free, pmd.net.e1000.tx_free, DEBUG) #endif - -/* 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) - return; - - e1000_logtype_init = rte_log_register("pmd.net.e1000.init"); - if (e1000_logtype_init >= 0) - rte_log_set_level(e1000_logtype_init, RTE_LOG_NOTICE); - e1000_logtype_driver = rte_log_register("pmd.net.e1000.driver"); - if (e1000_logtype_driver >= 0) - rte_log_set_level(e1000_logtype_driver, RTE_LOG_NOTICE); - -#ifdef RTE_LIBRTE_E1000_DEBUG_RX - e1000_logtype_rx = rte_log_register("pmd.net.e1000.rx"); - if (e1000_logtype_rx >= 0) - rte_log_set_level(e1000_logtype_rx, RTE_LOG_DEBUG); -#endif - -#ifdef RTE_LIBRTE_E1000_DEBUG_TX - e1000_logtype_tx = rte_log_register("pmd.net.e1000.tx"); - if (e1000_logtype_tx >= 0) - rte_log_set_level(e1000_logtype_tx, RTE_LOG_DEBUG); -#endif - -#ifdef RTE_LIBRTE_E1000_DEBUG_TX_FREE - e1000_logtype_tx_free = rte_log_register("pmd.net.e1000.tx_free"); - if (e1000_logtype_tx_free >= 0) - rte_log_set_level(e1000_logtype_tx_free, RTE_LOG_DEBUG); -#endif - - e1000_log_initialized = 1; -} diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c index 9b8c4a7de5..79a6d8f461 100644 --- a/drivers/net/e1000/em_ethdev.c +++ b/drivers/net/e1000/em_ethdev.c @@ -1846,9 +1846,3 @@ eth_em_set_mc_addr_list(struct rte_eth_dev *dev, 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"); - -/* see e1000_logs.c */ -RTE_INIT(igb_init_log) -{ - e1000_igb_init_log(); -} diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index 5323504e98..395dc3f5aa 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -5434,9 +5434,3 @@ 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) -{ - e1000_igb_init_log(); -} -- 2.30.1