Skip to contentSkip to conversation

vhost-user-gpu: Add blob resource and shared memory support

PATCH In review Dorinda Bassey 2 participants 6 messages Jul 17

lore
Share & tools
lore
#0 lore raw

v4 cover vhost-user-gpu: Add blob resource and shared memory support

Add blob resource support to the vhost-user-gpu device, enabling Vulkan pass-through via Venus with a vhost-user backend such as vhost-device-gpu.

Patch 1 fixes a deadlock that occurs when the memory region transaction commit triggers ADD_MEM_REG back to the backend while it is still blocked waiting for the SHMEM_MAP reply.

Patches 2-3 register a shared memory region for SHMEM_MAP/UNMAP operations and forward the RESOURCE_BLOB and CONTEXT_INIT feature flags from the backend to the guest.

Dorinda Bassey (1):
vhost: Fix SHMEM_MAP transaction ordering and resulting deadlock

Matej Hrica (2):
vhost-user-gpu: Add shared memory region support
vhost-user-gpu: Forward RESOURCE_BLOB and CONTEXT_INIT flags

 hw/display/vhost-user-gpu.c | 17 +++++++++++++++++
 hw/virtio/vhost-user.c      | 20 ++------------------
 hw/virtio/vhost.c           | 10 ++++++++++
 3 files changed, 29 insertions(+), 18 deletions(-)

Changes in v4:
- Document map/unmap ordering in commit message

Changes in v3:
- Reordered patches: bugfix first, then features
- Added Fixes tag

Changes in v2:
- Reordered patches: shmem support before feature flags
- Use virtio_new_shmem_region() helper
- Drop explicit transaction begin/commit wrapping

--
2.52.0

#1 lore raw

PATCH v4 1/3 vhost: Fix SHMEM_MAP transaction ordering and resulting deadlock

Commit the memory region transaction before sending the SHMEM_MAP reply so the KVM memory slot exists before the guest can access the mapped region.

This moves the commit to while the backend is still blocked waiting for the reply, which can trigger ADD_MEM_REG back to the backend and deadlock. Filter shmem mapping regions out of vhost_section() by checking the MR owner type to prevent this.

The explicit transaction begin/commit wrapping is dropped since virtio_add_shmem_map() already commits via memory_region_add_subregion(). The unmap handler keeps the original ordering: reply before delete, so the backend is unblocked before the transaction commit.

Fixes b52e1896e764 ("vhost-user: Add VirtIO Shared Memory map request")
---
 hw/virtio/vhost-user.c | 20 ++------------------
 hw/virtio/vhost.c      | 10 ++++++++++
 2 files changed, 12 insertions(+), 18 deletions(-)
hw/virtio/vhost-user.c +2 -18
index 517cc4ca716..01468f7441a 100644
@@ -1977,8 +1977,6 @@ vhost_user_backend_handle_shmem_map(struct vhost_dev *dev,
         }
     }
 
-    memory_region_transaction_begin();
-
     /* Create VirtioSharedMemoryMapping object */
     VirtioSharedMemoryMapping *mapping = virtio_shared_memory_mapping_new(
         vu_mmap->shmid, fd, vu_mmap->fd_offset, vu_mmap->shm_offset,
@@ -1986,7 +1984,7 @@ vhost_user_backend_handle_shmem_map(struct vhost_dev *dev,
 
     if (!mapping) {
         ret = -EFAULT;
-        goto send_reply_commit;
+        goto send_reply;
     }
 
     /* Add the mapping to the shared memory region */
@@ -1994,22 +1992,8 @@ vhost_user_backend_handle_shmem_map(struct vhost_dev *dev,
         error_report("Failed to add shared memory mapping");
         object_unref(OBJECT(mapping));
         ret = -EFAULT;
-        goto send_reply_commit;
-    }
-
-send_reply_commit:
-    /* Send reply and commit after transaction started */
-    if (hdr->flags & VHOST_USER_NEED_REPLY_MASK) {
-        payload->u64 = !!ret;
-        hdr->size = sizeof(payload->u64);
-        if (!vhost_user_send_resp(ioc, hdr, payload, &local_err)) {
-            error_report_err(local_err);
-            memory_region_transaction_commit();
-            return -EFAULT;
-        }
+        goto send_reply;
     }
-    memory_region_transaction_commit();
-    return 0;
 
 send_reply:
     if (hdr->flags & VHOST_USER_NEED_REPLY_MASK) {
hw/virtio/vhost.c +10 -0
index af41841b529..e5c219be095 100644
@@ -636,6 +636,16 @@ static bool vhost_section(struct vhost_dev *dev, MemoryRegionSection *section)
 {
     MemoryRegion *mr = section->mr;
 
+    /*
+     * Skip shmem mapping regions, they are managed via SHMEM_MAP/UNMAP.
+     * Including them triggers ADD_MEM_REG during the SHMEM_MAP transaction
+     * commit, deadlocking the backend.
+     */
+    if (object_dynamic_cast(memory_region_owner(mr),
+                            TYPE_VIRTIO_SHARED_MEMORY_MAPPING)) {
+        return false;
+    }
+
     if (memory_region_is_ram(mr) && !memory_region_is_rom(mr)) {
         uint8_t dirty_mask = memory_region_get_dirty_log_mask(mr);
         uint8_t handled_dirty;
Signature · 1 line
2.52.0
#2 lore raw

Re: [PATCH v4 1/3] vhost: Fix SHMEM_MAP transaction ordering and resulting deadlock

Quoted 60 lines · Dorinda Bassey

Commit the memory region transaction before sending the SHMEM_MAP reply so the KVM memory slot exists before the guest can access the mapped region.

This moves the commit to while the backend is still blocked waiting for the reply, which can trigger ADD_MEM_REG back to the backend and deadlock. Filter shmem mapping regions out of vhost_section() by checking the MR owner type to prevent this.

The explicit transaction begin/commit wrapping is dropped since virtio_add_shmem_map() already commits via memory_region_add_subregion(). The unmap handler keeps the original ordering: reply before delete, so the backend is unblocked before the transaction commit.

Fixes b52e1896e764 ("vhost-user: Add VirtIO Shared Memory map request")
---
 hw/virtio/vhost-user.c | 20 ++------------------
 hw/virtio/vhost.c      | 10 ++++++++++
 2 files changed, 12 insertions(+), 18 deletions(-)
hw/virtio/vhost-user.c +1 -12
index 517cc4ca716..01468f7441a 100644
@@ -1977,8 +1977,6 @@ vhost_user_backend_handle_shmem_map(struct vhost_dev *dev,
         }
     }
 
-    memory_region_transaction_begin();
-
     /* Create VirtioSharedMemoryMapping object */
     VirtioSharedMemoryMapping *mapping = virtio_shared_memory_mapping_new(
         vu_mmap->shmid, fd, vu_mmap->fd_offset, vu_mmap->shm_offset,
@@ -1986,7 +1984,7 @@ vhost_user_backend_handle_shmem_map(struct vhost_dev *dev,
 
     if (!mapping) {
         ret = -EFAULT;
-        goto send_reply_commit;
+        goto send_reply;
     }
 
     /* Add the mapping to the shared memory region */
@@ -1994,22 +1992,8 @@ vhost_user_backend_handle_shmem_map(struct vhost_dev *dev,
         error_report("Failed to add shared memory mapping");
         object_unref(OBJECT(mapping));
         ret = -EFAULT;
-        goto send_reply_commit;
-    }
-
-send_reply_commit:
-    /* Send reply and commit after transaction started */
-    if (hdr->flags & VHOST_USER_NEED_REPLY_MASK) {
-        payload->u64 = !!ret;
-        hdr->size = sizeof(payload->u64);
-        if (!vhost_user_send_resp(ioc, hdr, payload, &local_err)) {

hw/virtio/vhost-user.c vhost_user_backend_handle_shmem_map(struct vhost_dev *dev, · line 1998

Quoted 10 lines
hw/virtio/vhost-user.c +1 -6
-            error_report_err(local_err);
-            memory_region_transaction_commit();
-            return -EFAULT;
-        }
+        goto send_reply;
     }
-    memory_region_transaction_commit();
-    return 0;
 
 send_reply:

Minor idea for follow-up, not a blocker: with nothing left to do after the reply, we could drop reply_ack = false and the handler’s send_reply block, and rely on backend_read()’s default reply handling.

Quoted 25 lines
hw/virtio/vhost-user.c +0 -0
     if (hdr->flags & VHOST_USER_NEED_REPLY_MASK) {
hw/virtio/vhost.c +10 -1
index af41841b529..e5c219be095 100644
@@ -636,6 +636,16 @@ static bool vhost_section(struct vhost_dev *dev, MemoryRegionSection *section)
 {
     MemoryRegion *mr = section->mr;
 
+    /*
+     * Skip shmem mapping regions, they are managed via SHMEM_MAP/UNMAP.
+     * Including them triggers ADD_MEM_REG during the SHMEM_MAP transaction
+     * commit, deadlocking the backend.
+     */
+    if (object_dynamic_cast(memory_region_owner(mr),
+                            TYPE_VIRTIO_SHARED_MEMORY_MAPPING)) {
+        return false;
+    }
+
     if (memory_region_is_ram(mr) && !memory_region_is_rom(mr)) {
         uint8_t dirty_mask = memory_region_get_dirty_log_mask(mr);
         uint8_t handled_dirty;
--

2.52.0

#3 lore raw

Re: [PATCH v4 1/3] vhost: Fix SHMEM_MAP transaction ordering and resulting deadlock

Sounds good, I'll look into that as a follow up.

Br,
Dorinda.

Quoted 109 lines · Albert Esteve

hw/virtio/vhost-user.c vhost_user_backend_handle_shmem_map(struct

Quoted 30 lines · Dorinda Bassey

Commit the memory region transaction before sending the SHMEM_MAP reply so the KVM memory slot exists before the guest can access the mapped region.

This moves the commit to while the backend is still blocked waiting for the reply, which can trigger ADD_MEM_REG back to the backend and deadlock. Filter shmem mapping regions out of vhost_section() by checking the MR owner type to prevent this.

The explicit transaction begin/commit wrapping is dropped since virtio_add_shmem_map() already commits via memory_region_add_subregion(). The unmap handler keeps the original ordering: reply before delete, so the backend is unblocked before the transaction commit.

Fixes b52e1896e764 ("vhost-user: Add VirtIO Shared Memory map request")
---
 hw/virtio/vhost-user.c | 20 ++------------------
 hw/virtio/vhost.c      | 10 ++++++++++
 2 files changed, 12 insertions(+), 18 deletions(-)
hw/virtio/vhost-user.c +0 -0
index 517cc4ca716..01468f7441a 100644
@@ -1977,8 +1977,6 @@ vhost_user_backend_handle_shmem_map(struct

vhost_dev *dev,

hw/virtio/vhost-user.c vhost_user_backend_handle_shmem_map(struct vhost_dev *dev,

Quoted 7 lines
hw/virtio/vhost-user.c +0 -2
         }
     }
 
-    memory_region_transaction_begin();
-
     /* Create VirtioSharedMemoryMapping object */
     VirtioSharedMemoryMapping *mapping =

virtio_shared_memory_mapping_new(

hw/virtio/vhost-user.c vhost_user_backend_handle_shmem_map(struct

Quoted 2 lines
hw/virtio/vhost-user.c +0 -0
         vu_mmap->shmid, fd, vu_mmap->fd_offset, vu_mmap->shm_offset,
@@ -1986,7 +1984,7 @@ vhost_user_backend_handle_shmem_map(struct

vhost_dev *dev,

hw/virtio/vhost-user.c vhost_user_backend_handle_shmem_map(struct

Quoted 9 lines
hw/virtio/vhost-user.c +1 -1
     if (!mapping) {
         ret = -EFAULT;
-        goto send_reply_commit;
+        goto send_reply;
     }
 
     /* Add the mapping to the shared memory region */
@@ -1994,22 +1992,8 @@ vhost_user_backend_handle_shmem_map(struct

vhost_dev *dev,

Quoted 12 lines
hw/virtio/vhost-user.c +0 -9
         error_report("Failed to add shared memory mapping");
         object_unref(OBJECT(mapping));
         ret = -EFAULT;
-        goto send_reply_commit;
-    }
-
-send_reply_commit:
-    /* Send reply and commit after transaction started */
-    if (hdr->flags & VHOST_USER_NEED_REPLY_MASK) {
-        payload->u64 = !!ret;
-        hdr->size = sizeof(payload->u64);
-        if (!vhost_user_send_resp(ioc, hdr, payload, &local_err)) {

hw/virtio/vhost-user.c vhost_user_backend_handle_shmem_map(struct vhost_dev *dev, · line 1998

Quoted 10 lines
hw/virtio/vhost-user.c +1 -6
-            error_report_err(local_err);
-            memory_region_transaction_commit();
-            return -EFAULT;
-        }
+        goto send_reply;
     }
-    memory_region_transaction_commit();
-    return 0;
 
 send_reply:

Minor idea for follow-up, not a blocker: with nothing left to do after the reply, we could drop reply_ack = false and the handler’s send_reply block, and rely on backend_read()’s default reply handling.

hw/virtio/vhost.c static bool vhost_section(struct vhost_dev *dev,

Quoted 6 lines
hw/virtio/vhost-user.c +0 -0
     if (hdr->flags & VHOST_USER_NEED_REPLY_MASK) {
hw/virtio/vhost.c +0 -0
index af41841b529..e5c219be095 100644
@@ -636,6 +636,16 @@ static bool vhost_section(struct vhost_dev *dev,

MemoryRegionSection *section)

hw/virtio/vhost.c static bool vhost_section(struct vhost_dev *dev, MemoryRegionSection *section)

Quoted 6 lines
hw/virtio/vhost.c +3 -0
 {
     MemoryRegion *mr = section->mr;
 
+    /*
+     * Skip shmem mapping regions, they are managed via SHMEM_MAP/UNMAP.
+     * Including them triggers ADD_MEM_REG during the SHMEM_MAP

transaction

Quoted 13 lines
hw/virtio/vhost.c +7 -1
+     * commit, deadlocking the backend.
+     */
+    if (object_dynamic_cast(memory_region_owner(mr),
+                            TYPE_VIRTIO_SHARED_MEMORY_MAPPING)) {
+        return false;
+    }
+
     if (memory_region_is_ram(mr) && !memory_region_is_rom(mr)) {
         uint8_t dirty_mask = memory_region_get_dirty_log_mask(mr);
         uint8_t handled_dirty;
--

2.52.0

#4 lore raw

PATCH v4 2/3 vhost-user-gpu: Add shared memory region support

In reply to Dorinda Bassey

From: Matej Hrica <[email protected]>

Add a 'hostmem' property to the vhost-user-gpu which enables the shared memory in the parent object.

Register a container MR in the shmem_list for SHMEM_MAP/UNMAP operations. A container MR is used so that SHMEM_MAP FD-backed subregions each get their own KVM memory slot with the correct backing fd.

---
 hw/display/vhost-user-gpu.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
hw/display/vhost-user-gpu.c +11 -0
index 57360898ca0..dbba80c7783 100644
@@ -649,6 +649,16 @@ vhost_user_gpu_device_realize(DeviceState *qdev, Error **errp)
     }
 
     g->vhost_gpu_fd = -1;
+
+    /*
+     * If shared memory is enabled, register the hostmem region for
+     * SHMEM_MAP/UNMAP operations.
+     */
+    if (virtio_gpu_hostmem_enabled(g->parent_obj.conf)) {
+        VirtioSharedMemory *shmem = virtio_new_shmem_region(
+            vdev, VIRTIO_GPU_SHM_ID_HOST_VISIBLE, g->parent_obj.conf.hostmem);
+        memory_region_add_subregion(&g->parent_obj.hostmem, 0, &shmem->mr);
+    }
 }
 
 static struct vhost_dev *vhost_user_gpu_get_vhost(VirtIODevice *vdev)
@@ -659,6 +669,7 @@ static struct vhost_dev *vhost_user_gpu_get_vhost(VirtIODevice *vdev)
 
 static const Property vhost_user_gpu_properties[] = {
     VIRTIO_GPU_BASE_PROPERTIES(VhostUserGPU, parent_obj.conf),
+    DEFINE_PROP_SIZE("hostmem", VhostUserGPU, parent_obj.conf.hostmem, 0),
 };
 
 static void
Signature · 1 line
2.52.0
#5 lore raw

PATCH v4 3/3 vhost-user-gpu: Forward RESOURCE_BLOB and CONTEXT_INIT flags

In reply to Dorinda Bassey

From: Matej Hrica <[email protected]>

Forward VIRTIO_GPU_F_RESOURCE_BLOB and VIRTIO_GPU_F_CONTEXT_INIT received from a vhost backend to expose it to the guest.

Use vhost_dev_has_feature() to query the backend features, matching the existing pattern for RESOURCE_UUID.

This allows the guest to negotiate blob resource support and context initialization when the backend (e.g., vhost-device-gpu with Venus) advertises these capabilities.

---
 hw/display/vhost-user-gpu.c | 6 ++++++
 1 file changed, 6 insertions(+)
hw/display/vhost-user-gpu.c +6 -0
index dbba80c7783..4022a3026ca 100644
@@ -643,6 +643,12 @@ vhost_user_gpu_device_realize(DeviceState *qdev, Error **errp)
     if (vhost_dev_has_feature(&g->vhost->dev, VIRTIO_GPU_F_RESOURCE_UUID)) {
         g->parent_obj.conf.flags |= 1 << VIRTIO_GPU_FLAG_RESOURCE_UUID_ENABLED;
     }
+    if (vhost_dev_has_feature(&g->vhost->dev, VIRTIO_GPU_F_RESOURCE_BLOB)) {
+        g->parent_obj.conf.flags |= 1 << VIRTIO_GPU_FLAG_BLOB_ENABLED;
+    }
+    if (vhost_dev_has_feature(&g->vhost->dev, VIRTIO_GPU_F_CONTEXT_INIT)) {
+        g->parent_obj.conf.flags |= 1 << VIRTIO_GPU_FLAG_CONTEXT_INIT_ENABLED;
+    }
 
     if (!virtio_gpu_base_device_realize(qdev, NULL, NULL, errp)) {
         return;
Signature · 1 line
2.52.0