@@ -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;
@@ -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;
}
@@ -744,6 +747,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;
@@ -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
@@ -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;
@@ -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);
}
@@ -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.1
+#
+##
+{ '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.1)
+#
# 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:
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(-)