Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/90214/?format=api
https://patches.dpdk.org/api/patches/90214/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210331095254.2454439-4-qi.z.zhang@intel.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20210331095254.2454439-4-qi.z.zhang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210331095254.2454439-4-qi.z.zhang@intel.com", "date": "2021-03-31T09:52:49", "name": "[v6,3/8] net/e1000: refine debug build option", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "c4e9b62eb0b00e9b662007df84da0198531909f9", "submitter": { "id": 504, "url": "https://patches.dpdk.org/api/people/504/?format=api", "name": "Qi Zhang", "email": "qi.z.zhang@intel.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20210331095254.2454439-4-qi.z.zhang@intel.com/mbox/", "series": [ { "id": 16008, "url": "https://patches.dpdk.org/api/series/16008/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=16008", "date": "2021-03-31T09:52:46", "name": "ether: refine debug build option", "version": 6, "mbox": "https://patches.dpdk.org/series/16008/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/90214/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/90214/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 1E96DA034F;\n\tWed, 31 Mar 2021 11:49:33 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 50186140E6C;\n\tWed, 31 Mar 2021 11:49:24 +0200 (CEST)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n by mails.dpdk.org (Postfix) with ESMTP id 5937B140E59\n for <dev@dpdk.org>; Wed, 31 Mar 2021 11:49:19 +0200 (CEST)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 31 Mar 2021 02:49:19 -0700", "from dpdk51.sh.intel.com ([10.67.111.142])\n by fmsmga002.fm.intel.com with ESMTP; 31 Mar 2021 02:49:16 -0700" ], "IronPort-SDR": [ "\n MQIvgTpIJbNMNtq8mc839SNXHXM23Icot0Xc0zvMV5GYgml/RdfO9oBL96EsGYF6KR8wfov7BK\n Oxg3HPPBvUoA==", "\n NV4h5ok5N6B0aUGJEl5e5IDHETP272zad8nTvkr3gt6hMpsAlfPmIOnFskbevwBaSFjYXF4eFh\n gsjNWVWjCGpA==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9939\"; a=\"191448536\"", "E=Sophos;i=\"5.81,293,1610438400\"; d=\"scan'208\";a=\"191448536\"", "E=Sophos;i=\"5.81,293,1610438400\"; d=\"scan'208\";a=\"445603433\"" ], "X-ExtLoop1": "1", "From": "Qi Zhang <qi.z.zhang@intel.com>", "To": "ferruh.yigit@intel.com", "Cc": "dev@dpdk.org, thomas@monjalon.net, bruce.richardson@intel.com,\n xiao.w.wang@intel.com, jingjing.wu@intel.com, beilei.xing@intel.com,\n jia.guo@intel.com, qiming.yang@intel.com, haiyue.wang@intel.com,\n Qi Zhang <qi.z.zhang@intel.com>", "Date": "Wed, 31 Mar 2021 17:52:49 +0800", "Message-Id": "<20210331095254.2454439-4-qi.z.zhang@intel.com>", "X-Mailer": "git-send-email 2.26.2", "In-Reply-To": "<20210331095254.2454439-1-qi.z.zhang@intel.com>", "References": "<20210310121626.2019863-1-qi.z.zhang@intel.com>\n <20210331095254.2454439-1-qi.z.zhang@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v6 3/8] net/e1000: refine debug build option", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "1. replace RTE_LIBRTE_E1000_DEBUG_RX with RTE_ETHDEV_DEBUG_RX.\n2. replace RTE_LIBRTE_E1000_DEBUG_TX whth RTE_ETHDEV_DEBUG_TX.\n3. merge RTE_LIBRTE_E1000_DEBUG_TX_FREE and RTE_LIBRTE_ETHDEV_DEBUG\n into RTE_ETHDEV_DEBUG_TX\n\nSigned-off-by: Qi Zhang <qi.z.zhang@intel.com>\n---\n drivers/net/e1000/e1000_logs.c | 17 ++++-----------\n drivers/net/e1000/e1000_logs.h | 13 ++----------\n drivers/net/e1000/em_rxtx.c | 38 +++++++++++++++++-----------------\n drivers/net/e1000/igb_rxtx.c | 2 +-\n 4 files changed, 26 insertions(+), 44 deletions(-)", "diff": "diff --git a/drivers/net/e1000/e1000_logs.c b/drivers/net/e1000/e1000_logs.c\nindex 231f5c03ef..84ea0f9d4b 100644\n--- a/drivers/net/e1000/e1000_logs.c\n+++ b/drivers/net/e1000/e1000_logs.c\n@@ -8,15 +8,12 @@\n int e1000_logtype_init;\n int e1000_logtype_driver;\n \n-#ifdef RTE_LIBRTE_E1000_DEBUG_RX\n+#ifdef RTE_ETHDEV_DEBUG_RX\n int e1000_logtype_rx;\n #endif\n-#ifdef RTE_LIBRTE_E1000_DEBUG_TX\n+#ifdef RTE_ETHDEV_DEBUG_TX\n int e1000_logtype_tx;\n #endif\n-#ifdef RTE_LIBRTE_E1000_DEBUG_TX_FREE\n-int e1000_logtype_tx_free;\n-#endif\n \n /* avoids double registering of logs if EM and IGB drivers are in use */\n static int e1000_log_initialized;\n@@ -34,23 +31,17 @@ e1000_igb_init_log(void)\n \tif (e1000_logtype_driver >= 0)\n \t\trte_log_set_level(e1000_logtype_driver, RTE_LOG_NOTICE);\n \n-#ifdef RTE_LIBRTE_E1000_DEBUG_RX\n+#ifdef RTE_ETHDEV_DEBUG_RX\n \te1000_logtype_rx = rte_log_register(\"pmd.net.e1000.rx\");\n \tif (e1000_logtype_rx >= 0)\n \t\trte_log_set_level(e1000_logtype_rx, RTE_LOG_DEBUG);\n #endif\n \n-#ifdef RTE_LIBRTE_E1000_DEBUG_TX\n+#ifdef RTE_ETHDEV_DEBUG_TX\n \te1000_logtype_tx = rte_log_register(\"pmd.net.e1000.tx\");\n \tif (e1000_logtype_tx >= 0)\n \t\trte_log_set_level(e1000_logtype_tx, RTE_LOG_DEBUG);\n #endif\n \n-#ifdef RTE_LIBRTE_E1000_DEBUG_TX_FREE\n-\te1000_logtype_tx_free = rte_log_register(\"pmd.net.e1000.tx_free\");\n-\tif (e1000_logtype_tx_free >= 0)\n-\t\trte_log_set_level(e1000_logtype_tx_free, RTE_LOG_DEBUG);\n-#endif\n-\n \te1000_log_initialized = 1;\n }\ndiff --git a/drivers/net/e1000/e1000_logs.h b/drivers/net/e1000/e1000_logs.h\nindex 2612134f38..86f546b0f9 100644\n--- a/drivers/net/e1000/e1000_logs.h\n+++ b/drivers/net/e1000/e1000_logs.h\n@@ -15,7 +15,7 @@ extern int e1000_logtype_init;\n \n #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, \" >>\")\n \n-#ifdef RTE_LIBRTE_E1000_DEBUG_RX\n+#ifdef RTE_ETHDEV_DEBUG_RX\n extern int e1000_logtype_rx;\n #define PMD_RX_LOG(level, fmt, args...)\t\t\t\\\n \trte_log(RTE_LOG_ ## level, e1000_logtype_rx,\t\\\n@@ -24,7 +24,7 @@ extern int e1000_logtype_rx;\n #define PMD_RX_LOG(level, fmt, args...) do { } while (0)\n #endif\n \n-#ifdef RTE_LIBRTE_E1000_DEBUG_TX\n+#ifdef RTE_ETHDEV_DEBUG_TX\n extern int e1000_logtype_tx;\n #define PMD_TX_LOG(level, fmt, args...)\t\t\t\\\n \trte_log(RTE_LOG_ ## level, e1000_logtype_tx,\t\\\n@@ -33,15 +33,6 @@ extern int e1000_logtype_tx;\n #define PMD_TX_LOG(level, fmt, args...) do { } while (0)\n #endif\n \n-#ifdef RTE_LIBRTE_E1000_DEBUG_TX_FREE\n-extern int e1000_logtype_tx_free;\n-#define PMD_TX_FREE_LOG(level, fmt, args...)\t\t\t\\\n-\trte_log(RTE_LOG_ ## level, e1000_logtype_tx_free,\t\\\n-\t\t\"%s(): \" fmt \"\\n\", __func__, ## args)\n-#else\n-#define PMD_TX_FREE_LOG(level, fmt, args...) do { } while (0)\n-#endif\n-\n extern int e1000_logtype_driver;\n #define PMD_DRV_LOG_RAW(level, fmt, args...) \\\n \trte_log(RTE_LOG_ ## level, e1000_logtype_driver, \"%s(): \" fmt, \\\ndiff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c\nindex db5d1222ce..dfd8f2fd00 100644\n--- a/drivers/net/e1000/em_rxtx.c\n+++ b/drivers/net/e1000/em_rxtx.c\n@@ -311,10 +311,10 @@ em_xmit_cleanup(struct em_tx_queue *txq)\n \tdesc_to_clean_to = sw_ring[desc_to_clean_to].last_id;\n \tif (! (txr[desc_to_clean_to].upper.fields.status & E1000_TXD_STAT_DD))\n \t{\n-\t\tPMD_TX_FREE_LOG(DEBUG,\n-\t\t\t\t\"TX descriptor %4u is not done\"\n-\t\t\t\t\"(port=%d queue=%d)\", desc_to_clean_to,\n-\t\t\t\ttxq->port_id, txq->queue_id);\n+\t\tPMD_TX_LOG(DEBUG,\n+\t\t\t \"TX descriptor %4u is not done\"\n+\t\t\t \"(port=%d queue=%d)\", desc_to_clean_to,\n+\t\t\t txq->port_id, txq->queue_id);\n \t\t/* Failed to clean any descriptors, better luck next time */\n \t\treturn -(1);\n \t}\n@@ -327,11 +327,11 @@ em_xmit_cleanup(struct em_tx_queue *txq)\n \t\tnb_tx_to_clean = (uint16_t)(desc_to_clean_to -\n \t\t\t\t\t\tlast_desc_cleaned);\n \n-\tPMD_TX_FREE_LOG(DEBUG,\n-\t\t\t\"Cleaning %4u TX descriptors: %4u to %4u \"\n-\t\t\t\"(port=%d queue=%d)\", nb_tx_to_clean,\n-\t\t\tlast_desc_cleaned, desc_to_clean_to, txq->port_id,\n-\t\t\ttxq->queue_id);\n+\tPMD_TX_LOG(DEBUG,\n+\t\t \"Cleaning %4u TX descriptors: %4u to %4u \"\n+\t\t \"(port=%d queue=%d)\", nb_tx_to_clean,\n+\t\t last_desc_cleaned, desc_to_clean_to, txq->port_id,\n+\t\t txq->queue_id);\n \n \t/*\n \t * The last descriptor to clean is done, so that means all the\n@@ -457,11 +457,11 @@ eth_em_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\t * nb_used better be less than or equal to txq->tx_rs_thresh\n \t\t */\n \t\twhile (unlikely (nb_used > txq->nb_tx_free)) {\n-\t\t\tPMD_TX_FREE_LOG(DEBUG, \"Not enough free TX descriptors \"\n-\t\t\t\t\t\"nb_used=%4u nb_free=%4u \"\n-\t\t\t\t\t\"(port=%d queue=%d)\",\n-\t\t\t\t\tnb_used, txq->nb_tx_free,\n-\t\t\t\t\ttxq->port_id, txq->queue_id);\n+\t\t\tPMD_TX_LOG(DEBUG, \"Not enough free TX descriptors \"\n+\t\t\t\t \"nb_used=%4u nb_free=%4u \"\n+\t\t\t\t \"(port=%d queue=%d)\",\n+\t\t\t\t nb_used, txq->nb_tx_free,\n+\t\t\t\t txq->port_id, txq->queue_id);\n \n \t\t\tif (em_xmit_cleanup(txq) != 0) {\n \t\t\t\t/* Could not clean any descriptors */\n@@ -579,10 +579,10 @@ eth_em_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \n \t\t/* Set RS bit only on threshold packets' last descriptor */\n \t\tif (txq->nb_tx_used >= txq->tx_rs_thresh) {\n-\t\t\tPMD_TX_FREE_LOG(DEBUG,\n-\t\t\t\t\t\"Setting RS bit on TXD id=%4u \"\n-\t\t\t\t\t\"(port=%d queue=%d)\",\n-\t\t\t\t\ttx_last, txq->port_id, txq->queue_id);\n+\t\t\tPMD_TX_LOG(DEBUG,\n+\t\t\t\t \"Setting RS bit on TXD id=%4u \"\n+\t\t\t\t \"(port=%d queue=%d)\",\n+\t\t\t\t tx_last, txq->port_id, txq->queue_id);\n \n \t\t\tcmd_type_len |= E1000_TXD_CMD_RS;\n \n@@ -626,7 +626,7 @@ eth_em_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\t\treturn i;\n \t\t}\n \n-#ifdef RTE_LIBRTE_ETHDEV_DEBUG\n+#ifdef RTE_ETHDEV_DEBUG_TX\n \t\tret = rte_validate_tx_offload(m);\n \t\tif (ret != 0) {\n \t\t\trte_errno = -ret;\ndiff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c\nindex 1500d2ffff..45da4ed9d2 100644\n--- a/drivers/net/e1000/igb_rxtx.c\n+++ b/drivers/net/e1000/igb_rxtx.c\n@@ -641,7 +641,7 @@ eth_igb_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\t\treturn i;\n \t\t}\n \n-#ifdef RTE_LIBRTE_ETHDEV_DEBUG\n+#ifdef RTE_ETHDEV_DEBUG_TX\n \t\tret = rte_validate_tx_offload(m);\n \t\tif (ret != 0) {\n \t\t\trte_errno = -ret;\n", "prefixes": [ "v6", "3/8" ] }{ "id": 90214, "url": "