Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/75619/?format=api
{ "id": 75619, "url": "http://patches.dpdk.org/api/patches/75619/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200818120254.72792-5-huwei013@chinasoftinc.com/", "project": { "id": 1, "url": "http://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": "<20200818120254.72792-5-huwei013@chinasoftinc.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200818120254.72792-5-huwei013@chinasoftinc.com", "date": "2020-08-18T12:02:54", "name": "[4/4] app/testpmd: fix displaying Rx Tx queues information", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "bb254d6f7b2f2a3a69e4b897d1420defcf0a0f92", "submitter": { "id": 1537, "url": "http://patches.dpdk.org/api/people/1537/?format=api", "name": "Wei Hu (Xavier)", "email": "huwei013@chinasoftinc.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200818120254.72792-5-huwei013@chinasoftinc.com/mbox/", "series": [ { "id": 11684, "url": "http://patches.dpdk.org/api/series/11684/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=11684", "date": "2020-08-18T12:02:50", "name": "minor fixes for testpmd", "version": 1, "mbox": "http://patches.dpdk.org/series/11684/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/75619/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/75619/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 990BBA034C;\n\tTue, 18 Aug 2020 14:03:59 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 9F8F71C0CA;\n\tTue, 18 Aug 2020 14:03:37 +0200 (CEST)", "from mail.chinasoftinc.com (unknown [114.113.233.8])\n by dpdk.org (Postfix) with ESMTP id CD5CC1C0C4\n for <dev@dpdk.org>; Tue, 18 Aug 2020 14:03:33 +0200 (CEST)", "from localhost.localdomain (120.133.139.157) by INCCAS001.ito.icss\n (10.168.0.60) with Microsoft SMTP Server id 14.3.487.0; Tue, 18 Aug 2020\n 20:03:03 +0800" ], "From": "\"Wei Hu (Xavier)\" <huwei013@chinasoftinc.com>", "To": "Wenzhuo Lu <wenzhuo.lu@intel.com>, Beilei Xing <beilei.xing@intel.com>,\n Bernard Iremonger <bernard.iremonger@intel.com>, Shahaf Shuler\n <shahafs@mellanox.com>, Qi Zhang <qi.z.zhang@intel.com>, Ferruh Yigit\n <ferruh.yigit@intel.com>", "CC": "<dev@dpdk.org>, <xavier.huwei@huawei.com>", "Date": "Tue, 18 Aug 2020 20:02:54 +0800", "Message-ID": "<20200818120254.72792-5-huwei013@chinasoftinc.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20200818120254.72792-1-huwei013@chinasoftinc.com>", "References": "<20200818120254.72792-1-huwei013@chinasoftinc.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[120.133.139.157]", "Subject": "[dpdk-dev] [PATCH 4/4] app/testpmd: fix displaying Rx Tx queues\n\tinformation", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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": "From: Huisong Li <lihuisong@huawei.com>\n\nCurrently, the information of Rx/Tx queues from PMD driver is not displayed\nexactly in the rxtx_config_display function. Because \"ports[pid].rx_conf\"\nand \"ports[pid].tx_conf\" maintained in testpmd application may be not the\nvalue actually used by PMD driver. For instance, user does not set a field,\nbut PMD driver has to use the default value.\n\nThis patch fixes rxtx_config_display so that the information of Rx/Tx\nqueues can be really displayed for the PMD driver that implement\n.rxq_info_get and .txq_info_get ops callback function.\n\nFixes: 75c530c1bd5351 (\"app/testpmd: fix port configuration print\")\nFixes: d44f8a485f5d1f (\"app/testpmd: enable per queue configure\")\nCc: stable@dpdk.org\n\nSigned-off-by: Huisong Li <lihuisong@huawei.com>\nSigned-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>\n---\n app/test-pmd/config.c | 64 +++++++++++++++++++++++++++++++------------\n 1 file changed, 47 insertions(+), 17 deletions(-)", "diff": "diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c\nindex 6e8e05ab1..3ab24ebd2 100644\n--- a/app/test-pmd/config.c\n+++ b/app/test-pmd/config.c\n@@ -2089,10 +2089,17 @@ rxtx_config_display(void)\n \t\tstruct rte_eth_txconf *tx_conf = &ports[pid].tx_conf[0];\n \t\tuint16_t *nb_rx_desc = &ports[pid].nb_rx_desc[0];\n \t\tuint16_t *nb_tx_desc = &ports[pid].nb_tx_desc[0];\n-\t\tuint16_t nb_rx_desc_tmp;\n-\t\tuint16_t nb_tx_desc_tmp;\n \t\tstruct rte_eth_rxq_info rx_qinfo;\n \t\tstruct rte_eth_txq_info tx_qinfo;\n+\t\tuint16_t rx_free_thresh_tmp;\n+\t\tuint16_t tx_free_thresh_tmp;\n+\t\tuint16_t tx_rs_thresh_tmp;\n+\t\tuint16_t nb_rx_desc_tmp;\n+\t\tuint16_t nb_tx_desc_tmp;\n+\t\tuint64_t offloads_tmp;\n+\t\tuint8_t pthresh_tmp;\n+\t\tuint8_t hthresh_tmp;\n+\t\tuint8_t wthresh_tmp;\n \t\tint32_t rc;\n \n \t\t/* per port config */\n@@ -2106,41 +2113,64 @@ rxtx_config_display(void)\n \t\t/* per rx queue config only for first queue to be less verbose */\n \t\tfor (qid = 0; qid < 1; qid++) {\n \t\t\trc = rte_eth_rx_queue_info_get(pid, qid, &rx_qinfo);\n-\t\t\tif (rc)\n+\t\t\tif (rc) {\n \t\t\t\tnb_rx_desc_tmp = nb_rx_desc[qid];\n-\t\t\telse\n+\t\t\t\trx_free_thresh_tmp =\n+\t\t\t\t\trx_conf[qid].rx_free_thresh;\n+\t\t\t\tpthresh_tmp = rx_conf[qid].rx_thresh.pthresh;\n+\t\t\t\ththresh_tmp = rx_conf[qid].rx_thresh.hthresh;\n+\t\t\t\twthresh_tmp = rx_conf[qid].rx_thresh.wthresh;\n+\t\t\t\toffloads_tmp = rx_conf[qid].offloads;\n+\t\t\t} else {\n \t\t\t\tnb_rx_desc_tmp = rx_qinfo.nb_desc;\n+\t\t\t\trx_free_thresh_tmp =\n+\t\t\t\t\t\trx_qinfo.conf.rx_free_thresh;\n+\t\t\t\tpthresh_tmp = rx_qinfo.conf.rx_thresh.pthresh;\n+\t\t\t\ththresh_tmp = rx_qinfo.conf.rx_thresh.hthresh;\n+\t\t\t\twthresh_tmp = rx_qinfo.conf.rx_thresh.wthresh;\n+\t\t\t\toffloads_tmp = rx_qinfo.conf.offloads;\n+\t\t\t}\n \n \t\t\tprintf(\" RX queue: %d\\n\", qid);\n \t\t\tprintf(\" RX desc=%d - RX free threshold=%d\\n\",\n-\t\t\t\tnb_rx_desc_tmp, rx_conf[qid].rx_free_thresh);\n+\t\t\t\tnb_rx_desc_tmp, rx_free_thresh_tmp);\n \t\t\tprintf(\" RX threshold registers: pthresh=%d hthresh=%d \"\n \t\t\t\t\" wthresh=%d\\n\",\n-\t\t\t\trx_conf[qid].rx_thresh.pthresh,\n-\t\t\t\trx_conf[qid].rx_thresh.hthresh,\n-\t\t\t\trx_conf[qid].rx_thresh.wthresh);\n-\t\t\tprintf(\" RX Offloads=0x%\"PRIx64\"\\n\",\n-\t\t\t\trx_conf[qid].offloads);\n+\t\t\t\tpthresh_tmp, hthresh_tmp, wthresh_tmp);\n+\t\t\tprintf(\" RX Offloads=0x%\"PRIx64\"\\n\", offloads_tmp);\n \t\t}\n \n \t\t/* per tx queue config only for first queue to be less verbose */\n \t\tfor (qid = 0; qid < 1; qid++) {\n \t\t\trc = rte_eth_tx_queue_info_get(pid, qid, &tx_qinfo);\n-\t\t\tif (rc)\n+\t\t\tif (rc) {\n \t\t\t\tnb_tx_desc_tmp = nb_tx_desc[qid];\n-\t\t\telse\n+\t\t\t\ttx_free_thresh_tmp =\n+\t\t\t\t\ttx_conf[qid].tx_free_thresh;\n+\t\t\t\tpthresh_tmp = tx_conf[qid].tx_thresh.pthresh;\n+\t\t\t\ththresh_tmp = tx_conf[qid].tx_thresh.hthresh;\n+\t\t\t\twthresh_tmp = tx_conf[qid].tx_thresh.wthresh;\n+\t\t\t\toffloads_tmp = tx_conf[qid].offloads;\n+\t\t\t\ttx_rs_thresh_tmp = tx_conf[qid].tx_rs_thresh;\n+\t\t\t} else {\n \t\t\t\tnb_tx_desc_tmp = tx_qinfo.nb_desc;\n+\t\t\t\ttx_free_thresh_tmp =\n+\t\t\t\t\t\ttx_qinfo.conf.tx_free_thresh;\n+\t\t\t\tpthresh_tmp = tx_qinfo.conf.tx_thresh.pthresh;\n+\t\t\t\ththresh_tmp = tx_qinfo.conf.tx_thresh.hthresh;\n+\t\t\t\twthresh_tmp = tx_qinfo.conf.tx_thresh.wthresh;\n+\t\t\t\toffloads_tmp = tx_qinfo.conf.offloads;\n+\t\t\t\ttx_rs_thresh_tmp = tx_qinfo.conf.tx_rs_thresh;\n+\t\t\t}\n \n \t\t\tprintf(\" TX queue: %d\\n\", qid);\n \t\t\tprintf(\" TX desc=%d - TX free threshold=%d\\n\",\n-\t\t\t\tnb_tx_desc_tmp, tx_conf[qid].tx_free_thresh);\n+\t\t\t\tnb_tx_desc_tmp, tx_free_thresh_tmp);\n \t\t\tprintf(\" TX threshold registers: pthresh=%d hthresh=%d \"\n \t\t\t\t\" wthresh=%d\\n\",\n-\t\t\t\ttx_conf[qid].tx_thresh.pthresh,\n-\t\t\t\ttx_conf[qid].tx_thresh.hthresh,\n-\t\t\t\ttx_conf[qid].tx_thresh.wthresh);\n+\t\t\t\tpthresh_tmp, hthresh_tmp, wthresh_tmp);\n \t\t\tprintf(\" TX offloads=0x%\"PRIx64\" - TX RS bit threshold=%d\\n\",\n-\t\t\t\ttx_conf[qid].offloads, tx_conf->tx_rs_thresh);\n+\t\t\t\toffloads_tmp, tx_rs_thresh_tmp);\n \t\t}\n \t}\n }\n", "prefixes": [ "4/4" ] }