From patchwork Tue Dec 19 06:38:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 32398 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 50D481B173; Tue, 19 Dec 2017 07:39:07 +0100 (CET) Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by dpdk.org (Postfix) with ESMTP id 4F0607D19 for ; Tue, 19 Dec 2017 07:38:58 +0100 (CET) Received: by mail-pf0-f194.google.com with SMTP id l24so10767148pfj.6 for ; Mon, 18 Dec 2017 22:38:57 -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=HaB1bTCis0Gwpjn/i4RloyHthRcuxr2PbzCrfVEZ/ro=; b=2Tf9FxWhTdsKkvzS8dLlbCVKRZB7DTcVd8W8BBRmVOPjpu8CZxXpgvuJEHCZXQ01Rp dnSdNmFOKcyfFyzHjYcOKXhWoy4SVzOf7ClVu9xpmtS1zU6bRuMzQZxQmB0kZ0ASl9zI 75SwA7yo9gyCWXoIwAmwdGdebM+TM7zFMpzolfTY3uNjlYe7CkN8RqQK/ZwnnAz83a+r 9EZ4uwcLnfAhWcqqofqGoLad6SmDdQrP4rY/Eb19GEqoIPPE7aai/bUGrTjmeYk9j8+4 0HZ5rS+0XfRp0rAFg8mceopqO72ZsYF8lS6keVjrVCK2jLb9kbVUtQVUNriWJYmyXqjq RNlA== 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=HaB1bTCis0Gwpjn/i4RloyHthRcuxr2PbzCrfVEZ/ro=; b=VQTGm0Da/nZAHdciWd9lHUsJ5oDbR4cRDhs9N9DYo2IpElrwotClwDkomn+HkN1nB7 1UyZXBeB4aDL9ELZI9L4mRUA0oHkbwFmWsdxv5zushjvqlLdtW9JjI51tzC9hG5iWNYs Gd2cYeMWzU8UKdvWoVJmQyU2QDe+kouUdQt4YOTlRguaHIz6juJ4P/FJoNdOgYBTY2Y5 ontVDSmj6tQxCsDMTB/X96v3n89ocSgpQxMWekQnOYR6O/PUJuT1dBM7vqxbz0rjryVn i075y1vqXYr/8kndbZQZj9hLSL/VlX0ELhF8OJ/eUwu5ch19zxod2Oa8IefxNF30HOCS 0TTA== X-Gm-Message-State: AKGB3mIFexNKdtyToHwrFORjkz1WS+xU5NC7tmOepu5ebO6lk8YVKytp p8PAKoz9PGkKKaaoR5/TkFYg3b9Rb7E= X-Google-Smtp-Source: ACJfBovEacpqaZCwArhBQzB/NxA2UFnSWfD97Y4Av4fbTEiHoOmuETfis9ZsL/3Lw3+otxMS63vpgA== X-Received: by 10.99.175.14 with SMTP id w14mr2076629pge.11.1513665536650; Mon, 18 Dec 2017 22:38:56 -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.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Dec 2017 22:38:55 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 18 Dec 2017 22:38:38 -0800 Message-Id: <20171219063840.18981-10-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 09/11] ena: 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use dynamic rather static configuration for logging. Also include ena_assert_msg. Signed-off-by: Stephen Hemminger --- config/common_base | 1 - drivers/net/ena/ena_ethdev.c | 15 +++++++++++++++ drivers/net/ena/ena_logs.h | 14 ++++++-------- drivers/net/ena/ena_platform.h | 2 +- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/config/common_base b/config/common_base index 69004d1578ae..61ed718189ec 100644 --- a/config/common_base +++ b/config/common_base @@ -169,7 +169,6 @@ CONFIG_RTE_LIBRTE_ENA_PMD=y CONFIG_RTE_LIBRTE_ENA_DEBUG_RX=n CONFIG_RTE_LIBRTE_ENA_DEBUG_TX=n CONFIG_RTE_LIBRTE_ENA_DEBUG_TX_FREE=n -CONFIG_RTE_LIBRTE_ENA_DEBUG_DRIVER=n CONFIG_RTE_LIBRTE_ENA_COM_DEBUG=n # diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 22db8951f2d1..3f379a9b2ca6 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -178,6 +178,9 @@ static const struct ena_stats ena_stats_ena_com_strings[] = { #define ENA_TX_OFFLOAD_NOTSUP_MASK \ (PKT_TX_OFFLOAD_MASK ^ ENA_TX_OFFLOAD_MASK) +int ena_logtype_init; +int ena_logtype_driver; + static const struct rte_pci_id pci_id_ena_map[] = { { RTE_PCI_DEVICE(PCI_VENDOR_ID_AMAZON, PCI_DEVICE_ID_ENA_VF) }, { RTE_PCI_DEVICE(PCI_VENDOR_ID_AMAZON, PCI_DEVICE_ID_ENA_LLQ_VF) }, @@ -1814,3 +1817,15 @@ static struct rte_pci_driver rte_ena_pmd = { RTE_PMD_REGISTER_PCI(net_ena, rte_ena_pmd); RTE_PMD_REGISTER_PCI_TABLE(net_ena, pci_id_ena_map); RTE_PMD_REGISTER_KMOD_DEP(net_ena, "* igb_uio | uio_pci_generic | vfio-pci"); + +RTE_INIT(ena_init_log); +static void +ena_init_log(void) +{ + ena_logtype_init = rte_log_register("pmd.ena.init"); + if (ena_logtype_init >= 0) + rte_log_set_level(ena_logtype_init, RTE_LOG_NOTICE); + ena_logtype_driver = rte_log_register("pmd.ena.driver"); + if (ena_logtype_driver >= 0) + rte_log_set_level(ena_logtype_driver, RTE_LOG_NOTICE); +} diff --git a/drivers/net/ena/ena_logs.h b/drivers/net/ena/ena_logs.h index c6c8a41bd9fa..2c0e91b656ac 100644 --- a/drivers/net/ena/ena_logs.h +++ b/drivers/net/ena/ena_logs.h @@ -34,10 +34,10 @@ #ifndef _ENA_LOGS_H_ #define _ENA_LOGS_H_ -#define RTE_LOGTYPE_ENA RTE_LOGTYPE_USER1 - +extern int ena_logtype_init; #define PMD_INIT_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) + rte_log(RTE_LOG_ ## level, ena_logtype_init, \ + "%s(): " fmt "\n", __func__, ## args) #ifdef RTE_LIBRTE_ENA_DEBUG_RX #define PMD_RX_LOG(level, fmt, args...) \ @@ -60,11 +60,9 @@ #define PMD_TX_FREE_LOG(level, fmt, args...) do { } while (0) #endif -#ifdef RTE_LIBRTE_ENA_DEBUG_DRIVER +extern int ena_logtype_driver; #define PMD_DRV_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) -#else -#define PMD_DRV_LOG(level, fmt, args...) do { } while (0) -#endif + rte_log(RTE_LOG_ ## level, ena_logtype_driver, \ + "%s(): " fmt "\n", __func__, ## args) #endif /* _ENA_LOGS_H_ */ diff --git a/drivers/net/ena/ena_platform.h b/drivers/net/ena/ena_platform.h index 0df82d6fdb53..a2239a92c428 100644 --- a/drivers/net/ena/ena_platform.h +++ b/drivers/net/ena/ena_platform.h @@ -49,7 +49,7 @@ #define ena_assert_msg(cond, msg) \ do { \ if (unlikely(!(cond))) { \ - RTE_LOG(ERR, ENA, \ + rte_log(RTE_LOG_ERR, ena_logtype_driver, \ "Assert failed on %s:%s:%d: ", \ __FILE__, __func__, __LINE__); \ rte_panic(msg); \