[PATCH QEMU HCI-8.1 v4 31/31] VZ: vfio/container: lift the CPR blocker for mdev devices #VSTOR-103860

[Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>]

Upstream commit dac0dd68d9b ("vfio/container: mdev cpr blocker") blocks
cpr-transfer and cpr-exec for mdev devices on the legacy container, as
the kernel refuses VFIO_UPDATE_VADDR for them since ef3a3f6a294b
("vfio/type1: exclude mdevs from VFIO_UPDATE_VADDR").  We want CPR for
mdev vGPUs, so lift the blocker.

This needs a kernel which reverts ef3a3f6a294b, as UEK does.  Without
it the VFIO_UPDATE_VADDR extension check in vfio_cpr_supported() still
blocks CPR.

Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
---
 hw/vfio/container-legacy.c | 13 -------------
 include/hw/vfio/vfio-cpr.h |  1 -
 2 files changed, 14 deletions(-)

diff --git a/hw/vfio/container-legacy.c b/hw/vfio/container-legacy.c
index e437eb0c741..285e594b048 100644
--- a/hw/vfio/container-legacy.c
+++ b/hw/vfio/container-legacy.c
@@ -988,20 +988,8 @@ static bool vfio_legacy_attach_device(const char *name, VFIODevice *vbasedev,
         goto device_put_exit;
     }
 
-    if (vbasedev->mdev) {
-        error_setg(&vbasedev->cpr.mdev_blocker,
-                   "CPR does not support vfio mdev %s", vbasedev->name);
-        if (migrate_add_blocker_modes(&vbasedev->cpr.mdev_blocker, errp,
-                                      MIG_MODE_CPR_TRANSFER, MIG_MODE_CPR_EXEC,
-                                      -1) < 0) {
-            goto hiod_unref_exit;
-        }
-    }
-
     return true;
 
-hiod_unref_exit:
-    object_unref(vbasedev->hiod);
 device_put_exit:
     vfio_device_put(vbasedev);
 group_put_exit:
@@ -1017,7 +1005,6 @@ static void vfio_legacy_detach_device(VFIODevice *vbasedev)
 
     vfio_device_unprepare(vbasedev);
 
-    migrate_del_blocker(&vbasedev->cpr.mdev_blocker);
     object_unref(vbasedev->hiod);
     vfio_device_put(vbasedev);
     vfio_group_put(group);
diff --git a/include/hw/vfio/vfio-cpr.h b/include/hw/vfio/vfio-cpr.h
index fa1699857ca..a486b3b2578 100644
--- a/include/hw/vfio/vfio-cpr.h
+++ b/include/hw/vfio/vfio-cpr.h
@@ -32,7 +32,6 @@ typedef struct VFIOContainerCPR {
 } VFIOContainerCPR;
 
 typedef struct VFIODeviceCPR {
-    Error *mdev_blocker;
     Error *id_blocker;
     Error *mmap_blocker;
     uint32_t hwpt_id;

-- 
2.47.1