drm/virtio: fix stale mm entries on driver shutdown
Subsystems (4)
Gerd Hoffmann
maintainercover drm/virtio: fix stale mm entries on driver shutdown
Gerd Hoffmann (3):
drm/virtio: use drmm_mode_config_init
drm/virtio: return virtio_gpu_queue errors drm/virtio: add virtio_gpu_cmd_unref_resource error handling
drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- drivers/gpu/drm/virtio/virtgpu_display.c | 11 ++++--- drivers/gpu/drm/virtio/virtgpu_kms.c | 6 +++- drivers/gpu/drm/virtio/virtgpu_vq.c | 41 +++++++++++++----------- 4 files changed, 36 insertions(+), 24 deletions(-)
Signature · 7 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH 1/3 drm/virtio: use drmm_mode_config_init
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- drivers/gpu/drm/virtio/virtgpu_display.c | 11 +++++++---- drivers/gpu/drm/virtio/virtgpu_kms.c | 6 +++++- 3 files changed, 13 insertions(+), 6 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +1 -1
@@ -352,7 +352,7 @@ virtio_gpu_cmd_resource_assign_uuid(struct virtio_gpu_device *vgdev, struct virtio_gpu_object_array *objs);/* virtgpu_display.c */ -void virtio_gpu_modeset_init (struct virtio_gpu_device *vgdev); +int virtio_gpu_modeset_init (struct virtio_gpu_device *vgdev);void virtio_gpu_modeset_fini (struct virtio_gpu_device *vgdev);/* virtgpu_plane.c */
drivers/gpu/drm/virtio/virtgpu_display.c +7 -4
@@ -325,11 +325,14 @@ static const struct drm_mode_config_funcs virtio_gpu_mode_funcs = { .atomic_commit = drm_atomic_helper_commit, }; -void virtio_gpu_modeset_init (struct virtio_gpu_device *vgdev) +int virtio_gpu_modeset_init (struct virtio_gpu_device *vgdev) { -int i; +int i, ret; + + ret =drmm_mode_config_init (vgdev->ddev); +if (ret) +return ret; -drm_mode_config_init (vgdev->ddev); vgdev->ddev->mode_config.quirk_addfb_prefer_host_byte_order = true; vgdev->ddev->mode_config.funcs = &virtio_gpu_mode_funcs;
@@ -343,6 +346,7 @@ void virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev)vgdev_output_init (vgdev, i);drm_mode_config_reset (vgdev->ddev); +return 0 ; }void virtio_gpu_modeset_fini (struct virtio_gpu_device *vgdev)
@@ -351,5 +355,4 @@ void virtio_gpu_modeset_fini(struct virtio_gpu_device *vgdev)for (i =0 ; i < vgdev->num_scanouts; ++i)kfree (vgdev->outputs[i].edid); -drm_mode_config_cleanup (vgdev->ddev); }
drivers/gpu/drm/virtio/virtgpu_kms.c +5 -1
@@ -184,7 +184,11 @@ int virtio_gpu_init(struct drm_device *dev) num_capsets, &num_capsets);DRM_INFO ("number of cap sets: %d\n" , num_capsets); -virtio_gpu_modeset_init (vgdev); + ret =virtio_gpu_modeset_init (vgdev); +if (ret) { +DRM_ERROR ("modeset init failed\n" ); + goto err_scanouts; + }virtio_device_ready (vgdev->vdev);
Signature · 6 lines
2.27.0 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Gerd Hoffmann
maintainerPATCH 2/3 drm/virtio: return virtio_gpu_queue errors
In reply to Gerd HoffmannIn case queuing virtio commands fails (can happen when the device got unplugged) pass up the error.
--- drivers/gpu/drm/virtio/virtgpu_vq.c | 36 +++++++++++++++-------------- 1 file changed, 19 insertions(+), 17 deletions(-)
drivers/gpu/drm/virtio/virtgpu_vq.c +19 -17
@@ -320,13 +320,13 @@ static struct sg_table *vmalloc_to_sgt(char *data, uint32_t size, int *sg_ents)return sgt; } -static void virtio_gpu_queue_ctrl_sgs (struct virtio_gpu_device *vgdev, -struct virtio_gpu_vbuffer *vbuf, -struct virtio_gpu_fence *fence, -int elemcnt, -struct scatterlist **sgs, -int outcnt, -int incnt) +static int virtio_gpu_queue_ctrl_sgs (struct virtio_gpu_device *vgdev, +struct virtio_gpu_vbuffer *vbuf, +struct virtio_gpu_fence *fence, +int elemcnt, +struct scatterlist **sgs, +int outcnt, +int incnt) {struct virtqueue *vq = vgdev->ctrlq.vq;int ret, idx;
@@ -335,7 +335,7 @@ static void virtio_gpu_queue_ctrl_sgs(struct virtio_gpu_device *vgdev,if (fence && vbuf->objs)virtio_gpu_array_unlock_resv (vbuf->objs);free_vbuf (vgdev, vbuf); -return ; +return -1 ; }if (vgdev->has_indirect)
@@ -373,15 +373,16 @@ static void virtio_gpu_queue_ctrl_sgs(struct virtio_gpu_device *vgdev,spin_unlock (&vgdev->ctrlq.qlock);drm_dev_exit (idx); +return 0 ; } -static void virtio_gpu_queue_fenced_ctrl_buffer (struct virtio_gpu_device *vgdev, -struct virtio_gpu_vbuffer *vbuf, -struct virtio_gpu_fence *fence) +static int virtio_gpu_queue_fenced_ctrl_buffer (struct virtio_gpu_device *vgdev, +struct virtio_gpu_vbuffer *vbuf, +struct virtio_gpu_fence *fence) {struct scatterlist *sgs[3 ], vcmd, vout, vresp;struct sg_table *sgt =NULL ; -int elemcnt =0 , outcnt =0 , incnt =0 ; +int elemcnt =0 , outcnt =0 , incnt =0 , ret;/* set up vcmd */ sg_init_one (&vcmd, vbuf->buf, vbuf->size);
@@ -398,7 +399,7 @@ static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev,if (!sgt) {if (fence && vbuf->objs)virtio_gpu_array_unlock_resv (vbuf->objs); -return ; +return -1 ; } elemcnt += sg_ents;
@@ -419,13 +420,14 @@ static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev, incnt++; } -virtio_gpu_queue_ctrl_sgs (vgdev, vbuf, fence, elemcnt, sgs, outcnt, - incnt); + ret =virtio_gpu_queue_ctrl_sgs (vgdev, vbuf, fence, elemcnt, sgs, outcnt, + incnt);if (sgt) {sg_free_table (sgt);kfree (sgt); } +return ret; }void virtio_gpu_notify (struct virtio_gpu_device *vgdev)
@@ -444,10 +446,10 @@ void virtio_gpu_notify(struct virtio_gpu_device *vgdev)virtqueue_notify (vgdev->ctrlq.vq); } -static void virtio_gpu_queue_ctrl_buffer (struct virtio_gpu_device *vgdev, +static int virtio_gpu_queue_ctrl_buffer (struct virtio_gpu_device *vgdev,struct virtio_gpu_vbuffer *vbuf) { -virtio_gpu_queue_fenced_ctrl_buffer (vgdev, vbuf,NULL ); +return virtio_gpu_queue_fenced_ctrl_buffer (vgdev, vbuf,NULL ); } static void virtio_gpu_queue_cursor(struct virtio_gpu_device *vgdev,
Signature · 6 lines
2.27.0 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Gerd Hoffmann
maintainerPATCH 3/3 drm/virtio: add virtio_gpu_cmd_unref_resource error handling
In reply to Gerd HoffmannUsually we wait for the host to complete the unref request, then cleanup the guest-side state of the object in the completion callback. When submitting the unref command failed the completion callback will not be called though, so cleanup right away.
Fixes a WARN on stale mm entries on driver shutdown.
--- drivers/gpu/drm/virtio/virtgpu_vq.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/virtio/virtgpu_vq.c +4 -1
@@ -536,6 +536,7 @@ void virtio_gpu_cmd_unref_resource(struct virtio_gpu_device *vgdev, {struct virtio_gpu_resource_unref *cmd_p;struct virtio_gpu_vbuffer *vbuf; +int ret; cmd_p =virtio_gpu_alloc_cmd_cb (vgdev, &vbuf,sizeof (*cmd_p), virtio_gpu_cmd_unref_cb);
@@ -545,7 +546,9 @@ void virtio_gpu_cmd_unref_resource(struct virtio_gpu_device *vgdev, cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle); vbuf->resp_cb_data = bo; -virtio_gpu_queue_ctrl_buffer (vgdev, vbuf); + ret =virtio_gpu_queue_ctrl_buffer (vgdev, vbuf); +if (ret <0 ) +virtio_gpu_cleanup_object (bo); } void virtio_gpu_cmd_set_scanout(struct virtio_gpu_device *vgdev,
Signature · 6 lines
2.27.0 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Quoted 7 lines · Gerd Hoffmann
Gerd Hoffmann (3):
drm/virtio: usedrmm_mode_config_init
drm/virtio: returnvirtio_gpu_queueerrors drm/virtio: addvirtio_gpu_cmd_unref_resourceerror handling
lgtm +/- nits:
- add a simple "why" in the first commit message
- checkpatch --strict reports:
CHECK: Alignment should match open parenthesis
#101: FILE: drivers/gpu/drm/virtio/virtgpu_vq.c:450:
+static int virtio_gpu_queue_ctrl_buffer(struct virtio_gpu_device *vgdev,
struct virtio_gpu_vbuffer *vbuf)
Either way, series is:
Quoted 7 lines
drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- drivers/gpu/drm/virtio/virtgpu_display.c | 11 ++++--- drivers/gpu/drm/virtio/virtgpu_kms.c | 6 +++- drivers/gpu/drm/virtio/virtgpu_vq.c | 41 +++++++++++++----------- 4 files changed, 36 insertions(+), 24 deletions(-)
Quoted 9 lines
--
2.27.0_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel