drm/virtio: fix command submission with objects but without fence.
Subsystems (4)
Gerd Hoffmann
maintainerPATCH 1/1 drm/virtio: fix command submission with objects but without fence.
Only call virtio_gpu_array_add_fence if we actually have a fence.
--- drivers/gpu/drm/virtio/virtgpu_vq.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/virtio/virtgpu_vq.c +5 -4
@@ -339,11 +339,12 @@ static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev, goto again; } -if (fence) +if (fence) {virtio_gpu_fence_emit (vgdev, hdr, fence); -if (vbuf->objs) { -virtio_gpu_array_add_fence (vbuf->objs, &fence->f); -virtio_gpu_array_unlock_resv (vbuf->objs); +if (vbuf->objs) { +virtio_gpu_array_add_fence (vbuf->objs, &fence->f); +virtio_gpu_array_unlock_resv (vbuf->objs); + } } notify =virtio_gpu_queue_ctrl_buffer_locked (vgdev, vbuf);spin_unlock (&vgdev->ctrlq.qlock);
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Chia-I Wu
reviewerQuoted 17 lines · Gerd Hoffmann
Only call
virtio_gpu_array_add_fenceif we actually have a fence.Fixes da758d51968a ("drm/virtio: rework virtio_gpu_execbuffer_ioctl fencing")Signed-off-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/virtio/virtgpu_vq.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/gpu/drm/virtio/virtgpu_vq.c +0
-0@@ -339,11 +339,12 @@ static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev, goto again; }
drivers/gpu/drm/virtio/virtgpu_vq.c static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev, · line 347
Quoted 10 lines
drivers/gpu/drm/virtio/virtgpu_vq.c +5
-4-if (fence) +if (fence) {virtio_gpu_fence_emit (vgdev, hdr, fence); -if (vbuf->objs) { -virtio_gpu_array_add_fence (vbuf->objs, &fence->f); -virtio_gpu_array_unlock_resv (vbuf->objs); +if (vbuf->objs) { +virtio_gpu_array_add_fence (vbuf->objs, &fence->f); +virtio_gpu_array_unlock_resv (vbuf->objs); + }
This leaks when fence == NULL and vbuf->objs != NULL (which can really happen IIRC... not at my desk to check).
Quoted 6 lines
drivers/gpu/drm/virtio/virtgpu_vq.c +0
-1} notify =virtio_gpu_queue_ctrl_buffer_locked (vgdev, vbuf);spin_unlock (&vgdev->ctrlq.qlock); --2.18.1
Gerd Hoffmann
maintainerQuoted 18 lines · Chia-I Wu
Quoted 17 lines · Gerd Hoffmann
Only call
virtio_gpu_array_add_fenceif we actually have a fence.Fixes da758d51968a ("drm/virtio: rework virtio_gpu_execbuffer_ioctl fencing")Signed-off-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/virtio/virtgpu_vq.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/gpu/drm/virtio/virtgpu_vq.c +0
-0@@ -339,11 +339,12 @@ static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev, goto again; }
Quoted 12 lines
drivers/gpu/drm/virtio/virtgpu_vq.c static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev, · line 347
Quoted 10 lines
drivers/gpu/drm/virtio/virtgpu_vq.c +5
-4-if (fence) +if (fence) {virtio_gpu_fence_emit (vgdev, hdr, fence); -if (vbuf->objs) { -virtio_gpu_array_add_fence (vbuf->objs, &fence->f); -virtio_gpu_array_unlock_resv (vbuf->objs); +if (vbuf->objs) { +virtio_gpu_array_add_fence (vbuf->objs, &fence->f); +virtio_gpu_array_unlock_resv (vbuf->objs); + }This leaks when fence == NULL and
vbuf->objs!= NULL (which can really happen IIRC... not at my desk to check).
Yes, it can happen, for example when flushing dumb buffers.
But I don't think we leak in this case. The code paths which don't need a fence also do not call virtio_gpu_array_lock_resv(), so things are balanced. The actual release of the objs happens in virtio_gpu_dequeue_ctrl_func() via virtio_gpu_array_put_free_delayed().
cheers,
Gerd
Quoted 33 lines · Gerd Hoffmann
Quoted 18 lines · Chia-I Wu
Quoted 17 lines · Gerd Hoffmann
Only call
virtio_gpu_array_add_fenceif we actually have a fence.Fixes da758d51968a ("drm/virtio: rework virtio_gpu_execbuffer_ioctl fencing")Signed-off-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/virtio/virtgpu_vq.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/gpu/drm/virtio/virtgpu_vq.c +0
-0@@ -339,11 +339,12 @@ static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev, goto again; }Quoted 12 lines
drivers/gpu/drm/virtio/virtgpu_vq.c static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev, · line 347
Quoted 10 lines
drivers/gpu/drm/virtio/virtgpu_vq.c +5
-4-if (fence) +if (fence) {virtio_gpu_fence_emit (vgdev, hdr, fence); -if (vbuf->objs) { -virtio_gpu_array_add_fence (vbuf->objs, &fence->f); -virtio_gpu_array_unlock_resv (vbuf->objs); +if (vbuf->objs) { +virtio_gpu_array_add_fence (vbuf->objs, &fence->f); +virtio_gpu_array_unlock_resv (vbuf->objs); + }This leaks when fence == NULL and
vbuf->objs!= NULL (which can really happen IIRC... not at my desk to check).
Quoted 6 lines
Yes, it can happen, for example when flushing dumb buffers.
But I don't think we leak in this case. The code paths which don't need a fence also do not call
virtio_gpu_array_lock_resv(), so things are balanced. The actual release of the objs happens invirtio_gpu_dequeue_ctrl_func()viavirtio_gpu_array_put_free_delayed().
I misread and thought this was in virtio_gpu_dequeue_ctrl_func. Sorry :(
Quoted 4 lines
cheers,
Gerd
Quoted 33 lines · Gerd Hoffmann
Quoted 18 lines · Chia-I Wu
Quoted 17 lines · Gerd Hoffmann
Only call
virtio_gpu_array_add_fenceif we actually have a fence.Fixes da758d51968a ("drm/virtio: rework virtio_gpu_execbuffer_ioctl fencing")Signed-off-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/virtio/virtgpu_vq.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/gpu/drm/virtio/virtgpu_vq.c +0
-0@@ -339,11 +339,12 @@ static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev, goto again; }Quoted 12 lines
drivers/gpu/drm/virtio/virtgpu_vq.c static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev, · line 347
Quoted 10 lines
drivers/gpu/drm/virtio/virtgpu_vq.c +5
-4-if (fence) +if (fence) {virtio_gpu_fence_emit (vgdev, hdr, fence); -if (vbuf->objs) { -virtio_gpu_array_add_fence (vbuf->objs, &fence->f); -virtio_gpu_array_unlock_resv (vbuf->objs); +if (vbuf->objs) { +virtio_gpu_array_add_fence (vbuf->objs, &fence->f); +virtio_gpu_array_unlock_resv (vbuf->objs); + }This leaks when fence == NULL and
vbuf->objs!= NULL (which can really happen IIRC... not at my desk to check).
Quoted 6 lines
Yes, it can happen, for example when flushing dumb buffers.
But I don't think we leak in this case. The code paths which don't need a fence also do not call
virtio_gpu_array_lock_resv(), so things are balanced. The actual release of the objs happens invirtio_gpu_dequeue_ctrl_func()viavirtio_gpu_array_put_free_delayed().
I misread and thought this was in virtio_gpu_dequeue_ctrl_func. Sorry :(
Quoted 4 lines
cheers,
Gerd
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerQuoted 18 lines · Chia-I Wu
Quoted 17 lines · Gerd Hoffmann
Only call
virtio_gpu_array_add_fenceif we actually have a fence.Fixes da758d51968a ("drm/virtio: rework virtio_gpu_execbuffer_ioctl fencing")Signed-off-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/virtio/virtgpu_vq.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/gpu/drm/virtio/virtgpu_vq.c +0
-0@@ -339,11 +339,12 @@ static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev, goto again; }
Quoted 12 lines
drivers/gpu/drm/virtio/virtgpu_vq.c static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev, · line 347
Quoted 10 lines
drivers/gpu/drm/virtio/virtgpu_vq.c +5
-4-if (fence) +if (fence) {virtio_gpu_fence_emit (vgdev, hdr, fence); -if (vbuf->objs) { -virtio_gpu_array_add_fence (vbuf->objs, &fence->f); -virtio_gpu_array_unlock_resv (vbuf->objs); +if (vbuf->objs) { +virtio_gpu_array_add_fence (vbuf->objs, &fence->f); +virtio_gpu_array_unlock_resv (vbuf->objs); + }This leaks when fence == NULL and
vbuf->objs!= NULL (which can really happen IIRC... not at my desk to check).
Yes, it can happen, for example when flushing dumb buffers.
But I don't think we leak in this case. The code paths which don't need a fence also do not call virtio_gpu_array_lock_resv(), so things are balanced. The actual release of the objs happens in virtio_gpu_dequeue_ctrl_func() via virtio_gpu_array_put_free_delayed().
cheers,
Gerd
Chia-I Wu
reviewerQuoted 17 lines · Gerd Hoffmann
Only call
virtio_gpu_array_add_fenceif we actually have a fence.Fixes da758d51968a ("drm/virtio: rework virtio_gpu_execbuffer_ioctl fencing")Signed-off-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/virtio/virtgpu_vq.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/gpu/drm/virtio/virtgpu_vq.c +0
-0@@ -339,11 +339,12 @@ static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev, goto again; }
drivers/gpu/drm/virtio/virtgpu_vq.c static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev, · line 347
Quoted 10 lines
drivers/gpu/drm/virtio/virtgpu_vq.c +5
-4-if (fence) +if (fence) {virtio_gpu_fence_emit (vgdev, hdr, fence); -if (vbuf->objs) { -virtio_gpu_array_add_fence (vbuf->objs, &fence->f); -virtio_gpu_array_unlock_resv (vbuf->objs); +if (vbuf->objs) { +virtio_gpu_array_add_fence (vbuf->objs, &fence->f); +virtio_gpu_array_unlock_resv (vbuf->objs); + }
This leaks when fence == NULL and vbuf->objs != NULL (which can really happen IIRC... not at my desk to check).
Quoted 6 lines
drivers/gpu/drm/virtio/virtgpu_vq.c +0
-1} notify =virtio_gpu_queue_ctrl_buffer_locked (vgdev, vbuf);spin_unlock (&vgdev->ctrlq.qlock); --2.18.1