Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/16713/?format=api
{ "id": 16713, "url": "https://patches.dpdk.org/api/patches/16713/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1476850306-2141-30-git-send-email-rasesh.mody@qlogic.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": "<1476850306-2141-30-git-send-email-rasesh.mody@qlogic.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1476850306-2141-30-git-send-email-rasesh.mody@qlogic.com", "date": "2016-10-19T04:11:43", "name": "[dpdk-dev,v4,29/32] net/qede: add support for queue statistics", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "41a42135f1e01d0c889e47aede2fd6ea9567a0f1", "submitter": { "id": 325, "url": "https://patches.dpdk.org/api/people/325/?format=api", "name": "Rasesh Mody", "email": "rasesh.mody@qlogic.com" }, "delegate": { "id": 10, "url": "https://patches.dpdk.org/api/users/10/?format=api", "username": "bruce", "first_name": "Bruce", "last_name": "Richardson", "email": "bruce.richardson@intel.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1476850306-2141-30-git-send-email-rasesh.mody@qlogic.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/16713/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/16713/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 [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id F0ECD918F;\n\tWed, 19 Oct 2016 06:14:32 +0200 (CEST)", "from mx0b-0016ce01.pphosted.com (mx0b-0016ce01.pphosted.com\n\t[67.231.156.153]) by dpdk.org (Postfix) with ESMTP id 26E658E99\n\tfor <dev@dpdk.org>; Wed, 19 Oct 2016 06:14:31 +0200 (CEST)", "from pps.filterd (m0085408.ppops.net [127.0.0.1])\n\tby mx0b-0016ce01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id\n\tu9J4C00M031953; Tue, 18 Oct 2016 21:14:29 -0700", "from avcashub1.qlogic.com ([198.186.0.117])\n\tby mx0b-0016ce01.pphosted.com with ESMTP id 263keq5bpx-1\n\t(version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT);\n\tTue, 18 Oct 2016 21:14:29 -0700", "from avluser05.qlc.com (10.1.113.115) by qlc.com (10.1.4.192) with\n\tMicrosoft SMTP Server id 14.3.235.1;\n\tTue, 18 Oct 2016 21:14:28 -0700", "(from rmody@localhost)\tby avluser05.qlc.com (8.14.4/8.14.4/Submit)\n\tid u9J4ESCu002674;\tTue, 18 Oct 2016 21:14:28 -0700" ], "X-Authentication-Warning": "avluser05.qlc.com: rmody set sender to\n\trasesh.mody@qlogic.com using -f", "From": "Rasesh Mody <rasesh.mody@qlogic.com>", "To": "<ferruh.yigit@intel.com>, <thomas.monjalon@6wind.com>,\n\t<bruce.richardson@intel.com>", "CC": "<dev@dpdk.org>, <Dept-EngDPDKDev@qlogic.com>, Rasesh Mody\n\t<rasesh.mody@qlogic.com>", "Date": "Tue, 18 Oct 2016 21:11:43 -0700", "Message-ID": "<1476850306-2141-30-git-send-email-rasesh.mody@qlogic.com>", "X-Mailer": "git-send-email 1.7.10.3", "In-Reply-To": "<1476850306-2141-1-git-send-email-rasesh.mody@qlogic.com>", "References": "<1476850306-2141-1-git-send-email-rasesh.mody@qlogic.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "disclaimer": "bypass", "X-Proofpoint-Virus-Version": "vendor=nai engine=5800 definitions=8322\n\tsignatures=670725", "X-Proofpoint-Spam-Details": "rule=notspam policy=default score=0\n\tpriorityscore=1501 malwarescore=0\n\tsuspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015\n\tlowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam\n\tadjust=0\n\treason=mlx scancount=1 engine=8.0.1-1609300000\n\tdefinitions=main-1610190074", "Subject": "[dpdk-dev] [PATCH v4 29/32] net/qede: add support for queue\n\tstatistics", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "This patch adds support for pulling per queue statistics.\n\nSigned-off-by: Rasesh Mody <rasesh.mody@qlogic.com>\n---\n drivers/net/qede/qede_ethdev.c | 98 +++++++++++++++++++++++++++++++++++++-----\n drivers/net/qede/qede_ethdev.h | 3 ++\n drivers/net/qede/qede_rxtx.c | 23 +++++-----\n drivers/net/qede/qede_rxtx.h | 4 +-\n 4 files changed, 107 insertions(+), 21 deletions(-)", "diff": "diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c\nindex 394f89a..b91b478 100644\n--- a/drivers/net/qede/qede_ethdev.c\n+++ b/drivers/net/qede/qede_ethdev.c\n@@ -160,6 +160,15 @@ static const struct rte_qede_xstats_name_off qede_xstats_strings[] = {\n \t\toffsetof(struct ecore_eth_stats, tpa_coalesced_bytes)},\n };\n \n+static const struct rte_qede_xstats_name_off qede_rxq_xstats_strings[] = {\n+\t{\"rx_q_segments\",\n+\t\toffsetof(struct qede_rx_queue, rx_segs)},\n+\t{\"rx_q_hw_errors\",\n+\t\toffsetof(struct qede_rx_queue, rx_hw_errors)},\n+\t{\"rx_q_allocation_errors\",\n+\t\toffsetof(struct qede_rx_queue, rx_alloc_errors)}\n+};\n+\n static void qede_interrupt_action(struct ecore_hwfn *p_hwfn)\n {\n \tecore_int_sp_dpc((osal_int_ptr_t)(p_hwfn));\n@@ -828,6 +837,8 @@ 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+\tstruct qede_tx_queue *txq;\n \n \tqdev->ops->get_vport_stats(edev, &stats);\n \n@@ -858,20 +869,73 @@ qede_get_stats(struct rte_eth_dev *eth_dev, struct rte_eth_stats *eth_stats)\n \t stats.tx_mcast_bytes + stats.tx_bcast_bytes;\n \n \teth_stats->oerrors = stats.tx_err_drop_pkts;\n+\n+\t/* Queue stats */\n+\tfor (qid = 0; qid < QEDE_QUEUE_CNT(qdev); qid++) {\n+\t\tif (qdev->fp_array[qid].type & QEDE_FASTPATH_RX) {\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[(qid)].rxq)) +\n+\t\t\t\t\toffsetof(struct qede_rx_queue,\n+\t\t\t\t\trcv_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[(qid)].rxq)) +\n+\t\t\t\t\toffsetof(struct qede_rx_queue,\n+\t\t\t\t\trx_hw_errors)) +\n+\t\t\t\t*(uint64_t *)(\n+\t\t\t\t\t((char *)(qdev->fp_array[(qid)].rxq)) +\n+\t\t\t\t\toffsetof(struct qede_rx_queue,\n+\t\t\t\t\trx_alloc_errors));\n+\t\t\ti++;\n+\t\t}\n+\n+\t\tif (qdev->fp_array[qid].type & QEDE_FASTPATH_TX) {\n+\t\t\ttxq = qdev->fp_array[(qid)].txqs[0];\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\tj++;\n+\t\t}\n+\t}\n+}\n+\n+static unsigned\n+qede_get_xstats_count(struct qede_dev *qdev) {\n+\treturn RTE_DIM(qede_xstats_strings) +\n+\t\t(RTE_DIM(qede_rxq_xstats_strings) * QEDE_RSS_COUNT(qdev));\n }\n \n static int\n qede_get_xstats_names(__rte_unused struct rte_eth_dev *dev,\n \t\t struct rte_eth_xstat_name *xstats_names, unsigned limit)\n {\n-\tunsigned int i, stat_cnt = RTE_DIM(qede_xstats_strings);\n+\tstruct qede_dev *qdev = dev->data->dev_private;\n+\tconst unsigned int stat_cnt = qede_get_xstats_count(qdev);\n+\tunsigned int i, qid, stat_idx = 0;\n \n-\tif (xstats_names != NULL)\n-\t\tfor (i = 0; i < stat_cnt; i++)\n-\t\t\tsnprintf(xstats_names[i].name,\n-\t\t\t\tsizeof(xstats_names[i].name),\n+\tif (xstats_names != NULL) {\n+\t\tfor (i = 0; i < RTE_DIM(qede_xstats_strings); i++) {\n+\t\t\tsnprintf(xstats_names[stat_idx].name,\n+\t\t\t\tsizeof(xstats_names[stat_idx].name),\n \t\t\t\t\"%s\",\n \t\t\t\tqede_xstats_strings[i].name);\n+\t\t\tstat_idx++;\n+\t\t}\n+\n+\t\tfor (qid = 0; qid < QEDE_RSS_COUNT(qdev); qid++) {\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\tstat_idx++;\n+\t\t\t}\n+\t\t}\n+\t}\n \n \treturn stat_cnt;\n }\n@@ -883,18 +947,32 @@ qede_get_xstats(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,\n \tstruct qede_dev *qdev = dev->data->dev_private;\n \tstruct ecore_dev *edev = &qdev->edev;\n \tstruct ecore_eth_stats stats;\n-\tunsigned int num = RTE_DIM(qede_xstats_strings);\n+\tconst unsigned int num = qede_get_xstats_count(qdev);\n+\tunsigned int i, qid, stat_idx = 0;\n \n \tif (n < num)\n \t\treturn num;\n \n \tqdev->ops->get_vport_stats(edev, &stats);\n \n-\tfor (num = 0; num < n; num++)\n-\t\txstats[num].value = *(u64 *)(((char *)&stats) +\n-\t\t\t\t\t qede_xstats_strings[num].offset);\n+\tfor (i = 0; i < RTE_DIM(qede_xstats_strings); i++) {\n+\t\txstats[stat_idx].value = *(uint64_t *)(((char *)&stats) +\n+\t\t\t\t\t qede_xstats_strings[i].offset);\n+\t\tstat_idx++;\n+\t}\n+\n+\tfor (qid = 0; qid < QEDE_QUEUE_CNT(qdev); qid++) {\n+\t\tif (qdev->fp_array[qid].type & QEDE_FASTPATH_RX) {\n+\t\t\tfor (i = 0; i < RTE_DIM(qede_rxq_xstats_strings); i++) {\n+\t\t\t\txstats[stat_idx].value = *(uint64_t *)(\n+\t\t\t\t\t((char *)(qdev->fp_array[(qid)].rxq)) +\n+\t\t\t\t\t qede_rxq_xstats_strings[i].offset);\n+\t\t\t\tstat_idx++;\n+\t\t\t}\n+\t\t}\n+\t}\n \n-\treturn num;\n+\treturn stat_idx;\n }\n \n static void\ndiff --git a/drivers/net/qede/qede_ethdev.h b/drivers/net/qede/qede_ethdev.h\nindex 7b235b1..5ab36a5 100644\n--- a/drivers/net/qede/qede_ethdev.h\n+++ b/drivers/net/qede/qede_ethdev.h\n@@ -69,6 +69,9 @@\n #define QEDE_TSS_COUNT(qdev) (((qdev)->num_queues - (qdev)->fp_num_rx) * \\\n \t\t\t\t\t(qdev)->num_tc)\n \n+#define QEDE_FASTPATH_TX (1 << 0)\n+#define QEDE_FASTPATH_RX (1 << 1)\n+\n #define QEDE_DUPLEX_FULL\t1\n #define QEDE_DUPLEX_HALF\t2\n #define QEDE_DUPLEX_UNKNOWN 0xff\ndiff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c\nindex bfcb16c..2e181c8 100644\n--- a/drivers/net/qede/qede_rxtx.c\n+++ b/drivers/net/qede/qede_rxtx.c\n@@ -10,9 +10,6 @@\n \n static bool gro_disable = 1;\t/* mod_param */\n \n-#define QEDE_FASTPATH_TX (1 << 0)\n-#define QEDE_FASTPATH_RX (1 << 1)\n-\n static inline int qede_alloc_rx_buffer(struct qede_rx_queue *rxq)\n {\n \tstruct rte_mbuf *new_mb = NULL;\n@@ -838,7 +835,7 @@ static inline uint32_t qede_rx_cqe_to_pkt_type(uint16_t flags)\n }\n \n int qede_process_sg_pkts(void *p_rxq, struct rte_mbuf *rx_mb,\n-\t\t\t int num_frags, uint16_t pkt_len)\n+\t\t\t int num_segs, uint16_t pkt_len)\n {\n \tstruct qede_rx_queue *rxq = p_rxq;\n \tstruct qede_dev *qdev = rxq->qdev;\n@@ -849,13 +846,13 @@ int qede_process_sg_pkts(void *p_rxq, struct rte_mbuf *rx_mb,\n \tregister struct rte_mbuf *seg2 = NULL;\n \n \tseg1 = rx_mb;\n-\twhile (num_frags) {\n+\twhile (num_segs) {\n \t\tcur_size = pkt_len > rxq->rx_buf_size ?\n \t\t\t\trxq->rx_buf_size : pkt_len;\n \t\tif (!cur_size) {\n \t\t\tPMD_RX_LOG(DEBUG, rxq,\n \t\t\t\t \"SG packet, len and num BD mismatch\\n\");\n-\t\t\tqede_recycle_rx_bd_ring(rxq, qdev, num_frags);\n+\t\t\tqede_recycle_rx_bd_ring(rxq, qdev, num_segs);\n \t\t\treturn -EINVAL;\n \t\t}\n \n@@ -876,7 +873,8 @@ int qede_process_sg_pkts(void *p_rxq, struct rte_mbuf *rx_mb,\n \t\tseg2->data_len = cur_size;\n \t\tseg1->next = seg2;\n \t\tseg1 = seg1->next;\n-\t\tnum_frags--;\n+\t\tnum_segs--;\n+\t\trxq->rx_segs++;\n \t\tcontinue;\n \t}\n \tseg1 = NULL;\n@@ -904,7 +902,7 @@ qede_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \tregister struct rte_mbuf *seg1 = NULL;\n \tenum eth_rx_cqe_type cqe_type;\n \tuint16_t len, pad, preload_idx, pkt_len, parse_flag;\n-\tuint8_t csum_flag, num_frags;\n+\tuint8_t csum_flag, num_segs;\n \tenum rss_hash_type htype;\n \tint ret;\n \n@@ -978,11 +976,13 @@ qede_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \n \t\tif (fp_cqe->bd_num > 1) {\n \t\t\tpkt_len = rte_le_to_cpu_16(fp_cqe->pkt_len);\n-\t\t\tnum_frags = fp_cqe->bd_num - 1;\n+\t\t\tnum_segs = fp_cqe->bd_num - 1;\n+\n+\t\t\trxq->rx_segs++;\n \n \t\t\tpkt_len -= len;\n \t\t\tseg1 = rx_mb;\n-\t\t\tret = qede_process_sg_pkts(p_rxq, seg1, num_frags,\n+\t\t\tret = qede_process_sg_pkts(p_rxq, seg1, num_segs,\n \t\t\t\t\t\t pkt_len);\n \t\t\tif (ret != ECORE_SUCCESS) {\n \t\t\t\tqede_recycle_rx_bd_ring(rxq, qdev,\n@@ -1045,6 +1045,8 @@ next_cqe:\n \n \tqede_update_rx_prod(qdev, rxq);\n \n+\trxq->rcv_pkts += rx_pkt;\n+\n \tPMD_RX_LOG(DEBUG, rxq, \"rx_pkts=%u core=%d\\n\", rx_pkt, rte_lcore_id());\n \n \treturn rx_pkt;\n@@ -1237,6 +1239,7 @@ qede_xmit_pkts(void *p_txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t\tbd_prod =\n \t\t rte_cpu_to_le_16(ecore_chain_get_prod_idx(&txq->tx_pbl));\n \t\tnb_pkt_sent++;\n+\t\ttxq->xmit_pkts++;\n \t}\n \n \t/* Write value of prod idx into bd_prod */\ndiff --git a/drivers/net/qede/qede_rxtx.h b/drivers/net/qede/qede_rxtx.h\nindex da47b21..ed9a529 100644\n--- a/drivers/net/qede/qede_rxtx.h\n+++ b/drivers/net/qede/qede_rxtx.h\n@@ -99,6 +99,8 @@ struct qede_rx_queue {\n \tuint16_t queue_id;\n \tuint16_t port_id;\n \tuint16_t rx_buf_size;\n+\tuint64_t rcv_pkts;\n+\tuint64_t rx_segs;\n \tuint64_t rx_hw_errors;\n \tuint64_t rx_alloc_errors;\n \tstruct qede_dev *qdev;\n@@ -130,7 +132,7 @@ struct qede_tx_queue {\n \tvoid OSAL_IOMEM *doorbell_addr;\n \tvolatile union db_prod tx_db;\n \tuint16_t port_id;\n-\tuint64_t txq_counter;\n+\tuint64_t xmit_pkts;\n \tstruct qede_dev *qdev;\n };\n \n", "prefixes": [ "dpdk-dev", "v4", "29/32" ] }