From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by dpdk.org (Postfix) with ESMTP id DAB777D19 for ; Tue, 19 Dec 2017 07:38:47 +0100 (CET) Received: by mail-pf0-f195.google.com with SMTP id j28so10758467pfk.8 for ; Mon, 18 Dec 2017 22:38:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MOMQ8GqKGlOj2cSjWIVZ0Yy9WC3TDuXrBo+VctbZwP8=; b=g8NGoqfIgqDURTlymtYj41+j7ALdK/HPRd8tCrd4ezWqaivvsy2lkdHgowJ+RExsFQ yJY3ok/hNsIlRV2JVcK62plNCzgyAQp9niMdbsjUsRicFMCWU3wUtPP4NwAd2s3cBJGd R3NxKEI1/ff0cHQzR+SkVCtqpjIqPImf4QaQp76SzHaS/3FpMbvJZPahHgSu7h261nFU BVAh0M2fxDJ+Mks2mF+mOdV/I+2udxnknxBndOEwv+m0eDpxEhPRLrWF94f6puvbUbVP KggYXfLhLZAwECVA+guRyY7KEiiYbU3RvIzhir+kkAiG3DzgjfQZc3gTOUMQlEkfTst+ ckQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MOMQ8GqKGlOj2cSjWIVZ0Yy9WC3TDuXrBo+VctbZwP8=; b=kDcNSaBxYpBcPyMNyqAdbvBdO4+0wZ9bqMIHqetRKbPYuSX1qHwfvVWPoahmWQw1ZX 0cw8LdnvAZk/JcduMCCciKPrHxMN+7CEl9Xve+pGU1T6iRspjiusMo1y+mXJRL4cBMiO UNBykmrTcJpbi1C/Exjmg+KE9r3puEUu+fdSq5jPR03rTxZhquhzVACPKpBA31640uK7 N+m6aBIINal9wBbq7S57bFpsJnKNbTDmJinRKYBDw51L0awL2b4XeKm62ivuA9KQ7gl5 dvS/PONg7meN5ckyEJuBaHtbH6NhmIMi0dRvQIrhLQtkKoD0ATxSPKV2seuJbDeMpQIO TcGg== X-Gm-Message-State: AKGB3mJNQggZIBA594/YrOJoN5CyM+WRjT9NHnL0MKOQftLfkjtnw3ls eUoiI7kkDetcHOBRNr5ijVcPhuCBqFg= X-Google-Smtp-Source: ACJfBosMgnNv4TEGv+k4cgKzZy9OYJDvctOEg2rdtdVPKzCzTcvX0iw648tnJh4gNcUOlCbTHbn7NQ== X-Received: by 10.98.149.72 with SMTP id p69mr2260976pfd.76.1513665526649; Mon, 18 Dec 2017 22:38:46 -0800 (PST) Received: from xeon-e3.lan (204-195-18-133.wavecable.com. [204.195.18.133]) by smtp.gmail.com with ESMTPSA id d9sm31288842pfk.117.2017.12.18.22.38.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Dec 2017 22:38:45 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 18 Dec 2017 22:38:31 -0800 Message-Id: <20171219063840.18981-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171219063840.18981-1-stephen@networkplumber.org> References: <20171219063840.18981-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH 02/11] bnx2x: implement dynamic logging 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: Tue, 19 Dec 2017 06:38:48 -0000 Replace compile time option for init and driver log with dynamic value. Signed-off-by: Stephen Hemminger --- config/common_base | 2 -- doc/guides/nics/bnx2x.rst | 8 -------- drivers/net/bnx2x/bnx2x_ethdev.c | 15 +++++++++++++++ drivers/net/bnx2x/bnx2x_logs.h | 17 ++++++----------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/config/common_base b/config/common_base index f775ec96184c..82d1f9ac47ef 100644 --- a/config/common_base +++ b/config/common_base @@ -244,8 +244,6 @@ CONFIG_RTE_LIBRTE_MLX5_TX_MP_CACHE=8 # Compile burst-oriented Broadcom PMD driver # CONFIG_RTE_LIBRTE_BNX2X_PMD=n -CONFIG_RTE_LIBRTE_BNX2X_DEBUG=n -CONFIG_RTE_LIBRTE_BNX2X_DEBUG_INIT=n CONFIG_RTE_LIBRTE_BNX2X_DEBUG_RX=n CONFIG_RTE_LIBRTE_BNX2X_DEBUG_TX=n CONFIG_RTE_LIBRTE_BNX2X_MF_SUPPORT=n diff --git a/doc/guides/nics/bnx2x.rst b/doc/guides/nics/bnx2x.rst index fbfc048e04a0..b1fec8a365b0 100644 --- a/doc/guides/nics/bnx2x.rst +++ b/doc/guides/nics/bnx2x.rst @@ -102,14 +102,6 @@ enabling debugging options may affect system performance. to 'y'. Also, in order for firmware binary to load user will need zlib devel package installed. -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG`` (default **n**) - - Toggle display of generic debugging messages. - -- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_INIT`` (default **n**) - - Toggle display of initialization related messages. - - ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_TX`` (default **n**) Toggle display of transmit fast path run-time messages. diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c index 95861a06e565..483d5a17cd5d 100644 --- a/drivers/net/bnx2x/bnx2x_ethdev.c +++ b/drivers/net/bnx2x/bnx2x_ethdev.c @@ -14,6 +14,9 @@ #include #include +int bnx2x_logtype_init; +int bnx2x_logtype_driver; + /* * The set of PCI devices this driver supports */ @@ -687,3 +690,15 @@ RTE_PMD_REGISTER_KMOD_DEP(net_bnx2x, "* igb_uio | uio_pci_generic | vfio-pci"); RTE_PMD_REGISTER_PCI(net_bnx2xvf, rte_bnx2xvf_pmd); RTE_PMD_REGISTER_PCI_TABLE(net_bnx2xvf, pci_id_bnx2xvf_map); RTE_PMD_REGISTER_KMOD_DEP(net_bnx2xvf, "* igb_uio | vfio-pci"); + +RTE_INIT(bnx2x_init_log); +static void +bnx2x_init_log(void) +{ + bnx2x_logtype_init = rte_log_register("pmd.bnx2x.init"); + if (bnx2x_logtype_init >= 0) + rte_log_set_level(bnx2x_logtype_init, RTE_LOG_NOTICE); + bnx2x_logtype_driver = rte_log_register("pmd.bnx2x.driver"); + if (bnx2x_logtype_driver >= 0) + rte_log_set_level(bnx2x_logtype_driver, RTE_LOG_NOTICE); +} diff --git a/drivers/net/bnx2x/bnx2x_logs.h b/drivers/net/bnx2x/bnx2x_logs.h index dff014d7e122..08c1b764f028 100644 --- a/drivers/net/bnx2x/bnx2x_logs.h +++ b/drivers/net/bnx2x/bnx2x_logs.h @@ -11,14 +11,12 @@ #ifndef _PMD_LOGS_H_ #define _PMD_LOGS_H_ +extern int bnx2x_logtype_init; #define PMD_INIT_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ##args) + rte_log(RTE_LOG_ ## level, bnx2x_logtype_init, \ + "%s(): " fmt "\n", __func__, ##args) -#ifdef RTE_LIBRTE_BNX2X_DEBUG_INIT #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>") -#else -#define PMD_INIT_FUNC_TRACE() do { } while(0) -#endif #ifdef RTE_LIBRTE_BNX2X_DEBUG_RX #define PMD_RX_LOG(level, fmt, args...) \ @@ -41,12 +39,10 @@ #define PMD_TX_FREE_LOG(level, fmt, args...) do { } while(0) #endif -#ifdef RTE_LIBRTE_BNX2X_DEBUG +extern int bnx2x_logtype_driver; #define PMD_DRV_LOG_RAW(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt, __func__, ## args) -#else -#define PMD_DRV_LOG_RAW(level, fmt, args...) do { } while (0) -#endif + rte_log(RTE_LOG_ ## level, bnx2x_logtype_driver, \ + "%s(): " fmt, __func__, ## args) #define PMD_DRV_LOG(level, fmt, args...) \ PMD_DRV_LOG_RAW(level, fmt "\n", ## args) @@ -58,5 +54,4 @@ #define PMD_DEBUG_PERIODIC_LOG(level, fmt, args...) do { } while(0) #endif - #endif /* _PMD_LOGS_H_ */ -- 2.11.0