Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/94740/?format=api
{ "id": 94740, "url": "https://patches.dpdk.org/api/patches/94740/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210623044702.4240-45-ndabilpuram@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": "<20210623044702.4240-45-ndabilpuram@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210623044702.4240-45-ndabilpuram@marvell.com", "date": "2021-06-23T04:46:44", "name": "[v4,44/62] net/cnxk: add xstats apis", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "6c7d86d010311667730f99c3d52b72b2ebfd861e", "submitter": { "id": 1202, "url": "https://patches.dpdk.org/api/people/1202/?format=api", "name": "Nithin Dabilpuram", "email": "ndabilpuram@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/20210623044702.4240-45-ndabilpuram@marvell.com/mbox/", "series": [ { "id": 17449, "url": "https://patches.dpdk.org/api/series/17449/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=17449", "date": "2021-06-23T04:46:00", "name": "Marvell CNXK Ethdev Driver", "version": 4, "mbox": "https://patches.dpdk.org/series/17449/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/94740/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/94740/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 5812AA0C41;\n\tWed, 23 Jun 2021 06:52:16 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 7CFB84115B;\n\tWed, 23 Jun 2021 06:49:45 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com\n [67.231.156.173])\n by mails.dpdk.org (Postfix) with ESMTP id D1D2C4115B\n for <dev@dpdk.org>; Wed, 23 Jun 2021 06:49:43 +0200 (CEST)", "from pps.filterd (m0045851.ppops.net [127.0.0.1])\n by mx0b-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id\n 15N4k6fc025518 for <dev@dpdk.org>; Tue, 22 Jun 2021 21:49:43 -0700", "from dc5-exch02.marvell.com ([199.233.59.182])\n by mx0b-0016f401.pphosted.com with ESMTP id 39bptj1gt0-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n for <dev@dpdk.org>; Tue, 22 Jun 2021 21:49:43 -0700", "from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18;\n Tue, 22 Jun 2021 21:49:41 -0700", "from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend\n Transport; Tue, 22 Jun 2021 21:49:41 -0700", "from hyd1588t430.marvell.com (unknown [10.29.52.204])\n by maili.marvell.com (Postfix) with ESMTP id 83E2D5B6936;\n Tue, 22 Jun 2021 21:49:38 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-type; s=pfpt0220; bh=EmeREj9hO05Edir1dKjfOOlg90DA/yureIHugPK1vC0=;\n b=G2YinDs9GADQOyVw4ESi8r5WL5HkKa6clIKoWc1RzY5jfGYan++pahqf5tfJbGRZR339\n 0KshP9JniObRsbUyX3OW+o5ugjRhGfun/9aDb/qTAUhrWM+vGrsdln+G/WGPZX2dDUC6\n JCkDZiDF0L0wPaB8lMGyQex58p3epuQYp9Vd8Uai8XZV6E4YjDdEzpCNMnySdbOuEkJW\n wvQJzr+gqqGPPUVKMZk0KnpLlwa3z+vBcXePjsMNdgAhbXmWEpXoGoZLDYTdny8ugyq8\n QW8eggv7Z2yJ6qdLDZ3mzMT3g4Lux6QlMa0W25bJjgPc4pJhQKduOvDWFWA1mJn+YcI4 Dg==", "From": "Nithin Dabilpuram <ndabilpuram@marvell.com>", "To": "<dev@dpdk.org>", "CC": "<jerinj@marvell.com>, <skori@marvell.com>, <skoteshwar@marvell.com>,\n <pbhagavatula@marvell.com>, <kirankumark@marvell.com>,\n <psatheesh@marvell.com>, <asekhar@marvell.com>, <hkalra@marvell.com>", "Date": "Wed, 23 Jun 2021 10:16:44 +0530", "Message-ID": "<20210623044702.4240-45-ndabilpuram@marvell.com>", "X-Mailer": "git-send-email 2.8.4", "In-Reply-To": "<20210623044702.4240-1-ndabilpuram@marvell.com>", "References": "<20210306153404.10781-1-ndabilpuram@marvell.com>\n <20210623044702.4240-1-ndabilpuram@marvell.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Proofpoint-ORIG-GUID": "pdt7U2dTU48le6z7FsplaJkR1_bKvDrP", "X-Proofpoint-GUID": "pdt7U2dTU48le6z7FsplaJkR1_bKvDrP", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:6.0.391, 18.0.790\n definitions=2021-06-23_01:2021-06-22,\n 2021-06-23 signatures=0", "Subject": "[dpdk-dev] [PATCH v4 44/62] net/cnxk: add xstats apis", "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": "From: Satha Rao <skoteshwar@marvell.com>\n\nInitial implementation of xstats operations.\n\nSigned-off-by: Satha Rao <skoteshwar@marvell.com>\n---\n doc/guides/nics/features/cnxk.ini | 1 +\n doc/guides/nics/features/cnxk_vec.ini | 1 +\n doc/guides/nics/features/cnxk_vf.ini | 1 +\n drivers/net/cnxk/cnxk_ethdev.c | 5 +\n drivers/net/cnxk/cnxk_ethdev.h | 11 ++\n drivers/net/cnxk/cnxk_stats.c | 235 ++++++++++++++++++++++++++++++++++\n 6 files changed, 254 insertions(+)", "diff": "diff --git a/doc/guides/nics/features/cnxk.ini b/doc/guides/nics/features/cnxk.ini\nindex 40952a9..192c15a 100644\n--- a/doc/guides/nics/features/cnxk.ini\n+++ b/doc/guides/nics/features/cnxk.ini\n@@ -34,6 +34,7 @@ Inner L4 checksum = Y\n Packet type parsing = Y\n Basic stats = Y\n Stats per queue = Y\n+Extended stats = Y\n Module EEPROM dump = Y\n Linux = Y\n ARMv8 = Y\ndiff --git a/doc/guides/nics/features/cnxk_vec.ini b/doc/guides/nics/features/cnxk_vec.ini\nindex 32035bb..e990480 100644\n--- a/doc/guides/nics/features/cnxk_vec.ini\n+++ b/doc/guides/nics/features/cnxk_vec.ini\n@@ -32,6 +32,7 @@ Inner L4 checksum = Y\n Packet type parsing = Y\n Basic stats = Y\n Stats per queue = Y\n+Extended stats = Y\n Module EEPROM dump = Y\n Linux = Y\n ARMv8 = Y\ndiff --git a/doc/guides/nics/features/cnxk_vf.ini b/doc/guides/nics/features/cnxk_vf.ini\nindex 8060a68..3a4417c 100644\n--- a/doc/guides/nics/features/cnxk_vf.ini\n+++ b/doc/guides/nics/features/cnxk_vf.ini\n@@ -29,6 +29,7 @@ Inner L4 checksum = Y\n Packet type parsing = Y\n Basic stats = Y\n Stats per queue = Y\n+Extended stats = Y\n Module EEPROM dump = Y\n Linux = Y\n ARMv8 = Y\ndiff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c\nindex 32b6f6c..071c293 100644\n--- a/drivers/net/cnxk/cnxk_ethdev.c\n+++ b/drivers/net/cnxk/cnxk_ethdev.c\n@@ -1199,6 +1199,11 @@ struct eth_dev_ops cnxk_eth_dev_ops = {\n \t.queue_stats_mapping_set = cnxk_nix_queue_stats_mapping,\n \t.stats_get = cnxk_nix_stats_get,\n \t.stats_reset = cnxk_nix_stats_reset,\n+\t.xstats_get = cnxk_nix_xstats_get,\n+\t.xstats_get_names = cnxk_nix_xstats_get_names,\n+\t.xstats_reset = cnxk_nix_xstats_reset,\n+\t.xstats_get_by_id = cnxk_nix_xstats_get_by_id,\n+\t.xstats_get_names_by_id = cnxk_nix_xstats_get_names_by_id,\n };\n \n static int\ndiff --git a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h\nindex 860cfe1..5a0dc13 100644\n--- a/drivers/net/cnxk/cnxk_ethdev.h\n+++ b/drivers/net/cnxk/cnxk_ethdev.h\n@@ -294,6 +294,17 @@ int cnxk_nix_queue_stats_mapping(struct rte_eth_dev *dev, uint16_t queue_id,\n \t\t\t\t uint8_t stat_idx, uint8_t is_rx);\n int cnxk_nix_stats_reset(struct rte_eth_dev *dev);\n int cnxk_nix_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats);\n+int cnxk_nix_xstats_get(struct rte_eth_dev *eth_dev,\n+\t\t\tstruct rte_eth_xstat *xstats, unsigned int n);\n+int cnxk_nix_xstats_get_names(struct rte_eth_dev *eth_dev,\n+\t\t\t struct rte_eth_xstat_name *xstats_names,\n+\t\t\t unsigned int limit);\n+int cnxk_nix_xstats_get_names_by_id(struct rte_eth_dev *eth_dev,\n+\t\t\t\t struct rte_eth_xstat_name *xstats_names,\n+\t\t\t\t const uint64_t *ids, unsigned int limit);\n+int cnxk_nix_xstats_get_by_id(struct rte_eth_dev *eth_dev, const uint64_t *ids,\n+\t\t\t uint64_t *values, unsigned int n);\n+int cnxk_nix_xstats_reset(struct rte_eth_dev *eth_dev);\n \n /* Lookup configuration */\n const uint32_t *cnxk_nix_supported_ptypes_get(struct rte_eth_dev *eth_dev);\ndiff --git a/drivers/net/cnxk/cnxk_stats.c b/drivers/net/cnxk/cnxk_stats.c\nindex 24bff0b..19bab21 100644\n--- a/drivers/net/cnxk/cnxk_stats.c\n+++ b/drivers/net/cnxk/cnxk_stats.c\n@@ -4,6 +4,9 @@\n \n #include \"cnxk_ethdev.h\"\n \n+#define CNXK_NB_RXQ_STATS 5\n+#define CNXK_NB_TXQ_STATS 4\n+\n int\n cnxk_nix_stats_get(struct rte_eth_dev *eth_dev, struct rte_eth_stats *stats)\n {\n@@ -83,3 +86,235 @@ cnxk_nix_queue_stats_mapping(struct rte_eth_dev *eth_dev, uint16_t queue_id,\n \n \treturn 0;\n }\n+\n+int\n+cnxk_nix_xstats_get(struct rte_eth_dev *eth_dev, struct rte_eth_xstat *xstats,\n+\t\t unsigned int n)\n+{\n+\tstruct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);\n+\tstruct roc_nix_xstat roc_xstats[n];\n+\tstruct roc_nix *nix = &dev->nix;\n+\tint roc_size, q, idx = 0, size;\n+\n+\troc_size = roc_nix_xstats_get(nix, roc_xstats, n);\n+\n+\tif (roc_size < 0)\n+\t\treturn roc_size;\n+\n+\t/* Per Queue statistics also returned as part of xstats */\n+\tsize = roc_size + (dev->nb_rxq * CNXK_NB_RXQ_STATS) +\n+\t (dev->nb_txq * CNXK_NB_TXQ_STATS);\n+\n+\t/* If requested array do not have space then return with count */\n+\tif (size > (int)n || xstats == NULL)\n+\t\treturn size;\n+\n+\tfor (idx = 0; idx < roc_size; idx++) {\n+\t\txstats[idx].id = roc_xstats[idx].id;\n+\t\txstats[idx].value = roc_xstats[idx].value;\n+\t}\n+\tfor (q = 0; q < dev->nb_rxq; q++) {\n+\t\tstruct roc_nix_stats_queue qstats;\n+\t\tint rc;\n+\n+\t\trc = roc_nix_stats_queue_get(nix, q, 1, &qstats);\n+\t\tif (rc)\n+\t\t\treturn rc;\n+\n+\t\txstats[idx].id = idx;\n+\t\txstats[idx].value = qstats.rx_pkts;\n+\t\tidx++;\n+\t\txstats[idx].id = idx;\n+\t\txstats[idx].value = qstats.rx_octs;\n+\t\tidx++;\n+\t\txstats[idx].id = idx;\n+\t\txstats[idx].value = qstats.rx_drop_pkts;\n+\t\tidx++;\n+\t\txstats[idx].id = idx;\n+\t\txstats[idx].value = qstats.rx_drop_octs;\n+\t\tidx++;\n+\t\txstats[idx].id = idx;\n+\t\txstats[idx].value = qstats.rx_error_pkts;\n+\t\tidx++;\n+\t}\n+\tfor (q = 0; q < dev->nb_txq; q++) {\n+\t\tstruct roc_nix_stats_queue qstats;\n+\t\tint rc;\n+\n+\t\trc = roc_nix_stats_queue_get(nix, q, 0, &qstats);\n+\t\tif (rc)\n+\t\t\treturn rc;\n+\n+\t\txstats[idx].id = idx;\n+\t\txstats[idx].value = qstats.tx_pkts;\n+\t\tidx++;\n+\t\txstats[idx].id = idx;\n+\t\txstats[idx].value = qstats.tx_octs;\n+\t\tidx++;\n+\t\txstats[idx].id = idx;\n+\t\txstats[idx].value = qstats.tx_drop_pkts;\n+\t\tidx++;\n+\t\txstats[idx].id = idx;\n+\t\txstats[idx].value = qstats.tx_drop_octs;\n+\t\tidx++;\n+\t}\n+\n+\treturn size;\n+}\n+\n+int\n+cnxk_nix_xstats_get_names(struct rte_eth_dev *eth_dev,\n+\t\t\t struct rte_eth_xstat_name *xstats_names,\n+\t\t\t unsigned int limit)\n+{\n+\tstruct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);\n+\tstruct roc_nix_xstat_name roc_xstats_name[limit];\n+\tstruct roc_nix *nix = &dev->nix;\n+\tint roc_size, size, i, q;\n+\n+\troc_size = roc_nix_num_xstats_get(nix);\n+\t/* Per Queue statistics also returned as part of xstats */\n+\tsize = roc_size + (dev->nb_rxq * CNXK_NB_RXQ_STATS) +\n+\t (dev->nb_txq * CNXK_NB_TXQ_STATS);\n+\n+\tif (xstats_names == NULL)\n+\t\treturn size;\n+\n+\tif ((int)limit < size && xstats_names != NULL)\n+\t\treturn size;\n+\n+\troc_size = roc_nix_xstats_names_get(nix, roc_xstats_name, limit);\n+\n+\tfor (i = 0; i < roc_size; i++)\n+\t\trte_strscpy(xstats_names[i].name, roc_xstats_name[i].name,\n+\t\t\t sizeof(xstats_names[i].name));\n+\n+\tfor (q = 0; q < dev->nb_rxq; q++) {\n+\t\tsnprintf(xstats_names[i].name, sizeof(xstats_names[i].name),\n+\t\t\t \"rxq_%d_pkts\", q);\n+\t\ti++;\n+\t\tsnprintf(xstats_names[i].name, sizeof(xstats_names[i].name),\n+\t\t\t \"rxq_%d_octs\", q);\n+\t\ti++;\n+\t\tsnprintf(xstats_names[i].name, sizeof(xstats_names[i].name),\n+\t\t\t \"rxq_%d_drop_pkts\", q);\n+\t\ti++;\n+\t\tsnprintf(xstats_names[i].name, sizeof(xstats_names[i].name),\n+\t\t\t \"rxq_%d_drop_octs\", q);\n+\t\ti++;\n+\t\tsnprintf(xstats_names[i].name, sizeof(xstats_names[i].name),\n+\t\t\t \"rxq_%d_err_pkts\", q);\n+\t\ti++;\n+\t}\n+\n+\tfor (q = 0; q < dev->nb_txq; q++) {\n+\t\tsnprintf(xstats_names[i].name, sizeof(xstats_names[i].name),\n+\t\t\t \"txq_%d_pkts\", q);\n+\t\ti++;\n+\t\tsnprintf(xstats_names[i].name, sizeof(xstats_names[i].name),\n+\t\t\t \"txq_%d_octs\", q);\n+\t\ti++;\n+\t\tsnprintf(xstats_names[i].name, sizeof(xstats_names[i].name),\n+\t\t\t \"txq_%d_drop_pkts\", q);\n+\t\ti++;\n+\t\tsnprintf(xstats_names[i].name, sizeof(xstats_names[i].name),\n+\t\t\t \"txq_%d_drop_octs\", q);\n+\t\ti++;\n+\t}\n+\n+\treturn size;\n+}\n+\n+int\n+cnxk_nix_xstats_get_names_by_id(struct rte_eth_dev *eth_dev,\n+\t\t\t\tstruct rte_eth_xstat_name *xstats_names,\n+\t\t\t\tconst uint64_t *ids, unsigned int limit)\n+{\n+\tstruct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);\n+\tuint32_t nix_cnt = roc_nix_num_xstats_get(&dev->nix);\n+\tuint32_t stat_cnt = nix_cnt + (dev->nb_rxq * CNXK_NB_RXQ_STATS) +\n+\t\t\t (dev->nb_txq * CNXK_NB_TXQ_STATS);\n+\tstruct rte_eth_xstat_name xnames[stat_cnt];\n+\tuint32_t i;\n+\n+\tif (limit < stat_cnt && ids == NULL)\n+\t\treturn stat_cnt;\n+\n+\tif (limit > stat_cnt)\n+\t\treturn -EINVAL;\n+\n+\tif (xstats_names == NULL)\n+\t\treturn -ENOMEM;\n+\n+\tcnxk_nix_xstats_get_names(eth_dev, xnames, stat_cnt);\n+\n+\tfor (i = 0; i < limit; i++) {\n+\t\tif (ids[i] >= stat_cnt)\n+\t\t\treturn -EINVAL;\n+\n+\t\trte_strscpy(xstats_names[i].name, xnames[ids[i]].name,\n+\t\t\t sizeof(xstats_names[i].name));\n+\t}\n+\n+\treturn limit;\n+}\n+\n+int\n+cnxk_nix_xstats_get_by_id(struct rte_eth_dev *eth_dev, const uint64_t *ids,\n+\t\t\t uint64_t *values, unsigned int n)\n+{\n+\tstruct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);\n+\tuint32_t nix_cnt = roc_nix_num_xstats_get(&dev->nix);\n+\tuint32_t stat_cnt = nix_cnt + (dev->nb_rxq * CNXK_NB_RXQ_STATS) +\n+\t\t\t (dev->nb_txq * CNXK_NB_TXQ_STATS);\n+\tstruct rte_eth_xstat xstats[stat_cnt];\n+\tuint32_t i;\n+\n+\tif (n < stat_cnt && ids == NULL)\n+\t\treturn stat_cnt;\n+\n+\tif (n > stat_cnt)\n+\t\treturn -EINVAL;\n+\n+\tif (values == NULL)\n+\t\treturn -ENOMEM;\n+\n+\tcnxk_nix_xstats_get(eth_dev, xstats, stat_cnt);\n+\n+\tfor (i = 0; i < n; i++) {\n+\t\tif (ids[i] >= stat_cnt)\n+\t\t\treturn -EINVAL;\n+\t\tvalues[i] = xstats[ids[i]].value;\n+\t}\n+\n+\treturn n;\n+}\n+\n+int\n+cnxk_nix_xstats_reset(struct rte_eth_dev *eth_dev)\n+{\n+\tstruct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);\n+\tstruct roc_nix *nix = &dev->nix;\n+\tint rc = 0, i;\n+\n+\trc = roc_nix_stats_reset(nix);\n+\tif (rc)\n+\t\tgoto exit;\n+\n+\t/* Reset Rx Queues */\n+\tfor (i = 0; i < dev->nb_rxq; i++) {\n+\t\trc = roc_nix_stats_queue_reset(nix, i, 1);\n+\t\tif (rc)\n+\t\t\tgoto exit;\n+\t}\n+\n+\t/* Reset Tx Queues */\n+\tfor (i = 0; i < dev->nb_txq; i++) {\n+\t\trc = roc_nix_stats_queue_reset(nix, i, 0);\n+\t\tif (rc)\n+\t\t\tgoto exit;\n+\t}\n+\n+exit:\n+\treturn rc;\n+}\n", "prefixes": [ "v4", "44/62" ] }