* [PATCH v2] drm/virtio: exbuf->fence_fd unmodified on interrupted wait
@ 2023-02-03 23:33 ` Ryan Neph
0 siblings, 0 replies; 4+ messages in thread
From: Ryan Neph @ 2023-02-03 23:33 UTC (permalink / raw)
To: David Airlie, Gerd Hoffmann, Daniel Vetter, Gurchetan Singh,
Chia-I Wu, dri-devel, virtualization, linux-kernel
Cc: Yiwei Zhang, Rob Clark, Ryan Neph, Rob Clark, Dmitry Osipenko,
Emil Velikov, Gustavo Padovan
An interrupted dma_fence_wait() becomes an -ERESTARTSYS returned
to userspace ioctl(DRM_IOCTL_VIRTGPU_EXECBUFFER) calls, prompting to
retry the ioctl(), but the passed exbuf->fence_fd has been reset to -1,
making the retry attempt fail at sync_file_get_fence().
The uapi for DRM_IOCTL_VIRTGPU_EXECBUFFER is changed to retain the
passed value for exbuf->fence_fd when returning anything besides a
successful result from the ioctl.
Fixes: 2cd7b6f08bc4 ("drm/virtio: add in/out fence support for explicit synchronization")
Signed-off-by: Ryan Neph <ryanneph@chromium.org>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
---
Changes in v2:
- No longer modifies exbuf->fence_fd unless DRM_IOCTL_VIRTGPU_EXECBUFFER
succeeds.
- Added r-b tags (Rob/Dmitry) from v1.
drivers/gpu/drm/virtio/virtgpu_ioctl.c | 5 +----
include/uapi/drm/virtgpu_drm.h | 1 +
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index 9f4a90493aea..da45215a933d 100644
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -126,7 +126,6 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
void __user *user_bo_handles = NULL;
struct virtio_gpu_object_array *buflist = NULL;
struct sync_file *sync_file;
- int in_fence_fd = exbuf->fence_fd;
int out_fence_fd = -1;
void *buf;
uint64_t fence_ctx;
@@ -152,13 +151,11 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
ring_idx = exbuf->ring_idx;
}
- exbuf->fence_fd = -1;
-
virtio_gpu_create_context(dev, file);
if (exbuf->flags & VIRTGPU_EXECBUF_FENCE_FD_IN) {
struct dma_fence *in_fence;
- in_fence = sync_file_get_fence(in_fence_fd);
+ in_fence = sync_file_get_fence(exbuf->fence_fd);
if (!in_fence)
return -EINVAL;
diff --git a/include/uapi/drm/virtgpu_drm.h b/include/uapi/drm/virtgpu_drm.h
index 0512fde5e697..7b158fcb02b4 100644
--- a/include/uapi/drm/virtgpu_drm.h
+++ b/include/uapi/drm/virtgpu_drm.h
@@ -64,6 +64,7 @@ struct drm_virtgpu_map {
__u32 pad;
};
+/* fence_fd is modified on success if VIRTGPU_EXECBUF_FENCE_FD_OUT flag is set. */
struct drm_virtgpu_execbuffer {
__u32 flags;
__u32 size;
--
2.39.1.519.gcb327c4b5f-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v2] drm/virtio: exbuf->fence_fd unmodified on interrupted wait
@ 2023-02-03 23:33 ` Ryan Neph
0 siblings, 0 replies; 4+ messages in thread
From: Ryan Neph @ 2023-02-03 23:33 UTC (permalink / raw)
To: David Airlie, Gerd Hoffmann, Daniel Vetter, Gurchetan Singh,
Chia-I Wu, dri-devel, virtualization, linux-kernel
Cc: Rob Clark, Ryan Neph, Yiwei Zhang, Gustavo Padovan,
Dmitry Osipenko, Emil Velikov
An interrupted dma_fence_wait() becomes an -ERESTARTSYS returned
to userspace ioctl(DRM_IOCTL_VIRTGPU_EXECBUFFER) calls, prompting to
retry the ioctl(), but the passed exbuf->fence_fd has been reset to -1,
making the retry attempt fail at sync_file_get_fence().
The uapi for DRM_IOCTL_VIRTGPU_EXECBUFFER is changed to retain the
passed value for exbuf->fence_fd when returning anything besides a
successful result from the ioctl.
Fixes: 2cd7b6f08bc4 ("drm/virtio: add in/out fence support for explicit synchronization")
Signed-off-by: Ryan Neph <ryanneph@chromium.org>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
---
Changes in v2:
- No longer modifies exbuf->fence_fd unless DRM_IOCTL_VIRTGPU_EXECBUFFER
succeeds.
- Added r-b tags (Rob/Dmitry) from v1.
drivers/gpu/drm/virtio/virtgpu_ioctl.c | 5 +----
include/uapi/drm/virtgpu_drm.h | 1 +
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index 9f4a90493aea..da45215a933d 100644
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -126,7 +126,6 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
void __user *user_bo_handles = NULL;
struct virtio_gpu_object_array *buflist = NULL;
struct sync_file *sync_file;
- int in_fence_fd = exbuf->fence_fd;
int out_fence_fd = -1;
void *buf;
uint64_t fence_ctx;
@@ -152,13 +151,11 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
ring_idx = exbuf->ring_idx;
}
- exbuf->fence_fd = -1;
-
virtio_gpu_create_context(dev, file);
if (exbuf->flags & VIRTGPU_EXECBUF_FENCE_FD_IN) {
struct dma_fence *in_fence;
- in_fence = sync_file_get_fence(in_fence_fd);
+ in_fence = sync_file_get_fence(exbuf->fence_fd);
if (!in_fence)
return -EINVAL;
diff --git a/include/uapi/drm/virtgpu_drm.h b/include/uapi/drm/virtgpu_drm.h
index 0512fde5e697..7b158fcb02b4 100644
--- a/include/uapi/drm/virtgpu_drm.h
+++ b/include/uapi/drm/virtgpu_drm.h
@@ -64,6 +64,7 @@ struct drm_virtgpu_map {
__u32 pad;
};
+/* fence_fd is modified on success if VIRTGPU_EXECBUF_FENCE_FD_OUT flag is set. */
struct drm_virtgpu_execbuffer {
__u32 flags;
__u32 size;
--
2.39.1.519.gcb327c4b5f-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2] drm/virtio: exbuf->fence_fd unmodified on interrupted wait
2023-02-03 23:33 ` Ryan Neph
@ 2023-02-06 17:20 ` Dmitry Osipenko
-1 siblings, 0 replies; 4+ messages in thread
From: Dmitry Osipenko @ 2023-02-06 17:20 UTC (permalink / raw)
To: Ryan Neph, David Airlie, Gerd Hoffmann, Daniel Vetter,
Gurchetan Singh, Chia-I Wu, dri-devel, virtualization,
linux-kernel
Cc: Yiwei Zhang, Rob Clark, Rob Clark, Emil Velikov, Gustavo Padovan
On 2/4/23 02:33, Ryan Neph wrote:
> An interrupted dma_fence_wait() becomes an -ERESTARTSYS returned
> to userspace ioctl(DRM_IOCTL_VIRTGPU_EXECBUFFER) calls, prompting to
> retry the ioctl(), but the passed exbuf->fence_fd has been reset to -1,
> making the retry attempt fail at sync_file_get_fence().
>
> The uapi for DRM_IOCTL_VIRTGPU_EXECBUFFER is changed to retain the
> passed value for exbuf->fence_fd when returning anything besides a
> successful result from the ioctl.
>
> Fixes: 2cd7b6f08bc4 ("drm/virtio: add in/out fence support for explicit synchronization")
> Signed-off-by: Ryan Neph <ryanneph@chromium.org>
> Reviewed-by: Rob Clark <robdclark@gmail.com>
> Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
>
> ---
>
> Changes in v2:
> - No longer modifies exbuf->fence_fd unless DRM_IOCTL_VIRTGPU_EXECBUFFER
> succeeds.
> - Added r-b tags (Rob/Dmitry) from v1.
Thanks! Applied to misc-fixes
--
Best regards,
Dmitry
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] drm/virtio: exbuf->fence_fd unmodified on interrupted wait
@ 2023-02-06 17:20 ` Dmitry Osipenko
0 siblings, 0 replies; 4+ messages in thread
From: Dmitry Osipenko @ 2023-02-06 17:20 UTC (permalink / raw)
To: Ryan Neph, David Airlie, Gerd Hoffmann, Daniel Vetter,
Gurchetan Singh, Chia-I Wu, dri-devel, virtualization,
linux-kernel
Cc: Rob Clark, Yiwei Zhang, Gustavo Padovan, Emil Velikov
On 2/4/23 02:33, Ryan Neph wrote:
> An interrupted dma_fence_wait() becomes an -ERESTARTSYS returned
> to userspace ioctl(DRM_IOCTL_VIRTGPU_EXECBUFFER) calls, prompting to
> retry the ioctl(), but the passed exbuf->fence_fd has been reset to -1,
> making the retry attempt fail at sync_file_get_fence().
>
> The uapi for DRM_IOCTL_VIRTGPU_EXECBUFFER is changed to retain the
> passed value for exbuf->fence_fd when returning anything besides a
> successful result from the ioctl.
>
> Fixes: 2cd7b6f08bc4 ("drm/virtio: add in/out fence support for explicit synchronization")
> Signed-off-by: Ryan Neph <ryanneph@chromium.org>
> Reviewed-by: Rob Clark <robdclark@gmail.com>
> Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
>
> ---
>
> Changes in v2:
> - No longer modifies exbuf->fence_fd unless DRM_IOCTL_VIRTGPU_EXECBUFFER
> succeeds.
> - Added r-b tags (Rob/Dmitry) from v1.
Thanks! Applied to misc-fixes
--
Best regards,
Dmitry
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-06 17:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-03 23:33 [PATCH v2] drm/virtio: exbuf->fence_fd unmodified on interrupted wait Ryan Neph
2023-02-03 23:33 ` Ryan Neph
2023-02-06 17:20 ` Dmitry Osipenko
2023-02-06 17:20 ` Dmitry Osipenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.