From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl0-f67.google.com (mail-pl0-f67.google.com [209.85.160.67]) by dpdk.org (Postfix) with ESMTP id 1433E1B017 for ; Tue, 19 Dec 2017 07:38:50 +0100 (CET) Received: by mail-pl0-f67.google.com with SMTP id s3so6412921plp.4 for ; Mon, 18 Dec 2017 22:38:50 -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=3da9E/0MKMGEomFOpmXgZl8DrNFYr/jaxYX2dh5aPug=; b=mOvDfyaKzOUiD7F3iWvdzX2nZaCWaglWr+jdxse0aY61ZSR0SkPisuagXCAU5cMoGj kQ1PuZD+MmbXxpTsIN5a2nFlxFUgRHQ5a1A91GCKOBI1axHgb54pZFQOAuqy7rkeotDJ ODKOGe/GtHpFgsz4AIiXB/dyILozxCfJ84yL5IokGOCKo8xj+smtBMAGFYo0e9yFLdee uuFjUBj0dK82Jscved3QanG5MywcJzRh+qI4eMZvTc1tLeMBcXT/1x543qEqj3xRL5hJ OtIoUFNCgphTGkx38Yd8WbUVgGfyHsjAOfxJ27en7LIgOHkY0eEXwgrnCfqfkBgkuxO8 nibw== 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=3da9E/0MKMGEomFOpmXgZl8DrNFYr/jaxYX2dh5aPug=; b=ELW+RWe/wozShTvtNcjvThzSM46D5ralQyyE2l5mIOCdlUZasdCtYvDnt2oOh/V7/D B6TFCs4gIK3S1EsG9x2vpzrrW+ESg+cqnZHpQ6T2tZ+Kuv+wEF+hMSxBfbcxBbHxXXGg 21HHTKTHOsWt8mrGl5poj/0OJHxN9YJEOetAXiONKG5FSqTVT8BMHf8eGUjSjt8QL65w 0b0IMF1lcHbRwxDhh/b8xnn7rw6m6pIOU2UJ3rnaVrED97cAt1iRoLp44Z2Ibto3Nna7 CZ+fOkkCkSir5PN7lDwRW9eddiw8iouiVEvKhc3521cPsf0i5pdCr573VS4gz8TbZdIZ X3OQ== X-Gm-Message-State: AKGB3mIn/QEa05bI/D9SR3hsdZEJY2QwkNr/sdDJcq9mkCbwRy+FGkx9 Foz3Cl7EL9bwag1FDw0fwrWvWSXJYjI= X-Google-Smtp-Source: ACJfBosSqu4mGS8wc5DNIfPh4jxckUwji3Sg0AVdthpdrT6EYZYs1oucI2WHifNhud9RrWw4zO37bg== X-Received: by 10.84.225.21 with SMTP id t21mr2202761plj.68.1513665529903; Mon, 18 Dec 2017 22:38:49 -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.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Dec 2017 22:38:48 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 18 Dec 2017 22:38:33 -0800 Message-Id: <20171219063840.18981-5-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 04/11] ixgbe: 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:51 -0000 Convert all drivers possible to dynamic logging. Signed-off-by: Stephen Hemminger --- config/common_base | 2 -- drivers/net/ixgbe/ixgbe_ethdev.c | 15 +++++++++++++++ drivers/net/ixgbe/ixgbe_logs.h | 16 ++++++---------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/config/common_base b/config/common_base index 8b63f205d9b9..333689f052f5 100644 --- a/config/common_base +++ b/config/common_base @@ -188,11 +188,9 @@ CONFIG_RTE_LIBRTE_E1000_PF_DISABLE_STRIP_CRC=n # Compile burst-oriented IXGBE PMD driver # CONFIG_RTE_LIBRTE_IXGBE_PMD=y -CONFIG_RTE_LIBRTE_IXGBE_DEBUG_INIT=n CONFIG_RTE_LIBRTE_IXGBE_DEBUG_RX=n CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX=n CONFIG_RTE_LIBRTE_IXGBE_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_IXGBE_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC=n CONFIG_RTE_IXGBE_INC_VECTOR=y CONFIG_RTE_LIBRTE_IXGBE_BYPASS=n diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index ff19a564a42e..0946617b2e16 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -427,6 +427,9 @@ static void ixgbe_l2_tunnel_conf(struct rte_eth_dev *dev); (r) = (h)->bitmap[idx] >> bit & 1;\ } while (0) +int ixgbe_logtype_init; +int ixgbe_logtype_driver; + /* * The set of PCI devices this driver supports */ @@ -8444,3 +8447,15 @@ RTE_PMD_REGISTER_KMOD_DEP(net_ixgbe, "* igb_uio | uio_pci_generic | vfio-pci"); RTE_PMD_REGISTER_PCI(net_ixgbe_vf, rte_ixgbevf_pmd); RTE_PMD_REGISTER_PCI_TABLE(net_ixgbe_vf, pci_id_ixgbevf_map); RTE_PMD_REGISTER_KMOD_DEP(net_ixgbe_vf, "* igb_uio | vfio-pci"); + +RTE_INIT(ixgbe_init_log); +static void +ixgbe_init_log(void) +{ + ixgbe_logtype_init = rte_log_register("pmd.ixgbe.init"); + if (ixgbe_logtype_init >= 0) + rte_log_set_level(ixgbe_logtype_init, RTE_LOG_NOTICE); + ixgbe_logtype_driver = rte_log_register("pmd.ixgbe.driver"); + if (ixgbe_logtype_driver >= 0) + rte_log_set_level(ixgbe_logtype_driver, RTE_LOG_NOTICE); +} diff --git a/drivers/net/ixgbe/ixgbe_logs.h b/drivers/net/ixgbe/ixgbe_logs.h index 53ba42d927f6..9dfa238f2fc0 100644 --- a/drivers/net/ixgbe/ixgbe_logs.h +++ b/drivers/net/ixgbe/ixgbe_logs.h @@ -34,14 +34,12 @@ #ifndef _IXGBE_LOGS_H_ #define _IXGBE_LOGS_H_ +extern int ixgbe_logtype_init; #define PMD_INIT_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ##args) + rte_log(RTE_LOG_ ## level, ixgbe_logtype_init, \ + "%s(): " fmt "\n", __func__, ##args) -#ifdef RTE_LIBRTE_IXGBE_DEBUG_INIT #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>") -#else -#define PMD_INIT_FUNC_TRACE() do { } while(0) -#endif #ifdef RTE_LIBRTE_IXGBE_DEBUG_RX #define PMD_RX_LOG(level, fmt, args...) \ @@ -64,12 +62,10 @@ #define PMD_TX_FREE_LOG(level, fmt, args...) do { } while(0) #endif -#ifdef RTE_LIBRTE_IXGBE_DEBUG_DRIVER +extern int ixgbe_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, ixgbe_logtype_driver, "%s(): " fmt, \ + __func__, ## args) #define PMD_DRV_LOG(level, fmt, args...) \ PMD_DRV_LOG_RAW(level, fmt "\n", ## args) -- 2.11.0