Hi On Mon, Aug 29, 2022 at 7:44 PM Antonio Caggiano < antonio.caggi...@collabora.com> wrote:
> Support BLOB resources creation by calling > virgl_renderer_resource_create_blob. > > Signed-off-by: Antonio Caggiano <antonio.caggi...@collabora.com> > Signed-off-by: Dmitry Osipenko <dmitry.osipe...@collabora.com> > --- > hw/display/virtio-gpu-virgl.c | 169 +++++++++++++++++++++++++++ > hw/display/virtio-gpu.c | 8 +- > include/hw/virtio/virtio-gpu-bswap.h | 18 +++ > include/hw/virtio/virtio-gpu.h | 6 + > meson.build | 5 + > 5 files changed, 202 insertions(+), 4 deletions(-) > > diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c > index 73cb92c8d5..c4c2c31d76 100644 > --- a/hw/display/virtio-gpu-virgl.c > +++ b/hw/display/virtio-gpu-virgl.c > @@ -16,6 +16,8 @@ > #include "trace.h" > #include "hw/virtio/virtio.h" > #include "hw/virtio/virtio-gpu.h" > +#include "hw/virtio/virtio-gpu-bswap.h" > +#include "hw/virtio/virtio-iommu.h" > > #include <virglrenderer.h> > > @@ -398,6 +400,162 @@ static void virgl_cmd_get_capset(VirtIOGPU *g, > g_free(resp); > } > > +#ifdef HAVE_VIRGL_RESOURCE_BLOB > + > +static void virgl_cmd_resource_create_blob(VirtIOGPU *g, > + struct virtio_gpu_ctrl_command > *cmd) > +{ > + struct virtio_gpu_simple_resource *res; > + struct virtio_gpu_resource_create_blob cblob; > + int ret; > + > + VIRTIO_GPU_FILL_CMD(cblob); > + virtio_gpu_create_blob_bswap(&cblob); > + trace_virtio_gpu_cmd_res_create_blob(cblob.resource_id, cblob.size); > + > + if (cblob.resource_id == 0) { > + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource id 0 is not > allowed\n", > + __func__); > + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; > + return; > + } > + > + res = virtio_gpu_find_resource(g, cblob.resource_id); > + if (res) { > + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource already exists %d\n", > + __func__, cblob.resource_id); > + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; > + return; > + } > + > + res = g_new0(struct virtio_gpu_simple_resource, 1); > + res->resource_id = cblob.resource_id; > + res->blob_size = cblob.size; > + > + if (res->iov) { > + cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC; > res is leaked > + return; > + } > + > + if (cblob.blob_mem != VIRTIO_GPU_BLOB_MEM_HOST3D) { > + ret = virtio_gpu_create_mapping_iov(g, cblob.nr_entries, > sizeof(cblob), > + cmd, &res->addrs, &res->iov, > + &res->iov_cnt); > + if (ret != 0) { > + cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC; > same > + return; > + } > + } > + > + if (cblob.blob_mem == VIRTIO_GPU_BLOB_MEM_GUEST) { > + virtio_gpu_init_udmabuf(res); > I wonder what happens when the command fails, but this is ignored by virtio_gpu_resource_create_blob as well, ok. > + } > + QTAILQ_INSERT_HEAD(&g->reslist, res, next); > + > + const struct virgl_renderer_resource_create_blob_args virgl_args = { > + .res_handle = cblob.resource_id, > + .ctx_id = cblob.hdr.ctx_id, > + .blob_mem = cblob.blob_mem, > + .blob_id = cblob.blob_id, > + .blob_flags = cblob.blob_flags, > + .size = cblob.size, > + .iovecs = res->iov, > + .num_iovs = res->iov_cnt, > + }; > + ret = virgl_renderer_resource_create_blob(&virgl_args); > + if (ret) { > + g_print("Virgl blob create error: %s\n", strerror(-ret)); > why g_print? If not qemu_log_mask, then warn_report() perhaps? > + } > +} > + > +static void virgl_cmd_resource_map_blob(VirtIOGPU *g, > + struct virtio_gpu_ctrl_command > *cmd) > +{ > + struct virtio_gpu_simple_resource *res; > + struct virtio_gpu_resource_map_blob mblob; > + int ret; > + void *data; > + uint64_t size; > + struct virtio_gpu_resp_map_info resp; > + > + VIRTIO_GPU_FILL_CMD(mblob); > + virtio_gpu_map_blob_bswap(&mblob); > + > + if (mblob.resource_id == 0) { > + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource id 0 is not > allowed\n", > + __func__); > + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; > + return; > + } > + > + res = virtio_gpu_find_resource(g, mblob.resource_id); > + if (!res) { > + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource does not exist %d\n", > + __func__, mblob.resource_id); > + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; > + return; > + } > + > + ret = virgl_renderer_resource_map(res->resource_id, &data, &size); > + if (ret) { > + g_print("Virgl blob resource map error: %s\n", strerror(-ret)); > same about g_print > + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; > + return; > + } > + > + memory_region_init_ram_device_ptr(&res->region, OBJECT(g), NULL, > size, data); > + memory_region_add_subregion(&g->parent_obj.hostmem, mblob.offset, > &res->region); > + memory_region_set_enabled(&res->region, true); > + > + memset(&resp, 0, sizeof(resp)); > + resp.hdr.type = VIRTIO_GPU_RESP_OK_MAP_INFO; > + virgl_renderer_resource_get_map_info(mblob.resource_id, > &resp.map_info); > + virtio_gpu_ctrl_response(g, cmd, &resp.hdr, sizeof(resp)); > + > + res->mapped = true; > +} > + > +static void virgl_cmd_resource_unmap_blob(VirtIOGPU *g, > + struct virtio_gpu_ctrl_command > *cmd) > +{ > + struct virtio_gpu_simple_resource *res; > + struct virtio_gpu_resource_unmap_blob ublob; > + VIRTIO_GPU_FILL_CMD(ublob); > + virtio_gpu_unmap_blob_bswap(&ublob); > + > + if (ublob.resource_id == 0) { > + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource id 0 is not > allowed\n", > + __func__); > + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; > + return; > + } > + > + res = virtio_gpu_find_resource(g, ublob.resource_id); > + if (!res) { > + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource does not exist %d\n", > + __func__, ublob.resource_id); > + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; > + return; > + } > + > + if (!res->mapped) { > + qemu_log_mask(LOG_GUEST_ERROR, "%s: resource already unmapped > %d\n", > + __func__, ublob.resource_id); > + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; > + return; > + } > + > + memory_region_set_enabled(&res->region, false); > + memory_region_del_subregion(&g->parent_obj.hostmem, &res->region); > + object_unparent(OBJECT(&res->region)); > + > + virgl_renderer_resource_unmap(ublob.resource_id); > Shouldn't the mapped resources be unmap during unrealize? > + > + res->mapped = false; > +} > + > +#endif /* HAVE_VIRGL_RESOURCE_BLOB */ > + > void virtio_gpu_virgl_process_cmd(VirtIOGPU *g, > struct virtio_gpu_ctrl_command *cmd) > { > @@ -464,6 +622,17 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g, > case VIRTIO_GPU_CMD_GET_EDID: > virtio_gpu_get_edid(g, cmd); > break; > +#ifdef HAVE_VIRGL_RESOURCE_BLOB > + case VIRTIO_GPU_CMD_RESOURCE_CREATE_BLOB: > + virgl_cmd_resource_create_blob(g, cmd); > + break; > + case VIRTIO_GPU_CMD_RESOURCE_MAP_BLOB: > + virgl_cmd_resource_map_blob(g, cmd); > + break; > + case VIRTIO_GPU_CMD_RESOURCE_UNMAP_BLOB: > + virgl_cmd_resource_unmap_blob(g, cmd); > + break; > +#endif /* HAVE_VIRGL_RESOURCE_BLOB */ > default: > cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC; > break; > diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c > index 506b3b8eef..527c0aeede 100644 > --- a/hw/display/virtio-gpu.c > +++ b/hw/display/virtio-gpu.c > @@ -33,8 +33,6 @@ > > #define VIRTIO_GPU_VM_VERSION 1 > > -static struct virtio_gpu_simple_resource* > -virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id); > static struct virtio_gpu_simple_resource * > virtio_gpu_find_check_resource(VirtIOGPU *g, uint32_t resource_id, > bool require_backing, > @@ -115,7 +113,7 @@ static void update_cursor(VirtIOGPU *g, struct > virtio_gpu_update_cursor *cursor) > cursor->resource_id ? 1 : 0); > } > > -static struct virtio_gpu_simple_resource * > +struct virtio_gpu_simple_resource * > virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id) > { > struct virtio_gpu_simple_resource *res; > @@ -1323,10 +1321,12 @@ void virtio_gpu_device_realize(DeviceState *qdev, > Error **errp) > return; > } > > +#ifndef HAVE_VIRGL_RESOURCE_BLOB > if (virtio_gpu_virgl_enabled(g->parent_obj.conf)) { > - error_setg(errp, "blobs and virgl are not compatible (yet)"); > + error_setg(errp, "Linked virglrenderer does not support blob > resources"); > return; > } > +#endif > } > > if (!virtio_gpu_base_device_realize(qdev, > diff --git a/include/hw/virtio/virtio-gpu-bswap.h > b/include/hw/virtio/virtio-gpu-bswap.h > index 9124108485..dd1975e2d4 100644 > --- a/include/hw/virtio/virtio-gpu-bswap.h > +++ b/include/hw/virtio/virtio-gpu-bswap.h > @@ -63,10 +63,28 @@ virtio_gpu_create_blob_bswap(struct > virtio_gpu_resource_create_blob *cblob) > { > virtio_gpu_ctrl_hdr_bswap(&cblob->hdr); > le32_to_cpus(&cblob->resource_id); > + le32_to_cpus(&cblob->blob_mem); > le32_to_cpus(&cblob->blob_flags); > + le32_to_cpus(&cblob->nr_entries); > + le64_to_cpus(&cblob->blob_id); > le64_to_cpus(&cblob->size); > } > > +static inline void > +virtio_gpu_map_blob_bswap(struct virtio_gpu_resource_map_blob *mblob) > +{ > + virtio_gpu_ctrl_hdr_bswap(&mblob->hdr); > + le32_to_cpus(&mblob->resource_id); > + le64_to_cpus(&mblob->offset); > +} > + > +static inline void > +virtio_gpu_unmap_blob_bswap(struct virtio_gpu_resource_unmap_blob *ublob) > +{ > + virtio_gpu_ctrl_hdr_bswap(&ublob->hdr); > + le32_to_cpus(&ublob->resource_id); > +} > + > static inline void > virtio_gpu_scanout_blob_bswap(struct virtio_gpu_set_scanout_blob *ssb) > { > diff --git a/include/hw/virtio/virtio-gpu.h > b/include/hw/virtio/virtio-gpu.h > index eafce75b04..4f4cabf3b3 100644 > --- a/include/hw/virtio/virtio-gpu.h > +++ b/include/hw/virtio/virtio-gpu.h > @@ -55,6 +55,9 @@ struct virtio_gpu_simple_resource { > int dmabuf_fd; > uint8_t *remapped; > > + MemoryRegion region; > + bool mapped; > + > QTAILQ_ENTRY(virtio_gpu_simple_resource) next; > }; > > @@ -245,6 +248,9 @@ void virtio_gpu_base_fill_display_info(VirtIOGPUBase > *g, > struct virtio_gpu_resp_display_info *dpy_info); > > /* virtio-gpu.c */ > +struct virtio_gpu_simple_resource * > +virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id); > + > void virtio_gpu_ctrl_response(VirtIOGPU *g, > struct virtio_gpu_ctrl_command *cmd, > struct virtio_gpu_ctrl_hdr *resp, > diff --git a/meson.build b/meson.build > index 20fddbd707..058fe03fd7 100644 > --- a/meson.build > +++ b/meson.build > @@ -718,6 +718,11 @@ if not get_option('virglrenderer').auto() or > have_system or have_vhost_user_gpu > method: 'pkg-config', > required: get_option('virglrenderer'), > kwargs: static_kwargs) > + > + config_host_data.set('HAVE_VIRGL_RESOURCE_BLOB', > + > cc.has_function('virgl_renderer_resource_create_blob', > + prefix: '#include > <virglrenderer.h>', > + dependencies: virgl)) > endif > curl = not_found > if not get_option('curl').auto() or have_block > -- > 2.34.1 > > > -- Marc-André Lureau