From: Dmitry Osipenko <dmitry.osipenko@collabora.com>
To: "Akihiko Odaki" <akihiko.odaki@daynix.com>,
"Huang Rui" <ray.huang@amd.com>,
"Marc-André Lureau" <marcandre.lureau@gmail.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Anthony PERARD" <anthony.perard@citrix.com>,
"Antonio Caggiano" <quic_acaggian@quicinc.com>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
"Robert Beckett" <bob.beckett@collabora.com>,
"Gert Wollny" <gert.wollny@collabora.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Cc: qemu-devel@nongnu.org,
"Gurchetan Singh" <gurchetansingh@chromium.org>,
ernunes@redhat.com, "Alyssa Ross" <hi@alyssa.is>,
"Roger Pau Monné" <roger.pau@citrix.com>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Stefano Stabellini" <stefano.stabellini@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"Xenia Ragiadakou" <xenia.ragiadakou@amd.com>,
"Pierre-Eric Pelloux-Prayer" <pierre-eric.pelloux-prayer@amd.com>,
"Honglei Huang" <honglei1.huang@amd.com>,
"Julia Zhang" <julia.zhang@amd.com>,
"Chen Jiqian" <Jiqian.Chen@amd.com>,
"Yiwei Zhang" <zzyiwei@chromium.org>
Subject: [PATCH v8 09/11] virtio-gpu: Resource UUID
Date: Thu, 18 Apr 2024 22:00:38 +0300 [thread overview]
Message-ID: <20240418190040.1110210-10-dmitry.osipenko@collabora.com> (raw)
In-Reply-To: <20240418190040.1110210-1-dmitry.osipenko@collabora.com>
From: Antonio Caggiano <antonio.caggiano@collabora.com>
Enable resource UUID feature and implement command resource assign UUID.
UUID feature availability is mandatory for Vulkan Venus context.
UUID is intended for sharing dmabufs between virtio devices on host. Qemu
doesn't have second virtio device for sharing, thus a simple stub UUID
implementation is enough. More complete implementation using global UUID
resource table might become interesting for a multi-gpu cases.
Signed-off-by: Antonio Caggiano <antonio.caggiano@collabora.com>
Signed-off-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
---
hw/display/trace-events | 1 +
hw/display/virtio-gpu-base.c | 1 +
hw/display/virtio-gpu-virgl.c | 31 +++++++++++++++++++++++++++++++
hw/display/virtio-gpu.c | 5 +++++
include/hw/virtio/virtio-gpu.h | 3 +++
5 files changed, 41 insertions(+)
diff --git a/hw/display/trace-events b/hw/display/trace-events
index 2336a0ca1570..54d6894c59f4 100644
--- a/hw/display/trace-events
+++ b/hw/display/trace-events
@@ -41,6 +41,7 @@ virtio_gpu_cmd_res_create_blob(uint32_t res, uint64_t size) "res 0x%x, size %" P
virtio_gpu_cmd_res_unref(uint32_t res) "res 0x%x"
virtio_gpu_cmd_res_back_attach(uint32_t res) "res 0x%x"
virtio_gpu_cmd_res_back_detach(uint32_t res) "res 0x%x"
+virtio_gpu_cmd_res_assign_uuid(uint32_t res) "res 0x%x"
virtio_gpu_cmd_res_xfer_toh_2d(uint32_t res) "res 0x%x"
virtio_gpu_cmd_res_xfer_toh_3d(uint32_t res) "res 0x%x"
virtio_gpu_cmd_res_xfer_fromh_3d(uint32_t res) "res 0x%x"
diff --git a/hw/display/virtio-gpu-base.c b/hw/display/virtio-gpu-base.c
index 4fc7ef8896c1..610926348bd9 100644
--- a/hw/display/virtio-gpu-base.c
+++ b/hw/display/virtio-gpu-base.c
@@ -225,6 +225,7 @@ virtio_gpu_base_get_features(VirtIODevice *vdev, uint64_t features,
if (virtio_gpu_virgl_enabled(g->conf) ||
virtio_gpu_rutabaga_enabled(g->conf)) {
features |= (1 << VIRTIO_GPU_F_VIRGL);
+ features |= (1 << VIRTIO_GPU_F_RESOURCE_UUID);
}
if (virtio_gpu_edid_enabled(g->conf)) {
features |= (1 << VIRTIO_GPU_F_EDID);
diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c
index de132b22f554..eee3816b987f 100644
--- a/hw/display/virtio-gpu-virgl.c
+++ b/hw/display/virtio-gpu-virgl.c
@@ -160,6 +160,7 @@ static void virgl_cmd_create_resource_2d(VirtIOGPU *g,
res->format = c2d.format;
res->resource_id = c2d.resource_id;
res->dmabuf_fd = -1;
+ qemu_uuid_generate(&res->uuid);
QTAILQ_INSERT_HEAD(&g->reslist, res, next);
args.handle = c2d.resource_id;
@@ -208,6 +209,7 @@ static void virgl_cmd_create_resource_3d(VirtIOGPU *g,
res->format = c3d.format;
res->resource_id = c3d.resource_id;
res->dmabuf_fd = -1;
+ qemu_uuid_generate(&res->uuid);
QTAILQ_INSERT_HEAD(&g->reslist, res, next);
args.handle = c3d.resource_id;
@@ -635,6 +637,7 @@ static void virgl_cmd_resource_create_blob(VirtIOGPU *g,
res->resource_id = cblob.resource_id;
res->blob_size = cblob.size;
res->dmabuf_fd = -1;
+ qemu_uuid_generate(&res->uuid);
if (cblob.blob_mem != VIRTIO_GPU_BLOB_MEM_HOST3D) {
ret = virtio_gpu_create_mapping_iov(g, cblob.nr_entries, sizeof(cblob),
@@ -833,6 +836,31 @@ static void virgl_cmd_set_scanout_blob(VirtIOGPU *g,
}
#endif /* HAVE_VIRGL_RESOURCE_BLOB */
+static void virgl_cmd_assign_uuid(VirtIOGPU *g,
+ struct virtio_gpu_ctrl_command *cmd)
+{
+ struct virtio_gpu_resource_assign_uuid assign;
+ struct virtio_gpu_resp_resource_uuid resp;
+ struct virtio_gpu_simple_resource *res;
+
+ VIRTIO_GPU_FILL_CMD(assign);
+ virtio_gpu_bswap_32(&assign, sizeof(assign));
+ trace_virtio_gpu_cmd_res_assign_uuid(assign.resource_id);
+
+ res = virtio_gpu_find_resource(g, assign.resource_id);
+ if (!res) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: resource does not exist %d\n",
+ __func__, assign.resource_id);
+ cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
+ return;
+ }
+
+ memset(&resp, 0, sizeof(resp));
+ resp.hdr.type = VIRTIO_GPU_RESP_OK_RESOURCE_UUID;
+ memcpy(resp.uuid, res->uuid.data, sizeof(resp.uuid));
+ virtio_gpu_ctrl_response(g, cmd, &resp.hdr, sizeof(resp));
+}
+
void virtio_gpu_virgl_process_cmd(VirtIOGPU *g,
struct virtio_gpu_ctrl_command *cmd)
{
@@ -887,6 +915,9 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g,
/* TODO add security */
virgl_cmd_ctx_detach_resource(g, cmd);
break;
+ case VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID:
+ virgl_cmd_assign_uuid(g, cmd);
+ break;
case VIRTIO_GPU_CMD_GET_CAPSET_INFO:
virgl_cmd_get_capset_info(g, cmd);
break;
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 45c1f2006712..fbf5c0e6b8b7 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -1236,6 +1236,7 @@ static int virtio_gpu_save(QEMUFile *f, void *opaque, size_t size,
}
qemu_put_buffer(f, (void *)pixman_image_get_data(res->image),
pixman_image_get_stride(res->image) * res->height);
+ qemu_put_buffer(f, res->uuid.data, sizeof(res->uuid.data));
}
qemu_put_be32(f, 0); /* end of list */
@@ -1333,6 +1334,7 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size,
}
qemu_get_buffer(f, (void *)pixman_image_get_data(res->image),
pixman_image_get_stride(res->image) * res->height);
+ qemu_get_buffer(f, res->uuid.data, sizeof(res->uuid.data));
if (!virtio_gpu_load_restore_mapping(g, res)) {
pixman_image_unref(res->image);
@@ -1371,6 +1373,7 @@ static int virtio_gpu_blob_save(QEMUFile *f, void *opaque, size_t size,
qemu_put_be64(f, res->addrs[i]);
qemu_put_be32(f, res->iov[i].iov_len);
}
+ qemu_put_buffer(f, res->uuid.data, sizeof(res->uuid.data));
}
qemu_put_be32(f, 0); /* end of list */
@@ -1405,6 +1408,8 @@ static int virtio_gpu_blob_load(QEMUFile *f, void *opaque, size_t size,
res->iov[i].iov_len = qemu_get_be32(f);
}
+ qemu_get_buffer(f, res->uuid.data, sizeof(res->uuid.data));
+
if (!virtio_gpu_load_restore_mapping(g, res)) {
g_free(res);
return -EINVAL;
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
index b9d5e106f3c5..d2a0d542fbb3 100644
--- a/include/hw/virtio/virtio-gpu.h
+++ b/include/hw/virtio/virtio-gpu.h
@@ -19,6 +19,7 @@
#include "ui/console.h"
#include "hw/virtio/virtio.h"
#include "qemu/log.h"
+#include "qemu/uuid.h"
#include "sysemu/vhost-user-backend.h"
#include "standard-headers/linux/virtio_gpu.h"
@@ -65,6 +66,8 @@ struct virtio_gpu_simple_resource {
bool async_unmap_completed;
bool async_unmap_in_progress;
+ QemuUUID uuid;
+
QTAILQ_ENTRY(virtio_gpu_simple_resource) next;
};
--
2.44.0
next prev parent reply other threads:[~2024-04-18 19:02 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-18 19:00 [PATCH v8 00/11] Support blob memory and venus on qemu Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 01/11] linux-headers: Update to Linux v6.9-rc3 Dmitry Osipenko
2024-05-10 10:46 ` Alex Bennée
2024-05-10 16:23 ` Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 02/11] virtio-gpu: Use pkgconfig version to decide which virgl features are available Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 03/11] virtio-gpu: Support context-init feature with virglrenderer Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 04/11] virtio-gpu: Don't require udmabuf when blobs and virgl are enabled Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 05/11] virtio-gpu: Add virgl resource management Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 06/11] virtio-gpu: Support blob scanout using dmabuf fd Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 07/11] virtio-gpu: Support suspension of commands processing Dmitry Osipenko
2024-04-19 8:53 ` Akihiko Odaki
2024-04-24 9:43 ` Dmitry Osipenko
2024-04-27 5:48 ` Akihiko Odaki
2024-05-01 19:02 ` Dmitry Osipenko
2024-05-05 6:37 ` Akihiko Odaki
2024-05-09 12:39 ` Dmitry Osipenko
2024-05-10 10:56 ` Akihiko Odaki
2024-05-10 16:12 ` Dmitry Osipenko
2024-05-10 16:33 ` Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 08/11] virtio-gpu: Handle resource blob commands Dmitry Osipenko
2024-04-19 9:18 ` Akihiko Odaki
2024-04-24 10:30 ` Dmitry Osipenko
2024-04-27 5:52 ` Akihiko Odaki
2024-05-01 19:20 ` Dmitry Osipenko
2024-05-05 6:47 ` Akihiko Odaki
2024-05-09 12:29 ` Dmitry Osipenko
2024-04-18 19:00 ` Dmitry Osipenko [this message]
2024-04-19 9:29 ` [PATCH v8 09/11] virtio-gpu: Resource UUID Akihiko Odaki
2024-04-23 17:43 ` Dmitry Osipenko
2024-04-24 12:52 ` Dmitry Osipenko
2024-04-18 19:00 ` [PATCH v8 10/11] virtio-gpu: Register capsets dynamically Dmitry Osipenko
2024-04-19 9:35 ` Akihiko Odaki
2024-04-18 19:00 ` [PATCH v8 11/11] virtio-gpu: Support Venus context Dmitry Osipenko
2024-04-19 9:44 ` Akihiko Odaki
2024-04-23 8:30 ` [PATCH v8 00/11] Support blob memory and venus on qemu Alex Bennée
2024-04-23 17:37 ` Dmitry Osipenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240418190040.1110210-10-dmitry.osipenko@collabora.com \
--to=dmitry.osipenko@collabora.com \
--cc=Jiqian.Chen@amd.com \
--cc=akihiko.odaki@daynix.com \
--cc=alex.bennee@linaro.org \
--cc=alexander.deucher@amd.com \
--cc=anthony.perard@citrix.com \
--cc=bob.beckett@collabora.com \
--cc=christian.koenig@amd.com \
--cc=dgilbert@redhat.com \
--cc=ernunes@redhat.com \
--cc=gert.wollny@collabora.com \
--cc=gurchetansingh@chromium.org \
--cc=hi@alyssa.is \
--cc=honglei1.huang@amd.com \
--cc=julia.zhang@amd.com \
--cc=kraxel@redhat.com \
--cc=marcandre.lureau@gmail.com \
--cc=mst@redhat.com \
--cc=philmd@linaro.org \
--cc=pierre-eric.pelloux-prayer@amd.com \
--cc=qemu-devel@nongnu.org \
--cc=quic_acaggian@quicinc.com \
--cc=ray.huang@amd.com \
--cc=roger.pau@citrix.com \
--cc=sstabellini@kernel.org \
--cc=stefano.stabellini@amd.com \
--cc=xenia.ragiadakou@amd.com \
--cc=zzyiwei@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).