[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 08/15] vhost: extract the logic of unmapping the vrings and de
From: |
Kangjie Xu |
Subject: |
[PATCH v3 08/15] vhost: extract the logic of unmapping the vrings and desc |
Date: |
Thu, 25 Aug 2022 16:08:51 +0800 |
Introduce vhost_virtqueue_unmap() to ummap the vrings and desc
of a virtqueue.
The function will be re-used when resetting a virtqueue.
Signed-off-by: Kangjie Xu <kangjie.xu@linux.alibaba.com>
Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Acked-by: Jason Wang <jasowang@redhat.com>
---
hw/virtio/vhost.c | 20 ++++++++++++++------
include/hw/virtio/vhost.h | 3 +++
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index f758f177bb..2419521c36 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -1201,6 +1201,19 @@ fail_alloc_desc:
return r;
}
+void vhost_virtqueue_unmap(struct vhost_dev *dev,
+ struct VirtIODevice *vdev,
+ struct vhost_virtqueue *vq,
+ unsigned idx)
+{
+ vhost_memory_unmap(dev, vq->used, virtio_queue_get_used_size(vdev, idx),
+ 1, virtio_queue_get_used_size(vdev, idx));
+ vhost_memory_unmap(dev, vq->avail, virtio_queue_get_avail_size(vdev, idx),
+ 0, virtio_queue_get_avail_size(vdev, idx));
+ vhost_memory_unmap(dev, vq->desc, virtio_queue_get_desc_size(vdev, idx),
+ 0, virtio_queue_get_desc_size(vdev, idx));
+}
+
static void vhost_virtqueue_stop(struct vhost_dev *dev,
struct VirtIODevice *vdev,
struct vhost_virtqueue *vq,
@@ -1239,12 +1252,7 @@ static void vhost_virtqueue_stop(struct vhost_dev *dev,
vhost_vq_index);
}
- vhost_memory_unmap(dev, vq->used, virtio_queue_get_used_size(vdev, idx),
- 1, virtio_queue_get_used_size(vdev, idx));
- vhost_memory_unmap(dev, vq->avail, virtio_queue_get_avail_size(vdev, idx),
- 0, virtio_queue_get_avail_size(vdev, idx));
- vhost_memory_unmap(dev, vq->desc, virtio_queue_get_desc_size(vdev, idx),
- 0, virtio_queue_get_desc_size(vdev, idx));
+ vhost_virtqueue_unmap(dev, vdev, vq, idx);
}
static void vhost_eventfd_add(MemoryListener *listener,
diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h
index a346f23d13..d9adbca584 100644
--- a/include/hw/virtio/vhost.h
+++ b/include/hw/virtio/vhost.h
@@ -279,6 +279,9 @@ int vhost_net_set_backend(struct vhost_dev *hdev,
int vhost_device_iotlb_miss(struct vhost_dev *dev, uint64_t iova, int write);
+void vhost_virtqueue_unmap(struct vhost_dev *dev, struct VirtIODevice *vdev,
+ struct vhost_virtqueue *vq, unsigned idx);
+
void vhost_dev_reset_inflight(struct vhost_inflight *inflight);
void vhost_dev_free_inflight(struct vhost_inflight *inflight);
void vhost_dev_save_inflight(struct vhost_inflight *inflight, QEMUFile *f);
--
2.32.0
- [PATCH v3 00/15] Support VIRTIO_F_RING_RESET for virtio-net, vhost-net kernel in virtio pci-modern, Kangjie Xu, 2022/08/25
- [PATCH v3 12/15] virtio-net: introduce flush_or_purge_queued_packets(), Kangjie Xu, 2022/08/25
- [PATCH v3 01/15] virtio: sync relevant definitions with linux, Kangjie Xu, 2022/08/25
- [PATCH v3 10/15] vhost-net: vhost-kernel: introduce vhost_net_virtqueue_reset(), Kangjie Xu, 2022/08/25
- [PATCH v3 13/15] virtio-net: support queue reset, Kangjie Xu, 2022/08/25
- [PATCH v3 03/15] virtio: introduce virtio_queue_reset(), Kangjie Xu, 2022/08/25
- [PATCH v3 09/15] vhost: expose vhost_virtqueue_start(), Kangjie Xu, 2022/08/25
- [PATCH v3 04/15] virtio: introduce virtio_queue_enable(), Kangjie Xu, 2022/08/25
- [PATCH v3 08/15] vhost: extract the logic of unmapping the vrings and desc,
Kangjie Xu <=
- [PATCH v3 07/15] virtio-pci: support queue enable, Kangjie Xu, 2022/08/25
- [PATCH v3 14/15] virtio-net: support queue_enable, Kangjie Xu, 2022/08/25
- [PATCH v3 06/15] virtio-pci: support queue reset, Kangjie Xu, 2022/08/25
- [PATCH v3 02/15] virtio: introduce __virtio_queue_reset(), Kangjie Xu, 2022/08/25
- [PATCH v3 11/15] vhost-net: vhost-kernel: introduce vhost_net_virtqueue_restart(), Kangjie Xu, 2022/08/25
- [PATCH v3 05/15] virtio: core: vq reset feature negotation support, Kangjie Xu, 2022/08/25
- [PATCH v3 15/15] vhost: vhost-kernel: enable vq reset feature, Kangjie Xu, 2022/08/25