From: Qi Zhang <qi.z.zhang@intel.com>
To: ferruh.yigit@intel.com
Cc: dev@dpdk.org, thomas@monjalon.net, bruce.richardson@intel.com,
xiao.w.wang@intel.com, jingjing.wu@intel.com,
beilei.xing@intel.com, jia.guo@intel.com, qiming.yang@intel.com,
haiyue.wang@intel.com, Qi Zhang <qi.z.zhang@intel.com>
Subject: [dpdk-dev] [PATCH v5 5/8] net/iavf: refine debug build option
Date: Tue, 23 Mar 2021 19:07:46 +0800 [thread overview]
Message-ID: <20210323110749.2306452-6-qi.z.zhang@intel.com> (raw)
In-Reply-To: <20210323110749.2306452-1-qi.z.zhang@intel.com>
1. replace RTE_LIBRTE_IAVF_DEBUG_RX with RTE_ETHDEV_DEBUG_RX.
2. replace RTE_LIBRTE_IAVF_DEBUG_TX whth RTE_ETHDEV_DEBUG_TX.
3. merge RTE_LIBRTE_IAVF_DEBUG_TX_FREE and RTE_LIBRTE_ETHDEV_DEBUG
into RTE_ETHDEV_DEBUG_TX
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
drivers/net/iavf/iavf_ethdev.c | 7 ++-----
drivers/net/iavf/iavf_log.h | 13 ++-----------
drivers/net/iavf/iavf_rxtx.c | 8 ++++----
3 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 4d37722022..86bc5fcf3f 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -2360,12 +2360,9 @@ RTE_PMD_REGISTER_KMOD_DEP(net_iavf, "* igb_uio | vfio-pci");
RTE_PMD_REGISTER_PARAM_STRING(net_iavf, "cap=dcf");
RTE_LOG_REGISTER(iavf_logtype_init, pmd.net.iavf.init, NOTICE);
RTE_LOG_REGISTER(iavf_logtype_driver, pmd.net.iavf.driver, NOTICE);
-#ifdef RTE_LIBRTE_IAVF_DEBUG_RX
+#ifdef RTE_ETHDEV_DEBUG_RX
RTE_LOG_REGISTER(iavf_logtype_rx, pmd.net.iavf.rx, DEBUG);
#endif
-#ifdef RTE_LIBRTE_IAVF_DEBUG_TX
+#ifdef RTE_ETHDEV_DEBUG_TX
RTE_LOG_REGISTER(iavf_logtype_tx, pmd.net.iavf.tx, DEBUG);
#endif
-#ifdef RTE_LIBRTE_IAVF_DEBUG_TX_FREE
-RTE_LOG_REGISTER(iavf_logtype_tx_free, pmd.net.iavf.tx_free, DEBUG);
-#endif
diff --git a/drivers/net/iavf/iavf_log.h b/drivers/net/iavf/iavf_log.h
index 1088ec75f5..ff66ab0ccf 100644
--- a/drivers/net/iavf/iavf_log.h
+++ b/drivers/net/iavf/iavf_log.h
@@ -21,7 +21,7 @@ extern int iavf_logtype_driver;
#define PMD_DRV_FUNC_TRACE() PMD_DRV_LOG(DEBUG, " >>")
-#ifdef RTE_LIBRTE_IAVF_DEBUG_RX
+#ifdef RTE_ETHDEV_DEBUG_RX
extern int iavf_logtype_rx;
#define PMD_RX_LOG(level, fmt, args...) \
rte_log(RTE_LOG_ ## level, iavf_logtype_rx, \
@@ -30,7 +30,7 @@ extern int iavf_logtype_rx;
#define PMD_RX_LOG(level, fmt, args...) do { } while (0)
#endif
-#ifdef RTE_LIBRTE_IAVF_DEBUG_TX
+#ifdef RTE_ETHDEV_DEBUG_TX
extern int iavf_logtype_tx;
#define PMD_TX_LOG(level, fmt, args...) \
rte_log(RTE_LOG_ ## level, iavf_logtype_tx, \
@@ -39,13 +39,4 @@ extern int iavf_logtype_tx;
#define PMD_TX_LOG(level, fmt, args...) do { } while (0)
#endif
-#ifdef RTE_LIBRTE_IAVF_DEBUG_TX_FREE
-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
-
#endif /* _IAVF_LOG_H_ */
diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index 8fafe4579b..84df0989af 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -1979,9 +1979,9 @@ iavf_xmit_cleanup(struct iavf_tx_queue *txq)
if ((txd[desc_to_clean_to].cmd_type_offset_bsz &
rte_cpu_to_le_64(IAVF_TXD_QW1_DTYPE_MASK)) !=
rte_cpu_to_le_64(IAVF_TX_DESC_DTYPE_DESC_DONE)) {
- 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);
return -1;
}
@@ -2335,7 +2335,7 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
return i;
}
-#ifdef RTE_LIBRTE_ETHDEV_DEBUG
+#ifdef RTE_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-23 11:04 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: refine debug compile option 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 ` [dpdk-dev] [PATCH 3/8] net/e1000: " Qi Zhang
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 ` Qi Zhang [this message]
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=20210323110749.2306452-6-qi.z.zhang@intel.com \
--to=qi.z.zhang@intel.com \
--cc=beilei.xing@intel.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=haiyue.wang@intel.com \
--cc=jia.guo@intel.com \
--cc=jingjing.wu@intel.com \
--cc=qiming.yang@intel.com \
--cc=thomas@monjalon.net \
--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).