[v2,3/5] drm/virtio: add in-fences support for explicit synchronization

Commit Message

Gustavo Padovan Feb. 16, 2018, 3:12 p.m. UTC

From: Gustavo Padovan <[e-mail]>

When the execbuf call receives an in-fence it will get the dma_fence
related to that fence fd. If that fence is from a foreign context we wait
on it before submitting the draw call.

v2:	- incorporate fix for context check from Rob Herring

Signed-off-by: Gustavo Padovan <[e-mail]>
Signed-off-by: Rob Herring <[e-mail]>

virtio-gpu: fix context check

We may have a foreign context from sw_sync, so we need to wait in that case.

If there's a match, returning an error doesn't seem right either.

Signed-off-by: Rob Herring <[e-mail]>
---
 drivers/gpu/drm/virtio/virtgpu_ioctl.c | 42 ++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 9 deletions(-)

Comments

Rob Herring (Arm) Feb. 16, 2018, 5:18 p.m. UTC | #1

On Fri, Feb 16, 2018 at 9:12 AM, Gustavo Padovan <[e-mail]> wrote:
> From: Gustavo Padovan <[e-mail]>
>
> When the execbuf call receives an in-fence it will get the dma_fence
> related to that fence fd. If that fence is from a foreign context we wait
> on it before submitting the draw call.
>
> v2:     - incorporate fix for context check from Rob Herring
>
> Signed-off-by: Gustavo Padovan <[e-mail]>
> Signed-off-by: Rob Herring <[e-mail]>
>
> virtio-gpu: fix context check
>
> We may have a foreign context from sw_sync, so we need to wait in that case.
>
> If there's a match, returning an error doesn't seem right either.
>
> Signed-off-by: Rob Herring <[e-mail]>

Need to clean-up the squashed commit msg.

Rob

Patch

diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index bd46b0d76754..f3d1ffbbd430 100644
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -28,6 +28,7 @@ 
 #include <drm/drmP.h>
 #include <drm/virtgpu_drm.h>
 #include <drm/ttm/ttm_execbuf_util.h>
+#include <linux/sync_file.h>
 
 #include "virtgpu_drv.h"
 
@@ -113,6 +114,8 @@  static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
 	struct ttm_validate_buffer *buflist = NULL;
 	int i;
 	struct ww_acquire_ctx ticket;
+	struct dma_fence *in_fence = NULL;
+	int in_fence_fd = exbuf->fence_fd;
 	void *buf;
 
 	exbuf->fence_fd = -1;
@@ -120,6 +123,22 @@  static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
 	if (vgdev->has_virgl_3d == false)
 		return -ENOSYS;
 
+	if (exbuf->flags & VIRTGPU_EXECBUF_FENCE_FD_IN) {
+		in_fence = sync_file_get_fence(in_fence_fd);
+		if (!in_fence)
+			return -EINVAL;
+
+		/*
+		 * Wait if the fence is from a foreign context, or if the fence
+		 * array contains any fence from a foreign context.
+		 */
+		if (!dma_fence_match_context(in_fence, vgdev->fence_drv.context)) {
+			ret = dma_fence_wait(in_fence, true);
+			if (ret)
+				return ret;
+		}
+	}
+
 	INIT_LIST_HEAD(&validate_list);
 	if (exbuf->num_bo_handles) {
 
@@ -129,26 +148,22 @@  static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
 					   sizeof(struct ttm_validate_buffer),
 					   GFP_KERNEL | __GFP_ZERO);
 		if (!bo_handles || !buflist) {
-			kvfree(bo_handles);
-			kvfree(buflist);
-			return -ENOMEM;
+			ret = -ENOMEM;
+			goto out_in_fence;
 		}
 
 		user_bo_handles = (void __user *)(uintptr_t)exbuf->bo_handles;
 		if (copy_from_user(bo_handles, user_bo_handles,
 				   exbuf->num_bo_handles * sizeof(uint32_t))) {
 			ret = -EFAULT;
-			kvfree(bo_handles);
-			kvfree(buflist);
-			return ret;
+			goto out_in_fence;
 		}
 
 		for (i = 0; i < exbuf->num_bo_handles; i++) {
 			gobj = drm_gem_object_lookup(drm_file, bo_handles[i]);
 			if (!gobj) {
-				kvfree(bo_handles);
-				kvfree(buflist);
-				return -ENOENT;
+				ret = -ENOENT;
+				goto out_in_fence;
 			}
 
 			qobj = gem_to_virtio_gpu_obj(gobj);
@@ -157,6 +172,7 @@  static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
 			list_add(&buflist[i].head, &validate_list);
 		}
 		kvfree(bo_handles);
+		bo_handles = NULL;
 	}
 
 	ret = virtio_gpu_object_list_validate(&ticket, &validate_list);
@@ -177,6 +193,11 @@  static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
 		goto out_unresv;
 	}
 
+	if (in_fence) {
+		dma_fence_put(in_fence);
+		in_fence = NULL;
+	}
+
 	virtio_gpu_cmd_submit(vgdev, buf, exbuf->size,
 			      vfpriv->ctx_id, fence);
 
@@ -191,7 +212,10 @@  static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
 	ttm_eu_backoff_reservation(&ticket, &validate_list);
 out_free:
 	virtio_gpu_unref_list(&validate_list);
+out_in_fence:
+	kvfree(bo_handles);
 	kvfree(buflist);
+	dma_fence_put(in_fence);
 	return ret;
 }