From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Williamson" <alex.williamson@redhat.com>,
"Avihai Horon" <avihaih@nvidia.com>,
"Cédric Le Goater" <clg@redhat.com>
Subject: [PULL 16/47] vfio/migration: Emit VFIO migration QAPI event
Date: Wed, 22 May 2024 11:54:11 +0200 [thread overview]
Message-ID: <20240522095442.195243-17-clg@redhat.com> (raw)
In-Reply-To: <20240522095442.195243-1-clg@redhat.com>
From: Avihai Horon <avihaih@nvidia.com>
Emit VFIO migration QAPI event when a VFIO device changes its migration
state. This can be used by management applications to get updates on the
current state of the VFIO device for their own purposes.
A new per VFIO device capability, "migration-events", is added so events
can be enabled only for the required devices. It is disabled by default.
Signed-off-by: Avihai Horon <avihaih@nvidia.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
include/hw/vfio/vfio-common.h | 1 +
hw/vfio/migration.c | 59 +++++++++++++++++++++++++++++++++--
hw/vfio/pci.c | 2 ++
3 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index b6ac24953667bc5f72f28480a6bf0f4722069cb9..878e34a12874f63fcb8bbc8dc8ca3d2dfa84fdb4 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -115,6 +115,7 @@ typedef struct VFIODevice {
bool no_mmap;
bool ram_block_discard_allowed;
OnOffAuto enable_migration;
+ bool migration_events;
VFIODeviceOps *ops;
unsigned int num_irqs;
unsigned int num_regions;
diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
index c4403a38ddb5e7e09fbcde0ad4132653ecaf0d24..af579b868d7caa726fde1eeb73c832ebc3136a7a 100644
--- a/hw/vfio/migration.c
+++ b/hw/vfio/migration.c
@@ -24,6 +24,7 @@
#include "migration/register.h"
#include "migration/blocker.h"
#include "qapi/error.h"
+#include "qapi/qapi-events-vfio.h"
#include "exec/ramlist.h"
#include "exec/ram_addr.h"
#include "pci.h"
@@ -80,6 +81,58 @@ static const char *mig_state_to_str(enum vfio_device_mig_state state)
}
}
+static VfioMigrationState
+mig_state_to_qapi_state(enum vfio_device_mig_state state)
+{
+ switch (state) {
+ case VFIO_DEVICE_STATE_STOP:
+ return QAPI_VFIO_MIGRATION_STATE_STOP;
+ case VFIO_DEVICE_STATE_RUNNING:
+ return QAPI_VFIO_MIGRATION_STATE_RUNNING;
+ case VFIO_DEVICE_STATE_STOP_COPY:
+ return QAPI_VFIO_MIGRATION_STATE_STOP_COPY;
+ case VFIO_DEVICE_STATE_RESUMING:
+ return QAPI_VFIO_MIGRATION_STATE_RESUMING;
+ case VFIO_DEVICE_STATE_RUNNING_P2P:
+ return QAPI_VFIO_MIGRATION_STATE_RUNNING_P2P;
+ case VFIO_DEVICE_STATE_PRE_COPY:
+ return QAPI_VFIO_MIGRATION_STATE_PRE_COPY;
+ case VFIO_DEVICE_STATE_PRE_COPY_P2P:
+ return QAPI_VFIO_MIGRATION_STATE_PRE_COPY_P2P;
+ default:
+ g_assert_not_reached();
+ }
+}
+
+static void vfio_migration_send_event(VFIODevice *vbasedev)
+{
+ VFIOMigration *migration = vbasedev->migration;
+ DeviceState *dev = vbasedev->dev;
+ g_autofree char *qom_path = NULL;
+ Object *obj;
+
+ if (!vbasedev->migration_events) {
+ return;
+ }
+
+ g_assert(vbasedev->ops->vfio_get_object);
+ obj = vbasedev->ops->vfio_get_object(vbasedev);
+ g_assert(obj);
+ qom_path = object_get_canonical_path(obj);
+
+ qapi_event_send_vfio_migration(
+ dev->id, qom_path, mig_state_to_qapi_state(migration->device_state));
+}
+
+static void vfio_migration_set_device_state(VFIODevice *vbasedev,
+ enum vfio_device_mig_state state)
+{
+ VFIOMigration *migration = vbasedev->migration;
+
+ migration->device_state = state;
+ vfio_migration_send_event(vbasedev);
+}
+
static int vfio_migration_set_state(VFIODevice *vbasedev,
enum vfio_device_mig_state new_state,
enum vfio_device_mig_state recover_state,
@@ -131,12 +184,12 @@ static int vfio_migration_set_state(VFIODevice *vbasedev,
goto reset_device;
}
- migration->device_state = recover_state;
+ vfio_migration_set_device_state(vbasedev, recover_state);
return ret;
}
- migration->device_state = new_state;
+ vfio_migration_set_device_state(vbasedev, new_state);
if (mig_state->data_fd != -1) {
if (migration->data_fd != -1) {
/*
@@ -162,7 +215,7 @@ reset_device:
strerror(errno));
}
- migration->device_state = VFIO_DEVICE_STATE_RUNNING;
+ vfio_migration_set_device_state(vbasedev, VFIO_DEVICE_STATE_RUNNING);
return ret;
}
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 4789d43c0f9cc7ef94b73adc815377f7222d8c57..b5d1d398b120076c85cdd92d61793393f65e8554 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -3388,6 +3388,8 @@ static Property vfio_pci_dev_properties[] = {
VFIO_FEATURE_ENABLE_IGD_OPREGION_BIT, false),
DEFINE_PROP_ON_OFF_AUTO("enable-migration", VFIOPCIDevice,
vbasedev.enable_migration, ON_OFF_AUTO_AUTO),
+ DEFINE_PROP_BOOL("migration-events", VFIOPCIDevice,
+ vbasedev.migration_events, false),
DEFINE_PROP_BOOL("x-no-mmap", VFIOPCIDevice, vbasedev.no_mmap, false),
DEFINE_PROP_BOOL("x-balloon-allowed", VFIOPCIDevice,
vbasedev.ram_block_discard_allowed, false),
--
2.45.1
next prev parent reply other threads:[~2024-05-22 9:57 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-22 9:53 [PULL 00/47] vfio queue Cédric Le Goater
2024-05-22 9:53 ` [PULL 01/47] vfio: Add Error** argument to .set_dirty_page_tracking() handler Cédric Le Goater
2024-05-22 9:53 ` [PULL 02/47] vfio: Add Error** argument to vfio_devices_dma_logging_start() Cédric Le Goater
2024-05-22 9:53 ` [PULL 03/47] migration: Extend migration_file_set_error() with Error* argument Cédric Le Goater
2024-05-22 9:53 ` [PULL 04/47] vfio/migration: Add an Error** argument to vfio_migration_set_state() Cédric Le Goater
2024-05-22 9:54 ` [PULL 05/47] vfio/migration: Add Error** argument to .vfio_save_config() handler Cédric Le Goater
2024-05-22 9:54 ` [PULL 06/47] vfio: Reverse test on vfio_get_xlat_addr() Cédric Le Goater
2024-05-22 9:54 ` [PULL 07/47] memory: Add Error** argument to memory_get_xlat_addr() Cédric Le Goater
2024-05-22 9:54 ` [PULL 08/47] vfio: Add Error** argument to .get_dirty_bitmap() handler Cédric Le Goater
2024-05-22 9:54 ` [PULL 09/47] vfio: Also trace event failures in vfio_save_complete_precopy() Cédric Le Goater
2024-05-22 9:54 ` [PULL 10/47] vfio/ap: Use g_autofree variable in vfio_ap_register_irq_notifier() Cédric Le Goater
2024-05-22 9:54 ` [PULL 11/47] vfio/ap: Make vfio_ap_register_irq_notifier() return a bool Cédric Le Goater
2024-05-22 9:54 ` [PULL 12/47] vfio/ccw: Use g_autofree variable in vfio_ccw_register_irq_notifier() Cédric Le Goater
2024-05-22 9:54 ` [PULL 13/47] vfio/ccw: Make vfio_ccw_register_irq_notifier() return a bool Cédric Le Goater
2024-05-22 9:54 ` [PULL 14/47] vfio/pci: migration: Skip config space check for Vendor Specific Information in VSC during restore/load Cédric Le Goater
2024-05-22 9:54 ` [PULL 15/47] qapi/vfio: Add VFIO migration QAPI event Cédric Le Goater
2024-05-22 9:54 ` Cédric Le Goater [this message]
2024-05-22 9:54 ` [PULL 17/47] vfio/migration: Don't emit STOP_COPY VFIO migration QAPI event twice Cédric Le Goater
2024-05-22 9:54 ` [PULL 18/47] vfio/migration: Enhance VFIO migration state tracing Cédric Le Goater
2024-05-22 9:54 ` [PULL 19/47] vfio/pci: Use g_autofree in vfio_realize Cédric Le Goater
2024-05-22 9:54 ` [PULL 20/47] vfio/pci: Use g_autofree in iommufd_cdev_get_info_iova_range() Cédric Le Goater
2024-05-22 9:54 ` [PULL 21/47] vfio: Make VFIOIOMMUClass::attach_device() and its wrapper return bool Cédric Le Goater
2024-05-22 9:54 ` [PULL 22/47] vfio: Make VFIOIOMMUClass::setup() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 23/47] vfio: Make VFIOIOMMUClass::add_window() and its wrapper " Cédric Le Goater
2024-05-22 9:54 ` [PULL 24/47] vfio/container: Make vfio_connect_container() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 25/47] vfio/container: Make vfio_set_iommu() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 26/47] vfio/container: Make vfio_get_device() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 27/47] vfio/iommufd: Make iommufd_cdev_*() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 28/47] vfio/cpr: Make vfio_cpr_register_container() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 29/47] backends/iommufd: Make iommufd_backend_*() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 30/47] vfio/display: Fix error path in call site of ramfb_setup() Cédric Le Goater
2024-05-22 9:54 ` [PULL 31/47] vfio/display: Make vfio_display_*() return bool Cédric Le Goater
2024-05-22 9:54 ` [PULL 32/47] vfio/helpers: Use g_autofree in vfio_set_irq_signaling() Cédric Le Goater
2024-05-22 9:54 ` [PULL 33/47] vfio/helpers: Make vfio_set_irq_signaling() return bool Cédric Le Goater
2024-05-22 9:54 ` [PULL 34/47] vfio/helpers: Make vfio_device_get_name() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 35/47] vfio/platform: Make vfio_populate_device() and vfio_base_device_init() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 36/47] vfio/ccw: Make vfio_ccw_get_region() return a bool Cédric Le Goater
2024-05-22 9:54 ` [PULL 37/47] vfio/pci: Make vfio_intx_enable_kvm() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 38/47] vfio/pci: Make vfio_pci_relocate_msix() and vfio_msix_early_setup() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 39/47] vfio/pci: Make vfio_populate_device() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 40/47] vfio/pci: Make vfio_intx_enable() return bool Cédric Le Goater
2024-05-22 9:54 ` [PULL 41/47] vfio/pci: Make vfio_populate_vga() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 42/47] vfio/pci: Make capability related functions " Cédric Le Goater
2024-05-22 9:54 ` [PULL 43/47] vfio/pci: Use g_autofree for vfio_region_info pointer Cédric Le Goater
2024-05-22 9:54 ` [PULL 44/47] vfio/pci-quirks: Make vfio_pci_igd_opregion_init() return bool Cédric Le Goater
2024-05-22 9:54 ` [PULL 45/47] vfio/pci-quirks: Make vfio_add_*_cap() " Cédric Le Goater
2024-05-22 9:54 ` [PULL 46/47] vfio: Use g_autofree in all call site of vfio_get_region_info() Cédric Le Goater
2024-05-22 9:54 ` [PULL 47/47] vfio/igd: Use g_autofree in vfio_probe_igd_bar4_quirk() Cédric Le Goater
2024-05-22 22:31 ` [PULL 00/47] vfio queue Richard Henderson
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=20240522095442.195243-17-clg@redhat.com \
--to=clg@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=avihaih@nvidia.com \
--cc=qemu-devel@nongnu.org \
/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).