OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freedreno/drm/virtio: Flush before CREATE_BLOB

Browse Source 
The RESOURCE_CREATE_BLOB ioctl can carry a ccmd payload, similarly to
EXECBUF.  But we need to preserve the order of buffered execbuf cmds
which haven't been flushed to the guest kernel yet, rather than let the
CREATE_BLOB payload jump to the head of the queue.  Otherwise, for ex,
the host could see the guest requesting an iova that has not yet been
(from it's perspective) released.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20961>
This commit is contained in:
Rob Clark
2023-01-27 09:43:48 -08:00
committed by Marge Bot
parent df8243dadf
commit bb438c8dc7
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/freedreno/drm/virtio/virtio_bo.c
View File

@@ -415,8 +415,10 @@ virtio_bo_new(struct fd_device *dev, uint32_t size, uint32_t flags)
}
simple_mtx_lock(&virtio_dev->eb_lock);
if (args.cmd)
if (args.cmd) {
virtio_execbuf_flush_locked(dev);
req.hdr.seqno = ++virtio_dev->next_seqno;
}
ret = virtio_ioctl(dev->fd, VIRTGPU_RESOURCE_CREATE_BLOB, &args);
simple_mtx_unlock(&virtio_dev->eb_lock);
if (ret)

8
src/freedreno/drm/virtio/virtio_device.c
View File

@@ -329,6 +329,14 @@ virtio_execbuf_flush(struct fd_device *dev)
return ret;
}
int
virtio_execbuf_flush_locked(struct fd_device *dev)
{
struct virtio_device *virtio_dev = to_virtio_device(dev);
simple_mtx_assert_locked(&virtio_dev->eb_lock);
return execbuf_flush_locked(dev, NULL);
}
int
virtio_execbuf(struct fd_device *dev, struct msm_ccmd_req *req, bool sync)
{

1
src/freedreno/drm/virtio/virtio_priv.h
View File

@@ -185,6 +185,7 @@ int virtio_execbuf_fenced(struct fd_device *dev, struct msm_ccmd_req *req,
uint32_t *handles, uint32_t num_handles,
int in_fence_fd, int *out_fence_fd, int ring_idx);
int virtio_execbuf_flush(struct fd_device *dev);
int virtio_execbuf_flush_locked(struct fd_device *dev);
int virtio_execbuf(struct fd_device *dev, struct msm_ccmd_req *req, bool sync);
void virtio_host_sync(struct fd_device *dev, const struct msm_ccmd_req *req);
int virtio_simple_ioctl(struct fd_device *dev, unsigned cmd, void *req);