From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by dpdk.org (Postfix) with ESMTP id 15F161B020 for ; Tue, 19 Dec 2017 07:38:55 +0100 (CET) Received: by mail-pf0-f193.google.com with SMTP id n6so10769745pfa.4 for ; Mon, 18 Dec 2017 22:38:55 -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=WI2Nybjxc2t/ib/3YxgJoywu1hOjmxqajsQfUd+f5eg=; b=r/JuCIFF2UJuCJHaJMlK6nFBWzXFet5eAgrwSnzGVelCWFwLXRzmuNGom0iuyACtTa BOiSroNhOhANnFAHH7cxoo2q6FkPWrRrd6RgD6J+swIp51GYP63wsrT3NMzvozRebBQA 2+SsMnSiNJnGYqhOY7Eu+oOM7BauZhwCsdAJi5KHYvG81QUQco5kHky8FihJX6/nnyZc Y+G2GXZIPfF8zLXmZGkAT1scadJbA1DGHji3Q3/dod0FyjZc0lK9mkrjcVqm0oPr3Ea1 kZOeurWX93LjVJFhjyun23owQrgp/9UbSKj6B63/CvgNBRwP1TKq+RIavmssPOdJeASg 3nGA== 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=WI2Nybjxc2t/ib/3YxgJoywu1hOjmxqajsQfUd+f5eg=; b=pWBw1SRpDigppCMRXS73jAdUdZ8YYbWxJbRgFzS9Bo99TdxpAtpdiYYFoDB1OorxE3 4XqIOuXnNLazIUA53sriJyMLuct676uq+w4aodTJ9hD9x2IFMRZMLPkQZHTHc8LKX4Zm FqyO9JPD+TTdAA4vTVdlLDFnIJi95LIPZB2RmZ3BLjqyEhAREd13K/kJEemwFUXeJaaj c2HxFvMS0sCnSp/43SVpULC34GjHPzlQ32Os+VZqPIQ22xJb6nl4jotlpiSmqAeHLex1 yZykkARlFSbScougzE6SWO2npa2KFJFhlFdywydnmTjh90NrM8Bl51SoSKFoYuBq6/uH n6nA== X-Gm-Message-State: AKGB3mImmV8ro6HfwiSs8H+2jh5dkGDhXZwnxBochMFkr1N0oxbNvXlr B3CpJAOQSxYVAFJyoPvbwozzOAJqNmw= X-Google-Smtp-Source: ACJfBotjL2I7J3P/ethCRok2W7GLgb25jBetAOhNCd/nhE/Omfqf6C/BgtJBgVYqFYK/0QhbnWa3Kg== X-Received: by 10.99.134.195 with SMTP id x186mr2015399pgd.189.1513665533951; Mon, 18 Dec 2017 22:38:53 -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.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Dec 2017 22:38:53 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 18 Dec 2017 22:38:36 -0800 Message-Id: <20171219063840.18981-8-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 07/11] nfp: 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:55 -0000 Signed-off-by: Stephen Hemminger --- config/common_base | 3 ++- drivers/net/nfp/nfp_net.c | 14 ++++++++++++++ drivers/net/nfp/nfp_net_logs.h | 22 ++++++---------------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/config/common_base b/config/common_base index 3695fbe5de27..8d18b3c81db8 100644 --- a/config/common_base +++ b/config/common_base @@ -267,7 +267,8 @@ CONFIG_RTE_LIBRTE_ENIC_DEBUG_FLOW=n # Compile burst-oriented Netronome NFP PMD driver # CONFIG_RTE_LIBRTE_NFP_PMD=n -CONFIG_RTE_LIBRTE_NFP_DEBUG=n +CONFIG_RTE_LIBRTE_NFP_DEBUG_TX=n +CONFIG_RTE_LIBRTE_NFP_DEBUG_RX=n # # Compile Marvell PMD driver diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index 0501156bacb7..b9055e1030fa 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -2984,6 +2984,9 @@ static int nfp_pf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, return ret; } +int nfp_logtype_init; +int nfp_logtype_driver; + static const struct rte_pci_id pci_id_nfp_pf_net_map[] = { { RTE_PCI_DEVICE(PCI_VENDOR_ID_NETRONOME, @@ -3057,6 +3060,17 @@ RTE_PMD_REGISTER_PCI_TABLE(net_nfp_vf, pci_id_nfp_vf_net_map); RTE_PMD_REGISTER_KMOD_DEP(net_nfp_pf, "* igb_uio | uio_pci_generic | vfio"); RTE_PMD_REGISTER_KMOD_DEP(net_nfp_vf, "* igb_uio | uio_pci_generic | vfio"); +RTE_INIT(nfp_init_log); +static void +nfp_init_log(void) +{ + nfp_logtype_init = rte_log_register("pmd.nfp.init"); + if (nfp_logtype_init >= 0) + rte_log_set_level(nfp_logtype_init, RTE_LOG_NOTICE); + nfp_logtype_driver = rte_log_register("pmd.nfp.driver"); + if (nfp_logtype_driver >= 0) + rte_log_set_level(nfp_logtype_driver, RTE_LOG_NOTICE); +} /* * Local variables: * c-file-style: "Linux" diff --git a/drivers/net/nfp/nfp_net_logs.h b/drivers/net/nfp/nfp_net_logs.h index 0b966e431f7b..618aaca1d31e 100644 --- a/drivers/net/nfp/nfp_net_logs.h +++ b/drivers/net/nfp/nfp_net_logs.h @@ -36,14 +36,10 @@ #define RTE_LIBRTE_NFP_NET_DEBUG_INIT 1 -#ifdef RTE_LIBRTE_NFP_NET_DEBUG_INIT +extern int nfp_logtype_init; #define PMD_INIT_LOG(level, fmt, args...) \ RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>") -#else -#define PMD_INIT_LOG(level, fmt, args...) do { } while (0) -#define PMD_INIT_FUNC_TRACE() do { } while (0) -#endif #ifdef RTE_LIBRTE_NFP_NET_DEBUG_RX #define PMD_RX_LOG(level, fmt, args...) \ @@ -55,21 +51,15 @@ #ifdef RTE_LIBRTE_NFP_NET_DEBUG_TX #define PMD_TX_LOG(level, fmt, args...) \ RTE_LOG(level, PMD, "%s() tx: " fmt, __func__, ## args) +#define ASSERT(x) if (!(x)) rte_panic("NFP_NET: x") #else #define PMD_TX_LOG(level, fmt, args...) do { } while (0) +#define ASSERT(x) do { } while (0) #endif -#ifdef RTE_LIBRTE_NFP_NET_DEBUG_DRIVER +extern int nfp_logtype_driver; #define PMD_DRV_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt, __func__, ## args) -#else -#define PMD_DRV_LOG(level, fmt, args...) do { } while (0) -#endif - -#ifdef RTE_LIBRTE_NFP_NET_DEBUG_INIT -#define ASSERT(x) if (!(x)) rte_panic("NFP_NET: x") -#else -#define ASSERT(x) do { } while (0) -#endif + rte_log(RTE_LOG_ ## level, nfp_logtype_driver, \ + "%s(): " fmt, __func__, ## args) #endif /* _NFP_NET_LOGS_H_ */ -- 2.11.0