[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH QEMU v23 06/18] vfio: Add VM state change handler to know sta
From: |
Dr. David Alan Gilbert |
Subject: |
Re: [PATCH QEMU v23 06/18] vfio: Add VM state change handler to know state of VM |
Date: |
Thu, 21 May 2020 12:19:07 +0100 |
User-agent: |
Mutt/1.13.4 (2020-02-15) |
* Kirti Wankhede (address@hidden) wrote:
> VM state change handler gets called on change in VM's state. This is used to
> set
> VFIO device state to _RUNNING.
>
> Signed-off-by: Kirti Wankhede <address@hidden>
> Reviewed-by: Neo Jia <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
> ---
> hw/vfio/migration.c | 87
> +++++++++++++++++++++++++++++++++++++++++++
> hw/vfio/trace-events | 2 +
> include/hw/vfio/vfio-common.h | 4 ++
> 3 files changed, 93 insertions(+)
>
> diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
> index bf9384907ec0..e79b34003079 100644
> --- a/hw/vfio/migration.c
> +++ b/hw/vfio/migration.c
> @@ -10,6 +10,7 @@
> #include "qemu/osdep.h"
> #include <linux/vfio.h>
>
> +#include "sysemu/runstate.h"
> #include "hw/vfio/vfio-common.h"
> #include "cpu.h"
> #include "migration/migration.h"
> @@ -74,6 +75,85 @@ err:
> return ret;
> }
>
> +static int vfio_migration_set_state(VFIODevice *vbasedev, uint32_t mask,
> + uint32_t value)
> +{
> + VFIOMigration *migration = vbasedev->migration;
> + VFIORegion *region = &migration->region;
> + uint32_t device_state;
> + int ret;
> +
> + ret = pread(vbasedev->fd, &device_state, sizeof(device_state),
> + region->fd_offset + offsetof(struct
> vfio_device_migration_info,
> + device_state));
> + if (ret < 0) {
> + error_report("%s: Failed to read device state %d %s",
> + vbasedev->name, ret, strerror(errno));
> + return ret;
> + }
> +
> + device_state = (device_state & mask) | value;
> +
> + if (!VFIO_DEVICE_STATE_VALID(device_state)) {
> + return -EINVAL;
> + }
> +
> + ret = pwrite(vbasedev->fd, &device_state, sizeof(device_state),
> + region->fd_offset + offsetof(struct
> vfio_device_migration_info,
> + device_state));
> + if (ret < 0) {
> + error_report("%s: Failed to set device state %d %s",
> + vbasedev->name, ret, strerror(errno));
> +
> + ret = pread(vbasedev->fd, &device_state, sizeof(device_state),
> + region->fd_offset + offsetof(struct
> vfio_device_migration_info,
> + device_state));
> + if (ret < 0) {
> + error_report("%s: On failure, failed to read device state %d %s",
> + vbasedev->name, ret, strerror(errno));
> + return ret;
> + }
> +
> + if (VFIO_DEVICE_STATE_IS_ERROR(device_state)) {
> + error_report("%s: Device is in error state 0x%x",
> + vbasedev->name, device_state);
> + return -EFAULT;
> + }
> + }
> +
> + vbasedev->device_state = device_state;
> + trace_vfio_migration_set_state(vbasedev->name, device_state);
> + return 0;
> +}
> +
> +static void vfio_vmstate_change(void *opaque, int running, RunState state)
> +{
> + VFIODevice *vbasedev = opaque;
> +
> + if ((vbasedev->vm_running != running)) {
> + int ret;
> + uint32_t value = 0, mask = 0;
> +
> + if (running) {
> + value = VFIO_DEVICE_STATE_RUNNING;
> + if (vbasedev->device_state & VFIO_DEVICE_STATE_RESUMING) {
> + mask = ~VFIO_DEVICE_STATE_RESUMING;
> + }
> + } else {
> + mask = ~VFIO_DEVICE_STATE_RUNNING;
> + }
> +
> + ret = vfio_migration_set_state(vbasedev, mask, value);
> + if (ret) {
> + error_report("%s: Failed to set device state 0x%x",
> + vbasedev->name, value & mask);
> + }
> + vbasedev->vm_running = running;
> + trace_vfio_vmstate_change(vbasedev->name, running,
> RunState_str(state),
> + value & mask);
> + }
> +}
> +
> static int vfio_migration_init(VFIODevice *vbasedev,
> struct vfio_region_info *info)
> {
> @@ -90,6 +170,9 @@ static int vfio_migration_init(VFIODevice *vbasedev,
> return ret;
> }
>
> + vbasedev->vm_state =
> qemu_add_vm_change_state_handler(vfio_vmstate_change,
> + vbasedev);
> +
> return 0;
> }
>
> @@ -128,6 +211,10 @@ add_blocker:
>
> void vfio_migration_finalize(VFIODevice *vbasedev)
> {
> + if (vbasedev->vm_state) {
> + qemu_del_vm_change_state_handler(vbasedev->vm_state);
> + }
> +
> if (vbasedev->migration_blocker) {
> migrate_del_blocker(vbasedev->migration_blocker);
> error_free(vbasedev->migration_blocker);
> diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events
> index fd034ac53684..14b0a86c0035 100644
> --- a/hw/vfio/trace-events
> +++ b/hw/vfio/trace-events
> @@ -146,3 +146,5 @@ vfio_display_edid_write_error(void) ""
>
> # migration.c
> vfio_migration_probe(const char *name, uint32_t index) " (%s) Region %d"
> +vfio_migration_set_state(char *name, uint32_t state) " (%s) state %d"
> +vfio_vmstate_change(char *name, int running, const char *reason, uint32_t
> dev_state) " (%s) running %d reason %s device state %d"
> diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
> index d4b268641173..3d18eb146b33 100644
> --- a/include/hw/vfio/vfio-common.h
> +++ b/include/hw/vfio/vfio-common.h
> @@ -29,6 +29,7 @@
> #ifdef CONFIG_LINUX
> #include <linux/vfio.h>
> #endif
> +#include "sysemu/sysemu.h"
>
> #define VFIO_MSG_PREFIX "vfio %s: "
>
> @@ -119,6 +120,9 @@ typedef struct VFIODevice {
> unsigned int flags;
> VFIOMigration *migration;
> Error *migration_blocker;
> + VMChangeStateEntry *vm_state;
> + uint32_t device_state;
> + int vm_running;
> } VFIODevice;
>
> struct VFIODeviceOps {
> --
> 2.7.0
>
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK
- [PATCH QEMU v23 01/18] vfio: KABI for migration interface - Kernel header placeholder, (continued)
- [PATCH QEMU v23 05/18] vfio: Add migration region initialization and finalize function, Kirti Wankhede, 2020/05/20
- [PATCH QEMU v23 06/18] vfio: Add VM state change handler to know state of VM, Kirti Wankhede, 2020/05/20
- Re: [PATCH QEMU v23 06/18] vfio: Add VM state change handler to know state of VM,
Dr. David Alan Gilbert <=
- [PATCH QEMU v23 07/18] vfio: Add migration state change notifier, Kirti Wankhede, 2020/05/20
- [PATCH QEMU v23 08/18] vfio: Register SaveVMHandlers for VFIO device, Kirti Wankhede, 2020/05/20
[PATCH QEMU v23 09/18] vfio: Add save state functions to SaveVMHandlers, Kirti Wankhede, 2020/05/20
[PATCH QEMU v23 10/18] vfio: Add load state functions to SaveVMHandlers, Kirti Wankhede, 2020/05/20