[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/11] virtio: use VRingMemoryRegionCaches for descr
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 10/11] virtio: use VRingMemoryRegionCaches for descriptor ring |
Date: |
Mon, 12 Dec 2016 12:18:56 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/virtio/virtio.c | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 4f355b4..702da0b 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -484,18 +484,16 @@ void virtqueue_get_avail_bytes(VirtQueue *vq, unsigned
int *in_bytes,
unsigned int max, idx;
unsigned int total_bufs, in_total, out_total;
MemoryRegionCache *desc_cache = NULL;
- MemoryRegionCache vring_desc_cache;
MemoryRegionCache indirect_desc_cache;
+ VRingMemoryRegionCaches *caches;
int64_t len = 0;
int rc;
rcu_read_lock();
idx = vq->last_avail_idx;
max = vq->vring.num;
- len = address_space_cache_init(&vring_desc_cache, &address_space_memory,
- vq->vring.desc, max * sizeof(VRingDesc),
- false);
- if (len < max * sizeof(VRingDesc)) {
+ caches = atomic_rcu_read(&vq->vring.caches);
+ if (caches->desc.len < max * sizeof(VRingDesc)) {
virtio_error(vdev, "Cannot map descriptor ring");
goto err;
}
@@ -512,7 +510,7 @@ void virtqueue_get_avail_bytes(VirtQueue *vq, unsigned int
*in_bytes,
goto err;
}
- desc_cache = &vring_desc_cache;
+ desc_cache = &caches->desc;
vring_desc_read(vdev, &desc, desc_cache, i);
if (desc.flags & VRING_DESC_F_INDIRECT) {
@@ -578,7 +576,6 @@ void virtqueue_get_avail_bytes(VirtQueue *vq, unsigned int
*in_bytes,
}
done:
- address_space_cache_destroy(&vring_desc_cache);
if (in_bytes) {
*in_bytes = in_total;
}
@@ -729,7 +726,7 @@ void *virtqueue_pop(VirtQueue *vq, size_t sz)
unsigned int i, head, max;
MemoryRegionCache *desc_cache = NULL;
MemoryRegionCache indirect_desc_cache;
- MemoryRegionCache vring_desc_cache;
+ VRingMemoryRegionCaches *caches;
int64_t len;
VirtIODevice *vdev = vq->vdev;
VirtQueueElement *elem = NULL;
@@ -770,15 +767,13 @@ void *virtqueue_pop(VirtQueue *vq, size_t sz)
i = head;
rcu_read_lock();
- len = address_space_cache_init(&vring_desc_cache, &address_space_memory,
- vq->vring.desc, max * sizeof(VRingDesc),
- false);
- desc_cache = &vring_desc_cache;
- if (len < max * sizeof(VRingDesc)) {
+ caches = atomic_rcu_read(&vq->vring.caches);
+ if (caches->desc.len < max * sizeof(VRingDesc)) {
virtio_error(vdev, "Cannot map descriptor ring");
return NULL;
}
+ desc_cache = &caches->desc;
vring_desc_read(vdev, &desc, desc_cache, i);
if (desc.flags & VRING_DESC_F_INDIRECT) {
if (desc.len % sizeof(VRingDesc)) {
@@ -855,7 +850,6 @@ done:
if (desc_cache == &indirect_desc_cache) {
address_space_cache_destroy(&indirect_desc_cache);
}
- address_space_cache_destroy(&vring_desc_cache);
rcu_read_unlock();
return elem;
--
1.8.3.1
- Re: [Qemu-devel] [PATCH 07/11] virtio: use address_space_map/unmap to access descriptors, (continued)
- [Qemu-devel] [PATCH 01/11] exec: optimize remaining address_space_* cases, Paolo Bonzini, 2016/12/12
- [Qemu-devel] [PATCH 08/11] virtio: use MemoryRegionCache to access descriptors, Paolo Bonzini, 2016/12/12
- [Qemu-devel] [PATCH 02/11] exec: introduce memory_ldst.inc.c, Paolo Bonzini, 2016/12/12
- [Qemu-devel] [PATCH 09/11] virtio: add MemoryListener to cache ring translations, Paolo Bonzini, 2016/12/12
- [Qemu-devel] [PATCH 10/11] virtio: use VRingMemoryRegionCaches for descriptor ring,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 11/11] virtio: use VRingMemoryRegionCaches for avail and used rings, Paolo Bonzini, 2016/12/12
- Re: [Qemu-devel] [RFC PATCH 00/11] speedup vring processing with MemoryRegionCaches, Stefan Hajnoczi, 2016/12/12
- Re: [Qemu-devel] [RFC PATCH 00/11] speedup vring processing with MemoryRegionCaches, Christian Borntraeger, 2016/12/13