From patchwork Wed Mar 10 14:01:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 88884 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 2F3DAA0567; Wed, 10 Mar 2021 15:01:24 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E10BE22A387; Wed, 10 Mar 2021 15:01:15 +0100 (CET) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) by mails.dpdk.org (Postfix) with ESMTP id CD01222A347 for ; Wed, 10 Mar 2021 15:01:14 +0100 (CET) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id AF85D1977; Wed, 10 Mar 2021 09:01:13 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Wed, 10 Mar 2021 09:01:13 -0500 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=I6P8vmLGIb3gp S5nvUqPF3ysdqqa4S4YeWZmARqsV9k=; b=a7TUzfrQg320F3rvxySv+ThXuzhY0 nF3dCnP//c6ktj0CE4eV665BKqjh2WiZQgJXYQV+T/szeV+850bCaABo7/I5JG5A FMXtCkzdcfcrQ7vkgyKS+85dSLjujqn2D7g4JF/JTRUv/S+KstAno+uDBgWlNTGO nL+65cR+KXul0SczUURfl2JRjw3DSGaxXMjEJdYCJbERM03XuDp9gydjjKsyd5VX zKlCMmbCW+OhYlfIugIMoIvvMWqORmUlzWeIoGgnD/M8TR+izmYD6Sn1NfDbQbCn 9i7EBFZ0kdSlymFqJGblKDq5OvZZAJ9T+6LVVCjN61aYRY7NvCm5QUdaQ== 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=I6P8vmLGIb3gpS5nvUqPF3ysdqqa4S4YeWZmARqsV9k=; b=QhsY1eUj wuN7Qn8wXWYoiSC4xwHsIuLIRuasvNwJZNbfEzBMs+lWBqvO0S5Ls14h2Cgyjhmm Pm7EzvEi2GGqDsF16i674Tif6l0nk0/MXqWjaLDqMp/GxZuWSkozmuoi3DnBsEKg bM2ucLKVBSArikOL8zYTmG6H13njO5+JtpZZokN0urNSlTdESeI2PDBXpp3ekk6K CRO5pk+Tq2+hteTLyQGdXSM0EJlMjouiOubnUtmUurLbG1Li8z7026UK0KQRjym6 kmolXMYqfLHCmpMjyLPc4Jhdylmn5CAY6MATJThzCNj7WZHsXoKAFkmI3bG2SJXu +LDX5sOIDzZY3w== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddukedgheelucetufdoteggodetrfdotf 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 9FB1D1080063 for ; Wed, 10 Mar 2021 09:01:12 -0500 (EST) From: Thomas Monjalon To: dev@dpdk.org Date: Wed, 10 Mar 2021 15:01:05 +0100 Message-Id: <20210310140107.2730088-2-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 Subject: [dpdk-dev] [PATCH 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 --- lib/librte_eal/include/rte_log.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_eal/include/rte_log.h b/lib/librte_eal/include/rte_log.h index e6192892c3..178a265c3f 100644 --- a/lib/librte_eal/include/rte_log.h +++ b/lib/librte_eal/include/rte_log.h @@ -392,6 +392,7 @@ RTE_INIT(__##type) \ { \ type = rte_log_register_type_and_pick_level(RTE_STR(name), \ RTE_LOG_##level); \ + type = RTE_MAX(0, type); \ } #ifdef __cplusplus From patchwork Wed Mar 10 14:01:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 88885 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 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 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 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 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(); -} From patchwork Wed Mar 10 14:01:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 88886 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 074D4A0567; Wed, 10 Mar 2021 15:01:46 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 96F4C22A615; Wed, 10 Mar 2021 15:01:20 +0100 (CET) Received: from new4-smtp.messagingengine.com (new4-smtp.messagingengine.com [66.111.4.230]) by mails.dpdk.org (Postfix) with ESMTP id 1723822A464 for ; Wed, 10 Mar 2021 15:01:19 +0100 (CET) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.nyi.internal (Postfix) with ESMTP id BC43E580399; Wed, 10 Mar 2021 09:01:18 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Wed, 10 Mar 2021 09:01:18 -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=8xyx7WyNxtR80 dfs2FeqlK04wPCDY3hXHi6zqpuERDo=; b=PHf+RJKwfs/8LKDoTSsQvZdv0dUWY TdCF9AW4tzR4/g+juaBVMm8l0WovAyjQWakHutq1UQygotKd/Ozbtjui0WekTnuB +rTUXrBFZdcnVSZUKTROiz3NPkaRgZUidvoqXEavOuSHD/1nWXtbCXQnpYdNi8pz CxHqjJSIw0vpJC1mxKLqg89M9Pt37L4IPvGcy2S/TRfilEhUgUwg7zirh2JrZZT3 g0Jv7oD7p8jthbKQz6qBNepT2cRzwGoIwmxJnwLrnobERlXi/odwsqMpF9/30VLP G+yhqXK1ThpysBG7dkLNlfeeD4P3lNiHYaLfJeJmWjhNLofyStKhcTACQ== 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=8xyx7WyNxtR80dfs2FeqlK04wPCDY3hXHi6zqpuERDo=; b=W5lY138r 4y2aH59YGJRyFsKujvSh5RAuHF2DEmghZn3Y4rZzmjS8PLHHJiSQT2CC8uqbaImQ Ajmjcai4mRPLpzi9SjNMO/DPnqp3RlvrsseojlsLpC2K5t/LrbEe0+sA8HyDdXXG Y5wCh0A+0V3aw53a+sCxNHuv1Kc/9eUOKUNOvvHrf5MXfmHgvuD2zoOV+Qup7mpP oyvGJp0XmCyBvVcKv1qQwfeqGU+T5dMP+ekB52ETjRq0rM3SM7FqMvnl7iVT/HkD +Gsj/d4AgsPEUHo4HiXGJYtTAP2sR4RgwUvRodCEuKqrQsxzXSDvdnDnXIdzhKGC /1FWS6GmCErFVA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddukedgheelucetufdoteggodetrfdotf 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 EC4F11080063; Wed, 10 Mar 2021 09:01:16 -0500 (EST) From: Thomas Monjalon To: dev@dpdk.org Cc: John Griffin , Fiona Trahe , Deepak Kumar Jain , Ajit Khaparde , Raveendra Padasalagi , Vikas Gupta , Rosen Xu , Tianfei zhang , Bruce Richardson , Nipun Gupta , Hemant Agrawal , Xiao Wang Date: Wed, 10 Mar 2021 15:01:07 +0100 Message-Id: <20210310140107.2730088-4-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 Subject: [dpdk-dev] [PATCH 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 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 --- doc/guides/cryptodevs/qat.rst | 10 +++++----- drivers/common/qat/qat_logs.c | 4 ++-- drivers/crypto/bcmfs/bcmfs_logs.c | 4 ++-- 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 +- 7 files changed, 13 insertions(+), 13 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/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c index 27129b133e..56b1866f77 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 6a1b44bc77..bf7afe4610 100644 --- a/drivers/vdpa/ifc/ifcvf_vdpa.c +++ b/drivers/vdpa/ifc/ifcvf_vdpa.c @@ -25,7 +25,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)