From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUCA3-0007Du-4W for qemu-devel@nongnu.org; Tue, 25 Aug 2015 07:13:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZUC9y-0002S4-1b for qemu-devel@nongnu.org; Tue, 25 Aug 2015 07:13:03 -0400 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:48725) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUC9x-0002Rg-Or for qemu-devel@nongnu.org; Tue, 25 Aug 2015 07:12:57 -0400 Received: from /spool/local by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 25 Aug 2015 12:12:53 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id DBE5631304AE for ; Tue, 25 Aug 2015 11:35:09 +0100 (BST) Received: from d06av10.portsmouth.uk.ibm.com (d06av10.portsmouth.uk.ibm.com [9.149.37.251]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t7PAXVCi29753354 for ; Tue, 25 Aug 2015 10:33:31 GMT Received: from d06av10.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t7PAXUgO029819 for ; Tue, 25 Aug 2015 04:33:31 -0600 From: Pierre Morel Date: Tue, 25 Aug 2015 12:33:30 +0200 Message-Id: <1440498810-17354-1-git-send-email-pmorel@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH] virtio dataplane: adapt dataplane for virtio Version 1 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: cornelia.huck@de.ibm.com, mst@redhat.com, pmorel@linux.vnet.ibm.com, stefanha@redhat.com, gkurz@linux.vnet.ibm.com Let dataplane allocate different region for the desc/avail/used ring regions. Signed-off-by: Pierre Morel --- hw/virtio/dataplane/vring.c | 54 ++++++++++++++++++++++++++++------ include/hw/virtio/dataplane/vring.h | 4 ++- 2 files changed, 47 insertions(+), 11 deletions(-) diff --git a/hw/virtio/dataplane/vring.c b/hw/virtio/dataplane/vring.c index 07fd69c..49d783b 100644 --- a/hw/virtio/dataplane/vring.c +++ b/hw/virtio/dataplane/vring.c @@ -67,22 +67,46 @@ static void vring_unmap(void *buffer, bool is_write) /* Map the guest's vring to host memory */ bool vring_setup(Vring *vring, VirtIODevice *vdev, int n) { - hwaddr vring_addr = virtio_queue_get_ring_addr(vdev, n); - hwaddr vring_size = virtio_queue_get_ring_size(vdev, n); + hwaddr vring_addr; + hwaddr vring_size; void *vring_ptr; + struct vring *vr = &vring->vr; vring->broken = false; + vr->num = virtio_queue_get_num(vdev, n); - vring_ptr = vring_map(&vring->mr, vring_addr, vring_size, true); + vring_addr = virtio_queue_get_desc_addr(vdev, n); + vring_size = virtio_queue_get_desc_size(vdev, n); + vring_ptr = vring_map(&vring->mr_desc, vring_addr, vring_size, true); if (!vring_ptr) { - error_report("Failed to map vring " - "addr %#" HWADDR_PRIx " size %" HWADDR_PRIu, - vring_addr, vring_size); - vring->broken = true; - return false; + error_report("Failed to map vring desc " + "addr %#" HWADDR_PRIx " size %" HWADDR_PRIu, + vring_addr, vring_size); + goto out_err_desc; } + vr->desc = vring_ptr; - vring_init(&vring->vr, virtio_queue_get_num(vdev, n), vring_ptr, 4096); + vring_addr = virtio_queue_get_avail_addr(vdev, n); + vring_size = virtio_queue_get_avail_size(vdev, n); + vring_ptr = vring_map(&vring->mr_avail, vring_addr, vring_size, true); + if (!vring_ptr) { + error_report("Failed to map vring avail " + "addr %#" HWADDR_PRIx " size %" HWADDR_PRIu, + vring_addr, vring_size); + goto out_err_avail; + } + vr->avail = vring_ptr; + + vring_addr = virtio_queue_get_used_addr(vdev, n); + vring_size = virtio_queue_get_used_size(vdev, n); + vring_ptr = vring_map(&vring->mr_used, vring_addr, vring_size, true); + if (!vring_ptr) { + error_report("Failed to map vring used " + "addr %#" HWADDR_PRIx " size %" HWADDR_PRIu, + vring_addr, vring_size); + goto out_err_used; + } + vr->used = vring_ptr; vring->last_avail_idx = virtio_queue_get_last_avail_idx(vdev, n); vring->last_used_idx = vring_get_used_idx(vdev, vring); @@ -92,6 +116,14 @@ bool vring_setup(Vring *vring, VirtIODevice *vdev, int n) trace_vring_setup(virtio_queue_get_ring_addr(vdev, n), vring->vr.desc, vring->vr.avail, vring->vr.used); return true; + +out_err_used: + memory_region_unref(vring->mr_avail); +out_err_avail: + memory_region_unref(vring->mr_desc); +out_err_desc: + vring->broken = true; + return false; } void vring_teardown(Vring *vring, VirtIODevice *vdev, int n) @@ -99,7 +131,9 @@ void vring_teardown(Vring *vring, VirtIODevice *vdev, int n) virtio_queue_set_last_avail_idx(vdev, n, vring->last_avail_idx); virtio_queue_invalidate_signalled_used(vdev, n); - memory_region_unref(vring->mr); + memory_region_unref(vring->mr_desc); + memory_region_unref(vring->mr_avail); + memory_region_unref(vring->mr_used); } /* Disable guest->host notifies */ diff --git a/include/hw/virtio/dataplane/vring.h b/include/hw/virtio/dataplane/vring.h index 8d97db9..a596e4c 100644 --- a/include/hw/virtio/dataplane/vring.h +++ b/include/hw/virtio/dataplane/vring.h @@ -22,7 +22,9 @@ #include "hw/virtio/virtio.h" typedef struct { - MemoryRegion *mr; /* memory region containing the vring */ + MemoryRegion *mr_desc; /* memory region for the vring desc */ + MemoryRegion *mr_avail; /* memory region for the vring avail */ + MemoryRegion *mr_used; /* memory region for the vring used */ struct vring vr; /* virtqueue vring mapped to host memory */ uint16_t last_avail_idx; /* last processed avail ring index */ uint16_t last_used_idx; /* last processed used ring index */ -- 1.7.1