From patchwork Tue Jul 16 15:40:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 56515 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 D5DC91B96E; Tue, 16 Jul 2019 17:40:30 +0200 (CEST) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by dpdk.org (Postfix) with ESMTP id 4D34D4C8D for ; Tue, 16 Jul 2019 17:40:28 +0200 (CEST) Received: by mail-pg1-f195.google.com with SMTP id n9so3410576pgc.1 for ; Tue, 16 Jul 2019 08:40:28 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=ZXSV2Nlu4D0/iwC5xtg7RKMm+HIubjJ+bJkUF1sKjvs=; b=ORU/sKgi/m+jtwZx0JXdxFqXYahUAj/K009OOI5WvVD6eGo+GKqsNV+CQR8ZzJzGEh h2jJN6688s13Gj8dkcYkIHb1L59syg2VxCzJ6UAPdQpPN7b4eV0NgVZHaZ3SEVMPmDgk uzFY5iLX5J0tG6fNjV6KeZpoj+CsYlalyOy5BxF4GZ+paq0ynyqs8VC1+h2nLmwXa14E iK0J/MYZZOUcMhWFCCgUZS+jmb0lQglpRfdae4re5+DgJdjAA5IP23sqMvpfVoLRlCkS mH/0YEvz3UUQCwIZT87BHKGKHsT58s9gBXfWOKWXVMNgMFAQ7OgG8V9GTOYYYOUlZuQi 73Fg== 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:mime-version:content-transfer-encoding; bh=ZXSV2Nlu4D0/iwC5xtg7RKMm+HIubjJ+bJkUF1sKjvs=; b=N6s7DMofSC54NRQ/ctKrmEqYRLzi75sa1mpCIfLA1FS37Z09PkEHmkx2eBYT9jlX/7 rOvbfBpsLASGmOO4Uf3raP+L9ETMUIq+NL5ZH3eIczfRQ4nKwbI4RQq88XpCmL/7km4c svupS699y+PJ4e6ogskZSzyiNK8DFGFrGgc8GPBrJMEoFw6cw29s2mdj+D5iToO4ntA6 oiOs8ZRC7X3i5hUfJBBZOgCySFKnZ3/EimHwfIkYAAnkcwf868h+0zssdsj7TAduMouq c8bXj0yCiaJYpDFjkI1UTl9Ltdzkl16/ImU/fGEl38EeX5KrUemSw7xXHbLidkNseFBK s5GQ== X-Gm-Message-State: APjAAAWR7PY+Mq7pNjMLPtn3/aw/b1C5VC492wFVJj5hqNOklCwBWZ9J csporsuZ4E7mpu6XqcVeI4U= X-Google-Smtp-Source: APXvYqwx1Qxx3519pUzaTBHOsXBtVvREFIYoch20X6Pbl9y0zwe7lcP+4dg+byl/2NS/h9Nq8jVxzw== X-Received: by 2002:a63:4612:: with SMTP id t18mr25684015pga.85.1563291627091; Tue, 16 Jul 2019 08:40:27 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id b19sm20700833pgh.57.2019.07.16.08.40.25 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 08:40:26 -0700 (PDT) From: Stephen Hemminger To: wenzhuo.lu@intel.com, konstantin.ananyev@intel.com, beilei.xing@intel.com, qi.z.zhang@intel.com, xiao.w.wang@intel.com, jingjing.wu@intel.com Cc: dev@dpdk.org, Stephen Hemminger Date: Tue, 16 Jul 2019 08:40:08 -0700 Message-Id: <20190716154013.6974-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190716154013.6974-1-stephen@networkplumber.org> References: <20190716154013.6974-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 1/6] net/e1000: use dynamic log type for tx/rx debug 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" The generic RTE_LOGTYPE_PMD is a historical relic and should not be used. Every driver should register the logtypes for itself. Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit --- drivers/net/e1000/e1000_logs.c | 48 +++++++++++++++++++++++++++------- drivers/net/e1000/e1000_logs.h | 25 +++++++++++------- 2 files changed, 55 insertions(+), 18 deletions(-) diff --git a/drivers/net/e1000/e1000_logs.c b/drivers/net/e1000/e1000_logs.c index 22173939f5e5..05f883dd201b 100644 --- a/drivers/net/e1000/e1000_logs.c +++ b/drivers/net/e1000/e1000_logs.c @@ -8,19 +8,49 @@ int e1000_logtype_init; int e1000_logtype_driver; +#ifdef RTE_LIBRTE_E1000_DEBUG_RX +int e1000_logtype_rx; +#endif +#ifdef RTE_LIBRTE_E1000_DEBUG_TX +int e1000_logtype_tx; +#endif +#ifdef RTE_LIBRTE_E1000_DEBUG_TX_FREE +int e1000_logtype_tx_free; +#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) { - 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); - e1000_log_initialized = 1; - } + 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_NOTICE); +#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_NOTICE); +#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_NOTICE); +#endif + + e1000_log_initialized = 1; } diff --git a/drivers/net/e1000/e1000_logs.h b/drivers/net/e1000/e1000_logs.h index 69d3d31186e0..2612134f38a0 100644 --- a/drivers/net/e1000/e1000_logs.h +++ b/drivers/net/e1000/e1000_logs.h @@ -8,6 +8,7 @@ #include extern int e1000_logtype_init; + #define PMD_INIT_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, e1000_logtype_init, \ "%s(): " fmt "\n", __func__, ##args) @@ -15,24 +16,30 @@ extern int e1000_logtype_init; #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>") #ifdef RTE_LIBRTE_E1000_DEBUG_RX -#define PMD_RX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +extern int e1000_logtype_rx; +#define PMD_RX_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, e1000_logtype_rx, \ + "%s(): " fmt "\n", __func__, ## args) #else -#define PMD_RX_LOG(level, fmt, args...) do { } while(0) +#define PMD_RX_LOG(level, fmt, args...) do { } while (0) #endif #ifdef RTE_LIBRTE_E1000_DEBUG_TX -#define PMD_TX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +extern int e1000_logtype_tx; +#define PMD_TX_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, e1000_logtype_tx, \ + "%s(): " fmt "\n", __func__, ## args) #else -#define PMD_TX_LOG(level, fmt, args...) do { } while(0) +#define PMD_TX_LOG(level, fmt, args...) do { } while (0) #endif #ifdef RTE_LIBRTE_E1000_DEBUG_TX_FREE -#define PMD_TX_FREE_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +extern int e1000_logtype_tx_free; +#define PMD_TX_FREE_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, e1000_logtype_tx_free, \ + "%s(): " fmt "\n", __func__, ## args) #else -#define PMD_TX_FREE_LOG(level, fmt, args...) do { } while(0) +#define PMD_TX_FREE_LOG(level, fmt, args...) do { } while (0) #endif extern int e1000_logtype_driver; From patchwork Tue Jul 16 15:40:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 56516 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 4C9651B9AA; Tue, 16 Jul 2019 17:40:33 +0200 (CEST) Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by dpdk.org (Postfix) with ESMTP id 0755B1B964 for ; Tue, 16 Jul 2019 17:40:29 +0200 (CEST) Received: by mail-pl1-f196.google.com with SMTP id m9so10262635pls.8 for ; Tue, 16 Jul 2019 08:40:29 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=UA4Cle0m0GWuH0sR5xi4HB1jiid4oFAG7LgHMgt3Avs=; b=N8lqBHQknRf2DpoiRGfdD/9BXphFjwJ/ZUGTCIM2yfuv2/aNGtfaNHs4ODQYACvk9a PV4d6HyGNZc6gV87hLnBfn7PWmSmUpwjQMHhjSFLE4TLtc1vUIZIjs52Uv8mSRjQ0QX9 NcnOXsu+iF/Go2AQZixYx+Ud0y/tlm8e2mrgOMvYzh8KUhCtRknrUpTNbHT8j9Sz8D6s 4Qi0ISXO6ebP3nINaqCitktNM5zZM2O2q44C7u0G3F6JT5rs9Z5swa818lSaIQ4i7Io8 kZBHeL4P7CDrgMmzzLjHHK8BgQ8xAtqwfOt/g9gFZPpXEreGbg6/JeKOd8/Ib9rTPQP9 nKDA== 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:mime-version:content-transfer-encoding; bh=UA4Cle0m0GWuH0sR5xi4HB1jiid4oFAG7LgHMgt3Avs=; b=GjoUdNpCbw8UQTbYv/TSXzRp4qZwgCbwh+j+1h2aQx5p7aWjIAgpsr+N7jm+JvwurA Hjhst5CeQRHXJUAGnvpAUCXKIxM9UtH3hEfiGrCU4nfRexVZoC8F4XDKgzuBCVMPnOw6 5ptmm2tnzxzZP/4IP78D0AeRblBGdpWUBkYdEdc1h7uILDL/RhjXGk08Gd9OuAQdDoNx /13j4jF58jR4UO6d/ByUEIbCaw3ARU35Z+f7M23w8McqHXDaL5TdojsEnYQb1Xfk/Ssw 9bUZQweqX6INp3pLKgQPseutjtN/+G/pee/uJBgbfgxBJF8nhDvBpK7kpo4o66PTtQCY C/4w== X-Gm-Message-State: APjAAAVRttQRGrVty3NLE7zC1VxlzXYUdoLlPFLxc9lNKHXbAx4isuvV BTxjknUJiIWplh/OFU0HshE= X-Google-Smtp-Source: APXvYqyjID2lo+/22DP5BsK3TGLjf+420cb4BbNg8URuIx2SFxf8URUM5Ngbcrpue8ifa+l1jOL1pQ== X-Received: by 2002:a17:902:9a85:: with SMTP id w5mr36543778plp.221.1563291628488; Tue, 16 Jul 2019 08:40:28 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id b19sm20700833pgh.57.2019.07.16.08.40.27 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 08:40:27 -0700 (PDT) From: Stephen Hemminger To: wenzhuo.lu@intel.com, konstantin.ananyev@intel.com, beilei.xing@intel.com, qi.z.zhang@intel.com, xiao.w.wang@intel.com, jingjing.wu@intel.com Cc: dev@dpdk.org, Stephen Hemminger Date: Tue, 16 Jul 2019 08:40:09 -0700 Message-Id: <20190716154013.6974-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190716154013.6974-1-stephen@networkplumber.org> References: <20190716154013.6974-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 2/6] net/fm10k: use dynamic log type for tx/rx debug 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" The generic RTE_LOGTYPE_PMD is a historical relic and should not be used. Every driver must dynamic log types. Signed-off-by: Stephen Hemminger --- drivers/net/fm10k/fm10k_ethdev.c | 28 ++++++++++++++++++++++++++++ drivers/net/fm10k/fm10k_logs.h | 18 ++++++++++++------ 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c index a1e3836cb449..1f0a6286a57b 100644 --- a/drivers/net/fm10k/fm10k_ethdev.c +++ b/drivers/net/fm10k/fm10k_ethdev.c @@ -43,6 +43,16 @@ int fm10k_logtype_init; int fm10k_logtype_driver; +#ifdef RTE_LIBRTE_FM10K_DEBUG_RX +int fm10k_logtype_rx; +#endif +#ifdef RTE_LIBRTE_FM10K_DEBUG_TX +int fm10k_logtype_tx; +#endif +#ifdef RTE_LIBRTE_FM10K_DEBUG_TX_FREE +int fm10k_logtype_tx_free; +#endif + static void fm10k_close_mbx_service(struct fm10k_hw *hw); static void fm10k_dev_promiscuous_enable(struct rte_eth_dev *dev); static void fm10k_dev_promiscuous_disable(struct rte_eth_dev *dev); @@ -3286,4 +3296,22 @@ RTE_INIT(fm10k_init_log) fm10k_logtype_driver = rte_log_register("pmd.net.fm10k.driver"); if (fm10k_logtype_driver >= 0) rte_log_set_level(fm10k_logtype_driver, RTE_LOG_NOTICE); + +#ifdef RTE_LIBRTE_FM10K_DEBUG_RX + fm10k_logtype_rx = rte_log_register("pmd.net.fm10k.rx"); + if (fm10k_logtype_rx >= 0) + rte_log_set_level(fm10k_logtype_rx, RTE_LOG_NOTICE); +#endif + +#ifdef RTE_LIBRTE_FM10K_DEBUG_TX + fm10k_logtype_tx = rte_log_register("pmd.net.fm10k.tx"); + if (fm10k_logtype_tx >= 0) + rte_log_set_level(fm10k_logtype_tx, RTE_LOG_NOTICE); +#endif + +#ifdef RTE_LIBRTE_FM10K_DEBUG_TX_FREE + fm10k_logtype_tx_free = rte_log_register("pmd.net.fm10k.tx_free"); + if (fm10k_logtype_tx_free >= 0) + rte_log_set_level(fm10k_logtype_tx_free, RTE_LOG_NOTICE); +#endif } diff --git a/drivers/net/fm10k/fm10k_logs.h b/drivers/net/fm10k/fm10k_logs.h index df56a51cac48..9ae743d80678 100644 --- a/drivers/net/fm10k/fm10k_logs.h +++ b/drivers/net/fm10k/fm10k_logs.h @@ -15,22 +15,28 @@ extern int fm10k_logtype_init; #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>") #ifdef RTE_LIBRTE_FM10K_DEBUG_RX -#define PMD_RX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +extern int fm10k_logtype_rx; +#define PMD_RX_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, fm10k_logtype_rx, \ + "%s(): " fmt "\n", __func__, ## args) #else #define PMD_RX_LOG(level, fmt, args...) do { } while (0) #endif #ifdef RTE_LIBRTE_FM10K_DEBUG_TX -#define PMD_TX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +extern int fm10k_logtype_tx; +#define PMD_TX_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, fm10k_logtype_tx, \ + "%s(): " fmt "\n", __func__, ## args) #else #define PMD_TX_LOG(level, fmt, args...) do { } while (0) #endif #ifdef RTE_LIBRTE_FM10K_DEBUG_TX_FREE -#define PMD_TX_FREE_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +extern int fm10k_logtype_tx_free; +#define PMD_TX_FREE_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, fm10k_logtype_tx_free, \ + "%s(): " fmt "\n", __func__, ## args) #else #define PMD_TX_FREE_LOG(level, fmt, args...) do { } while (0) #endif From patchwork Tue Jul 16 15:40:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 56517 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 0E8551B9C9; Tue, 16 Jul 2019 17:40:36 +0200 (CEST) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by dpdk.org (Postfix) with ESMTP id 25DA61B993 for ; Tue, 16 Jul 2019 17:40:31 +0200 (CEST) Received: by mail-pl1-f194.google.com with SMTP id az7so10305727plb.5 for ; Tue, 16 Jul 2019 08:40:31 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=86DlfqbCTtipSA4feDoZUp7m1s8v+Lm2is1qKP3dRPs=; b=hO72xGSTvhAjfz/xXRt3g9A87KGwE1bKHkBzEY3CnwI0/PUsAPv1gC/NTCkJYB9PMk UYWP+QkpT7TnlqnsQnh9z1DZ4sRuwvdpOlywWjA0iN9wu3tSliKxu9zFNlY67pufKSzi uapW/2Zd8nwCFh4hbvCVfCJNBywwZa1p+tubQkie3cbEPR8G9GeXIYFnEtYO0OLAgL8O wvQAJ7hnIF7quD+V2jVfw5PH1rMks2NhsMGd5qcBQo5XzgFyWDw2Fd97w5xledp7Ljpl 12cH8Ges4jWHBIc9d+WW1/q6On48eiAYF+BpEzrR1LI7v6sJmgv3dA0uWpZsuytmcwx2 8e1Q== 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:mime-version:content-transfer-encoding; bh=86DlfqbCTtipSA4feDoZUp7m1s8v+Lm2is1qKP3dRPs=; b=MoK46PzoY2KjlnFpDukDmgaWBWoHFXXMwWB2eBW0p8BbRLXEAywLpDNU0Cx1pZez/T ygaiJIqqyAXVYxgrgl/s555885H7LyE9OCo2H0933BwMTdqEyEAs8gUpTeE92wbaE2TZ VwoMv+rL/0qMoUBG28Y5jDOv7wus6f2oGB+bx3cN2QCQZ205tJfQFyQQFixkPKRfmf1X H885n5PKsXgDxDLSkSsH+HHwXEY1NYv4VXuRdQOYNR18bhC5l27d+Zavv3bAkE+N5RmF 22VurcwRq7hf9T/A10ET8fJBefwAUZa/XKYudj/gmcj1vn9eX+8dkfDDNOMiIpMmhXYf JbQQ== X-Gm-Message-State: APjAAAU57kmnRk98lDf/e9CDuoM/URPJNKR0dS2SQv2atlpMljOpFa9i b51SXvdXbhRfzJ4FAOZjDFI= X-Google-Smtp-Source: APXvYqzQ5rfeUEmraafIXOzfDnCPr/v/GY3Pw8bw0pQ3eSFASOyfK/iahlioNwSc0vcyCJZqe2rFPg== X-Received: by 2002:a17:902:6ac6:: with SMTP id i6mr36724345plt.233.1563291630235; Tue, 16 Jul 2019 08:40:30 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id b19sm20700833pgh.57.2019.07.16.08.40.28 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 08:40:28 -0700 (PDT) From: Stephen Hemminger To: wenzhuo.lu@intel.com, konstantin.ananyev@intel.com, beilei.xing@intel.com, qi.z.zhang@intel.com, xiao.w.wang@intel.com, jingjing.wu@intel.com Cc: dev@dpdk.org, Stephen Hemminger Date: Tue, 16 Jul 2019 08:40:10 -0700 Message-Id: <20190716154013.6974-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190716154013.6974-1-stephen@networkplumber.org> References: <20190716154013.6974-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 3/6] net/ixgbe: use dynamic log type for tx/rx debug 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" The generic RTE_LOGTYPE_PMD is a historical relic and should not be used. Every driver must dynamic log types. Signed-off-by: Stephen Hemminger --- drivers/net/ixgbe/ixgbe_ethdev.c | 27 +++++++++++++++++++++++++++ drivers/net/ixgbe/ixgbe_logs.h | 24 +++++++++++++++--------- drivers/net/ixgbe/ixgbe_pf.c | 19 ++++++++----------- 3 files changed, 50 insertions(+), 20 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 22c5b2c5cabd..5c84fd046752 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -419,6 +419,16 @@ static void ixgbe_l2_tunnel_conf(struct rte_eth_dev *dev); int ixgbe_logtype_init; int ixgbe_logtype_driver; +#ifdef RTE_LIBRTE_IXGBE_DEBUG_RX +int ixgbe_logtype_rx; +#endif +#ifdef RTE_LIBRTE_IXGBE_DEBUG_TX +int ixgbe_logtype_tx; +#endif +#ifdef RTE_LIBRTE_IXGBE_DEBUG_TX_FREE +int ixgbe_logtype_tx_free; +#endif + /* * The set of PCI devices this driver supports */ @@ -8732,4 +8742,21 @@ RTE_INIT(ixgbe_init_log) ixgbe_logtype_driver = rte_log_register("pmd.net.ixgbe.driver"); if (ixgbe_logtype_driver >= 0) rte_log_set_level(ixgbe_logtype_driver, RTE_LOG_NOTICE); +#ifdef RTE_LIBRTE_IXGBE_DEBUG_RX + ixgbe_logtype_rx = rte_log_register("pmd.net.ixgbe.rx"); + if (ixgbe_logtype_rx >= 0) + rte_log_set_level(ixgbe_logtype_rx, RTE_LOG_NOTICE); +#endif + +#ifdef RTE_LIBRTE_IXGBE_DEBUG_TX + ixgbe_logtype_tx = rte_log_register("pmd.net.ixgbe.tx"); + if (ixgbe_logtype_tx >= 0) + rte_log_set_level(ixgbe_logtype_tx, RTE_LOG_NOTICE); +#endif + +#ifdef RTE_LIBRTE_IXGBE_DEBUG_TX_FREE + ixgbe_logtype_tx_free = rte_log_register("pmd.net.ixgbe.tx_free"); + if (ixgbe_logtype_tx_free >= 0) + rte_log_set_level(ixgbe_logtype_tx_free, RTE_LOG_NOTICE); +#endif } diff --git a/drivers/net/ixgbe/ixgbe_logs.h b/drivers/net/ixgbe/ixgbe_logs.h index dc73e9bded35..2a279d109813 100644 --- a/drivers/net/ixgbe/ixgbe_logs.h +++ b/drivers/net/ixgbe/ixgbe_logs.h @@ -13,24 +13,30 @@ extern int ixgbe_logtype_init; #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>") #ifdef RTE_LIBRTE_IXGBE_DEBUG_RX -#define PMD_RX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +extern int ixgbe_logtype_rx; +#define PMD_RX_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, ixgbe_logtype_rx, \ + "%s(): " fmt "\n", __func__, ## args) #else -#define PMD_RX_LOG(level, fmt, args...) do { } while(0) +#define PMD_RX_LOG(level, fmt, args...) do { } while (0) #endif #ifdef RTE_LIBRTE_IXGBE_DEBUG_TX -#define PMD_TX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +extern int ixgbe_logtype_tx; +#define PMD_TX_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, ixgbe_logtype_tx, \ + "%s(): " fmt "\n", __func__, ## args) #else -#define PMD_TX_LOG(level, fmt, args...) do { } while(0) +#define PMD_TX_LOG(level, fmt, args...) do { } while (0) #endif #ifdef RTE_LIBRTE_IXGBE_DEBUG_TX_FREE -#define PMD_TX_FREE_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +extern int ixgbe_logtype_tx_free; +#define PMD_TX_FREE_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, ixgbe_logtype_tx_free, \ + "%s(): " fmt "\n", __func__, ## args) #else -#define PMD_TX_FREE_LOG(level, fmt, args...) do { } while(0) +#define PMD_TX_FREE_LOG(level, fmt, args...) do { } while (0) #endif extern int ixgbe_logtype_driver; diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c index c88d56e24564..a9e77f21c0de 100644 --- a/drivers/net/ixgbe/ixgbe_pf.c +++ b/drivers/net/ixgbe/ixgbe_pf.c @@ -161,16 +161,14 @@ ixgbe_add_tx_flow_control_drop_filter(struct rte_eth_dev *eth_dev) struct ixgbe_ethertype_filter ethertype_filter; if (!hw->mac.ops.set_ethertype_anti_spoofing) { - RTE_LOG(INFO, PMD, "ether type anti-spoofing is not" - " supported.\n"); + PMD_DRV_LOG(INFO, "ether type anti-spoofing is not supported.\n"); return; } i = ixgbe_ethertype_filter_lookup(filter_info, IXGBE_ETHERTYPE_FLOW_CTRL); if (i >= 0) { - RTE_LOG(ERR, PMD, "A ether type filter" - " entity for flow control already exists!\n"); + PMD_DRV_LOG(ERR, "A ether type filter entity for flow control already exists!\n"); return; } @@ -183,8 +181,7 @@ ixgbe_add_tx_flow_control_drop_filter(struct rte_eth_dev *eth_dev) i = ixgbe_ethertype_filter_insert(filter_info, ðertype_filter); if (i < 0) { - RTE_LOG(ERR, PMD, "Cannot find an unused ether type filter" - " entity for flow control.\n"); + PMD_DRV_LOG(ERR, "Cannot find an unused ether type filter entity for flow control.\n"); return; } @@ -415,7 +412,7 @@ ixgbe_disable_vf_mc_promisc(struct rte_eth_dev *dev, uint32_t vf) vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf)); - RTE_LOG(INFO, PMD, "VF %u: disabling multicast promiscuous\n", vf); + PMD_DRV_LOG(INFO, "VF %u: disabling multicast promiscuous\n", vf); vmolr &= ~IXGBE_VMOLR_MPE; @@ -588,7 +585,7 @@ ixgbe_negotiate_vf_api(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf) break; } - RTE_LOG(ERR, PMD, "Negotiate invalid api version %u from VF %d\n", + PMD_DRV_LOG(ERR, "Negotiate invalid api version %u from VF %d\n", api_version, vf); return -1; @@ -635,7 +632,7 @@ ixgbe_get_vf_queues(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf) switch (eth_conf->txmode.mq_mode) { case ETH_MQ_TX_NONE: case ETH_MQ_TX_DCB: - RTE_LOG(ERR, PMD, "PF must work with virtualization for VF %u" + PMD_DRV_LOG(ERR, "PF must work with virtualization for VF %u" ", but its tx mode = %d\n", vf, eth_conf->txmode.mq_mode); return -1; @@ -670,7 +667,7 @@ ixgbe_get_vf_queues(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf) break; default: - RTE_LOG(ERR, PMD, "PF work with invalid mode = %d\n", + PMD_DRV_LOG(ERR, "PF work with invalid mode = %d\n", eth_conf->txmode.mq_mode); return -1; } @@ -725,7 +722,7 @@ ixgbe_set_vf_mc_promisc(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf) fctrl = IXGBE_READ_REG(hw, IXGBE_FCTRL); if (!(fctrl & IXGBE_FCTRL_UPE)) { /* VF promisc requires PF in promisc */ - RTE_LOG(ERR, PMD, + PMD_DRV_LOG(ERR, "Enabling VF promisc requires PF in promisc\n"); return -1; } From patchwork Tue Jul 16 15:40:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 56518 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 9A94C1B9FA; Tue, 16 Jul 2019 17:40:38 +0200 (CEST) Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by dpdk.org (Postfix) with ESMTP id 676E81B993 for ; Tue, 16 Jul 2019 17:40:32 +0200 (CEST) Received: by mail-pl1-f196.google.com with SMTP id m9so10262705pls.8 for ; Tue, 16 Jul 2019 08:40:32 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=FXNLOxCE2/VEowrEtxzrj9lKo/FQMAR3CQpfGnOuEN8=; b=fwLhWP8fYt9IASQtulgp06Qg7HryKffE+c3hI4zP+bGv6YpSZJnOIOLVmCYW/R/JAN ikKtnMhDBJPyJENTQ2FJATuELErkiXsVp915yFaDIJsFGjl/I4xFQaInCYno9vsqdVlS muhThMvWEOp1z7Zpb+7mNeTKMPE/06mmmddAHQt+J/RuI/6IjZaXgVf906sofzKTgpjw KT+07g+9PnDC1ApTT0R0SrE691fX0GgDHuhdGCPoxESDs+epCkJFgL2Vm4b+plDiBKqP T1RVl3uCsRuY1JgJRhvO0kweGDlngAl8rM6Rp+/EPjKPlb+m1UNBP82jRdolSpPUfwTm Kidw== 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:mime-version:content-transfer-encoding; bh=FXNLOxCE2/VEowrEtxzrj9lKo/FQMAR3CQpfGnOuEN8=; b=qS9tgHOMd76gttOjfaSuWKaQ01bHa8Uho8urxT2K3GHmB4XdXrApRIsofKqZY+QSIz 00TmAJfzfmMvxoOULOjtIsd6mWnAFvt/JkiLf+4h9vjJlzXSx94qgalyn8+AhhCbylWB qycC9gCZl359Da/l1ddUz6xnjh9GSr1s3Auv5yN1yZDZgxrGuywbcigeFC4Mst6DZc3v 0uE6T51pxO3l65nDdOO1YmM03/sO36nMCxOhLmEvIz4u8wXesAMubPGr/jJTgfL8TMDp zCCRMCTSdG52rBE6NIrM1rc7oXZzqpuLWZt5gHdb/KPyFcZqawGvJ2ffjQvrul7dgvHp GTBw== X-Gm-Message-State: APjAAAWo2aUwWZvc+MCGbeYDZVSFYSLLpldQ+7MyH0PQzgYwBRRAJIIS L3+RYXRf2YaZJrhw/v+Gl68= X-Google-Smtp-Source: APXvYqzPHzg5sd+4dhB2YAwJdATkQ8mCAFZQfAWEbWjul7Q4D04uSE/8Cn0zto1T8wPIB8rzfHTsOA== X-Received: by 2002:a17:902:684:: with SMTP id 4mr36684378plh.138.1563291631664; Tue, 16 Jul 2019 08:40:31 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id b19sm20700833pgh.57.2019.07.16.08.40.30 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 08:40:30 -0700 (PDT) From: Stephen Hemminger To: wenzhuo.lu@intel.com, konstantin.ananyev@intel.com, beilei.xing@intel.com, qi.z.zhang@intel.com, xiao.w.wang@intel.com, jingjing.wu@intel.com Cc: dev@dpdk.org, Stephen Hemminger Date: Tue, 16 Jul 2019 08:40:11 -0700 Message-Id: <20190716154013.6974-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190716154013.6974-1-stephen@networkplumber.org> References: <20190716154013.6974-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 4/6] net/ice: use dynamic log type for tx/rx debug 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" The generic RTE_LOGTYPE_PMD is a historical relic and should not be used. Every driver must dynamic log types. Signed-off-by: Stephen Hemminger --- drivers/net/ice/ice_ethdev.c | 27 +++++++++++++++++++++++++++ drivers/net/ice/ice_logs.h | 18 ++++++++++++------ 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 9ce730cd4412..37cc59bc7060 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -23,6 +23,15 @@ int ice_logtype_init; int ice_logtype_driver; +#ifdef RTE_LIBRTE_ICE_DEBUG_RX +int ice_logtype_rx; +#endif +#ifdef RTE_LIBRTE_ICE_DEBUG_TX +int ice_logtype_tx; +#endif +#ifdef RTE_LIBRTE_ICE_DEBUG_TX_FREE +int ice_logtype_tx_free; +#endif static int ice_dev_configure(struct rte_eth_dev *dev); static int ice_dev_start(struct rte_eth_dev *dev); @@ -3762,4 +3771,22 @@ RTE_INIT(ice_init_log) ice_logtype_driver = rte_log_register("pmd.net.ice.driver"); if (ice_logtype_driver >= 0) rte_log_set_level(ice_logtype_driver, RTE_LOG_NOTICE); + +#ifdef RTE_LIBRTE_ICE_DEBUG_RX + ice_logtype_rx = rte_log_register("pmd.net.ice.rx"); + if (ice_logtype_rx >= 0) + rte_log_set_level(ice_logtype_rx, RTE_LOG_NOTICE); +#endif + +#ifdef RTE_LIBRTE_ICE_DEBUG_TX + ice_logtype_tx = rte_log_register("pmd.net.ice.tx"); + if (ice_logtype_tx >= 0) + rte_log_set_level(ice_logtype_tx, RTE_LOG_NOTICE); +#endif + +#ifdef RTE_LIBRTE_ICE_DEBUG_TX_FREE + ice_logtype_tx_free = rte_log_register("pmd.net.ice.tx_free"); + if (ice_logtype_tx_free >= 0) + rte_log_set_level(ice_logtype_tx_free, RTE_LOG_NOTICE); +#endif } diff --git a/drivers/net/ice/ice_logs.h b/drivers/net/ice/ice_logs.h index de2d573d440a..aab7da5f7b37 100644 --- a/drivers/net/ice/ice_logs.h +++ b/drivers/net/ice/ice_logs.h @@ -15,22 +15,28 @@ extern int ice_logtype_driver; #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>") #ifdef RTE_LIBRTE_ICE_DEBUG_RX -#define PMD_RX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +extern int ice_logtype_rx; +#define PMD_RX_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, ice_logtype_rx, \ + "%s(): " fmt "\n", __func__, ## args) #else #define PMD_RX_LOG(level, fmt, args...) do { } while (0) #endif #ifdef RTE_LIBRTE_ICE_DEBUG_TX -#define PMD_TX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +extern int ice_logtype_tx; +#define PMD_TX_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, ice_logtype_tx, \ + "%s(): " fmt "\n", __func__, ## args) #else #define PMD_TX_LOG(level, fmt, args...) do { } while (0) #endif #ifdef RTE_LIBRTE_ICE_DEBUG_TX_FREE -#define PMD_TX_FREE_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +extern int ice_logtype_tx_free; +#define PMD_TX_FREE_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, ice_logtype_tx_free, \ + "%s(): " fmt "\n", __func__, ## args) #else #define PMD_TX_FREE_LOG(level, fmt, args...) do { } while (0) #endif From patchwork Tue Jul 16 15:40:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 56519 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 594D81BCB8; Tue, 16 Jul 2019 17:40:41 +0200 (CEST) Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by dpdk.org (Postfix) with ESMTP id 7E1A41B965 for ; Tue, 16 Jul 2019 17:40:33 +0200 (CEST) Received: by mail-pg1-f193.google.com with SMTP id f25so9623971pgv.10 for ; Tue, 16 Jul 2019 08:40:33 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=mY0BtOrHH0mMkayclX1hB3mO/yRpPWthJPirvCx7vG8=; b=FUpWd9gZDZwdPr00t0fIn0KBpYu9yeV+RGdfedhMhF3JMRriu3pl3a04nzAb18nR6Y TqzQ0OLHfgx+KvmgoC5/5r/CaAs/6/1/HqiL3JGIPfRFsSi1yRa3Bb+79bU668cmhT8T uzbVUpXqGSlerU8LkYd5u8gdeUowzrKxeFcFCYoNo3VBQp1364H5nvSgJ6FvkxMgItkl JuqdjOgcXojRE48kwst0Ny4yj/zVUseKvP34cHx+otQHs0/2ERnanKaCvJWCmmYyU4IS Ym3QMBD1SJ+9SBy2Os2GKsYH5xgJN4Kk832aZW5yQIKGDu3hnA1WW/FArna/wNzHHEm6 fw2w== 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:mime-version:content-transfer-encoding; bh=mY0BtOrHH0mMkayclX1hB3mO/yRpPWthJPirvCx7vG8=; b=nvUr0EM6tlmhu3YticYkGzoV7eDtLpU4CNggCZ6fp+v9e7YGXA/NAEJx3JrSX24geT eWvbwpQEhSS0hM6GVahqTLuftN4BQhwG5gldSkwiNJ9omH2ucm08TPHy5ltt4SgtXs7k UimUOWlejpp7wO2LsEF2eJ7cQpOF7oxCunR7FhlpCw3n4IrFLZNAYoxAMjMQ2WI5yX7o zZvT7Mn64LHWen9qA8PvVrb3CkCaW/VpgrkZ83Q3tZQFiLYMnvh7W3JAk6kYQAIxfUhj qjgQW0tilABD7FFWP7D8QXuO8Tua2TKwHF5BwXUCX/l9QiziRWim2u8y8TCq4lL7GHVZ Zj0Q== X-Gm-Message-State: APjAAAUeQQM3kx5BMyeBBOzor2D+fMYBBIhwLpdlNuBEKB7S9CP4vwfm jHcT+h13KIL+wIdoEjRlxBU= X-Google-Smtp-Source: APXvYqytLtEcZQV6j4S7cbOihtvJr3FqnhreOuZejId7NDb3phFFA3N/WDieM1jTqBEjzyQ0ISVyRQ== X-Received: by 2002:a17:90a:1b0c:: with SMTP id q12mr37785382pjq.76.1563291632743; Tue, 16 Jul 2019 08:40:32 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id b19sm20700833pgh.57.2019.07.16.08.40.31 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 08:40:31 -0700 (PDT) From: Stephen Hemminger To: wenzhuo.lu@intel.com, konstantin.ananyev@intel.com, beilei.xing@intel.com, qi.z.zhang@intel.com, xiao.w.wang@intel.com, jingjing.wu@intel.com Cc: dev@dpdk.org, Stephen Hemminger Date: Tue, 16 Jul 2019 08:40:12 -0700 Message-Id: <20190716154013.6974-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190716154013.6974-1-stephen@networkplumber.org> References: <20190716154013.6974-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 5/6] net/i40e: use dynamic log type for tx/rx debug 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" The generic RTE_LOGTYPE_PMD is a historical relic and should not be used. Every driver must dynamic log types. Signed-off-by: Stephen Hemminger --- drivers/net/i40e/i40e_ethdev.c | 27 +++++++++++++++++++++++++++ drivers/net/i40e/i40e_logs.h | 24 +++++++++++++++--------- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 2b9fc4572290..1e168c6253d8 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -399,6 +399,15 @@ static void i40e_notify_all_vfs_link_status(struct rte_eth_dev *dev); int i40e_logtype_init; int i40e_logtype_driver; +#ifdef RTE_LIBRTE_I40E_DEBUG_RX +int i40e_logtype_rx; +#endif +#ifdef RTE_LIBRTE_I40E_DEBUG_TX +int i40e_logtype_tx; +#endif +#ifdef RTE_LIBRTE_I40E_DEBUG_TX_FREE +int i40e_logtype_tx_free; +#endif static const char *const valid_keys[] = { ETH_I40E_FLOATING_VEB_ARG, @@ -12766,6 +12775,24 @@ RTE_INIT(i40e_init_log) i40e_logtype_driver = rte_log_register("pmd.net.i40e.driver"); if (i40e_logtype_driver >= 0) rte_log_set_level(i40e_logtype_driver, RTE_LOG_NOTICE); + +#ifdef RTE_LIBRTE_I40E_DEBUG_RX + i40e_logtype_rx = rte_log_register("pmd.net.i40e.rx"); + if (i40e_logtype_rx >= 0) + rte_log_set_level(i40e_logtype_rx, RTE_LOG_NOTICE); +#endif + +#ifdef RTE_LIBRTE_I40E_DEBUG_TX + i40e_logtype_tx = rte_log_register("pmd.net.i40e.tx"); + if (i40e_logtype_tx >= 0) + rte_log_set_level(i40e_logtype_tx, RTE_LOG_NOTICE); +#endif + +#ifdef RTE_LIBRTE_I40E_DEBUG_TX_FREE + i40e_logtype_tx_free = rte_log_register("pmd.net.i40e.tx_free"); + if (i40e_logtype_tx_free >= 0) + rte_log_set_level(i40e_logtype_tx_free, RTE_LOG_NOTICE); +#endif } RTE_PMD_REGISTER_PARAM_STRING(net_i40e, diff --git a/drivers/net/i40e/i40e_logs.h b/drivers/net/i40e/i40e_logs.h index b1049699352f..dac3267eb4e2 100644 --- a/drivers/net/i40e/i40e_logs.h +++ b/drivers/net/i40e/i40e_logs.h @@ -12,24 +12,30 @@ extern int i40e_logtype_init; #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>") #ifdef RTE_LIBRTE_I40E_DEBUG_RX -#define PMD_RX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +extern int i40e_logtype_rx; +#define PMD_RX_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, i40e_logtype_rx, \ + "%s(): " fmt "\n", __func__, ## args) #else -#define PMD_RX_LOG(level, fmt, args...) do { } while(0) +#define PMD_RX_LOG(level, fmt, args...) do { } while (0) #endif #ifdef RTE_LIBRTE_I40E_DEBUG_TX -#define PMD_TX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +extern int i40e_logtype_tx; +#define PMD_TX_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, i40e_logtype_tx, \ + "%s(): " fmt "\n", __func__, ## args) #else -#define PMD_TX_LOG(level, fmt, args...) do { } while(0) +#define PMD_TX_LOG(level, fmt, args...) do { } while (0) #endif #ifdef RTE_LIBRTE_I40E_DEBUG_TX_FREE -#define PMD_TX_FREE_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) +extern int i40e_logtype_tx_free; +#define PMD_TX_FREE_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, i40e_logtype_tx_free, \ + "%s(): " fmt "\n", __func__, ## args) #else -#define PMD_TX_FREE_LOG(level, fmt, args...) do { } while(0) +#define PMD_TX_FREE_LOG(level, fmt, args...) do { } while (0) #endif extern int i40e_logtype_driver; From patchwork Tue Jul 16 15:40:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 56520 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 DF87E1BD62; Tue, 16 Jul 2019 17:40:44 +0200 (CEST) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by dpdk.org (Postfix) with ESMTP id BF1221B9B5 for ; Tue, 16 Jul 2019 17:40:34 +0200 (CEST) Received: by mail-pl1-f195.google.com with SMTP id a93so10298571pla.7 for ; Tue, 16 Jul 2019 08:40:34 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=m57TkkJRUha/gcY2GGTqEdIPNieueH5Gbvxg0IHeSWQ=; b=cApj3yHpXlB1mFsHYybWq15nZwloCHEaJCsAnZcR2cZCSNiSErez6jEG+yVrb2BBSJ 7vtYQpALPRz1Fp/z5Gt0F3xilQ4b8TDxZMHklyEkpRC2lRMNrQyqKYojRlW8nAYhigod w9Z7AHn45I/fR0aaVa/9cqkFJrCmyGs4OJbvEtCfVdi8sWNceG88WnXUHTGxIIR/7JOF ae0hFT6QbYAOXmOU36Xp/4h6Nhuv2K29UzfRH3yLvSqZDo/xugiebWnAeLjJRheHIW+P pTzjsuoweBgQT+xJZtTW+bkhApLOco6djKCZoZlvSkCGt8e3qVCQNGMdWMywkaYLuojI glHA== 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:mime-version:content-transfer-encoding; bh=m57TkkJRUha/gcY2GGTqEdIPNieueH5Gbvxg0IHeSWQ=; b=RKJRKMPk82VYTg0RBZYVdM5BWUnAq1sk+ZaPOW/znK890SRsRUBxlzYC7HnI8MNU0G FkQUVN3I3kbuSbUJeoXXLcJf1C21rcNP26lZln0NwR7g+ojMzVHxZ9xuPwMMrk1qEgoS wcf+TmijcKQMaQ1uM6ZGYFVRJVxYiiebXFmwUcLVGaN0GniiuiW075FAMc9ZAgse8Wna Jum1TAUXlZWykEQ7PzH0NNQ8CfbUN/nUDcFibBTOzrtXxnLiMZHS3kzz6e+71foXxf+g tLg2mNJ1QnuBYNdMzZpihW4Fi5+J2Ea0tDWiu/587wvp5GA6w3re/ek5FJyw4+2r5hsn h3Uw== X-Gm-Message-State: APjAAAWeaiUhsKx800hcbmv0wwbK15GPWup7TANwcVHNMaqTvOTX5xMb JcDXiRDGzsqrXv2Xuy8wrzE= X-Google-Smtp-Source: APXvYqzSnd4ule+kSlF8TblrooYzhVSYYzAOyANR5xAWRq9JeiLYXaSAkQDaXdFkMK2FpADU50PZeQ== X-Received: by 2002:a17:902:2d01:: with SMTP id o1mr37254916plb.105.1563291633988; Tue, 16 Jul 2019 08:40:33 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id b19sm20700833pgh.57.2019.07.16.08.40.32 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 08:40:33 -0700 (PDT) From: Stephen Hemminger To: wenzhuo.lu@intel.com, konstantin.ananyev@intel.com, beilei.xing@intel.com, qi.z.zhang@intel.com, xiao.w.wang@intel.com, jingjing.wu@intel.com Cc: dev@dpdk.org, Stephen Hemminger Date: Tue, 16 Jul 2019 08:40:13 -0700 Message-Id: <20190716154013.6974-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190716154013.6974-1-stephen@networkplumber.org> References: <20190716154013.6974-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 6/6] net/iavf: use dynamic log type for tx/rx debug 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" The generic RTE_LOGTYPE_PMD is a historical relic and should not be used. Every driver must dynamic log types. Signed-off-by: Stephen Hemminger --- drivers/net/iavf/iavf_ethdev.c | 28 ++++++++++++++++++++++++++++ drivers/net/iavf/iavf_log.h | 19 +++++++++++++------ 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 53dc05c78d1c..d019e6ad57cb 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -76,6 +76,16 @@ static int iavf_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, int iavf_logtype_init; int iavf_logtype_driver; +#ifdef RTE_LIBRTE_IAVF_DEBUG_RX +int iavf_logtype_rx; +#endif +#ifdef RTE_LIBRTE_IAVF_DEBUG_TX +int iavf_logtype_tx; +#endif +#ifdef RTE_LIBRTE_IAVF_DEBUG_TX_FREE +int iavf_logtype_tx_free; +#endif + static const struct rte_pci_id pci_id_iavf_map[] = { { RTE_PCI_DEVICE(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_ADAPTIVE_VF) }, { .vendor_id = 0, /* sentinel */ }, @@ -1419,6 +1429,24 @@ RTE_INIT(iavf_init_log) iavf_logtype_driver = rte_log_register("pmd.net.iavf.driver"); if (iavf_logtype_driver >= 0) rte_log_set_level(iavf_logtype_driver, RTE_LOG_NOTICE); + +#ifdef RTE_LIBRTE_IAVF_DEBUG_RX + iavf_logtype_rx = rte_log_register("pmd.net.iavf.rx"); + if (iavf_logtype_rx >= 0) + rte_log_set_level(iavf_logtype_rx, RTE_LOG_NOTICE); +#endif + +#ifdef RTE_LIBRTE_IAVF_DEBUG_TX + iavf_logtype_tx = rte_log_register("pmd.net.iavf.tx"); + if (iavf_logtype_tx >= 0) + rte_log_set_level(iavf_logtype_tx, RTE_LOG_NOTICE); +#endif + +#ifdef RTE_LIBRTE_IAVF_DEBUG_TX_FREE + iavf_logtype_tx_free = rte_log_register("pmd.net.iavf.tx_free"); + if (iavf_logtype_tx_free >= 0) + rte_log_set_level(iavf_logtype_tx_free, RTE_LOG_NOTICE); +#endif } /* memory func for base code */ diff --git a/drivers/net/iavf/iavf_log.h b/drivers/net/iavf/iavf_log.h index f66c37041439..1088ec75f55b 100644 --- a/drivers/net/iavf/iavf_log.h +++ b/drivers/net/iavf/iavf_log.h @@ -20,23 +20,30 @@ extern int iavf_logtype_driver; PMD_DRV_LOG_RAW(level, fmt "\n", ## args) #define PMD_DRV_FUNC_TRACE() PMD_DRV_LOG(DEBUG, " >>") + #ifdef RTE_LIBRTE_IAVF_DEBUG_RX -#define PMD_RX_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, "%s(): " fmt "\n", __func__, ## args) +extern int iavf_logtype_rx; +#define PMD_RX_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, iavf_logtype_rx, \ + "%s(): " fmt "\n", __func__, ## args) #else #define PMD_RX_LOG(level, fmt, args...) do { } while (0) #endif #ifdef RTE_LIBRTE_IAVF_DEBUG_TX -#define PMD_TX_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, "%s(): " fmt "\n", __func__, ## args) +extern int iavf_logtype_tx; +#define PMD_TX_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, iavf_logtype_tx, \ + "%s(): " fmt "\n", __func__, ## args) #else #define PMD_TX_LOG(level, fmt, args...) do { } while (0) #endif #ifdef RTE_LIBRTE_IAVF_DEBUG_TX_FREE -#define PMD_TX_FREE_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, "%s(): " fmt "\n", __func__, ## args) +extern int iavf_logtype_tx_free; +#define PMD_TX_FREE_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, iavf_logtype_tx_free, \ + "%s(): " fmt "\n", __func__, ## args) #else #define PMD_TX_FREE_LOG(level, fmt, args...) do { } while (0) #endif