[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 2/9] virtio: device/driver area size calculation refactor for
From: |
Eugenio Pérez |
Subject: |
[PATCH v6 2/9] virtio: device/driver area size calculation refactor for split ring |
Date: |
Thu, 24 Oct 2019 19:13:59 +0200 |
From: Wei Xu <address@hidden>
There is slight size difference between split/packed rings.
This is the refactor of split ring as well as a helper to expanding
device and driver area size calculation for packed ring.
Signed-off-by: Wei Xu <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Jens Freimann <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 fdac203cdf..74cc10fad9 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -159,10 +159,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) {
@@ -177,7 +175,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) {
@@ -185,7 +183,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) {
@@ -2414,14 +2412,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)
--
2.16.5
- [PATCH v6 0/9] Packed virtqueue for virtio, Eugenio Pérez, 2019/10/24
- [PATCH v6 1/9] virtio: basic structure for packed ring, Eugenio Pérez, 2019/10/24
- [PATCH v6 7/9] virtio: add property to enable packed virtqueue, Eugenio Pérez, 2019/10/24
- [PATCH v6 5/9] virtio: event suppression support for packed ring, Eugenio Pérez, 2019/10/24
- [PATCH v6 4/9] virtio: basic packed virtqueue support, Eugenio Pérez, 2019/10/24
- [PATCH v6 6/9] vhost_net: enable packed ring support, Eugenio Pérez, 2019/10/24
- [PATCH v6 3/9] virtio: Free rng and blk virqueues, Eugenio Pérez, 2019/10/24
- [PATCH v6 2/9] virtio: device/driver area size calculation refactor for split ring,
Eugenio Pérez <=
- [PATCH v6 8/9] virtio: add some rcu comments, Eugenio Pérez, 2019/10/24
- [PATCH v6 9/9] virtio: Move vdev->broken check to dispatch drop_all, Eugenio Pérez, 2019/10/24
- Re: [PATCH v6 0/9] Packed virtqueue for virtio, Jason Wang, 2019/10/24