Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/6747/?format=api
{ "id": 6747, "url": "https://patches.dpdk.org/api/patches/6747/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1439366567-3402-11-git-send-email-changchun.ouyang@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": "<1439366567-3402-11-git-send-email-changchun.ouyang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1439366567-3402-11-git-send-email-changchun.ouyang@intel.com", "date": "2015-08-12T08:02:45", "name": "[dpdk-dev,v4,10/12] vhost: add per queue stats info", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "bcff79ed584b97cccbbfd377a6e7781dffb511f5", "submitter": { "id": 31, "url": "https://patches.dpdk.org/api/people/31/?format=api", "name": "Ouyang Changchun", "email": "changchun.ouyang@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1439366567-3402-11-git-send-email-changchun.ouyang@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/6747/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/6747/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 4D9048DB0;\n\tWed, 12 Aug 2015 10:03:26 +0200 (CEST)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby dpdk.org (Postfix) with ESMTP id 73C9B20F\n\tfor <dev@dpdk.org>; Wed, 12 Aug 2015 10:03:24 +0200 (CEST)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby fmsmga101.fm.intel.com with ESMTP; 12 Aug 2015 01:03:24 -0700", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby orsmga002.jf.intel.com with ESMTP; 12 Aug 2015 01:03:24 -0700", "from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com\n\t[10.239.29.89])\n\tby shvmail01.sh.intel.com with ESMTP id t7C83Jc4027098;\n\tWed, 12 Aug 2015 16:03:19 +0800", "from shecgisg004.sh.intel.com (localhost [127.0.0.1])\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP\n\tid t7C83H3p003696; Wed, 12 Aug 2015 16:03:19 +0800", "(from couyang@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t7C83HCb003692; \n\tWed, 12 Aug 2015 16:03:17 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.15,659,1432623600\"; d=\"scan'208\";a=\"782522747\"", "From": "Ouyang Changchun <changchun.ouyang@intel.com>", "To": "dev@dpdk.org", "Date": "Wed, 12 Aug 2015 16:02:45 +0800", "Message-Id": "<1439366567-3402-11-git-send-email-changchun.ouyang@intel.com>", "X-Mailer": "git-send-email 1.7.12.2", "In-Reply-To": "<1439366567-3402-1-git-send-email-changchun.ouyang@intel.com>", "References": "<1434355006-30583-1-git-send-email-changchun.ouyang@intel.com>\n\t<1439366567-3402-1-git-send-email-changchun.ouyang@intel.com>", "Subject": "[dpdk-dev] [PATCH v4 10/12] vhost: add per queue stats info", "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": "Add per queue stats info\n\nSigned-off-by: Changchun Ouyang <changchun.ouyang@intel.com>\n---\nChanges in v3\n - fix coding style and displaying format\n - check stats_enable to alloc mem for queue pair\n\nChanges in v2\n - fix the stats issue in tx_local\n - dynamically alloc mem for queue pair stats info\n - fix checkpatch errors\n\n examples/vhost/main.c | 126 +++++++++++++++++++++++++++++++-------------------\n 1 file changed, 79 insertions(+), 47 deletions(-)", "diff": "diff --git a/examples/vhost/main.c b/examples/vhost/main.c\nindex 683a300..54f9648 100644\n--- a/examples/vhost/main.c\n+++ b/examples/vhost/main.c\n@@ -314,7 +314,7 @@ struct ipv4_hdr {\n #define VLAN_ETH_HLEN 18\n \n /* Per-device statistics struct */\n-struct device_statistics {\n+struct qp_statistics {\n \tuint64_t tx_total;\n \trte_atomic64_t rx_total_atomic;\n \tuint64_t rx_total;\n@@ -322,6 +322,10 @@ struct device_statistics {\n \trte_atomic64_t rx_atomic;\n \tuint64_t rx;\n } __rte_cache_aligned;\n+\n+struct device_statistics {\n+\tstruct qp_statistics *qp_stats;\n+};\n struct device_statistics dev_statistics[MAX_DEVICES];\n \n /*\n@@ -766,6 +770,17 @@ us_vhost_parse_args(int argc, char **argv)\n \t\t\t\t\treturn -1;\n \t\t\t\t} else {\n \t\t\t\t\tenable_stats = ret;\n+\t\t\t\t\tif (enable_stats)\n+\t\t\t\t\t\tfor (i = 0; i < MAX_DEVICES; i++) {\n+\t\t\t\t\t\t\tdev_statistics[i].qp_stats =\n+\t\t\t\t\t\t\t\tmalloc(VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX * sizeof(struct qp_statistics));\n+\t\t\t\t\t\t\tif (dev_statistics[i].qp_stats == NULL) {\n+\t\t\t\t\t\t\t\tRTE_LOG(ERR, VHOST_CONFIG, \"Failed to allocate memory for qp stats.\\n\");\n+\t\t\t\t\t\t\t\treturn -1;\n+\t\t\t\t\t\t\t}\n+\t\t\t\t\t\t\tmemset(dev_statistics[i].qp_stats, 0,\n+\t\t\t\t\t\t\t\tVIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX * sizeof(struct qp_statistics));\n+\t\t\t\t\t\t}\n \t\t\t\t}\n \t\t\t}\n \n@@ -1121,13 +1136,13 @@ virtio_tx_local(struct vhost_dev *vdev, struct rte_mbuf *m, uint32_t q_idx)\n \t\t\t\t\t&m, 1);\n \t\t\t\tif (enable_stats) {\n \t\t\t\t\trte_atomic64_add(\n-\t\t\t\t\t&dev_statistics[tdev->device_fh].rx_total_atomic,\n+\t\t\t\t\t&dev_statistics[tdev->device_fh].qp_stats[q_idx].rx_total_atomic,\n \t\t\t\t\t1);\n \t\t\t\t\trte_atomic64_add(\n-\t\t\t\t\t&dev_statistics[tdev->device_fh].rx_atomic,\n+\t\t\t\t\t&dev_statistics[tdev->device_fh].qp_stats[q_idx].rx_atomic,\n \t\t\t\t\tret);\n-\t\t\t\t\tdev_statistics[tdev->device_fh].tx_total++;\n-\t\t\t\t\tdev_statistics[tdev->device_fh].tx += ret;\n+\t\t\t\t\tdev_statistics[dev->device_fh].qp_stats[q_idx].tx_total++;\n+\t\t\t\t\tdev_statistics[dev->device_fh].qp_stats[q_idx].tx += ret;\n \t\t\t\t}\n \t\t\t}\n \n@@ -1261,8 +1276,8 @@ virtio_tx_route(struct vhost_dev *vdev, struct rte_mbuf *m,\n \ttx_q->m_table[len] = m;\n \tlen++;\n \tif (enable_stats) {\n-\t\tdev_statistics[dev->device_fh].tx_total++;\n-\t\tdev_statistics[dev->device_fh].tx++;\n+\t\tdev_statistics[dev->device_fh].qp_stats[q_idx].tx_total++;\n+\t\tdev_statistics[dev->device_fh].qp_stats[q_idx].tx++;\n \t}\n \n \tif (unlikely(len == MAX_PKT_BURST)) {\n@@ -1393,10 +1408,10 @@ switch_worker(__attribute__((unused)) void *arg)\n \t\t\t\t\t\t\t\t\t\t\tpkts_burst, rx_count);\n \t\t\t\t\t\tif (enable_stats) {\n \t\t\t\t\t\t\trte_atomic64_add(\n-\t\t\t\t\t\t\t&dev_statistics[dev_ll->vdev->dev->device_fh].rx_total_atomic,\n+\t\t\t\t\t\t\t&dev_statistics[dev_ll->vdev->dev->device_fh].qp_stats[i].rx_total_atomic,\n \t\t\t\t\t\t\trx_count);\n \t\t\t\t\t\t\trte_atomic64_add(\n-\t\t\t\t\t\t\t&dev_statistics[dev_ll->vdev->dev->device_fh].rx_atomic, ret_count);\n+\t\t\t\t\t\t\t&dev_statistics[dev_ll->vdev->dev->device_fh].qp_stats[i].rx_atomic, ret_count);\n \t\t\t\t\t\t}\n \t\t\t\t\t\twhile (likely(rx_count)) {\n \t\t\t\t\t\t\trx_count--;\n@@ -1946,8 +1961,8 @@ virtio_tx_route_zcp(struct virtio_net *dev, struct rte_mbuf *m,\n \t\t(mbuf->next == NULL) ? \"null\" : \"non-null\");\n \n \tif (enable_stats) {\n-\t\tdev_statistics[dev->device_fh].tx_total++;\n-\t\tdev_statistics[dev->device_fh].tx++;\n+\t\tdev_statistics[dev->device_fh].qp_stats[0].tx_total++;\n+\t\tdev_statistics[dev->device_fh].qp_stats[0].tx++;\n \t}\n \n \tif (unlikely(len == MAX_PKT_BURST)) {\n@@ -2230,9 +2245,9 @@ switch_worker_zcp(__attribute__((unused)) void *arg)\n \t\t\t\t\tret_count = virtio_dev_rx_zcp(dev,\n \t\t\t\t\t\t\tpkts_burst, rx_count);\n \t\t\t\t\tif (enable_stats) {\n-\t\t\t\t\t\tdev_statistics[dev->device_fh].rx_total\n+\t\t\t\t\t\tdev_statistics[dev->device_fh].qp_stats[0].rx_total\n \t\t\t\t\t\t\t+= rx_count;\n-\t\t\t\t\t\tdev_statistics[dev->device_fh].rx\n+\t\t\t\t\t\tdev_statistics[dev->device_fh].qp_stats[0].rx\n \t\t\t\t\t\t\t+= ret_count;\n \t\t\t\t\t}\n \t\t\t\t\twhile (likely(rx_count)) {\n@@ -2853,7 +2868,9 @@ new_device (struct virtio_net *dev)\n \tadd_data_ll_entry(&lcore_info[vdev->coreid].lcore_ll->ll_root_used, ll_dev);\n \n \t/* Initialize device stats */\n-\tmemset(&dev_statistics[dev->device_fh], 0, sizeof(struct device_statistics));\n+\tif (enable_stats)\n+\t\tmemset(dev_statistics[dev->device_fh].qp_stats, 0,\n+\t\t\tVIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX * sizeof(struct qp_statistics));\n \n \t/* Disable notifications. */\n \tfor (i = 0; i < rxq; i++) {\n@@ -2889,7 +2906,7 @@ print_stats(void)\n \tstruct virtio_net_data_ll *dev_ll;\n \tuint64_t tx_dropped, rx_dropped;\n \tuint64_t tx, tx_total, rx, rx_total;\n-\tuint32_t device_fh;\n+\tuint32_t device_fh, i;\n \tconst char clr[] = { 27, '[', '2', 'J', '\\0' };\n \tconst char top_left[] = { 27, '[', '1', ';', '1', 'H','\\0' };\n \n@@ -2904,35 +2921,53 @@ print_stats(void)\n \t\tdev_ll = ll_root_used;\n \t\twhile (dev_ll != NULL) {\n \t\t\tdevice_fh = (uint32_t)dev_ll->vdev->dev->device_fh;\n-\t\t\ttx_total = dev_statistics[device_fh].tx_total;\n-\t\t\ttx = dev_statistics[device_fh].tx;\n-\t\t\ttx_dropped = tx_total - tx;\n-\t\t\tif (zero_copy == 0) {\n-\t\t\t\trx_total = rte_atomic64_read(\n-\t\t\t\t\t&dev_statistics[device_fh].rx_total_atomic);\n-\t\t\t\trx = rte_atomic64_read(\n-\t\t\t\t\t&dev_statistics[device_fh].rx_atomic);\n-\t\t\t} else {\n-\t\t\t\trx_total = dev_statistics[device_fh].rx_total;\n-\t\t\t\trx = dev_statistics[device_fh].rx;\n-\t\t\t}\n-\t\t\trx_dropped = rx_total - rx;\n-\n-\t\t\tprintf(\"\\nStatistics for device %\"PRIu32\" ------------------------------\"\n-\t\t\t\t\t\"\\nTX total: \t\t%\"PRIu64\"\"\n-\t\t\t\t\t\"\\nTX dropped: \t\t%\"PRIu64\"\"\n-\t\t\t\t\t\"\\nTX successful: \t\t%\"PRIu64\"\"\n-\t\t\t\t\t\"\\nRX total: \t\t%\"PRIu64\"\"\n-\t\t\t\t\t\"\\nRX dropped: \t\t%\"PRIu64\"\"\n-\t\t\t\t\t\"\\nRX successful: \t\t%\"PRIu64\"\",\n-\t\t\t\t\tdevice_fh,\n-\t\t\t\t\ttx_total,\n-\t\t\t\t\ttx_dropped,\n-\t\t\t\t\ttx,\n-\t\t\t\t\trx_total,\n-\t\t\t\t\trx_dropped,\n-\t\t\t\t\trx);\n-\n+\t\t\tfor (i = 0; i < rxq; i++) {\n+\t\t\t\ttx_total = dev_statistics[device_fh].qp_stats[i].tx_total;\n+\t\t\t\ttx = dev_statistics[device_fh].qp_stats[i].tx;\n+\t\t\t\ttx_dropped = tx_total - tx;\n+\t\t\t\tif (zero_copy == 0) {\n+\t\t\t\t\trx_total = rte_atomic64_read(\n+\t\t\t\t\t\t&dev_statistics[device_fh].qp_stats[i].rx_total_atomic);\n+\t\t\t\t\trx = rte_atomic64_read(\n+\t\t\t\t\t\t&dev_statistics[device_fh].qp_stats[i].rx_atomic);\n+\t\t\t\t} else {\n+\t\t\t\t\trx_total = dev_statistics[device_fh].qp_stats[0].rx_total;\n+\t\t\t\t\trx = dev_statistics[device_fh].qp_stats[0].rx;\n+\t\t\t\t}\n+\t\t\t\trx_dropped = rx_total - rx;\n+\n+\t\t\t\tif (rxq > 1)\n+\t\t\t\t\tprintf(\"\\nStatistics for device %\"PRIu32\" queue id: %d------------------\"\n+\t\t\t\t\t\t\"\\nTX total:\t\t%\"PRIu64\"\"\n+\t\t\t\t\t\t\"\\nTX dropped:\t\t%\"PRIu64\"\"\n+\t\t\t\t\t\t\"\\nTX success:\t\t%\"PRIu64\"\"\n+\t\t\t\t\t\t\"\\nRX total:\t\t%\"PRIu64\"\"\n+\t\t\t\t\t\t\"\\nRX dropped:\t\t%\"PRIu64\"\"\n+\t\t\t\t\t\t\"\\nRX success:\t\t%\"PRIu64\"\",\n+\t\t\t\t\t\tdevice_fh,\n+\t\t\t\t\t\ti,\n+\t\t\t\t\t\ttx_total,\n+\t\t\t\t\t\ttx_dropped,\n+\t\t\t\t\t\ttx,\n+\t\t\t\t\t\trx_total,\n+\t\t\t\t\t\trx_dropped,\n+\t\t\t\t\t\trx);\n+\t\t\t\telse\n+\t\t\t\t\tprintf(\"\\nStatistics for device %\"PRIu32\" ------------------------------\"\n+\t\t\t\t\t\t\"\\nTX total:\t\t%\"PRIu64\"\"\n+\t\t\t\t\t\t\"\\nTX dropped:\t\t%\"PRIu64\"\"\n+\t\t\t\t\t\t\"\\nTX success:\t\t%\"PRIu64\"\"\n+\t\t\t\t\t\t\"\\nRX total:\t\t%\"PRIu64\"\"\n+\t\t\t\t\t\t\"\\nRX dropped:\t\t%\"PRIu64\"\"\n+\t\t\t\t\t\t\"\\nRX success:\t\t%\"PRIu64\"\",\n+\t\t\t\t\t\tdevice_fh,\n+\t\t\t\t\t\ttx_total,\n+\t\t\t\t\t\ttx_dropped,\n+\t\t\t\t\t\ttx,\n+\t\t\t\t\t\trx_total,\n+\t\t\t\t\t\trx_dropped,\n+\t\t\t\t\t\trx);\n+\t\t\t\t}\n \t\t\tdev_ll = dev_ll->next;\n \t\t}\n \t\tprintf(\"\\n======================================================\\n\");\n@@ -3114,9 +3149,6 @@ main(int argc, char *argv[])\n \tif (init_data_ll() == -1)\n \t\trte_exit(EXIT_FAILURE, \"Failed to initialize linked list\\n\");\n \n-\t/* Initialize device stats */\n-\tmemset(&dev_statistics, 0, sizeof(dev_statistics));\n-\n \t/* Enable stats if the user option is set. */\n \tif (enable_stats)\n \t\tpthread_create(&tid, NULL, (void*)print_stats, NULL );\n", "prefixes": [ "dpdk-dev", "v4", "10/12" ] }