Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/58604/?format=api
{ "id": 58604, "url": "https://patches.dpdk.org/api/patches/58604/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20190905053933.27929-3-xiaoyun.li@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": "<20190905053933.27929-3-xiaoyun.li@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190905053933.27929-3-xiaoyun.li@intel.com", "date": "2019-09-05T05:39:31", "name": "[2/4] raw/ntb: add xstats support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "39841e3f103559c4da42bcec66efe3ce73b152f4", "submitter": { "id": 798, "url": "https://patches.dpdk.org/api/people/798/?format=api", "name": "Li, Xiaoyun", "email": "xiaoyun.li@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20190905053933.27929-3-xiaoyun.li@intel.com/mbox/", "series": [ { "id": 6245, "url": "https://patches.dpdk.org/api/series/6245/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=6245", "date": "2019-09-05T05:39:29", "name": "enable FIFO for NTB", "version": 1, "mbox": "https://patches.dpdk.org/series/6245/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/58604/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/58604/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 8E8621ECDA;\n\tThu, 5 Sep 2019 07:39:56 +0200 (CEST)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby dpdk.org (Postfix) with ESMTP id 179CB1EBEC\n\tfor <dev@dpdk.org>; Thu, 5 Sep 2019 07:39:53 +0200 (CEST)", "from orsmga008.jf.intel.com ([10.7.209.65])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t04 Sep 2019 22:39:53 -0700", "from dpdk-xiaoyun3.sh.intel.com ([10.67.118.227])\n\tby orsmga008.jf.intel.com with ESMTP; 04 Sep 2019 22:39:52 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.64,469,1559545200\"; d=\"scan'208\";a=\"177188702\"", "From": "Xiaoyun Li <xiaoyun.li@intel.com>", "To": "jingjing.wu@intel.com, keith.wiles@intel.com, omkar.maslekar@intel.com, \n\tcunming.liang@intel.com", "Cc": "dev@dpdk.org,\n\tXiaoyun Li <xiaoyun.li@intel.com>", "Date": "Thu, 5 Sep 2019 13:39:31 +0800", "Message-Id": "<20190905053933.27929-3-xiaoyun.li@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20190905053933.27929-1-xiaoyun.li@intel.com>", "References": "<20190905053933.27929-1-xiaoyun.li@intel.com>", "Subject": "[dpdk-dev] [PATCH 2/4] raw/ntb: add xstats support", "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": "Add xstats support for ntb rawdev.\nSupport tx-packets, tx-bytes, tx-errors and\nrx-packets, rx-bytes, rx-missed.\n\nSigned-off-by: Xiaoyun Li <xiaoyun.li@intel.com>\n---\n drivers/raw/ntb/ntb.c | 135 ++++++++++++++++++++++++++++++++++++------\n drivers/raw/ntb/ntb.h | 11 ++++\n 2 files changed, 128 insertions(+), 18 deletions(-)", "diff": "diff --git a/drivers/raw/ntb/ntb.c b/drivers/raw/ntb/ntb.c\nindex 124c82a95..c104557d4 100644\n--- a/drivers/raw/ntb/ntb.c\n+++ b/drivers/raw/ntb/ntb.c\n@@ -30,6 +30,17 @@ static const struct rte_pci_id pci_id_ntb_map[] = {\n \t{ .vendor_id = 0, /* sentinel */ },\n };\n \n+/* Align with enum ntb_xstats_idx */\n+static struct rte_rawdev_xstats_name ntb_xstats_names[] = {\n+\t{\"Tx-packtes\"},\n+\t{\"Tx-bytes\"},\n+\t{\"Tx-errors\"},\n+\t{\"Rx-packets\"},\n+\t{\"Rx-bytes\"},\n+\t{\"Rx-missed\"},\n+};\n+#define NTB_XSTATS_NUM RTE_DIM(ntb_xstats_names)\n+\n static inline void\n ntb_link_cleanup(struct rte_rawdev *dev)\n {\n@@ -538,6 +549,10 @@ ntb_queue_init(struct rte_rawdev *dev, uint16_t qp_id)\n \ttxq->last_avail = 0;\n \ttxq->nb_tx_free = txq->nb_tx_desc - 1;\n \n+\t/* Set per queue stats. */\n+\tfor (i = 0; i < NTB_XSTATS_NUM; i++)\n+\t\thw->ntb_xstats[i + NTB_XSTATS_NUM * (qp_id + 1)] = 0;\n+\n \treturn 0;\n }\n \n@@ -614,6 +629,7 @@ ntb_dev_configure(const struct rte_rawdev *dev, rte_rawdev_obj_t config)\n {\n \tstruct ntb_dev_config *conf = config;\n \tstruct ntb_hw *hw = dev->dev_private;\n+\tuint32_t xstats_num;\n \tint ret;\n \n \thw->queue_pairs\t= conf->num_queues;\n@@ -624,6 +640,10 @@ ntb_dev_configure(const struct rte_rawdev *dev, rte_rawdev_obj_t config)\n \t\t\tsizeof(struct ntb_rx_queue *) * hw->queue_pairs, 0);\n \thw->tx_queues = rte_zmalloc(\"ntb_tx_queues\",\n \t\t\tsizeof(struct ntb_tx_queue *) * hw->queue_pairs, 0);\n+\t/* First total stats, then per queue stats. */\n+\txstats_num = (hw->queue_pairs + 1) * NTB_XSTATS_NUM;\n+\thw->ntb_xstats = rte_zmalloc(\"ntb_xstats\", xstats_num *\n+\t\t\t\t sizeof(uint64_t), 0);\n \n \t/* Start handshake with the peer. */\n \tret = ntb_handshake_work(dev);\n@@ -645,6 +665,10 @@ ntb_dev_start(struct rte_rawdev *dev)\n \tif (!hw->link_status || !hw->peer_dev_up)\n \t\treturn -EINVAL;\n \n+\t/* Set total stats. */\n+\tfor (i = 0; i < NTB_XSTATS_NUM; i++)\n+\t\thw->ntb_xstats[i] = 0;\n+\n \tfor (i = 0; i < hw->queue_pairs; i++) {\n \t\tret = ntb_queue_init(dev, i);\n \t\tif (ret) {\n@@ -909,38 +933,113 @@ ntb_attr_get(struct rte_rawdev *dev, const char *attr_name,\n }\n \n static int\n-ntb_xstats_get(const struct rte_rawdev *dev __rte_unused,\n-\t const unsigned int ids[] __rte_unused,\n-\t uint64_t values[] __rte_unused,\n-\t unsigned int n __rte_unused)\n+ntb_xstats_get(const struct rte_rawdev *dev,\n+\t const unsigned int ids[],\n+\t uint64_t values[],\n+\t unsigned int n)\n {\n-\treturn 0;\n+\tstruct ntb_hw *hw = dev->dev_private;\n+\tuint32_t i, j, off, xstats_num;\n+\n+\t/* Calculate total stats of all queues. */\n+\tfor (i = 0; i < NTB_XSTATS_NUM; i++) {\n+\t\tfor (j = 0; j < hw->queue_pairs; j++) {\n+\t\t\toff = NTB_XSTATS_NUM * (j + 1) + i;\n+\t\t\thw->ntb_xstats[i] += hw->ntb_xstats[off];\n+\t\t}\n+\t}\n+\n+\txstats_num = NTB_XSTATS_NUM * (hw->queue_pairs + 1);\n+\tfor (i = 0; i < n && ids[i] < xstats_num; i++)\n+\t\tvalues[i] = hw->ntb_xstats[ids[i]];\n+\n+\treturn i;\n }\n \n static int\n-ntb_xstats_get_names(const struct rte_rawdev *dev __rte_unused,\n-\t\t struct rte_rawdev_xstats_name *xstats_names __rte_unused,\n-\t\t unsigned int size __rte_unused)\n+ntb_xstats_get_names(const struct rte_rawdev *dev,\n+\t\t struct rte_rawdev_xstats_name *xstats_names,\n+\t\t unsigned int size)\n {\n-\treturn 0;\n+\tstruct ntb_hw *hw = dev->dev_private;\n+\tuint32_t xstats_num, i, j, off;\n+\n+\txstats_num = NTB_XSTATS_NUM * (hw->queue_pairs + 1);\n+\tif (xstats_names == NULL || size < xstats_num)\n+\t\treturn xstats_num;\n+\n+\t/* Total stats names */\n+\tfor (i = 0; i < NTB_XSTATS_NUM; i++) {\n+\t\tstrncpy(xstats_names[i].name, ntb_xstats_names[i].name,\n+\t\t\tsizeof(xstats_names[0].name));\n+\t}\n+\n+\t/* Queue stats names */\n+\tfor (i = 0; i < hw->queue_pairs; i++) {\n+\t\tfor (j = 0; j < NTB_XSTATS_NUM; j++) {\n+\t\t\toff = j + (i + 1) * NTB_XSTATS_NUM;\n+\t\t\tsnprintf(xstats_names[off].name,\n+\t\t\t\tsizeof(xstats_names[0].name),\n+\t\t\t\t\"%s_q%u\", ntb_xstats_names[j].name, i);\n+\t\t}\n+\t}\n+\n+\treturn xstats_num;\n }\n \n static uint64_t\n-ntb_xstats_get_by_name(const struct rte_rawdev *dev __rte_unused,\n-\t\t const char *name __rte_unused,\n-\t\t unsigned int *id __rte_unused)\n+ntb_xstats_get_by_name(const struct rte_rawdev *dev,\n+\t\t const char *name, unsigned int *id)\n {\n-\treturn 0;\n+\tstruct rte_rawdev_xstats_name *xstats_names;\n+\tstruct ntb_hw *hw = dev->dev_private;\n+\tuint32_t xstats_num, i, j, off;\n+\n+\tif (name == NULL)\n+\t\treturn -EINVAL;\n+\n+\txstats_num = NTB_XSTATS_NUM * (hw->queue_pairs + 1);\n+\txstats_names = rte_zmalloc(\"ntb_stats_name\",\n+\t\t\t\t sizeof(struct rte_rawdev_xstats_name) *\n+\t\t\t\t xstats_num, 0);\n+\tntb_xstats_get_names(dev, xstats_names, xstats_num);\n+\n+\t/* Calculate total stats of all queues. */\n+\tfor (i = 0; i < NTB_XSTATS_NUM; i++) {\n+\t\tfor (j = 0; j < hw->queue_pairs; j++) {\n+\t\t\toff = NTB_XSTATS_NUM * (j + 1) + i;\n+\t\t\thw->ntb_xstats[i] += hw->ntb_xstats[off];\n+\t\t}\n+\t}\n+\n+\tfor (i = 0; i < xstats_num; i++) {\n+\t\tif (!strncmp(name, xstats_names[i].name,\n+\t\t RTE_RAW_DEV_XSTATS_NAME_SIZE)) {\n+\t\t\t*id = i;\n+\t\t\trte_free(xstats_names);\n+\t\t\treturn hw->ntb_xstats[i];\n+\t\t}\n+\t}\n+\n+\tNTB_LOG(ERR, \"Cannot find the xstats name.\");\n+\n+\treturn -EINVAL;\n }\n \n static int\n-ntb_xstats_reset(struct rte_rawdev *dev __rte_unused,\n-\t\t const uint32_t ids[] __rte_unused,\n-\t\t uint32_t nb_ids __rte_unused)\n+ntb_xstats_reset(struct rte_rawdev *dev,\n+\t\t const uint32_t ids[],\n+\t\t uint32_t nb_ids)\n {\n-\treturn 0;\n-}\n+\tstruct ntb_hw *hw = dev->dev_private;\n+\tuint32_t i, xstats_num;\n \n+\txstats_num = NTB_XSTATS_NUM * (hw->queue_pairs + 1);\n+\tfor (i = 0; i < nb_ids && ids[i] < xstats_num; i++)\n+\t\thw->ntb_xstats[ids[i]] = 0;\n+\n+\treturn i;\n+}\n \n static const struct rte_rawdev_ops ntb_ops = {\n \t.dev_info_get = ntb_dev_info_get,\ndiff --git a/drivers/raw/ntb/ntb.h b/drivers/raw/ntb/ntb.h\nindex 0ad20aed3..09e28050f 100644\n--- a/drivers/raw/ntb/ntb.h\n+++ b/drivers/raw/ntb/ntb.h\n@@ -27,6 +27,15 @@ extern int ntb_logtype;\n \n #define NTB_DFLT_TX_FREE_THRESH 256\n \n+enum ntb_xstats_idx {\n+\tNTB_TX_PKTS_ID = 0,\n+\tNTB_TX_BYTES_ID,\n+\tNTB_TX_ERRS_ID,\n+\tNTB_RX_PKTS_ID,\n+\tNTB_RX_BYTES_ID,\n+\tNTB_RX_MISS_ID,\n+};\n+\n enum ntb_topo {\n \tNTB_TOPO_NONE = 0,\n \tNTB_TOPO_B2B_USD,\n@@ -216,6 +225,8 @@ struct ntb_hw {\n \n \tuint8_t peer_used_mws;\n \n+\tuint64_t *ntb_xstats;\n+\n \t/* Reserve several spad for app to use. */\n \tint spad_user_list[NTB_SPAD_USER_MAX_NUM];\n };\n", "prefixes": [ "2/4" ] }