S3 support
v4 cover S3 support
v4:
Hi all,
Thanks for Gerd Hoffmann's advice. V4 makes below changes:
* Use enum for freeze mode, so this can be extended with more modes in the future.
* Rename functions and paratemers with "_S3" postfix. And no functional changes.
latest version on kernel side:
https://lore.kernel.org/lkml/[email protected]/T/#t
Best regards,
Jiqian Chen.
v3:
link,
https://lore.kernel.org/qemu-devel/[email protected]/T/#t
Hi all,
Thanks for Michael S. Tsirkin's advice. V3 makes below changes:
* Remove changes in file include/standard-headers/linux/virtio_gpu.h I am not supposed to edit this file and it will be imported after the patches of linux kernel was merged.
v2:
link,
https://lore.kernel.org/qemu-devel/[email protected]/T/#t
Hi all,
Thanks to Marc-André Lureau, Robert Beckett and Gerd Hoffmann for their advice and guidance. V2 makes below changes:
* Change VIRTIO_CPU_CMD_STATUS_FREEZING to 0x0400 (<0x1000)
* Add virtio_gpu_device_unrealize to destroy resources to solve potential memory leak problem. This also needs hot-plug support.
* Add a new feature flag VIRTIO_GPU_F_FREEZING, so that guest and host can negotiate whenever freezing is supported or not.
v1:
link,
https://lore.kernel.org/qemu-devel/[email protected]/
Hi all,
I am working to implement virtgpu S3 function on Xen.
Currently on Xen, if we start a guest who enables virtgpu, and then run "echo mem > /sys/power/state" to suspend guest. And run "sudo xl trigger <guest id> s3resume" to resume guest. We can find that the guest kernel comes back, but the display doesn't. It just shown a black screen.
Through reading codes, I founded that when guest was during suspending, it called into Qemu to call virtio_gpu_gl_reset. In virtio_gpu_gl_reset, it destroyed all resources and reset renderer. This made the display gone after guest resumed.
I think we should keep resources or prevent they being destroyed when guest is suspending. So, I add a new status named freezing to virtgpu, and add a new ctrl message VIRTIO_GPU_CMD_STATUS_FREEZING to get notification from guest. If freezing is set to true, and then Qemu will realize that guest is suspending, it will not destroy resources and will not reset renderer. If freezing is set to false, Qemu will do its origin actions, and has no other impaction.
And now, display can come back and applications can continue their status after guest resumes.
Jiqian Chen (1):
virtgpu: do not destroy resources when guest suspend
hw/display/virtio-gpu-base.c | 3 ++ hw/display/virtio-gpu-gl.c | 10 ++++++- hw/display/virtio-gpu-virgl.c | 7 +++++ hw/display/virtio-gpu.c | 55 ++++++++++++++++++++++++++++++++-- hw/virtio/virtio.c | 3 ++ include/hw/virtio/virtio-gpu.h | 6 ++++ 6 files changed, 81 insertions(+), 3 deletions(-)
Signature · 1 line
2.34.1
PATCH v4 1/1 virtgpu: do not destroy resources when guest suspend
After suspending and resuming guest VM, you will get a black screen, and the display can't come back.
This is because when guest did suspending, it called into qemu to call virtio_gpu_gl_reset. In function virtio_gpu_gl_reset, it destroyed resources and reset renderer, which were used for display. As a result, guest's screen can't come back to the time when it was suspended and only showed black.
So, this patch adds a new ctrl message VIRTIO_GPU_CMD_SET_FREEZE_MODE to get notifications from guest. If guest is during suspending, it sets freeze mode of virtgpu to freeze_S3, this will prevent destroying resources and resetting renderer when guest calls into virtio_gpu_gl_reset. If guest is during resuming, it sets freeze mode to unfreeze, and then virtio_gpu_gl_reset will keep its origin actions and has no other impaction.
Due to this implemention needs cooperation with guest, so it added a new feature flag VIRTIO_GPU_F_FREEZE_S3, so that guest and host can negotiate whenever freeze_S3 is supported or not.
--- hw/display/virtio-gpu-base.c | 3 ++ hw/display/virtio-gpu-gl.c | 10 ++++++- hw/display/virtio-gpu-virgl.c | 7 +++++ hw/display/virtio-gpu.c | 55 ++++++++++++++++++++++++++++++++-- hw/virtio/virtio.c | 3 ++ include/hw/virtio/virtio-gpu.h | 6 ++++ 6 files changed, 81 insertions(+), 3 deletions(-)
hw/display/virtio-gpu-base.c +3 -0
@@ -215,6 +215,9 @@ virtio_gpu_base_get_features(VirtIODevice *vdev, uint64_t features,if (virtio_gpu_blob_enabled (g->conf)) { features |= (1 <<VIRTIO_GPU_F_RESOURCE_BLOB ); } +if (virtio_gpu_freeze_S3_enabled (g->conf)) { + features |= (1 <<VIRTIO_GPU_F_FREEZE_S3 ); + }return features; }
hw/display/virtio-gpu-gl.c +9 -1
@@ -100,7 +100,15 @@ static void virtio_gpu_gl_reset(VirtIODevice *vdev)*/ if (gl->renderer_inited && !gl->renderer_reset) {virtio_gpu_virgl_reset_scanout (g); - gl->renderer_reset = true; +/* +* If guest is suspending, we shouldn't reset renderer, +* otherwise, the display can't come back to the time when +* it was suspended after guest was resumed. +*/ +if (!virtio_gpu_freeze_S3_enabled (g->parent_obj.conf) || + g->freeze_mode ==VIRTIO_GPU_FREEZE_MODE_UNFREEZE ) { + gl->renderer_reset = true; + } } }
hw/display/virtio-gpu-virgl.c +7 -0
@@ -464,6 +464,13 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g,case VIRTIO_GPU_CMD_GET_EDID :virtio_gpu_get_edid (g, cmd);break ; +case VIRTIO_GPU_CMD_SET_FREEZE_MODE : +if (virtio_gpu_freeze_S3_enabled (g->parent_obj.conf)) { +virtio_gpu_cmd_set_freeze_mode (g, cmd); + }else { + cmd->error =VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER ; + } +break ;default : cmd->error =VIRTIO_GPU_RESP_ERR_UNSPEC ;break ;
hw/display/virtio-gpu.c +53 -2
91 lines not on this page · raw message
hw/virtio/virtio.c +3 -0
@@ -240,6 +240,9 @@ qmp_virtio_feature_map_t virtio_gpu_feature_map[] = {FEATURE_ENTRY (VIRTIO_GPU_F_CONTEXT_INIT , \"VIRTIO_GPU_F_CONTEXT_INIT: Context types and synchronization " "timelines supported" ), +FEATURE_ENTRY (VIRTIO_GPU_F_FREEZE_S3 , \ +"VIRTIO_GPU_F_FREEZE_S3: Freezing virtio-gpu and keeping resources" +"alive is supported." ),FEATURE_ENTRY (VHOST_F_LOG_ALL , \"VHOST_F_LOG_ALL: Logging write descriptors supported" ), FEATURE_ENTRY(VHOST_USER_F_PROTOCOL_FEATURES, \
include/hw/virtio/virtio-gpu.h +6 -0
@@ -90,6 +90,7 @@ enum virtio_gpu_base_conf_flags {VIRTIO_GPU_FLAG_EDID_ENABLED ,VIRTIO_GPU_FLAG_DMABUF_ENABLED ,VIRTIO_GPU_FLAG_BLOB_ENABLED , + VIRTIO_GPU_FLAG_FREEZE_S3_ENABLED, };#define virtio_gpu_virgl_enabled (_cfg) \
@@ -102,6 +103,8 @@ enum virtio_gpu_base_conf_flags { (_cfg.flags & (1 << VIRTIO_GPU_FLAG_DMABUF_ENABLED))#define virtio_gpu_blob_enabled (_cfg) \ (_cfg.flags & (1 << VIRTIO_GPU_FLAG_BLOB_ENABLED)) +#define virtio_gpu_freeze_S3_enabled (_cfg) \ + (_cfg.flags & (1 << VIRTIO_GPU_FLAG_FREEZE_S3_ENABLED))struct virtio_gpu_base_conf {uint32_t max_outputs;
@@ -173,6 +176,7 @@ struct VirtIOGPU {uint64_t hostmem; +virtio_gpu_freeze_mode_t freeze_mode;bool processing_cmdq;QEMUTimer *fence_poll;QEMUTimer *print_stats;
@@ -284,5 +288,7 @@ void virtio_gpu_virgl_reset_scanout(VirtIOGPU *g);void virtio_gpu_virgl_reset (VirtIOGPU *g);int virtio_gpu_virgl_init (VirtIOGPU *g);int virtio_gpu_virgl_get_num_capsets (VirtIOGPU *g); +void virtio_gpu_cmd_set_freeze_mode (VirtIOGPU *g, +struct virtio_gpu_ctrl_command *cmd);#endif
Signature · 1 line
2.34.1
Hi all,
Please forgive me for asking. Do you have any other comments on my latest version patches about virtio-gpu S3 on Xen? Looking forward to your reply.
Quoted 81 lines · Jiqian Chen
v4:
Hi all,
Thanks for Gerd Hoffmann's advice. V4 makes below changes:
* Use enum for freeze mode, so this can be extended with more modes in the future.
* Rename functions and paratemers with "_S3" postfix. And no functional changes.latest version on kernel side:
https://lore.kernel.org/lkml/[email protected]/T/#tBest regards,
Jiqian Chen.v3:
link,
https://lore.kernel.org/qemu-devel/[email protected]/T/#tHi all,
Thanks for Michael S. Tsirkin's advice. V3 makes below changes:
* Remove changes in fileinclude/standard-headers/linux/virtio_gpu.hI am not supposed to edit this file and it will be imported after the patches of linux kernel was merged.v2:
link,
https://lore.kernel.org/qemu-devel/[email protected]/T/#tHi all,
Thanks to Marc-André Lureau, Robert Beckett and Gerd Hoffmann for their advice and guidance. V2 makes below changes:* Change
VIRTIO_CPU_CMD_STATUS_FREEZINGto0x0400(<0x1000)
* Addvirtio_gpu_device_unrealizeto destroy resources to solve potential memory leak problem. This also needs hot-plug support.
* Add a new feature flagVIRTIO_GPU_F_FREEZING, so that guest and host can negotiate whenever freezing is supported or not.v1:
link,
https://lore.kernel.org/qemu-devel/[email protected]/Hi all,
I am working to implement virtgpu S3 function on Xen.Currently on Xen, if we start a guest who enables virtgpu, and then run "echo mem >
/sys/power/state" to suspend guest. And run "sudo xl trigger <guest id> s3resume" to resume guest. We can find that the guest kernel comes back, but the display doesn't. It just shown a black screen.Through reading codes, I founded that when guest was during suspending, it called into Qemu to call
virtio_gpu_gl_reset. Invirtio_gpu_gl_reset, it destroyed all resources and reset renderer. This made the display gone after guest resumed.I think we should keep resources or prevent they being destroyed when guest is suspending. So, I add a new status named freezing to virtgpu, and add a new ctrl message
VIRTIO_GPU_CMD_STATUS_FREEZINGto get notification from guest. If freezing is set to true, and then Qemu will realize that guest is suspending, it will not destroy resources and will not reset renderer. If freezing is set to false, Qemu will do its origin actions, and has no other impaction.And now, display can come back and applications can continue their status after guest resumes.
Jiqian Chen (1):
virtgpu: do not destroy resources when guest suspendhw/display/virtio-gpu-base.c | 3 ++ hw/display/virtio-gpu-gl.c | 10 ++++++- hw/display/virtio-gpu-virgl.c | 7 +++++ hw/display/virtio-gpu.c | 55 ++++++++++++++++++++++++++++++++-- hw/virtio/virtio.c | 3 ++ include/hw/virtio/virtio-gpu.h | 6 ++++ 6 files changed, 81 insertions(+), 3 deletions(-)
Signature · 2 lines
Best regards, Jiqian Chen.