From: Qi Zhang <qi.z.zhang@intel.com>
To: ferruh.yigit@intel.com
Cc: dev@dpdk.org, xiao.w.wang@intel.com, jingjing.wu@intel.com,
beilei.xing@intel.com, jia.guo@intel.com, qiming.yang@intel.com,
haiyue.wang@intel.comi, Qi Zhang <qi.z.zhang@intel.com>
Subject: [dpdk-dev] [PATCH 3/8] net/e1000: refine debug compile option
Date: Wed, 10 Mar 2021 20:16:21 +0800 [thread overview]
Message-ID: <20210310121626.2019863-4-qi.z.zhang@intel.com> (raw)
In-Reply-To: <20210310121626.2019863-1-qi.z.zhang@intel.com>
1. replace RTE_LIBRTE_E1000_DEBUG_RX with RTE_LIBRTE_ETHDEV_DEBUG_RX.
2. replace RTE_LIBRTE_E1000_DEBUG_TX whth RTE_LIBRTE_ETHDEV_DEBUG_TX.
3. merge RTE_LIBRTE_E1000_DEBUG_TX_FREE and RTE_LIBRTE_ETHDEV_DEBUG
into RTE_LIBRTE_ETHDEV_DEBUG_TX
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
drivers/net/e1000/e1000_logs.c | 17 ++++-----------
drivers/net/e1000/e1000_logs.h | 13 ++----------
drivers/net/e1000/em_rxtx.c | 38 +++++++++++++++++-----------------
drivers/net/e1000/igb_rxtx.c | 2 +-
4 files changed, 26 insertions(+), 44 deletions(-)
diff --git a/drivers/net/e1000/e1000_logs.c b/drivers/net/e1000/e1000_logs.c
index 231f5c03ef..f4b5a545f6 100644
--- a/drivers/net/e1000/e1000_logs.c
+++ b/drivers/net/e1000/e1000_logs.c
@@ -8,15 +8,12 @@
int e1000_logtype_init;
int e1000_logtype_driver;
-#ifdef RTE_LIBRTE_E1000_DEBUG_RX
+#ifdef RTE_LIBRTE_ETHDEV_DEBUG_RX
int e1000_logtype_rx;
#endif
-#ifdef RTE_LIBRTE_E1000_DEBUG_TX
+#ifdef RTE_LIBRTE_ETHDEV_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;
@@ -34,23 +31,17 @@ e1000_igb_init_log(void)
if (e1000_logtype_driver >= 0)
rte_log_set_level(e1000_logtype_driver, RTE_LOG_NOTICE);
-#ifdef RTE_LIBRTE_E1000_DEBUG_RX
+#ifdef RTE_LIBRTE_ETHDEV_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_DEBUG);
#endif
-#ifdef RTE_LIBRTE_E1000_DEBUG_TX
+#ifdef RTE_LIBRTE_ETHDEV_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_DEBUG);
#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_DEBUG);
-#endif
-
e1000_log_initialized = 1;
}
diff --git a/drivers/net/e1000/e1000_logs.h b/drivers/net/e1000/e1000_logs.h
index 2612134f38..c989033392 100644
--- a/drivers/net/e1000/e1000_logs.h
+++ b/drivers/net/e1000/e1000_logs.h
@@ -15,7 +15,7 @@ extern int e1000_logtype_init;
#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")
-#ifdef RTE_LIBRTE_E1000_DEBUG_RX
+#ifdef RTE_LIBRTE_ETHDEV_DEBUG_RX
extern int e1000_logtype_rx;
#define PMD_RX_LOG(level, fmt, args...) \
rte_log(RTE_LOG_ ## level, e1000_logtype_rx, \
@@ -24,7 +24,7 @@ extern int e1000_logtype_rx;
#define PMD_RX_LOG(level, fmt, args...) do { } while (0)
#endif
-#ifdef RTE_LIBRTE_E1000_DEBUG_TX
+#ifdef RTE_LIBRTE_ETHDEV_DEBUG_TX
extern int e1000_logtype_tx;
#define PMD_TX_LOG(level, fmt, args...) \
rte_log(RTE_LOG_ ## level, e1000_logtype_tx, \
@@ -33,15 +33,6 @@ extern int e1000_logtype_tx;
#define PMD_TX_LOG(level, fmt, args...) do { } while (0)
#endif
-#ifdef RTE_LIBRTE_E1000_DEBUG_TX_FREE
-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)
-#endif
-
extern int e1000_logtype_driver;
#define PMD_DRV_LOG_RAW(level, fmt, args...) \
rte_log(RTE_LOG_ ## level, e1000_logtype_driver, "%s(): " fmt, \
diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c
index db5d1222ce..47a02b6cf4 100644
--- a/drivers/net/e1000/em_rxtx.c
+++ b/drivers/net/e1000/em_rxtx.c
@@ -311,10 +311,10 @@ em_xmit_cleanup(struct em_tx_queue *txq)
desc_to_clean_to = sw_ring[desc_to_clean_to].last_id;
if (! (txr[desc_to_clean_to].upper.fields.status & E1000_TXD_STAT_DD))
{
- PMD_TX_FREE_LOG(DEBUG,
- "TX descriptor %4u is not done"
- "(port=%d queue=%d)", desc_to_clean_to,
- txq->port_id, txq->queue_id);
+ PMD_TX_LOG(DEBUG,
+ "TX descriptor %4u is not done"
+ "(port=%d queue=%d)", desc_to_clean_to,
+ txq->port_id, txq->queue_id);
/* Failed to clean any descriptors, better luck next time */
return -(1);
}
@@ -327,11 +327,11 @@ em_xmit_cleanup(struct em_tx_queue *txq)
nb_tx_to_clean = (uint16_t)(desc_to_clean_to -
last_desc_cleaned);
- PMD_TX_FREE_LOG(DEBUG,
- "Cleaning %4u TX descriptors: %4u to %4u "
- "(port=%d queue=%d)", nb_tx_to_clean,
- last_desc_cleaned, desc_to_clean_to, txq->port_id,
- txq->queue_id);
+ PMD_TX_LOG(DEBUG,
+ "Cleaning %4u TX descriptors: %4u to %4u "
+ "(port=%d queue=%d)", nb_tx_to_clean,
+ last_desc_cleaned, desc_to_clean_to, txq->port_id,
+ txq->queue_id);
/*
* The last descriptor to clean is done, so that means all the
@@ -457,11 +457,11 @@ eth_em_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
* nb_used better be less than or equal to txq->tx_rs_thresh
*/
while (unlikely (nb_used > txq->nb_tx_free)) {
- PMD_TX_FREE_LOG(DEBUG, "Not enough free TX descriptors "
- "nb_used=%4u nb_free=%4u "
- "(port=%d queue=%d)",
- nb_used, txq->nb_tx_free,
- txq->port_id, txq->queue_id);
+ PMD_TX_LOG(DEBUG, "Not enough free TX descriptors "
+ "nb_used=%4u nb_free=%4u "
+ "(port=%d queue=%d)",
+ nb_used, txq->nb_tx_free,
+ txq->port_id, txq->queue_id);
if (em_xmit_cleanup(txq) != 0) {
/* Could not clean any descriptors */
@@ -579,10 +579,10 @@ eth_em_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
/* Set RS bit only on threshold packets' last descriptor */
if (txq->nb_tx_used >= txq->tx_rs_thresh) {
- PMD_TX_FREE_LOG(DEBUG,
- "Setting RS bit on TXD id=%4u "
- "(port=%d queue=%d)",
- tx_last, txq->port_id, txq->queue_id);
+ PMD_TX_LOG(DEBUG,
+ "Setting RS bit on TXD id=%4u "
+ "(port=%d queue=%d)",
+ tx_last, txq->port_id, txq->queue_id);
cmd_type_len |= E1000_TXD_CMD_RS;
@@ -626,7 +626,7 @@ eth_em_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
return i;
}
-#ifdef RTE_LIBRTE_ETHDEV_DEBUG
+#ifdef RTE_LIBRTE_ETHDEV_DEBUG_TX
ret = rte_validate_tx_offload(m);
if (ret != 0) {
rte_errno = -ret;
diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c
index 1500d2ffff..5749650f95 100644
--- a/drivers/net/e1000/igb_rxtx.c
+++ b/drivers/net/e1000/igb_rxtx.c
@@ -641,7 +641,7 @@ eth_igb_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
return i;
}
-#ifdef RTE_LIBRTE_ETHDEV_DEBUG
+#ifdef RTE_LIBRTE_ETHDEV_DEBUG_TX
ret = rte_validate_tx_offload(m);
if (ret != 0) {
rte_errno = -ret;
--
2.26.2
next prev parent reply other threads:[~2021-03-10 12:13 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-10 12:16 [dpdk-dev] [PATCH 0/8] ether: " Qi Zhang
2021-03-10 12:16 ` [dpdk-dev] [PATCH 1/8] " Qi Zhang
2021-03-10 12:16 ` [dpdk-dev] [PATCH 2/8] net/fm10k: " Qi Zhang
2021-03-10 12:16 ` Qi Zhang [this message]
2021-03-10 12:16 ` [dpdk-dev] [PATCH 4/8] net/i40e: " Qi Zhang
2021-03-10 12:16 ` [dpdk-dev] [PATCH 5/8] net/iavf: " Qi Zhang
2021-03-10 12:16 ` [dpdk-dev] [PATCH 6/8] net/ice: " Qi Zhang
2021-03-10 12:16 ` [dpdk-dev] [PATCH 7/8] net/ixgbe: " Qi Zhang
2021-03-10 12:16 ` [dpdk-dev] [PATCH 8/8] net/igc: " Qi Zhang
2021-03-10 12:35 ` [dpdk-dev] [PATCH 0/8] ether: " Ferruh Yigit
2021-03-12 12:12 ` [dpdk-dev] [PATCH v2 " Qi Zhang
2021-03-12 12:12 ` [dpdk-dev] [PATCH v2 1/8] " Qi Zhang
2021-03-16 13:05 ` Ferruh Yigit
2021-03-16 13:39 ` Thomas Monjalon
2021-03-16 14:12 ` Bruce Richardson
2021-03-16 23:29 ` Zhang, Qi Z
2021-03-16 16:37 ` Ferruh Yigit
2021-03-22 17:24 ` Ferruh Yigit
2021-03-23 8:43 ` Zhang, Qi Z
2021-03-12 12:12 ` [dpdk-dev] [PATCH v2 2/8] net/fm10k: " Qi Zhang
2021-03-12 12:12 ` [dpdk-dev] [PATCH v2 3/8] net/e1000: " Qi Zhang
2021-03-12 12:12 ` [dpdk-dev] [PATCH v2 4/8] net/i40e: " Qi Zhang
2021-03-12 12:12 ` [dpdk-dev] [PATCH v2 5/8] net/iavf: " Qi Zhang
2021-03-12 12:12 ` [dpdk-dev] [PATCH v2 6/8] net/ice: " Qi Zhang
2021-03-12 12:12 ` [dpdk-dev] [PATCH v2 7/8] net/ixgbe: " Qi Zhang
2021-03-12 12:12 ` [dpdk-dev] [PATCH v2 8/8] net/igc: " Qi Zhang
2021-03-17 11:15 ` [dpdk-dev] [PATCH v3 0/9] ether: refine debug build option Qi Zhang
2021-03-17 11:15 ` [dpdk-dev] [PATCH v3 1/9] " Qi Zhang
2021-03-17 11:15 ` [dpdk-dev] [PATCH v3 2/9] net: replace " Qi Zhang
2021-03-17 21:47 ` Ferruh Yigit
2021-03-17 22:00 ` Thomas Monjalon
2021-03-18 0:58 ` Zhang, Qi Z
2021-03-17 11:15 ` [dpdk-dev] [PATCH v3 3/9] net/fm10k: refine debug " Qi Zhang
2021-03-17 11:15 ` [dpdk-dev] [PATCH v3 4/9] net/e1000: " Qi Zhang
2021-03-17 11:15 ` [dpdk-dev] [PATCH v3 5/9] net/i40e: " Qi Zhang
2021-03-17 11:15 ` [dpdk-dev] [PATCH v3 6/9] net/iavf: " Qi Zhang
2021-03-17 11:15 ` [dpdk-dev] [PATCH v3 7/9] net/ice: " Qi Zhang
2021-03-17 11:15 ` [dpdk-dev] [PATCH v3 8/9] net/ixgbe: " Qi Zhang
2021-03-17 11:15 ` [dpdk-dev] [PATCH v3 9/9] net/igc: " Qi Zhang
2021-03-18 1:42 ` [dpdk-dev] [PATCH v4 0/8] ether: " Qi Zhang
2021-03-18 1:42 ` [dpdk-dev] [PATCH v4 1/8] " Qi Zhang
2021-03-18 1:42 ` [dpdk-dev] [PATCH v4 2/8] net/fm10k: " Qi Zhang
2021-03-18 1:42 ` [dpdk-dev] [PATCH v4 3/8] net/e1000: " Qi Zhang
2021-03-18 1:42 ` [dpdk-dev] [PATCH v4 4/8] net/i40e: " Qi Zhang
2021-03-18 1:42 ` [dpdk-dev] [PATCH v4 5/8] net/iavf: " Qi Zhang
2021-03-18 1:42 ` [dpdk-dev] [PATCH v4 6/8] net/ice: " Qi Zhang
2021-03-18 1:42 ` [dpdk-dev] [PATCH v4 7/8] net/ixgbe: " Qi Zhang
2021-03-18 1:42 ` [dpdk-dev] [PATCH v4 8/8] net/igc: " Qi Zhang
2021-03-23 11:07 ` [dpdk-dev] [PATCH v5 0/8] ether: " Qi Zhang
2021-03-23 11:07 ` [dpdk-dev] [PATCH v5 1/8] " Qi Zhang
2021-03-23 14:44 ` Ferruh Yigit
2021-03-23 21:14 ` Thomas Monjalon
2021-03-23 11:07 ` [dpdk-dev] [PATCH v5 2/8] net/fm10k: " Qi Zhang
2021-03-23 14:45 ` Ferruh Yigit
2021-03-23 11:07 ` [dpdk-dev] [PATCH v5 3/8] net/e1000: " Qi Zhang
2021-03-23 11:07 ` [dpdk-dev] [PATCH v5 4/8] net/i40e: " Qi Zhang
2021-03-23 11:07 ` [dpdk-dev] [PATCH v5 5/8] net/iavf: " Qi Zhang
2021-03-23 11:07 ` [dpdk-dev] [PATCH v5 6/8] net/ice: " Qi Zhang
2021-03-23 11:07 ` [dpdk-dev] [PATCH v5 7/8] net/ixgbe: " Qi Zhang
2021-03-23 11:07 ` [dpdk-dev] [PATCH v5 8/8] net/igc: " Qi Zhang
2021-03-24 19:27 ` Ferruh Yigit
2021-03-24 20:31 ` David Marchand
2021-03-25 15:43 ` Ferruh Yigit
2021-03-30 14:06 ` Ferruh Yigit
2021-03-23 11:08 ` [dpdk-dev] [PATCH v5 0/8] ether: " Zhang, Qi Z
2021-03-23 14:47 ` Ferruh Yigit
2021-03-31 9:52 ` [dpdk-dev] [PATCH v6 " Qi Zhang
2021-03-31 9:52 ` [dpdk-dev] [PATCH v6 1/8] " Qi Zhang
2021-04-01 14:30 ` Ferruh Yigit
2021-05-05 11:45 ` Ferruh Yigit
2021-05-05 12:21 ` Michał Krawczyk
2021-05-05 14:38 ` Ferruh Yigit
2021-05-06 11:09 ` [dpdk-dev] [EXT] " Rasesh Mody
2021-03-31 9:52 ` [dpdk-dev] [PATCH v6 2/8] net/fm10k: " Qi Zhang
2021-03-31 9:52 ` [dpdk-dev] [PATCH v6 3/8] net/e1000: " Qi Zhang
2021-03-31 9:52 ` [dpdk-dev] [PATCH v6 4/8] net/i40e: " Qi Zhang
2021-03-31 9:52 ` [dpdk-dev] [PATCH v6 5/8] net/iavf: " Qi Zhang
2021-03-31 9:52 ` [dpdk-dev] [PATCH v6 6/8] net/ice: " Qi Zhang
2021-03-31 9:52 ` [dpdk-dev] [PATCH v6 7/8] net/ixgbe: " Qi Zhang
2021-03-31 9:52 ` [dpdk-dev] [PATCH v6 8/8] net/igc: " Qi Zhang
2021-04-01 14:11 ` [dpdk-dev] [PATCH v6 0/8] ether: " Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210310121626.2019863-4-qi.z.zhang@intel.com \
--to=qi.z.zhang@intel.com \
--cc=beilei.xing@intel.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=haiyue.wang@intel.comi \
--cc=jia.guo@intel.com \
--cc=jingjing.wu@intel.com \
--cc=qiming.yang@intel.com \
--cc=xiao.w.wang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).