starred/qemu-qemu-1
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-08 17:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

vhost: simplify vhost_memory_map() and vhost_memory_unmap()

Browse Source 
Make these functions simple wrappers around address_space_map() and
address_space_unmap(). Move IOMMU handling logic one layer up to the
callers.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Based-on: <20260206095258.894504-1-vsementsov@yandex-team.ru>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20260420202032.714884-6-vsementsov@yandex-team.ru>
This commit is contained in:
Vladimir Sementsov-Ogievskiy
2026-04-20 23:20:26 +03:00
committed by Michael S. Tsirkin
parent a471e5b50c
commit 846a29de2b
1 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
hw/virtio/vhost.c
View File

@@ -456,21 +456,17 @@ static inline void vhost_dev_log_resize(struct vhost_dev *dev, uint64_t size)
static void *vhost_memory_map(struct vhost_dev *dev, hwaddr addr,
hwaddr len, bool is_write)
{
if (!vhost_dev_has_iommu(dev)) {
hwaddr mapped_len = len;
void *res = address_space_map(dev->vdev->dma_as, addr, &mapped_len,
is_write, MEMTXATTRS_UNSPECIFIED);
if (!res) {
return NULL;
}
if (len != mapped_len) {
address_space_unmap(dev->vdev->dma_as, res, mapped_len, 0, 0);
return NULL;
}
return res;
} else {
return (void *)(uintptr_t)addr;
hwaddr mapped_len = len;
void *res = address_space_map(dev->vdev->dma_as, addr, &mapped_len,
is_write, MEMTXATTRS_UNSPECIFIED);
if (!res) {
return NULL;
}
if (len != mapped_len) {
address_space_unmap(dev->vdev->dma_as, res, mapped_len, 0, 0);
return NULL;
}
return res;
}
static void vhost_memory_unmap(struct vhost_dev *dev, void **buffer,
@@ -481,17 +477,18 @@ static void vhost_memory_unmap(struct vhost_dev *dev, void **buffer,
return;
}
if (!vhost_dev_has_iommu(dev)) {
address_space_unmap(dev->vdev->dma_as, *buffer, len, is_write,
access_len);
}
address_space_unmap(dev->vdev->dma_as, *buffer, len, is_write,
access_len);
*buffer = NULL;
}
static void vhost_vrings_unmap(struct vhost_dev *dev,
struct vhost_virtqueue *vq, bool touched)
{
if (vhost_dev_has_iommu(dev)) {
return;
}
vhost_memory_unmap(dev, &vq->used, vq->used_size, touched,
touched ? vq->used_size : 0);
vhost_memory_unmap(dev, &vq->avail, vq->avail_size, 0,
@@ -519,6 +516,14 @@ static int vhost_vrings_map(struct vhost_dev *dev,
/* Queue might not be ready for start */
return 0;
}
if (vhost_dev_has_iommu(dev)) {
vq->desc = (void *)(uintptr_t)vq->desc_phys;
vq->avail = (void *)(uintptr_t)vq->avail_phys;
vq->used = (void *)(uintptr_t)vq->used_phys;
return 1;
}
vq->desc = vhost_memory_map(dev, vq->desc_phys, vq->desc_size, false);
if (!vq->desc) {
goto fail;