|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [QEMU PATCH v5 10/13] virtio-gpu: Resource UUID
On Sat, Sep 16, 2023 at 12:48:14AM +0800, Akihiko Odaki wrote:
> On 2023/09/15 20:11, Huang Rui wrote:
> > From: Antonio Caggiano <antonio.caggiano@xxxxxxxxxxxxx>
> >
> > Enable resource UUID feature and implement command resource assign UUID.
> > This is done by introducing a hash table to map resource IDs to their
> > UUIDs.
> >
> > Signed-off-by: Antonio Caggiano <antonio.caggiano@xxxxxxxxxxxxx>
> > Signed-off-by: Huang Rui <ray.huang@xxxxxxx>
> > ---
> >
> > V4 -> V5:
> > - Add virtio migration handling for uuid (Akihiko)
> > - Adjust sequence to allocate gpu resource before virglrender resource
> > creation (Akihiko)
> > - Clean up (Akihiko)
> >
> > hw/display/trace-events | 1 +
> > hw/display/virtio-gpu-base.c | 2 ++
> > hw/display/virtio-gpu-virgl.c | 21 ++++++++++++
> > hw/display/virtio-gpu.c | 58 ++++++++++++++++++++++++++++++++++
> > include/hw/virtio/virtio-gpu.h | 6 ++++
> > 5 files changed, 88 insertions(+)
> >
> > diff --git a/hw/display/trace-events b/hw/display/trace-events
> > index 2336a0ca15..54d6894c59 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 4f2b0ba1f3..f44388715c 100644
> > --- a/hw/display/virtio-gpu-base.c
> > +++ b/hw/display/virtio-gpu-base.c
> > @@ -236,6 +236,8 @@ virtio_gpu_base_get_features(VirtIODevice *vdev,
> > uint64_t features,
> > features |= (1 << VIRTIO_GPU_F_CONTEXT_INIT);
> > }
> >
> > + features |= (1 << VIRTIO_GPU_F_RESOURCE_UUID);
> > +
> > return features;
> > }
> >
> > diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c
> > index 563a6f2f58..8a017dbeb4 100644
> > --- a/hw/display/virtio-gpu-virgl.c
> > +++ b/hw/display/virtio-gpu-virgl.c
> > @@ -36,11 +36,20 @@ static void virgl_cmd_create_resource_2d(VirtIOGPU *g,
> > {
> > struct virtio_gpu_resource_create_2d c2d;
> > struct virgl_renderer_resource_create_args args;
> > + struct virtio_gpu_simple_resource *res;
> >
> > VIRTIO_GPU_FILL_CMD(c2d);
> > trace_virtio_gpu_cmd_res_create_2d(c2d.resource_id, c2d.format,
> > c2d.width, c2d.height);
> >
> > + res = g_new0(struct virtio_gpu_simple_resource, 1);
> > + if (!res) {
> > + cmd->error = VIRTIO_GPU_RESP_ERR_OUT_OF_MEMORY;
> > + return;
> > + }
> > + res->resource_id = c2d.resource_id;
> > + QTAILQ_INSERT_HEAD(&g->reslist, res, next);
> > +
>
> The struct virtio_gpu_simple_resource for a resource created with
> virgl_cmd_create_resource_2d() and virgl_resource_attach_backing() will
> not have iov and iov_cnt set, which is inconsistent with
> virgl_cmd_resource_create_blob().
>
OK, so we should find out the resource in virgl_resource_attach_backing(),
and set the related iov and iov_cnt for this resource to align with blob
memory.
> > args.handle = c2d.resource_id;
> > args.target = 2;
> > args.format = c2d.format;
> > @@ -60,11 +69,20 @@ static void virgl_cmd_create_resource_3d(VirtIOGPU *g,
> > {
> > struct virtio_gpu_resource_create_3d c3d;
> > struct virgl_renderer_resource_create_args args;
> > + struct virtio_gpu_simple_resource *res;
> >
> > VIRTIO_GPU_FILL_CMD(c3d);
> > trace_virtio_gpu_cmd_res_create_3d(c3d.resource_id, c3d.format,
> > c3d.width, c3d.height, c3d.depth);
> >
> > + res = g_new0(struct virtio_gpu_simple_resource, 1);
> > + if (!res) {
> > + cmd->error = VIRTIO_GPU_RESP_ERR_OUT_OF_MEMORY;
> > + return;
> > + }
> > + res->resource_id = c3d.resource_id;
> > + QTAILQ_INSERT_HEAD(&g->reslist, res, next);
> > +
> > args.handle = c3d.resource_id;
> > args.target = c3d.target;
> > args.format = c3d.format;
> > @@ -682,6 +700,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:
> > + virtio_gpu_resource_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 cc4c1f81bb..44414c1c5e 100644
> > --- a/hw/display/virtio-gpu.c
> > +++ b/hw/display/virtio-gpu.c
> > @@ -966,6 +966,38 @@ virtio_gpu_resource_detach_backing(VirtIOGPU *g,
> > virtio_gpu_cleanup_mapping(g, res);
> > }
> >
> > +void virtio_gpu_resource_assign_uuid(VirtIOGPU *g,
> > + struct virtio_gpu_ctrl_command *cmd)
> > +{
> > + struct virtio_gpu_simple_resource *res;
> > + struct virtio_gpu_resource_assign_uuid assign;
> > + struct virtio_gpu_resp_resource_uuid resp;
> > + QemuUUID *uuid;
> > +
> > + 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_check_resource(g, assign.resource_id, false,
> > __func__, &cmd->error);
> > + if (!res) {
> > + return;
> > + }
> > +
> > + memset(&resp, 0, sizeof(resp));
> > + resp.hdr.type = VIRTIO_GPU_RESP_OK_RESOURCE_UUID;
> > +
> > + uuid = g_hash_table_lookup(g->resource_uuids,
> > GUINT_TO_POINTER(assign.resource_id));
> > + if (!uuid) {
> > + uuid = g_new(QemuUUID, 1);
> > + qemu_uuid_generate(uuid);
> > + g_hash_table_insert(g->resource_uuids,
> > GUINT_TO_POINTER(assign.resource_id), uuid);
> > + res->has_uuid = true;
> > + }
>
> What about embedding uuid into struct virtio_gpu_simple_resource? You
> will not need to maintain another table in this way.
Yes, agree. Will update it in V6.
Thanks,
Ray
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |