[RFC PATCH 2/2] drm/virtio: Implement save and restore for virtio_gpu_objects
dongwon.kim at intel.com
dongwon.kim at intel.com
Fri Apr 18 23:29:49 UTC 2025
From: Dongwon Kim <dongwon.kim at intel.com>
Host KVM/QEMU loses all graphics resources submitted by the guest OS
upon resumption from sleep or hibernation. This results in invalid
resource errors when the guest OS attempts to interact with the host
regarding those resources.
To address this issue, the virtio-gpu driver now resubmits all existing
resources upon resumption. A linked list has been introduced to maintain
references to all created `virtio_gpu_object` instances and their parameters.
Whenever a new object is created and sent to the host, it is added to this
list. During the `.resume` function, all backed-up objects are re-sent to
the host using the 'create resource' virtio GPU command, ensuring the
resources are restored seamlessly.
Cc: Dmitry Osipenko <dmitry.osipenko at collabora.com>
Cc: Vivek Kasireddy <vivek.kasireddy at intel.com>
Signed-off-by: Dongwon Kim <dongwon.kim at intel.com>
---
drivers/gpu/drm/virtio/virtgpu_drv.c | 6 +++
drivers/gpu/drm/virtio/virtgpu_drv.h | 10 ++++
drivers/gpu/drm/virtio/virtgpu_kms.c | 1 +
drivers/gpu/drm/virtio/virtgpu_object.c | 65 +++++++++++++++++++++++++
4 files changed, 82 insertions(+)
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c
index 1c0e47447cc0..8267b6d61b22 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.c
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.c
@@ -192,6 +192,12 @@ static int virtgpu_restore(struct virtio_device *vdev)
virtio_device_ready(vdev);
+ error = virtio_gpu_object_restore_all(vgdev);
+ if (error) {
+ DRM_ERROR("Failed to recover objects\n");
+ return error;
+ }
+
error = drm_mode_config_helper_resume(dev);
if (error) {
DRM_ERROR("resume error %d\n", error);
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
index 1279f998c8e0..55f836378237 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.h
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
@@ -126,6 +126,12 @@ struct virtio_gpu_object_array {
struct drm_gem_object *objs[] __counted_by(total);
};
+struct virtio_gpu_object_restore {
+ struct virtio_gpu_object *bo;
+ struct virtio_gpu_object_params params;
+ struct list_head node;
+};
+
struct virtio_gpu_vbuffer;
struct virtio_gpu_device;
@@ -265,6 +271,7 @@ struct virtio_gpu_device {
struct work_struct obj_free_work;
spinlock_t obj_free_lock;
struct list_head obj_free_list;
+ struct list_head obj_restore;
struct virtio_gpu_drv_capset *capsets;
uint32_t num_capsets;
@@ -479,6 +486,9 @@ bool virtio_gpu_is_shmem(struct virtio_gpu_object *bo);
int virtio_gpu_resource_id_get(struct virtio_gpu_device *vgdev,
uint32_t *resid);
+
+int virtio_gpu_object_restore_all(struct virtio_gpu_device *vgdev);
+
/* virtgpu_prime.c */
int virtio_gpu_resource_assign_uuid(struct virtio_gpu_device *vgdev,
struct virtio_gpu_object *bo);
diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/virtgpu_kms.c
index 6c1af77ea083..17d182737910 100644
--- a/drivers/gpu/drm/virtio/virtgpu_kms.c
+++ b/drivers/gpu/drm/virtio/virtgpu_kms.c
@@ -162,6 +162,7 @@ int virtio_gpu_init(struct virtio_device *vdev, struct drm_device *dev)
vgdev->fence_drv.context = dma_fence_context_alloc(1);
spin_lock_init(&vgdev->fence_drv.lock);
INIT_LIST_HEAD(&vgdev->fence_drv.fences);
+ INIT_LIST_HEAD(&vgdev->obj_restore);
INIT_LIST_HEAD(&vgdev->cap_cache);
INIT_WORK(&vgdev->config_changed_work,
virtio_gpu_config_changed_work_func);
diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c
index 5517cff8715c..05c07c874c26 100644
--- a/drivers/gpu/drm/virtio/virtgpu_object.c
+++ b/drivers/gpu/drm/virtio/virtgpu_object.c
@@ -61,6 +61,38 @@ static void virtio_gpu_resource_id_put(struct virtio_gpu_device *vgdev, uint32_t
}
}
+static void virtio_gpu_object_add_restore_list(struct virtio_gpu_device *vgdev,
+ struct virtio_gpu_object *bo,
+ struct virtio_gpu_object_params *params)
+{
+ struct virtio_gpu_object_restore *new;
+
+ new = kvmalloc(sizeof(*new), GFP_KERNEL);
+ if (!new) {
+ DRM_ERROR("Fail to allocate virtio_gpu_object_restore");
+ return;
+ }
+
+ new->bo = bo;
+ memcpy(&new->params, params, sizeof(*params));
+
+ list_add_tail(&new->node, &vgdev->obj_restore);
+}
+
+static void virtio_gpu_object_del_restore_list(struct virtio_gpu_device *vgdev,
+ struct virtio_gpu_object *bo)
+{
+ struct virtio_gpu_object_restore *curr, *tmp;
+
+ list_for_each_entry_safe(curr, tmp, &vgdev->obj_restore, node) {
+ if (bo == curr->bo) {
+ list_del(&curr->node);
+ kvfree(curr);
+ break;
+ }
+ }
+}
+
void virtio_gpu_cleanup_object(struct virtio_gpu_object *bo)
{
struct virtio_gpu_device *vgdev = bo->base.base.dev->dev_private;
@@ -84,6 +116,7 @@ void virtio_gpu_cleanup_object(struct virtio_gpu_object *bo)
drm_gem_object_release(&bo->base.base);
kfree(bo);
}
+ virtio_gpu_object_del_restore_list(vgdev, bo);
}
static void virtio_gpu_free_object(struct drm_gem_object *obj)
@@ -257,8 +290,11 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev,
objs, fence);
virtio_gpu_object_attach(vgdev, bo, ents, nents);
}
+ /* add submitted object to restore list */
+ virtio_gpu_object_add_restore_list(vgdev, bo, params);
*bo_ptr = bo;
+
return 0;
err_put_objs:
@@ -271,3 +307,32 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev,
drm_gem_shmem_free(shmem_obj);
return ret;
}
+
+int virtio_gpu_object_restore_all(struct virtio_gpu_device *vgdev)
+{
+ struct virtio_gpu_object_restore *curr, *tmp;
+ struct virtio_gpu_mem_entry *ents;
+ unsigned int nents;
+ int ret;
+
+ list_for_each_entry_safe(curr, tmp, &vgdev->obj_restore, node) {
+ ret = virtio_gpu_object_shmem_init(vgdev, curr->bo, &ents, &nents);
+ if (ret)
+ break;
+
+ if (curr->params.blob) {
+ virtio_gpu_cmd_resource_create_blob(vgdev, curr->bo, &curr->params,
+ ents, nents);
+ } else if (curr->params.virgl) {
+ virtio_gpu_cmd_resource_create_3d(vgdev, curr->bo, &curr->params,
+ NULL, NULL);
+ virtio_gpu_object_attach(vgdev, curr->bo, ents, nents);
+ } else {
+ virtio_gpu_cmd_create_resource(vgdev, curr->bo, &curr->params,
+ NULL, NULL);
+ virtio_gpu_object_attach(vgdev, curr->bo, ents, nents);
+ }
+ }
+
+ return ret;
+}
--
2.34.1
More information about the dri-devel
mailing list