From: Kirti Wankhede <kwankhede@nvidia.com>
To: <alex.williamson@redhat.com>, <cjia@nvidia.com>
Cc: cohuck@redhat.com, aik@ozlabs.ru, Zhengxiao.zx@Alibaba-inc.com,
shuangtai.tst@alibaba-inc.com, qemu-devel@nongnu.org,
peterx@redhat.com, Kirti Wankhede <kwankhede@nvidia.com>,
eauger@redhat.com, yi.l.liu@intel.com, quintela@redhat.com,
ziye.yang@intel.com, armbru@redhat.com, mlevitsk@redhat.com,
pasic@linux.ibm.com, felipe@nutanix.com, zhi.a.wang@intel.com,
kevin.tian@intel.com, yan.y.zhao@intel.com, dgilbert@redhat.com,
changpeng.liu@intel.com, eskultet@redhat.com, Ken.Xue@amd.com,
jonathan.davies@nutanix.com, pbonzini@redhat.com
Subject: [PATCH v18 QEMU 18/18] qapi: Add VFIO devices migration stats in Migration stats
Date: Tue, 5 May 2020 04:14:53 +0530 [thread overview]
Message-ID: <1588632293-18932-19-git-send-email-kwankhede@nvidia.com> (raw)
In-Reply-To: <1588632293-18932-1-git-send-email-kwankhede@nvidia.com>
Added amount of bytes transferred to the target VM by all VFIO devices
Signed-off-by: Kirti Wankhede <kwankhede@nvidia.com>
---
hw/vfio/common.c | 20 ++++++++++++++++++++
hw/vfio/migration.c | 10 +++++++++-
include/qemu/vfio-helpers.h | 3 +++
migration/migration.c | 12 ++++++++++++
monitor/hmp-cmds.c | 6 ++++++
qapi/migration.json | 19 ++++++++++++++++++-
6 files changed, 68 insertions(+), 2 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index b94e2bcb1178..53455946b31b 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -40,6 +40,7 @@
#include "trace.h"
#include "qapi/error.h"
#include "migration/migration.h"
+#include "qemu/vfio-helpers.h"
VFIOGroupList vfio_group_list =
QLIST_HEAD_INITIALIZER(vfio_group_list);
@@ -293,6 +294,25 @@ const MemoryRegionOps vfio_region_ops = {
* Device state interfaces
*/
+bool vfio_mig_active(void)
+{
+ VFIOGroup *group;
+ VFIODevice *vbasedev;
+
+ if (QLIST_EMPTY(&vfio_group_list)) {
+ return false;
+ }
+
+ QLIST_FOREACH(group, &vfio_group_list, next) {
+ QLIST_FOREACH(vbasedev, &group->device_list, next) {
+ if (vbasedev->migration_blocker) {
+ return false;
+ }
+ }
+ }
+ return true;
+}
+
static bool vfio_devices_are_stopped_and_saving(void)
{
VFIOGroup *group;
diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
index 7d1f64a96676..250a24d4b9ff 100644
--- a/hw/vfio/migration.c
+++ b/hw/vfio/migration.c
@@ -26,7 +26,7 @@
#include "exec/ram_addr.h"
#include "pci.h"
#include "trace.h"
-
+#include "qemu/vfio-helpers.h"
/*
* Flags used as delimiter:
* 0xffffffff => MSB 32-bit all 1s
@@ -38,6 +38,8 @@
#define VFIO_MIG_FLAG_DEV_SETUP_STATE (0xffffffffef100003ULL)
#define VFIO_MIG_FLAG_DEV_DATA_STATE (0xffffffffef100004ULL)
+static int64_t bytes_transferred;
+
static void vfio_migration_region_exit(VFIODevice *vbasedev)
{
VFIOMigration *migration = vbasedev->migration;
@@ -229,6 +231,7 @@ static int vfio_save_buffer(QEMUFile *f, VFIODevice *vbasedev)
return ret;
}
+ bytes_transferred += data_size;
return data_size;
}
@@ -750,6 +753,11 @@ static int vfio_migration_init(VFIODevice *vbasedev,
/* ---------------------------------------------------------------------- */
+int64_t vfio_mig_bytes_transferred(void)
+{
+ return bytes_transferred;
+}
+
int vfio_migration_probe(VFIODevice *vbasedev, Error **errp)
{
struct vfio_region_info *info;
diff --git a/include/qemu/vfio-helpers.h b/include/qemu/vfio-helpers.h
index 1f057c2b9e40..26a7df0767b1 100644
--- a/include/qemu/vfio-helpers.h
+++ b/include/qemu/vfio-helpers.h
@@ -29,4 +29,7 @@ void qemu_vfio_pci_unmap_bar(QEMUVFIOState *s, int index, void *bar,
int qemu_vfio_pci_init_irq(QEMUVFIOState *s, EventNotifier *e,
int irq_type, Error **errp);
+bool vfio_mig_active(void);
+int64_t vfio_mig_bytes_transferred(void);
+
#endif
diff --git a/migration/migration.c b/migration/migration.c
index 187ac0410c2d..9d763447261c 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -54,6 +54,7 @@
#include "net/announce.h"
#include "qemu/queue.h"
#include "multifd.h"
+#include "qemu/vfio-helpers.h"
#define MAX_THROTTLE (32 << 20) /* Migration transfer speed throttling */
@@ -967,6 +968,15 @@ static void populate_disk_info(MigrationInfo *info)
}
}
+static void populate_vfio_info(MigrationInfo *info)
+{
+ if (vfio_mig_active()) {
+ info->has_vfio = true;
+ info->vfio = g_malloc0(sizeof(*info->vfio));
+ info->vfio->bytes = vfio_mig_bytes_transferred();
+ }
+}
+
static void fill_source_migration_info(MigrationInfo *info)
{
MigrationState *s = migrate_get_current();
@@ -992,6 +1002,7 @@ static void fill_source_migration_info(MigrationInfo *info)
populate_time_info(info, s);
populate_ram_info(info, s);
populate_disk_info(info);
+ populate_vfio_info(info);
break;
case MIGRATION_STATUS_COLO:
info->has_status = true;
@@ -1000,6 +1011,7 @@ static void fill_source_migration_info(MigrationInfo *info)
case MIGRATION_STATUS_COMPLETED:
populate_time_info(info, s);
populate_ram_info(info, s);
+ populate_vfio_info(info);
break;
case MIGRATION_STATUS_FAILED:
info->has_status = true;
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 7f6e982dc834..d04bc042f2fe 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -353,6 +353,12 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
}
monitor_printf(mon, "]\n");
}
+
+ if (info->has_vfio) {
+ monitor_printf(mon, "vfio device bytes: %" PRIu64 " kbytes\n",
+ info->vfio->bytes >> 10);
+ }
+
qapi_free_MigrationInfo(info);
}
diff --git a/qapi/migration.json b/qapi/migration.json
index eca2981d0a33..a06ecae89b3d 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -144,6 +144,18 @@
'active', 'postcopy-active', 'postcopy-paused',
'postcopy-recover', 'completed', 'failed', 'colo',
'pre-switchover', 'device', 'wait-unplug' ] }
+##
+# @VfioStats:
+#
+# Detailed VFIO devices migration statistics
+#
+# @bytes: amount of bytes transferred to the target VM by VFIO devices
+#
+# Since: 5.0
+#
+##
+{ 'struct': 'VfioStats',
+ 'data': {'bytes': 'int' } }
##
# @MigrationInfo:
@@ -205,6 +217,10 @@
#
# @socket-address: Only used for tcp, to know what the real port is (Since 4.0)
#
+# @vfio: @VfioStats containing detailed VFIO devices migration statistics,
+# only returned if VFIO device is present, migration is supported by all
+# VFIO devices and status is 'active' or 'completed' (since 5.0)
+#
# Since: 0.14.0
##
{ 'struct': 'MigrationInfo',
@@ -220,7 +236,8 @@
'*postcopy-blocktime' : 'uint32',
'*postcopy-vcpu-blocktime': ['uint32'],
'*compression': 'CompressionStats',
- '*socket-address': ['SocketAddress'] } }
+ '*socket-address': ['SocketAddress'],
+ '*vfio': 'VfioStats' } }
##
# @query-migrate:
--
2.7.0
next prev parent reply other threads:[~2020-05-04 23:26 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-04 22:44 [PATCH v18 QEMU 00/18] Add migration support for VFIO devices Kirti Wankhede
2020-05-04 22:44 ` [PATCH v18 QEMU 01/18] vfio: KABI for migration interface - Kernel header placeholder Kirti Wankhede
2020-05-04 22:44 ` [PATCH v18 QEMU 02/18] vfio: Add function to unmap VFIO region Kirti Wankhede
2020-05-05 6:16 ` Philippe Mathieu-Daudé
2020-05-06 19:23 ` Kirti Wankhede
2020-05-04 22:44 ` [PATCH v18 QEMU 03/18] vfio: Add vfio_get_object callback to VFIODeviceOps Kirti Wankhede
2020-05-04 22:44 ` [PATCH v18 QEMU 04/18] vfio: Add save and load functions for VFIO PCI devices Kirti Wankhede
2020-05-04 22:44 ` [PATCH v18 QEMU 05/18] vfio: Add migration region initialization and finalize function Kirti Wankhede
2020-05-05 9:42 ` Cornelia Huck
2020-05-04 22:44 ` [PATCH v18 QEMU 06/18] vfio: Add VM state change handler to know state of VM Kirti Wankhede
2020-05-05 10:11 ` Cornelia Huck
2020-05-04 22:44 ` [PATCH v18 QEMU 07/18] vfio: Add migration state change notifier Kirti Wankhede
2020-05-05 10:46 ` Cornelia Huck
2020-05-04 22:44 ` [PATCH v18 QEMU 08/18] vfio: Register SaveVMHandlers for VFIO device Kirti Wankhede
2020-05-04 22:44 ` [PATCH v18 QEMU 09/18] vfio: Add save state functions to SaveVMHandlers Kirti Wankhede
2020-05-04 22:44 ` [PATCH v18 QEMU 10/18] vfio: Add load " Kirti Wankhede
2020-05-04 22:44 ` [PATCH v18 QEMU 11/18] iommu: add callback to get address limit IOMMU supports Kirti Wankhede
2020-05-04 22:44 ` [PATCH v18 QEMU 12/18] memory: Set DIRTY_MEMORY_MIGRATION when IOMMU is enabled Kirti Wankhede
2020-05-04 22:44 ` [PATCH v18 QEMU 13/18] vfio: Add function to start and stop dirty pages tracking Kirti Wankhede
2020-05-04 22:44 ` [PATCH v18 QEMU 14/18] vfio: Add vfio_listener_log_sync to mark dirty pages Kirti Wankhede
2020-05-04 22:44 ` [PATCH v18 QEMU 15/18] vfio: Get migration capability flags for container Kirti Wankhede
2020-05-04 22:44 ` [PATCH v18 QEMU 16/18] vfio: Add ioctl to get dirty pages bitmap during dma unmap Kirti Wankhede
2020-05-06 10:31 ` Cornelia Huck
2020-05-04 22:44 ` [PATCH v18 QEMU 17/18] vfio: Make vfio-pci device migration capable Kirti Wankhede
2020-05-04 22:44 ` Kirti Wankhede [this message]
2020-05-05 14:13 ` [PATCH v18 QEMU 18/18] qapi: Add VFIO devices migration stats in Migration stats Eric Blake
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1588632293-18932-19-git-send-email-kwankhede@nvidia.com \
--to=kwankhede@nvidia.com \
--cc=Ken.Xue@amd.com \
--cc=Zhengxiao.zx@Alibaba-inc.com \
--cc=aik@ozlabs.ru \
--cc=alex.williamson@redhat.com \
--cc=armbru@redhat.com \
--cc=changpeng.liu@intel.com \
--cc=cjia@nvidia.com \
--cc=cohuck@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eauger@redhat.com \
--cc=eskultet@redhat.com \
--cc=felipe@nutanix.com \
--cc=jonathan.davies@nutanix.com \
--cc=kevin.tian@intel.com \
--cc=mlevitsk@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=shuangtai.tst@alibaba-inc.com \
--cc=yan.y.zhao@intel.com \
--cc=yi.l.liu@intel.com \
--cc=zhi.a.wang@intel.com \
--cc=ziye.yang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).