[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 02/11] virtio: device/driver area size calculatio
From: |
wexu |
Subject: |
[Qemu-devel] [PATCH v4 02/11] virtio: device/driver area size calculation helper for split ring |
Date: |
Wed, 13 Feb 2019 23:26:33 -0500 |
From: Wei Xu <address@hidden>
There is slight size difference between split/packed rings.
This is a refactor of split ring as well as a helper to expand
device and driver area size calculation for packed ring.
Signed-off-by: Wei Xu <address@hidden>
---
hw/virtio/virtio.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index eafb4cc..6769e54 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -155,10 +155,8 @@ static void virtio_init_region_cache(VirtIODevice *vdev,
int n)
VRingMemoryRegionCaches *old = vq->vring.caches;
VRingMemoryRegionCaches *new = NULL;
hwaddr addr, size;
- int event_size;
int64_t len;
- event_size = virtio_vdev_has_feature(vq->vdev, VIRTIO_RING_F_EVENT_IDX) ?
2 : 0;
addr = vq->vring.desc;
if (!addr) {
@@ -173,7 +171,7 @@ static void virtio_init_region_cache(VirtIODevice *vdev,
int n)
goto err_desc;
}
- size = virtio_queue_get_used_size(vdev, n) + event_size;
+ size = virtio_queue_get_used_size(vdev, n);
len = address_space_cache_init(&new->used, vdev->dma_as,
vq->vring.used, size, true);
if (len < size) {
@@ -181,7 +179,7 @@ static void virtio_init_region_cache(VirtIODevice *vdev,
int n)
goto err_used;
}
- size = virtio_queue_get_avail_size(vdev, n) + event_size;
+ size = virtio_queue_get_avail_size(vdev, n);
len = address_space_cache_init(&new->avail, vdev->dma_as,
vq->vring.avail, size, false);
if (len < size) {
@@ -2335,14 +2333,20 @@ hwaddr virtio_queue_get_desc_size(VirtIODevice *vdev,
int n)
hwaddr virtio_queue_get_avail_size(VirtIODevice *vdev, int n)
{
+ int s;
+
+ s = virtio_vdev_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX) ? 2 : 0;
return offsetof(VRingAvail, ring) +
- sizeof(uint16_t) * vdev->vq[n].vring.num;
+ sizeof(uint16_t) * vdev->vq[n].vring.num + s;
}
hwaddr virtio_queue_get_used_size(VirtIODevice *vdev, int n)
{
+ int s;
+
+ s = virtio_vdev_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX) ? 2 : 0;
return offsetof(VRingUsed, ring) +
- sizeof(VRingUsedElem) * vdev->vq[n].vring.num;
+ sizeof(VRingUsedElem) * vdev->vq[n].vring.num + s;
}
uint16_t virtio_queue_get_last_avail_idx(VirtIODevice *vdev, int n)
--
1.8.3.1
- [Qemu-devel] [PATCH v4 00/11] packed ring virtio-net backends support, wexu, 2019/02/13
- [Qemu-devel] [PATCH v4 04/11] virtio: initialize wrap counter for packed ring, wexu, 2019/02/13
- [Qemu-devel] [PATCH v4 05/11] virtio: queue/descriptor check helpers for packed ring, wexu, 2019/02/13
- [Qemu-devel] [PATCH v4 02/11] virtio: device/driver area size calculation helper for split ring,
wexu <=
- [Qemu-devel] [PATCH v4 03/11] virtio: initialize packed ring region, wexu, 2019/02/13
- [Qemu-devel] [PATCH v4 01/11] virtio: rename structure for packed ring, wexu, 2019/02/13
- [Qemu-devel] [PATCH v4 09/11] virtio-net: update the head descriptor in a chain lastly, wexu, 2019/02/13
- Re: [Qemu-devel] [PATCH v4 09/11] virtio-net: update the head descriptor in a chain lastly, Jason Wang, 2019/02/19
- Re: [Qemu-devel] [PATCH v4 09/11] virtio-net: update the head descriptor in a chain lastly, Wei Xu, 2019/02/19
- Re: [Qemu-devel] [PATCH v4 09/11] virtio-net: update the head descriptor in a chain lastly, Jason Wang, 2019/02/19
- Re: [Qemu-devel] [PATCH v4 09/11] virtio-net: update the head descriptor in a chain lastly, Wei Xu, 2019/02/19
- Re: [Qemu-devel] [PATCH v4 09/11] virtio-net: update the head descriptor in a chain lastly, Jason Wang, 2019/02/19
- Re: [Qemu-devel] [PATCH v4 09/11] virtio-net: update the head descriptor in a chain lastly, Wei Xu, 2019/02/19
- Re: [Qemu-devel] [PATCH v4 09/11] virtio-net: update the head descriptor in a chain lastly, Jason Wang, 2019/02/20