From patchwork Mon Apr 5 10:02:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 90554 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 56F0CA0A0A; Mon, 5 Apr 2021 12:03:13 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 475AA140E41; Mon, 5 Apr 2021 12:03:10 +0200 (CEST) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by mails.dpdk.org (Postfix) with ESMTP id 56263140E29 for ; Mon, 5 Apr 2021 12:03:08 +0200 (CEST) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id D66A55C003D; Mon, 5 Apr 2021 06:03:07 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Mon, 05 Apr 2021 06:03:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=bZfcGAjqoVUKa f4MSRSxyPXnE5egTetUolMBzyzAROc=; b=1uz3NQJw9uL9f3K87C7LuymO2Wygd PsUFwJ6Sfztrbb9cWkdw4EwANio9FnN7xLqyQACIQjv3phj/nThF1pmqbqT0ygG3 S2WQ2PU61ZjCz1FL14ONSO7DBFDTPaOoCi3cMRXmyEZbWJvW0FPCPw4cNtcctCve gTKBVZcD34NNs5KqitAiE65RQ4AYVH0Cn7UYNWfPwlzQiQMStQLjHEkoc+WCIUR1 U2ELsfLWkb6Iez8Iv+pcZrrHD142YuFN6dqdYJQPpghwNdoavcA635f3Dr2DgZgA jq5c5Ex8fchdKaheHXtKdwsJ0ifXPxR6ErsegGORdw3bkvphsXLHl26og== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=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=bZfcGAjqoVUKaf4MSRSxyPXnE5egTetUolMBzyzAROc=; b=FTpCU4fS Kf2h2BPPH4r+Xh/qGmXvK4cWEgNMH8McYWFnWaEmjNKnVXq0utmDnt//bMO9S83n 0Hht5CsZm4PzSGmOM1x2md6zl41+RufJLQFk0jJ5kXL6pPP4k3L9yzrFgQKGQPgZ lL/W/R76xZCYaryAX2Wa0q1hZi/FXmbrjLDrke9UDcdh9av+rfGH5y0aK3IHe7aM YQQ9T0Q085qkNZDrmQEnoIxa2aQH/V4DFSm0ek18oXEi8+Jj3wLGmHqR22aP6r89 /QqfM196epWVadu9ZL4RoaK5tIg/lgTv4sePhSj4F0uF2gVNaq2BED4IDjwud99C 8JCTxd7YghFlEQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudejvddgvdegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfhhohhmrghsucfoohhnjhgrlhhonhcuoehthhhomhgrshes mhhonhhjrghlohhnrdhnvghtqeenucggtffrrghtthgvrhhnpedvhefgiedvjeegtdevhe efhfetleefgfeivefgffevfeejgedtgfeutdehtdegveenucfkphepjeejrddufeegrddv tdefrddukeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepthhhohhmrghssehmohhnjhgrlhhonhdrnhgvth 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 457E6108005F for ; Mon, 5 Apr 2021 06:03:07 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Date: Mon, 5 Apr 2021 12:02:59 +0200 Message-Id: <20210405100301.657768-2-thomas@monjalon.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405100301.657768-1-thomas@monjalon.net> References: <20210310140107.2730088-1-thomas@monjalon.net> <20210405100301.657768-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 1/3] log: choose EAL log type on registration failure 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" In the unlikely case where something goes wrong while registering a log type, the fallback is to use the log type 0, assigned to EAL. Signed-off-by: Thomas Monjalon Reviewed-by: David Marchand --- lib/librte_eal/include/rte_log.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/librte_eal/include/rte_log.h b/lib/librte_eal/include/rte_log.h index 173004fd71..21a7d16340 100644 --- a/lib/librte_eal/include/rte_log.h +++ b/lib/librte_eal/include/rte_log.h @@ -380,6 +380,8 @@ RTE_INIT(__##type) \ { \ type = rte_log_register_type_and_pick_level(RTE_STR(name), \ RTE_LOG_##level); \ + if (type < 0) \ + type = RTE_LOGTYPE_EAL; \ } #ifdef __cplusplus From patchwork Mon Apr 5 10:03:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 90555 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4093DA0A0A; Mon, 5 Apr 2021 12:03:19 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8360D140E6B; Mon, 5 Apr 2021 12:03:13 +0200 (CEST) Received: from new3-smtp.messagingengine.com (new3-smtp.messagingengine.com [66.111.4.229]) by mails.dpdk.org (Postfix) with ESMTP id 9B4C6140E54; Mon, 5 Apr 2021 12:03:11 +0200 (CEST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailnew.nyi.internal (Postfix) with ESMTP id 3A8C8580396; Mon, 5 Apr 2021 06:03:11 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Mon, 05 Apr 2021 06:03:11 -0400 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=E+MasGM+l69cq netBOINvYGsFQSb9MGU+SfmBBRDU5A=; b=2hs+lRd3KAVVOyluRWMlucvn6Rywc CWRw6oERIIk6CdlesgywCSmEkNuFnvAjCMZH5zrB7pUz8UJVHnTFHY393E89uksC nx2YN18rFgtg0iPi8xsMovP8p17tLdQJIhw61o1gjR0sGubJ9mj+4lCYg9bdgDNH 2+9JOZ/W60sjbRVm2kBR0nuJkTwGtoUFJkMn+vcS3So3Qe03XA4ue2FjzH2Mrlid R54WHeAZqJQ/NKSepv/33/pEc8L+tt/PS5GkTy7Ggjoy8hICR531ELqKa/jCE8xh mz7A1bz9g7aX3epyeuexPSW3bb+4I1DsuA2XEtH3SWdz1j27ZomQM2qow== 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=E+MasGM+l69cqnetBOINvYGsFQSb9MGU+SfmBBRDU5A=; b=RHWE76uF uUeiyX985gwnuuwEz4NEngdW4C8YpCt3+Y2uwLMdjZCFbFefW7D4ZPBQOKwODJKk P/Lk9hPcS5B7XaHF/7+Zyzh6AL9S/Eistrdzu/L1wcRbMG9t74/b/4iFZX+UKzmB h1vW5o5tUqCtjWhgjkgWY5VbkkC8BIc+D4QWjr3rvh1eJvwpXxzpCmA/7ELPjuQa TFpubIT0S5hozkFVzmImfd+G7t5d97KWW0GyJXWt6w/iJJMSavhhqMclADvrw/X8 j8E+B/+CXhOO8ouvYRq5/3jVCHkJkal70PgEu+edcpGnFzvWoY2K3+QKw0K1lFi8 /LQESTCa08GTbw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudejvddgvdegucetufdoteggodetrfdotf 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 D3E60108005C; Mon, 5 Apr 2021 06:03:08 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: stable@dpdk.org, David Marchand , Ajit Khaparde , Matan Azrad , Shahaf Shuler , Viacheslav Ovsiienko , Raveendra Padasalagi , Vikas Gupta , Jeff Guo , Haiyue Wang , Jerin Jacob , Adam Dybkowski , Sachin Saxena , Akhil Goyal Date: Mon, 5 Apr 2021 12:03:00 +0200 Message-Id: <20210405100301.657768-3-thomas@monjalon.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405100301.657768-1-thomas@monjalon.net> References: <20210310140107.2730088-1-thomas@monjalon.net> <20210405100301.657768-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 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 Reviewed-by: David Marchand Acked-by: Ajit Khaparde --- 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 3c6f643c19..3e7ccdbf09 100644 --- a/drivers/net/e1000/em_ethdev.c +++ b/drivers/net/e1000/em_ethdev.c @@ -1850,9 +1850,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 17ee6e91a0..a1a72339ba 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -5421,9 +5421,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(); -} From patchwork Mon Apr 5 10:03:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 90556 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D4A99A0A0A; Mon, 5 Apr 2021 12:03:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0C0B8140E93; Mon, 5 Apr 2021 12:03:15 +0200 (CEST) Received: from new3-smtp.messagingengine.com (new3-smtp.messagingengine.com [66.111.4.229]) by mails.dpdk.org (Postfix) with ESMTP id ECF4D140E80 for ; Mon, 5 Apr 2021 12:03:13 +0200 (CEST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailnew.nyi.internal (Postfix) with ESMTP id 9269D58039B; Mon, 5 Apr 2021 06:03:13 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Mon, 05 Apr 2021 06:03:13 -0400 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=mz5qiDBLyHQJG dmyDzjv8BP6s72Ef5xTHwJSKO1f07M=; b=FJMntpkLbqzJwPoF3JwGucZHsPPQY xFWVX1YnIt/rXCnC6dPLU41CbbK1PfYFata1knpcFFXMb3/r4N1aIIjj40rT3OM7 ps3zJXiJZ1Vhs6hYmvKbhMV77xlyWBYEJQmOaG0qm4OxJfQk3G2cyf3k4StIlI/M z/Lb4YFUNnH8URuyE1fXzgXdC1Yv+OVhxGzBUi9Sp+paTssVatMxpsvSpMunrEHf VlVmA/c3Ct1DCHu2KTrh67Qk/oOpKbCisMtRtqd5jeSDDkQBJUqpgjdnE67MUKsY SkrBZA7SXNHsJDgTg1EAmw5+Br4BhGvVi1BXPb85gP1S0rLyeJ3z/fy3Q== 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=mz5qiDBLyHQJGdmyDzjv8BP6s72Ef5xTHwJSKO1f07M=; b=KKz8mD6d DPujeMLPu/AoYMuC2F9SWPfgopJOk+qZ2znDaz2HjEDPs0Bva9PmRy9koSxoewBl KQPgjHCd9n9J6XYrp4kmrNbmT2qWux8RPKZSYHUwdzg4bEzOhVgyuRRLPUsvuXgJ TFCw8I5mvFBaKRQlOQw/Rd3GCV86X/aNsT3cFk/TPXWvsWp7Ek5W40L6/UBjR8g8 phNL0duieCJEF7oPaxTlPkK44n+SL+TFcpisyzlfP8BwjsFUxIEJphDIeZtPERrw iujFfy+ywn5TqtPqFyVcwNTabr40PVPgO5ejHIraJSf7tgtsFAONgKNRQGuahooF ZzJ/ZWmDsMs2Dw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudejvddgvdegucetufdoteggodetrfdotf 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 514E71080064; Mon, 5 Apr 2021 06:03:11 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: Bruce Richardson , Rosen Xu , Xiao Wang , Hemant Agrawal , Ajit Khaparde , John Griffin , Fiona Trahe , Deepak Kumar Jain , Raveendra Padasalagi , Vikas Gupta , "John W. Linville" , Chas Williams , "Min Hu (Connor)" , Tianfei zhang , Nipun Gupta Date: Mon, 5 Apr 2021 12:03:01 +0200 Message-Id: <20210405100301.657768-4-thomas@monjalon.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405100301.657768-1-thomas@monjalon.net> References: <20210310140107.2730088-1-thomas@monjalon.net> <20210405100301.657768-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 3/3] drivers: align log names 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" The log levels are configured by using the name of the logs. Some drivers are aligned to follow a common log name standard: pmd.class.driver[.sub] Some "common" drivers skip the "class" part: pmd.driver.sub Two drivers have exceptions to be clarified: pmd.vdpa.ifcvf instead of pmd.vdpa.ifc pmd.afu.ipn3ke instead of pmd.net.ipn3ke Signed-off-by: Thomas Monjalon Acked-by: Bruce Richardson Acked-by: Rosen Xu Acked-by: Xiao Wang Acked-by: Hemant Agrawal Acked-by: Ajit Khaparde Acked-by: Xiao Wang Acked-by: Rosen Xu Acked-by: Min Hu (Connor) --- doc/guides/cryptodevs/qat.rst | 10 +++++----- drivers/common/qat/qat_logs.c | 4 ++-- drivers/crypto/bcmfs/bcmfs_logs.c | 4 ++-- drivers/net/af_packet/rte_eth_af_packet.c | 2 +- drivers/net/bonding/rte_eth_bond_pmd.c | 2 +- drivers/raw/ifpga/ifpga_rawdev.c | 2 +- drivers/raw/ioat/ioat_rawdev.c | 2 +- drivers/raw/skeleton/skeleton_rawdev.c | 2 +- drivers/vdpa/ifc/ifcvf_vdpa.c | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst index cf16f03503..224b22b3f7 100644 --- a/doc/guides/cryptodevs/qat.rst +++ b/doc/guides/cryptodevs/qat.rst @@ -659,15 +659,15 @@ Debugging There are 2 sets of trace available via the dynamic logging feature: -* pmd.qat_dp exposes trace on the data-path. -* pmd.qat_general exposes all other trace. +* pmd.qat.dp exposes trace on the data-path. +* pmd.qat.general exposes all other trace. pmd.qat exposes both sets of traces. They can be enabled using the log-level option (where 8=maximum log level) on the process cmdline, e.g. using any of the following:: - --log-level="pmd.qat_general,8" - --log-level="pmd.qat_dp,8" + --log-level="pmd.qat.general,8" + --log-level="pmd.qat.dp,8" --log-level="pmd.qat,8" .. Note:: @@ -678,4 +678,4 @@ the process cmdline, e.g. using any of the following:: Also the dynamic global log level overrides both sets of trace, so e.g. no QAT trace would display in this case:: - --log-level="7" --log-level="pmd.qat_general,8" + --log-level="7" --log-level="pmd.qat.general,8" diff --git a/drivers/common/qat/qat_logs.c b/drivers/common/qat/qat_logs.c index fa48be53c3..adbe163cd9 100644 --- a/drivers/common/qat/qat_logs.c +++ b/drivers/common/qat/qat_logs.c @@ -17,5 +17,5 @@ qat_hexdump_log(uint32_t level, uint32_t logtype, const char *title, return 0; } -RTE_LOG_REGISTER(qat_gen_logtype, pmd.qat_general, NOTICE); -RTE_LOG_REGISTER(qat_dp_logtype, pmd.qat_dp, NOTICE); +RTE_LOG_REGISTER(qat_gen_logtype, pmd.qat.general, NOTICE); +RTE_LOG_REGISTER(qat_dp_logtype, pmd.qat.dp, NOTICE); diff --git a/drivers/crypto/bcmfs/bcmfs_logs.c b/drivers/crypto/bcmfs/bcmfs_logs.c index 701da9ecf3..9faf12f238 100644 --- a/drivers/crypto/bcmfs/bcmfs_logs.c +++ b/drivers/crypto/bcmfs/bcmfs_logs.c @@ -21,5 +21,5 @@ bcmfs_hexdump_log(uint32_t level, uint32_t logtype, const char *title, return 0; } -RTE_LOG_REGISTER(bcmfs_conf_logtype, pmd.bcmfs_config, NOTICE) -RTE_LOG_REGISTER(bcmfs_dp_logtype, pmd.bcmfs_fp, NOTICE) +RTE_LOG_REGISTER(bcmfs_conf_logtype, pmd.crypto.bcmfs.config, NOTICE) +RTE_LOG_REGISTER(bcmfs_dp_logtype, pmd.crypto.bcmfs.fp, NOTICE) diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c index bfe5a0a451..a04f7c773a 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -97,7 +97,7 @@ static struct rte_eth_link pmd_link = { .link_autoneg = ETH_LINK_FIXED, }; -RTE_LOG_REGISTER(af_packet_logtype, pmd.net.packet, NOTICE); +RTE_LOG_REGISTER(af_packet_logtype, pmd.net.af_packet, NOTICE); #define PMD_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, af_packet_logtype, \ diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 24e3cf3c2e..2e9cea5b8e 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -3775,4 +3775,4 @@ RTE_PMD_REGISTER_PARAM_STRING(net_bonding, "up_delay= " "down_delay="); -RTE_LOG_REGISTER(bond_logtype, pmd.net.bond, NOTICE); +RTE_LOG_REGISTER(bond_logtype, pmd.net.bonding, NOTICE); diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c index 05d79bfcc2..d9a46ef915 100644 --- a/drivers/raw/ifpga/ifpga_rawdev.c +++ b/drivers/raw/ifpga/ifpga_rawdev.c @@ -1611,7 +1611,7 @@ static struct rte_pci_driver rte_ifpga_rawdev_pmd = { RTE_PMD_REGISTER_PCI(ifpga_rawdev_pci_driver, rte_ifpga_rawdev_pmd); RTE_PMD_REGISTER_PCI_TABLE(ifpga_rawdev_pci_driver, rte_ifpga_rawdev_pmd); RTE_PMD_REGISTER_KMOD_DEP(ifpga_rawdev_pci_driver, "* igb_uio | uio_pci_generic | vfio-pci"); -RTE_LOG_REGISTER(ifpga_rawdev_logtype, driver.raw.init, NOTICE); +RTE_LOG_REGISTER(ifpga_rawdev_logtype, pmd.raw.ifpga, NOTICE); static const char * const valid_args[] = { #define IFPGA_ARG_NAME "ifpga" diff --git a/drivers/raw/ioat/ioat_rawdev.c b/drivers/raw/ioat/ioat_rawdev.c index a95854d5ac..15af07017c 100644 --- a/drivers/raw/ioat/ioat_rawdev.c +++ b/drivers/raw/ioat/ioat_rawdev.c @@ -28,7 +28,7 @@ static struct rte_pci_driver ioat_pmd_drv; #define IOAT_DEVICE_ID_BDXF 0x6f2F #define IOAT_DEVICE_ID_ICX 0x0b00 -RTE_LOG_REGISTER(ioat_pmd_logtype, rawdev.ioat, INFO); +RTE_LOG_REGISTER(ioat_pmd_logtype, pmd.raw.ioat, INFO); #define DESC_SZ sizeof(struct rte_ioat_generic_hw_desc) #define COMPLETION_SZ sizeof(__m128i) diff --git a/drivers/raw/skeleton/skeleton_rawdev.c b/drivers/raw/skeleton/skeleton_rawdev.c index aa3beaad18..8896f0c9c5 100644 --- a/drivers/raw/skeleton/skeleton_rawdev.c +++ b/drivers/raw/skeleton/skeleton_rawdev.c @@ -768,4 +768,4 @@ static struct rte_vdev_driver skeleton_pmd_drv = { }; RTE_PMD_REGISTER_VDEV(SKELETON_PMD_RAWDEV_NAME, skeleton_pmd_drv); -RTE_LOG_REGISTER(skeleton_pmd_logtype, rawdev.skeleton, INFO); +RTE_LOG_REGISTER(skeleton_pmd_logtype, pmd.raw.skeleton, INFO); diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c index 39237aecf7..7a06f97429 100644 --- a/drivers/vdpa/ifc/ifcvf_vdpa.c +++ b/drivers/vdpa/ifc/ifcvf_vdpa.c @@ -26,7 +26,7 @@ #include "base/ifcvf.h" -RTE_LOG_REGISTER(ifcvf_vdpa_logtype, pmd.net.ifcvf_vdpa, NOTICE); +RTE_LOG_REGISTER(ifcvf_vdpa_logtype, pmd.vdpa.ifcvf, NOTICE); #define DRV_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, ifcvf_vdpa_logtype, \ "IFCVF %s(): " fmt "\n", __func__, ##args)