From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56081) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYxxf-0001DY-P8 for qemu-devel@nongnu.org; Mon, 07 Sep 2015 11:04:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZYxxc-0001J5-Eo for qemu-devel@nongnu.org; Mon, 07 Sep 2015 11:03:59 -0400 Received: from e06smtp05.uk.ibm.com ([195.75.94.101]:47943) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYxxc-0001Is-6M for qemu-devel@nongnu.org; Mon, 07 Sep 2015 11:03:56 -0400 Received: from /spool/local by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 7 Sep 2015 16:03:53 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 491001B08074 for ; Mon, 7 Sep 2015 16:05:26 +0100 (BST) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t87F3nmi42205216 for ; Mon, 7 Sep 2015 15:03:49 GMT Received: from d06av05.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t87F3m6I031429 for ; Mon, 7 Sep 2015 09:03:48 -0600 Date: Mon, 7 Sep 2015 17:03:44 +0200 From: Greg Kurz Message-ID: <20150907170344.3762ead0@bahia.local> In-Reply-To: <1441625636-23773-1-git-send-email-pmorel@linux.vnet.ibm.com> References: <1441625636-23773-1-git-send-email-pmorel@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v5] virtio dataplane: adapt dataplane for virtio Version 1 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Pierre Morel Cc: cornelia.huck@de.ibm.com, qemu-devel@nongnu.org, stefanha@redhat.com, mst@redhat.com On Mon, 7 Sep 2015 13:33:56 +0200 Pierre Morel wrote: > Let dataplane allocate different region for the desc/avail/used > ring regions. > Take VIRTIO_RING_F_EVENT_IDX into account to increase the used/avail > rings accordingly. > > Signed-off-by: Pierre Morel > (changed __virtio16 into uint16_t, > map descriptor table and available ring read-only) > Signed-off-by: Greg Kurz > --- > I have tested it works on ppc64. Tested-by: Greg Kurz > Changes from V4: > - added comments for VIRTIO_RING_F_EVENT_IDX and mapping > - use uint16_t as in ring definitions instead of __virtio16 > - map descriptor table and available ring read-only > > Changes from V3: > - added changelog > > Changes from V2: > - incorporate the code directly in vring_setup(). > - added room for the event indexes used with VIRTIO_RING_F_EVENT_IDX > > Changes from v1: > - use a macro to gain LOCs inside of vring_setup() > > hw/virtio/dataplane/vring.c | 66 +++++++++++++++++++++++++++++-------- > include/hw/virtio/dataplane/vring.h | 4 ++- > 2 files changed, 55 insertions(+), 15 deletions(-) > > diff --git a/hw/virtio/dataplane/vring.c b/hw/virtio/dataplane/vring.c > index 07fd69c..75db534 100644 > --- a/hw/virtio/dataplane/vring.c > +++ b/hw/virtio/dataplane/vring.c > @@ -67,22 +67,50 @@ 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); > - void *vring_ptr; > + struct vring *vr = &vring->vr; > + hwaddr addr; > + hwaddr size; > + void *ptr; > > vring->broken = false; > - > - vring_ptr = vring_map(&vring->mr, 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; > + vr->num = virtio_queue_get_num(vdev, n); > + > + addr = virtio_queue_get_desc_addr(vdev, n); > + size = virtio_queue_get_desc_size(vdev, n); > + /* Map the descriptor area as read only */ > + ptr = vring_map(&vring->mr_desc, addr, size, false); > + if (!ptr) { > + error_report("Failed to map 0x%16lx byte for vring desc at %16lx", > + size, addr); > + goto out_err_desc; > } > - > - vring_init(&vring->vr, virtio_queue_get_num(vdev, n), vring_ptr, 4096); > + vr->desc = ptr; > + > + addr = virtio_queue_get_avail_addr(vdev, n); > + size = virtio_queue_get_avail_size(vdev, n); > + /* Add the size of the used_event_idx */ > + size += sizeof(uint16_t); > + /* Map the driver area as read only */ > + ptr = vring_map(&vring->mr_avail, addr, size, false); > + if (!ptr) { > + error_report("Failed to map 0x%16lx byte for vring avail at %16lx", > + size, addr); > + goto out_err_avail; > + } > + vr->avail = ptr; > + > + addr = virtio_queue_get_used_addr(vdev, n); > + size = virtio_queue_get_used_size(vdev, n); > + /* Add the size of the avail_event_idx */ > + size += sizeof(uint16_t); > + /* Map the device area as read-write */ > + ptr = vring_map(&vring->mr_used, addr, size, true); > + if (!ptr) { > + error_report("Failed to map 0x%16lx byte for vring used at %16lx", > + size, addr); > + goto out_err_used; > + } > + vr->used = 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 +120,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 +135,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 */