Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/59165/?format=api
{ "id": 59165, "url": "https://patches.dpdk.org/api/patches/59165/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20190912152416.2990-5-shshaikh@marvell.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": "<20190912152416.2990-5-shshaikh@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190912152416.2990-5-shshaikh@marvell.com", "date": "2019-09-12T15:24:15", "name": "[v2,4/5] net/qede: fix stats flow as per new 100Gb queue allocation method", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "918519d057ddb4dd8a0834098ec1c4a7b2856017", "submitter": { "id": 1210, "url": "https://patches.dpdk.org/api/people/1210/?format=api", "name": "Shahed Shaikh", "email": "shshaikh@marvell.com" }, "delegate": { "id": 310, "url": "https://patches.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20190912152416.2990-5-shshaikh@marvell.com/mbox/", "series": [ { "id": 6390, "url": "https://patches.dpdk.org/api/series/6390/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=6390", "date": "2019-09-12T15:24:11", "name": "net/qede: fixes and enhancement", "version": 2, "mbox": "https://patches.dpdk.org/series/6390/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/59165/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/59165/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 909811EBE6;\n\tThu, 12 Sep 2019 17:24:49 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com\n\t[67.231.156.173]) by dpdk.org (Postfix) with ESMTP id A6C541EB4C;\n\tThu, 12 Sep 2019 17:24:46 +0200 (CEST)", "from pps.filterd (m0045851.ppops.net [127.0.0.1])\n\tby mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id\n\tx8CFOjxN017888; Thu, 12 Sep 2019 08:24:46 -0700", "from sc-exch03.marvell.com ([199.233.58.183])\n\tby mx0b-0016f401.pphosted.com with ESMTP id 2uvc2jy6bx-1\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); \n\tThu, 12 Sep 2019 08:24:46 -0700", "from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH03.marvell.com\n\t(10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1367.3;\n\tThu, 12 Sep 2019 08:24:43 -0700", "from maili.marvell.com (10.93.176.43) by SC-EXCH03.marvell.com\n\t(10.93.176.83) with Microsoft SMTP Server id 15.0.1367.3 via Frontend\n\tTransport; Thu, 12 Sep 2019 08:24:43 -0700", "from dut1171.mv.qlogic.com (unknown [10.112.88.18])\n\tby maili.marvell.com (Postfix) with ESMTP id AB19B3F703F;\n\tThu, 12 Sep 2019 08:24:43 -0700 (PDT)", "from dut1171.mv.qlogic.com (localhost [127.0.0.1])\n\tby dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id x8CFOhx3003081;\n\tThu, 12 Sep 2019 08:24:43 -0700", "(from root@localhost)\n\tby dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id x8CFOhva003077;\n\tThu, 12 Sep 2019 08:24:43 -0700" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n\th=from : to : cc :\n\tsubject : date : message-id : in-reply-to : references : mime-version\n\t: content-type; s=pfpt0818;\n\tbh=twMVfJa1XUa4w5qFNpFoPhK0i+1zZxeathAwgdZX3iM=; \n\tb=Y3Vo/LnntKWA+lV/EkN4NsExfOT61zL87PJIHwvg/QgcQiN7SM6PydzducA6ZMIyln40\n\t3Gbq6AlRHRGdRvJC7RfyPlRraFZHk4qwR2umau/64B+voyPWppCi7pw5gvA/9309SVfw\n\tDT0ft8Mt5pGf8/FFXnqf3Lj8iF70gR6DBH3MB36p76Jm0JAeGzeUIdBTlQY5CimL1YgI\n\tNbQamYl21x6g4SMCnvZTt539mGlt7RJEbNdLAUB4qXb9aXRnok/H8yFb5eXcycpolpoR\n\tMEQAPCSohsSZvq1+RcZjCjGZsaRbqbcm703c+5f1QfTmmoix8ZJD1TRf7ex6ZV8m6/Yw\n\tqg== ", "From": "Shahed Shaikh <shshaikh@marvell.com>", "To": "<dev@dpdk.org>", "CC": "<rmody@marvell.com>, <jerinj@marvell.com>,\n\t<GR-Everest-DPDK-Dev@marvell.com>, <stable@dpdk.org>", "Date": "Thu, 12 Sep 2019 08:24:15 -0700", "Message-ID": "<20190912152416.2990-5-shshaikh@marvell.com>", "X-Mailer": "git-send-email 2.12.0", "In-Reply-To": "<20190912152416.2990-1-shshaikh@marvell.com>", "References": "<20190912152416.2990-1-shshaikh@marvell.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:6.0.70,1.0.8\n\tdefinitions=2019-09-12_08:2019-09-11,2019-09-12 signatures=0", "Subject": "[dpdk-dev] [PATCH v2 4/5] net/qede: fix stats flow as per new 100Gb\n\tqueue allocation method", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "As per new method, need to consider hw stats of queues from\nboth engines. This patch fixes the stats collection flow accordingly.\n\nFixes: 2af14ca79c0a (\"net/qede: support 100G\")\nCc: stable@dpdk.org\n\nSigned-off-by: Shahed Shaikh <shshaikh@marvell.com>\n---\n drivers/net/qede/qede_ethdev.c | 135 +++++++++++++++++++--------------\n 1 file changed, 76 insertions(+), 59 deletions(-)", "diff": "diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c\nindex 8b75ca3a7..98290fdc7 100644\n--- a/drivers/net/qede/qede_ethdev.c\n+++ b/drivers/net/qede/qede_ethdev.c\n@@ -1477,7 +1477,7 @@ qede_get_stats(struct rte_eth_dev *eth_dev, struct rte_eth_stats *eth_stats)\n \tstruct qede_dev *qdev = eth_dev->data->dev_private;\n \tstruct ecore_dev *edev = &qdev->edev;\n \tstruct ecore_eth_stats stats;\n-\tunsigned int i = 0, j = 0, qid;\n+\tunsigned int i = 0, j = 0, qid, idx, hw_fn;\n \tunsigned int rxq_stat_cntrs, txq_stat_cntrs;\n \tstruct qede_tx_queue *txq;\n \n@@ -1525,32 +1525,47 @@ qede_get_stats(struct rte_eth_dev *eth_dev, struct rte_eth_stats *eth_stats)\n \t\t \" appropriately and retry.\\n\");\n \n \tfor (qid = 0; qid < eth_dev->data->nb_rx_queues; qid++) {\n-\t\teth_stats->q_ipackets[i] =\n-\t\t\t*(uint64_t *)(\n-\t\t\t\t((char *)(qdev->fp_array[qid].rxq)) +\n-\t\t\t\toffsetof(struct qede_rx_queue,\n-\t\t\t\trcv_pkts));\n-\t\teth_stats->q_errors[i] =\n-\t\t\t*(uint64_t *)(\n-\t\t\t\t((char *)(qdev->fp_array[qid].rxq)) +\n-\t\t\t\toffsetof(struct qede_rx_queue,\n-\t\t\t\trx_hw_errors)) +\n-\t\t\t*(uint64_t *)(\n-\t\t\t\t((char *)(qdev->fp_array[qid].rxq)) +\n-\t\t\t\toffsetof(struct qede_rx_queue,\n-\t\t\t\trx_alloc_errors));\n+\t\teth_stats->q_ipackets[i] = 0;\n+\t\teth_stats->q_errors[i] = 0;\n+\n+\t\tfor_each_hwfn(edev, hw_fn) {\n+\t\t\tidx = qid * edev->num_hwfns + hw_fn;\n+\n+\t\t\teth_stats->q_ipackets[i] +=\n+\t\t\t\t*(uint64_t *)\n+\t\t\t\t\t(((char *)(qdev->fp_array[idx].rxq)) +\n+\t\t\t\t\t offsetof(struct qede_rx_queue,\n+\t\t\t\t\t rcv_pkts));\n+\t\t\teth_stats->q_errors[i] +=\n+\t\t\t\t*(uint64_t *)\n+\t\t\t\t\t(((char *)(qdev->fp_array[idx].rxq)) +\n+\t\t\t\t\t offsetof(struct qede_rx_queue,\n+\t\t\t\t\t rx_hw_errors)) +\n+\t\t\t\t*(uint64_t *)\n+\t\t\t\t\t(((char *)(qdev->fp_array[idx].rxq)) +\n+\t\t\t\t\t offsetof(struct qede_rx_queue,\n+\t\t\t\t\t rx_alloc_errors));\n+\t\t}\n+\n \t\ti++;\n \t\tif (i == rxq_stat_cntrs)\n \t\t\tbreak;\n \t}\n \n \tfor (qid = 0; qid < eth_dev->data->nb_tx_queues; qid++) {\n-\t\ttxq = qdev->fp_array[qid].txq;\n-\t\teth_stats->q_opackets[j] =\n-\t\t\t*((uint64_t *)(uintptr_t)\n-\t\t\t\t(((uint64_t)(uintptr_t)(txq)) +\n-\t\t\t\t offsetof(struct qede_tx_queue,\n-\t\t\t\t\t xmit_pkts)));\n+\t\teth_stats->q_opackets[j] = 0;\n+\n+\t\tfor_each_hwfn(edev, hw_fn) {\n+\t\t\tidx = qid * edev->num_hwfns + hw_fn;\n+\n+\t\t\ttxq = qdev->fp_array[idx].txq;\n+\t\t\teth_stats->q_opackets[j] +=\n+\t\t\t\t*((uint64_t *)(uintptr_t)\n+\t\t\t\t\t(((uint64_t)(uintptr_t)(txq)) +\n+\t\t\t\t\t offsetof(struct qede_tx_queue,\n+\t\t\t\t\t\t xmit_pkts)));\n+\t\t}\n+\n \t\tj++;\n \t\tif (j == txq_stat_cntrs)\n \t\t\tbreak;\n@@ -1583,42 +1598,43 @@ qede_get_xstats_names(struct rte_eth_dev *dev,\n \tstruct qede_dev *qdev = dev->data->dev_private;\n \tstruct ecore_dev *edev = &qdev->edev;\n \tconst unsigned int stat_cnt = qede_get_xstats_count(qdev);\n-\tunsigned int i, qid, stat_idx = 0;\n-\tunsigned int rxq_stat_cntrs;\n+\tunsigned int i, qid, hw_fn, stat_idx = 0;\n \n-\tif (xstats_names != NULL) {\n-\t\tfor (i = 0; i < RTE_DIM(qede_xstats_strings); i++) {\n+\tif (xstats_names == NULL)\n+\t\treturn stat_cnt;\n+\n+\tfor (i = 0; i < RTE_DIM(qede_xstats_strings); i++) {\n+\t\tstrlcpy(xstats_names[stat_idx].name,\n+\t\t\tqede_xstats_strings[i].name,\n+\t\t\tsizeof(xstats_names[stat_idx].name));\n+\t\tstat_idx++;\n+\t}\n+\n+\tif (ECORE_IS_BB(edev)) {\n+\t\tfor (i = 0; i < RTE_DIM(qede_bb_xstats_strings); i++) {\n \t\t\tstrlcpy(xstats_names[stat_idx].name,\n-\t\t\t\tqede_xstats_strings[i].name,\n+\t\t\t\tqede_bb_xstats_strings[i].name,\n \t\t\t\tsizeof(xstats_names[stat_idx].name));\n \t\t\tstat_idx++;\n \t\t}\n-\n-\t\tif (ECORE_IS_BB(edev)) {\n-\t\t\tfor (i = 0; i < RTE_DIM(qede_bb_xstats_strings); i++) {\n-\t\t\t\tstrlcpy(xstats_names[stat_idx].name,\n-\t\t\t\t\tqede_bb_xstats_strings[i].name,\n-\t\t\t\t\tsizeof(xstats_names[stat_idx].name));\n-\t\t\t\tstat_idx++;\n-\t\t\t}\n-\t\t} else {\n-\t\t\tfor (i = 0; i < RTE_DIM(qede_ah_xstats_strings); i++) {\n-\t\t\t\tstrlcpy(xstats_names[stat_idx].name,\n-\t\t\t\t\tqede_ah_xstats_strings[i].name,\n-\t\t\t\t\tsizeof(xstats_names[stat_idx].name));\n-\t\t\t\tstat_idx++;\n-\t\t\t}\n+\t} else {\n+\t\tfor (i = 0; i < RTE_DIM(qede_ah_xstats_strings); i++) {\n+\t\t\tstrlcpy(xstats_names[stat_idx].name,\n+\t\t\t\tqede_ah_xstats_strings[i].name,\n+\t\t\t\tsizeof(xstats_names[stat_idx].name));\n+\t\t\tstat_idx++;\n \t\t}\n+\t}\n \n-\t\trxq_stat_cntrs = RTE_MIN(QEDE_RSS_COUNT(dev),\n-\t\t\t\t\t RTE_ETHDEV_QUEUE_STAT_CNTRS);\n-\t\tfor (qid = 0; qid < rxq_stat_cntrs; qid++) {\n+\tfor (qid = 0; qid < QEDE_RSS_COUNT(dev); qid++) {\n+\t\tfor_each_hwfn(edev, hw_fn) {\n \t\t\tfor (i = 0; i < RTE_DIM(qede_rxq_xstats_strings); i++) {\n \t\t\t\tsnprintf(xstats_names[stat_idx].name,\n-\t\t\t\t\tsizeof(xstats_names[stat_idx].name),\n-\t\t\t\t\t\"%.4s%d%s\",\n-\t\t\t\t\tqede_rxq_xstats_strings[i].name, qid,\n-\t\t\t\t\tqede_rxq_xstats_strings[i].name + 4);\n+\t\t\t\t\t RTE_ETH_XSTATS_NAME_SIZE,\n+\t\t\t\t\t \"%.4s%d.%d%s\",\n+\t\t\t\t\t qede_rxq_xstats_strings[i].name,\n+\t\t\t\t\t hw_fn, qid,\n+\t\t\t\t\t qede_rxq_xstats_strings[i].name + 4);\n \t\t\t\tstat_idx++;\n \t\t\t}\n \t\t}\n@@ -1635,8 +1651,7 @@ qede_get_xstats(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,\n \tstruct ecore_dev *edev = &qdev->edev;\n \tstruct ecore_eth_stats stats;\n \tconst unsigned int num = qede_get_xstats_count(qdev);\n-\tunsigned int i, qid, stat_idx = 0;\n-\tunsigned int rxq_stat_cntrs;\n+\tunsigned int i, qid, hw_fn, fpidx, stat_idx = 0;\n \n \tif (n < num)\n \t\treturn num;\n@@ -1668,15 +1683,17 @@ qede_get_xstats(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,\n \t\t}\n \t}\n \n-\trxq_stat_cntrs = RTE_MIN(QEDE_RSS_COUNT(dev),\n-\t\t\t\t RTE_ETHDEV_QUEUE_STAT_CNTRS);\n-\tfor (qid = 0; qid < rxq_stat_cntrs; qid++) {\n-\t\tfor (i = 0; i < RTE_DIM(qede_rxq_xstats_strings); i++) {\n-\t\t\txstats[stat_idx].value = *(uint64_t *)\n-\t\t\t\t(((char *)(qdev->fp_array[qid].rxq)) +\n-\t\t\t\t qede_rxq_xstats_strings[i].offset);\n-\t\t\txstats[stat_idx].id = stat_idx;\n-\t\t\tstat_idx++;\n+\tfor (qid = 0; qid < dev->data->nb_rx_queues; qid++) {\n+\t\tfor_each_hwfn(edev, hw_fn) {\n+\t\t\tfor (i = 0; i < RTE_DIM(qede_rxq_xstats_strings); i++) {\n+\t\t\t\tfpidx = qid * edev->num_hwfns + hw_fn;\n+\t\t\t\txstats[stat_idx].value = *(uint64_t *)\n+\t\t\t\t\t(((char *)(qdev->fp_array[fpidx].rxq)) +\n+\t\t\t\t\t qede_rxq_xstats_strings[i].offset);\n+\t\t\t\txstats[stat_idx].id = stat_idx;\n+\t\t\t\tstat_idx++;\n+\t\t\t}\n+\n \t\t}\n \t}\n \n", "prefixes": [ "v2", "4/5" ] }