From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 84BB6A04F1; Thu, 18 Jun 2020 21:00:00 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9D48D1BFF9; Thu, 18 Jun 2020 20:59:58 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 16B3D1BFF8 for ; Thu, 18 Jun 2020 20:59:57 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from matan@mellanox.com) with SMTP; 18 Jun 2020 21:59:54 +0300 Received: from pegasus25.mtr.labs.mlnx. (pegasus25.mtr.labs.mlnx [10.210.16.10]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 05IIxoPn016515; Thu, 18 Jun 2020 21:59:54 +0300 From: Matan Azrad To: Maxime Coquelin , Xiao Wang Cc: dev@dpdk.org Date: Thu, 18 Jun 2020 18:59:41 +0000 Message-Id: <1592506784-441548-2-git-send-email-matan@mellanox.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1592506784-441548-1-git-send-email-matan@mellanox.com> References: <01591112869-78828-1-git-send-email-matan@mellanox.com> <1592506784-441548-1-git-send-email-matan@mellanox.com> Subject: [dpdk-dev] [PATCH v4 1/4] vhost: inroduce operation to get vDPA queue stats X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The vDPA device offloads all the datapath of the vhost device to the HW device. In order to expose to the user traffic information this patch introduces new 3 APIs to get traffic statistics, the device statistics name and to reset the statistics per virtio queue. The statistics are taken directly from the vDPA driver managing the HW device and can be different for each vendor driver. Signed-off-by: Matan Azrad Reviewed-by: Maxime Coquelin --- doc/guides/rel_notes/release_20_08.rst | 5 ++ doc/guides/vdpadevs/features/default.ini | 1 + doc/guides/vdpadevs/features_overview.rst | 3 + lib/librte_vhost/rte_vdpa.h | 115 +++++++++++++++++++++++++++++- lib/librte_vhost/rte_vhost_version.map | 3 + lib/librte_vhost/vdpa.c | 47 ++++++++++++ 6 files changed, 173 insertions(+), 1 deletion(-) diff --git a/doc/guides/rel_notes/release_20_08.rst b/doc/guides/rel_notes/release_20_08.rst index f5a22bc..1d9bd5c 100644 --- a/doc/guides/rel_notes/release_20_08.rst +++ b/doc/guides/rel_notes/release_20_08.rst @@ -68,6 +68,11 @@ New Features * Added new PMD devarg ``reclaim_mem_mode``. +* **Added vDPA device APIs to query virtio queue statistics.** + + A new 3 APIs has been added to query virtio queue statistics, to get their + names and to reset them by a vDPA device. + Removed Items ------------- diff --git a/doc/guides/vdpadevs/features/default.ini b/doc/guides/vdpadevs/features/default.ini index 518e4f1..2c122a3 100644 --- a/doc/guides/vdpadevs/features/default.ini +++ b/doc/guides/vdpadevs/features/default.ini @@ -37,6 +37,7 @@ proto rarp = proto reply ack = proto host notifier = proto pagefault = +queue statistics = BSD nic_uio = Linux VFIO = Other kdrv = diff --git a/doc/guides/vdpadevs/features_overview.rst b/doc/guides/vdpadevs/features_overview.rst index eb7eb3b..930bc87 100644 --- a/doc/guides/vdpadevs/features_overview.rst +++ b/doc/guides/vdpadevs/features_overview.rst @@ -96,6 +96,9 @@ proto host notifier proto pagefault Slave expose page-fault FD for migration process. +queue statistics + Support virtio queue statistics query. + BSD nic_uio BSD ``nic_uio`` module supported. diff --git a/lib/librte_vhost/rte_vdpa.h b/lib/librte_vhost/rte_vdpa.h index 3c400ee..ecb3d91 100644 --- a/lib/librte_vhost/rte_vdpa.h +++ b/lib/librte_vhost/rte_vdpa.h @@ -37,6 +37,34 @@ struct rte_vdpa_dev_addr { }; }; +/** Maximum name length for statistics counters */ +#define RTE_VDPA_STATS_NAME_SIZE 64 + +/** + * A vDPA device statistic structure + * + * This structure is used by rte_vdpa_stats_get() to provide + * statistics from the HW vDPA device. + * + * It maps a name id, corresponding to an index in the array returned + * by rte_vdpa_get_stats_names, to a statistic value. + */ +struct rte_vdpa_stat { + uint64_t id; /**< The index in stats name array */ + uint64_t value; /**< The statistic counter value */ +}; + +/** + * A name element for statistics + * + * An array of this structure is returned by rte_vdpa_get_stats_names + * It lists the names of extended statistics for a PMD. The rte_vdpa_stat + * structure references these names by their array index + */ +struct rte_vdpa_stat_name { + char name[RTE_VDPA_STATS_NAME_SIZE]; /**< The statistic name */ +}; + /** * vdpa device operations */ @@ -73,8 +101,19 @@ struct rte_vdpa_dev_ops { int (*get_notify_area)(int vid, int qid, uint64_t *offset, uint64_t *size); + /** Get statistics name */ + int (*get_stats_names)(int did, struct rte_vdpa_stat_name *stats_names, + unsigned int size); + + /** Get statistics of the queue */ + int (*get_stats)(int did, int qid, struct rte_vdpa_stat *stats, + unsigned int n); + + /** Reset statistics of the queue */ + int (*reset_stats)(int did, int qid); + /** Reserved for future extension */ - void *reserved[5]; + void *reserved[2]; }; /** @@ -200,4 +239,78 @@ struct rte_vdpa_device * __rte_experimental int rte_vdpa_relay_vring_used(int vid, uint16_t qid, void *vring_m); + +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice + * + * Retrieve names of statistics of a vDPA device. + * + * There is an assumption that 'stat_names' and 'stats' arrays are matched + * by array index: stats_names[i].name => stats[i].value + * + * And the array index is same with id field of 'struct rte_vdpa_stat': + * stats[i].id == i + * + * @param did + * device id + * @param stats_names + * array of at least size elements to be filled. + * If set to NULL, the function returns the required number of elements. + * @param size + * The number of elements in stats_names array. + * @return + * A negative value on error, otherwise the number of entries filled in the + * stats name array. + */ +__rte_experimental +int +rte_vdpa_get_stats_names(int did, struct rte_vdpa_stat_name *stats_names, + unsigned int size); + +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice + * + * Retrieve statistics of a vDPA device. + * + * There is an assumption that 'stat_names' and 'stats' arrays are matched + * by array index: stats_names[i].name => stats[i].value + * + * And the array index is same with id field of 'struct rte_vdpa_stat': + * stats[i].id == i + * + * @param did + * device id + * @param qid + * queue id + * @param stats + * A pointer to a table of structure of type rte_vdpa_stat to be filled with + * device statistics ids and values. + * @param n + * The number of elements in stats array. + * @return + * A negative value on error, otherwise the number of entries filled in the + * stats table. + */ +__rte_experimental +int +rte_vdpa_get_stats(int did, uint16_t qid, struct rte_vdpa_stat *stats, + unsigned int n); +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice + * + * Reset statistics of a vDPA device. + * + * @param did + * device id + * @param qid + * queue id + * @return + * 0 on success, a negative value on error. + */ +__rte_experimental +int +rte_vdpa_reset_stats(int did, uint16_t qid); #endif /* _RTE_VDPA_H_ */ diff --git a/lib/librte_vhost/rte_vhost_version.map b/lib/librte_vhost/rte_vhost_version.map index 051d08c..3a2f7df 100644 --- a/lib/librte_vhost/rte_vhost_version.map +++ b/lib/librte_vhost/rte_vhost_version.map @@ -38,6 +38,9 @@ EXPERIMENTAL { rte_vdpa_find_device_id; rte_vdpa_get_device; rte_vdpa_get_device_num; + rte_vdpa_get_stats_names; + rte_vdpa_get_stats; + rte_vdpa_reset_stats; rte_vhost_driver_attach_vdpa_device; rte_vhost_driver_detach_vdpa_device; rte_vhost_driver_get_vdpa_device_id; diff --git a/lib/librte_vhost/vdpa.c b/lib/librte_vhost/vdpa.c index b2b2a10..1f5cdcd 100644 --- a/lib/librte_vhost/vdpa.c +++ b/lib/librte_vhost/vdpa.c @@ -227,3 +227,50 @@ struct rte_vdpa_device * free_ind_table(idesc); return -1; } + +int +rte_vdpa_get_stats_names(int did, struct rte_vdpa_stat_name *stats_names, + unsigned int size) +{ + struct rte_vdpa_device *vdpa_dev; + + vdpa_dev = rte_vdpa_get_device(did); + if (!vdpa_dev) + return -ENODEV; + + RTE_FUNC_PTR_OR_ERR_RET(vdpa_dev->ops->get_stats_names, -ENOTSUP); + + return vdpa_dev->ops->get_stats_names(did, stats_names, size); +} + +int +rte_vdpa_get_stats(int did, uint16_t qid, struct rte_vdpa_stat *stats, + unsigned int n) +{ + struct rte_vdpa_device *vdpa_dev; + + vdpa_dev = rte_vdpa_get_device(did); + if (!vdpa_dev) + return -ENODEV; + + if (!stats || !n) + return -EINVAL; + + RTE_FUNC_PTR_OR_ERR_RET(vdpa_dev->ops->get_stats, -ENOTSUP); + + return vdpa_dev->ops->get_stats(did, qid, stats, n); +} + +int +rte_vdpa_reset_stats(int did, uint16_t qid) +{ + struct rte_vdpa_device *vdpa_dev; + + vdpa_dev = rte_vdpa_get_device(did); + if (!vdpa_dev) + return -ENODEV; + + RTE_FUNC_PTR_OR_ERR_RET(vdpa_dev->ops->reset_stats, -ENOTSUP); + + return vdpa_dev->ops->reset_stats(did, qid); +} -- 1.8.3.1