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 5F27DA0A0A for ; Tue, 23 Mar 2021 19:50:31 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4AF30140D0D; Tue, 23 Mar 2021 19:50:31 +0100 (CET) Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) by mails.dpdk.org (Postfix) with ESMTP id A67BD4014D for ; Tue, 23 Mar 2021 19:50:28 +0100 (CET) Received: by mail-qt1-f179.google.com with SMTP id y2so13292364qtw.13 for ; Tue, 23 Mar 2021 11:50:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=uwGXpBwzTkWrXFdFfbQQz6woAOZs9TcRyRGC58cqWbw=; b=LeWs0Y/Eg6K9RAgdiFMTCCjbIdURsA0pKv0U+3/lV8bnEUI3IQVNhL3Nu4G+5TGE8B Gw5mWDZjDrwxwUyAv/oMdKvA3sCOOfcRgaPYWX0e7NGZWArURhgklS9RyH+L6OdITq+k 6xC9GGvw/9KvBEBu8SemGaiIF4c0Zn7jo8zcg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=uwGXpBwzTkWrXFdFfbQQz6woAOZs9TcRyRGC58cqWbw=; b=fEJzjf8kkr800u4Dnm7BbXWuPmzK/0lj1OkNAh/Zs+1jldsOQwBQJGCgDHuhLP/5lK nXo3PD3BgFAuDmRyJ58a625BoiAOKMMdatpcjh9B29uLij59gEEqZt0RllPemFn/BM7X 1z75KWAse/2oSPWLrqaZLr7viDnvUXnHeL3I9OhshQNlo7sCFAjoNBWFvZ0BBrTBpoqK LcXMzaanQ0jjkxln6n9muy2ak60wFVnD/Bv816QJK3+q1CyGoU6zI/VSKKo5yE6CW4yV 1ffOz4qVe7qjn73brFdJ2Fy9exFcX7CbXw5RC4HAcdkCx5vOyp8W3vnzqKg6FKMKNHsY 42Sw== X-Gm-Message-State: AOAM533KYM6+8yFThwP/S8hhJbbWpljDqaN0n0+eXJkLi/zQ5UHa4GcY D4iIUbFxOyKppdky8PX2xXxUqUe4k2mHQgM8NgUiew== X-Google-Smtp-Source: ABdhPJzFtYY5zvJ/ggM8Cpan56Uk7F+eK0+poxVeYQO8tlCHlRxwYtOAR6CV7V5YWkWADQUxdd4XYsl13O3GYFgtnm4= X-Received: by 2002:ac8:71d2:: with SMTP id i18mr5658910qtp.371.1616525427836; Tue, 23 Mar 2021 11:50:27 -0700 (PDT) MIME-Version: 1.0 References: <20210310140107.2730088-1-thomas@monjalon.net> <20210310140107.2730088-3-thomas@monjalon.net> In-Reply-To: <20210310140107.2730088-3-thomas@monjalon.net> From: Ajit Khaparde Date: Tue, 23 Mar 2021 11:50:11 -0700 Message-ID: To: Thomas Monjalon Cc: dpdk-dev , dpdk stable , Matan Azrad , Shahaf Shuler , Viacheslav Ovsiienko , Raveendra Padasalagi , Vikas Gupta , Jeff Guo , Haiyue Wang , Adam Dybkowski , Jerin Jacob , Akhil Goyal , Sachin Saxena Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="000000000000ecf43405be38a726" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [dpdk-stable] [PATCH 2/3] drivers: fix log level after loading X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" --000000000000ecf43405be38a726 Content-Type: text/plain; charset="UTF-8" On Wed, Mar 10, 2021 at 6:01 AM Thomas Monjalon wrote: > > 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 ++--------- For bcmfs, Acked-by: Ajit Khaparde > 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 > --000000000000ecf43405be38a726--