Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/8517/?format=api
{ "id": 8517, "url": "https://patches.dpdk.org/api/patches/8517/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1446459547-1754-4-git-send-email-harry.van.haaren@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": "<1446459547-1754-4-git-send-email-harry.van.haaren@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1446459547-1754-4-git-send-email-harry.van.haaren@intel.com", "date": "2015-11-02T10:19:00", "name": "[dpdk-dev,v5,03/10] virtio: add xstats() implementation", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "da86f7ec68faa6b84d39d46f7c519e6f6a9f288e", "submitter": { "id": 317, "url": "https://patches.dpdk.org/api/people/317/?format=api", "name": "Van Haaren, Harry", "email": "harry.van.haaren@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1446459547-1754-4-git-send-email-harry.van.haaren@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/8517/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/8517/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 E283F8E90;\n\tMon, 2 Nov 2015 11:19:22 +0100 (CET)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby dpdk.org (Postfix) with ESMTP id D67EC8E6C\n\tfor <dev@dpdk.org>; Mon, 2 Nov 2015 11:19:20 +0100 (CET)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga101.jf.intel.com with ESMTP; 02 Nov 2015 02:19:21 -0800", "from sie-lab-212-222.ir.intel.com (HELO\n\tsilpixa00366884.ir.intel.com) ([10.237.212.222])\n\tby orsmga002.jf.intel.com with ESMTP; 02 Nov 2015 02:19:19 -0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.20,234,1444719600\"; d=\"scan'208\";a=\"840505394\"", "From": "Harry van Haaren <harry.van.haaren@intel.com>", "To": "dev@dpdk.org", "Date": "Mon, 2 Nov 2015 10:19:00 +0000", "Message-Id": "<1446459547-1754-4-git-send-email-harry.van.haaren@intel.com>", "X-Mailer": "git-send-email 1.9.1", "In-Reply-To": "<1446459547-1754-1-git-send-email-harry.van.haaren@intel.com>", "References": "<1446204998-17151-2-git-send-email-harry.van.haaren@intel.com>\n\t<1446459547-1754-1-git-send-email-harry.van.haaren@intel.com>", "Subject": "[dpdk-dev] [PATCH v5 03/10] virtio: add xstats() implementation", "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 xstats() functions and statistic strings to virtio PMD.\n\nSigned-off-by: Harry van Haaren <harry.van.haaren@intel.com>\n---\n drivers/net/virtio/virtio_ethdev.c | 98 +++++++++++++++++++++++++++++++++++++-\n drivers/net/virtio/virtio_rxtx.c | 32 +++++++++++++\n drivers/net/virtio/virtqueue.h | 4 ++\n 3 files changed, 132 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex 12fcc23..fe5afb9 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -80,7 +80,10 @@ static int virtio_dev_link_update(struct rte_eth_dev *dev,\n static void virtio_set_hwaddr(struct virtio_hw *hw);\n static void virtio_get_hwaddr(struct virtio_hw *hw);\n \n-static void virtio_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats);\n+static void virtio_dev_stats_get(struct rte_eth_dev *dev,\n+\t\t\t\t struct rte_eth_stats *stats);\n+static int virtio_dev_xstats_get(struct rte_eth_dev *dev,\n+\t\t\t\t struct rte_eth_xstats *xstats, unsigned n);\n static void virtio_dev_stats_reset(struct rte_eth_dev *dev);\n static void virtio_dev_free_mbufs(struct rte_eth_dev *dev);\n static int virtio_vlan_filter_set(struct rte_eth_dev *dev,\n@@ -109,6 +112,31 @@ static const struct rte_pci_id pci_id_virtio_map[] = {\n { .vendor_id = 0, /* sentinel */ },\n };\n \n+struct rte_virtio_xstats_name_off {\n+\tchar name[RTE_ETH_XSTATS_NAME_SIZE];\n+\tunsigned offset;\n+};\n+\n+/* [rt]x_qX_ is prepended to the name string here */\n+static const struct rte_virtio_xstats_name_off rte_virtio_q_stat_strings[] = {\n+\t{\"good_packets\", offsetof(struct virtqueue, packets)},\n+\t{\"good_bytes\", offsetof(struct virtqueue, bytes)},\n+\t{\"errors\", offsetof(struct virtqueue, errors)},\n+\t{\"multicast_packets\", offsetof(struct virtqueue, multicast)},\n+\t{\"broadcast_packets\", offsetof(struct virtqueue, broadcast)},\n+\t{\"undersize_packets\", offsetof(struct virtqueue, size_bins[0])},\n+\t{\"size_64_packets\", offsetof(struct virtqueue, size_bins[1])},\n+\t{\"size_65_127_packets\", offsetof(struct virtqueue, size_bins[2])},\n+\t{\"size_128_255_packets\", offsetof(struct virtqueue, size_bins[3])},\n+\t{\"size_256_511_packets\", offsetof(struct virtqueue, size_bins[4])},\n+\t{\"size_512_1023_packets\", offsetof(struct virtqueue, size_bins[5])},\n+\t{\"size_1024_1517_packets\", offsetof(struct virtqueue, size_bins[6])},\n+\t{\"size_1518_max_packets\", offsetof(struct virtqueue, size_bins[7])},\n+};\n+\n+#define VIRTIO_NB_Q_XSTATS (sizeof(rte_virtio_q_stat_strings) / \\\n+\t\t\t sizeof(rte_virtio_q_stat_strings[0]))\n+\n static int\n virtio_send_command(struct virtqueue *vq, struct virtio_pmd_ctrl *ctrl,\n \t\tint *dlen, int pkt_num)\n@@ -568,7 +596,9 @@ static const struct eth_dev_ops virtio_eth_dev_ops = {\n \n \t.dev_infos_get = virtio_dev_info_get,\n \t.stats_get = virtio_dev_stats_get,\n+\t.xstats_get = virtio_dev_xstats_get,\n \t.stats_reset = virtio_dev_stats_reset,\n+\t.xstats_reset = virtio_dev_stats_reset,\n \t.link_update = virtio_dev_link_update,\n \t.rx_queue_setup = virtio_dev_rx_queue_setup,\n \t.rx_queue_release = virtio_dev_rx_queue_release,\n@@ -623,7 +653,7 @@ virtio_dev_atomic_write_link_status(struct rte_eth_dev *dev,\n }\n \n static void\n-virtio_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n+virtio_update_stats(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n {\n \tunsigned i;\n \n@@ -660,6 +690,64 @@ virtio_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n \tstats->rx_nombuf = dev->data->rx_mbuf_alloc_failed;\n }\n \n+static int\n+virtio_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstats *xstats,\n+\t\t unsigned n)\n+{\n+\tunsigned i;\n+\tunsigned count = 0;\n+\n+\tunsigned nstats = dev->data->nb_tx_queues * VIRTIO_NB_Q_XSTATS +\n+\t\tdev->data->nb_rx_queues * VIRTIO_NB_Q_XSTATS;\n+\n+\tif (n < nstats)\n+\t\treturn nstats;\n+\n+\tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n+\t\tstruct virtqueue *rxvq = dev->data->rx_queues[i];\n+\n+\t\tif (rxvq == NULL)\n+\t\t\tcontinue;\n+\n+\t\tunsigned t;\n+\n+\t\tfor (t = 0; t < VIRTIO_NB_Q_XSTATS; t++) {\n+\t\t\tsnprintf(xstats[count].name, sizeof(xstats[count].name),\n+\t\t\t\t \"rx_q%u_%s\", i,\n+\t\t\t\t rte_virtio_q_stat_strings[t].name);\n+\t\t\txstats[count].value = *(uint64_t *)(((char *)rxvq) +\n+\t\t\t\trte_virtio_q_stat_strings[t].offset);\n+\t\t\tcount++;\n+\t\t}\n+\t}\n+\n+\tfor (i = 0; i < dev->data->nb_tx_queues; i++) {\n+\t\tstruct virtqueue *txvq = dev->data->tx_queues[i];\n+\n+\t\tif (txvq == NULL)\n+\t\t\tcontinue;\n+\n+\t\tunsigned t;\n+\n+\t\tfor (t = 0; t < VIRTIO_NB_Q_XSTATS; t++) {\n+\t\t\tsnprintf(xstats[count].name, sizeof(xstats[count].name),\n+\t\t\t\t \"tx_q%u_%s\", i,\n+\t\t\t\t rte_virtio_q_stat_strings[t].name);\n+\t\t\txstats[count].value = *(uint64_t *)(((char *)txvq) +\n+\t\t\t\trte_virtio_q_stat_strings[t].offset);\n+\t\t\tcount++;\n+\t\t}\n+\t}\n+\n+\treturn count;\n+}\n+\n+static void\n+virtio_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n+{\n+\tvirtio_update_stats(dev, stats);\n+}\n+\n static void\n virtio_dev_stats_reset(struct rte_eth_dev *dev)\n {\n@@ -673,6 +761,9 @@ virtio_dev_stats_reset(struct rte_eth_dev *dev)\n \t\ttxvq->packets = 0;\n \t\ttxvq->bytes = 0;\n \t\ttxvq->errors = 0;\n+\t\ttxvq->multicast = 0;\n+\t\ttxvq->broadcast = 0;\n+\t\tmemset(txvq->size_bins, 0, sizeof(txvq->size_bins[0]) * 8);\n \t}\n \n \tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n@@ -683,6 +774,9 @@ virtio_dev_stats_reset(struct rte_eth_dev *dev)\n \t\trxvq->packets = 0;\n \t\trxvq->bytes = 0;\n \t\trxvq->errors = 0;\n+\t\trxvq->multicast = 0;\n+\t\trxvq->broadcast = 0;\n+\t\tmemset(rxvq->size_bins, 0, sizeof(rxvq->size_bins[0]) * 8);\n \t}\n \n \tdev->data->rx_mbuf_alloc_failed = 0;\ndiff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c\nindex d35c5f9..7590485 100644\n--- a/drivers/net/virtio/virtio_rxtx.c\n+++ b/drivers/net/virtio/virtio_rxtx.c\n@@ -482,6 +482,34 @@ virtio_discard_rxbuf(struct virtqueue *vq, struct rte_mbuf *m)\n \t}\n }\n \n+static void\n+virtio_update_packet_stats(struct virtqueue *vq, struct rte_mbuf *mbuf)\n+{\n+\tuint32_t s = mbuf->pkt_len;\n+\tstruct ether_addr *ea;\n+\n+\tif (s == 64) {\n+\t\tvq->size_bins[1]++;\n+\t} else if (s > 64 && s < 1024) {\n+\t\tuint32_t bin;\n+\n+\t\t/* count zeros, and offset into correct bin */\n+\t\tbin = (sizeof(s) * 8) - __builtin_clz(s) - 5;\n+\t\tvq->size_bins[bin]++;\n+\t} else {\n+\t\tif (s < 64)\n+\t\t\tvq->size_bins[0]++;\n+\t\telse if (s < 1519)\n+\t\t\tvq->size_bins[6]++;\n+\t\telse if (s >= 1519)\n+\t\t\tvq->size_bins[7]++;\n+\t}\n+\n+\tea = rte_pktmbuf_mtod(mbuf, struct ether_addr *);\n+\tvq->multicast += is_multicast_ether_addr(ea);\n+\tvq->broadcast += is_broadcast_ether_addr(ea);\n+}\n+\n #define VIRTIO_MBUF_BURST_SZ 64\n #define DESC_PER_CACHELINE (RTE_CACHE_LINE_SIZE / sizeof(struct vring_desc))\n uint16_t\n@@ -543,7 +571,9 @@ virtio_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \t\tVIRTIO_DUMP_PACKET(rxm, rxm->data_len);\n \n \t\trx_pkts[nb_rx++] = rxm;\n+\n \t\trxvq->bytes += rx_pkts[nb_rx - 1]->pkt_len;\n+\t\tvirtio_update_packet_stats(rxvq, rxm);\n \t}\n \n \trxvq->packets += nb_rx;\n@@ -706,6 +736,7 @@ virtio_recv_mergeable_pkts(void *rx_queue,\n \t\t\trx_pkts[nb_rx]->data_len);\n \n \t\trxvq->bytes += rx_pkts[nb_rx]->pkt_len;\n+\t\tvirtio_update_packet_stats(rxvq, rx_pkts[nb_rx]);\n \t\tnb_rx++;\n \t}\n \n@@ -806,6 +837,7 @@ virtio_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t\t\t}\n \t\t\tnb_tx++;\n \t\t\ttxvq->bytes += txm->pkt_len;\n+\t\t\tvirtio_update_packet_stats(txvq, txm);\n \t\t} else {\n \t\t\tPMD_TX_LOG(ERR, \"No free tx descriptors to transmit\");\n \t\t\tbreak;\ndiff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h\nindex 7789411..9032e6d 100644\n--- a/drivers/net/virtio/virtqueue.h\n+++ b/drivers/net/virtio/virtqueue.h\n@@ -194,6 +194,10 @@ struct virtqueue {\n \tuint64_t\tpackets;\n \tuint64_t\tbytes;\n \tuint64_t\terrors;\n+\tuint64_t\tmulticast;\n+\tuint64_t\tbroadcast;\n+\t/* Size bins in array as RFC 2819, undersized [0], 64 [1], etc */\n+\tuint64_t\tsize_bins[8];\n \n \tstruct vq_desc_extra {\n \t\tvoid *cookie;\n", "prefixes": [ "dpdk-dev", "v5", "03/10" ] }