From patchwork Wed Aug 26 11:29:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kurz X-Patchwork-Id: 510818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1333A1401DA for ; Wed, 26 Aug 2015 21:38:59 +1000 (AEST) Received: from localhost ([::1]:37651 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUZ2f-0003Iw-7f for incoming@patchwork.ozlabs.org; Wed, 26 Aug 2015 07:38:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59920) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUZ2M-000319-Hy for qemu-devel@nongnu.org; Wed, 26 Aug 2015 07:38:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZUZ2F-0002Xg-Rq for qemu-devel@nongnu.org; Wed, 26 Aug 2015 07:38:38 -0400 Received: from e06smtp14.uk.ibm.com ([195.75.94.110]:52122) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUZ2F-0002Wg-8V for qemu-devel@nongnu.org; Wed, 26 Aug 2015 07:38:31 -0400 Received: from /spool/local by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 26 Aug 2015 12:38:23 +0100 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp14.uk.ibm.com (192.168.101.144) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 26 Aug 2015 12:30:16 +0100 X-Helo: d06dlp02.portsmouth.uk.ibm.com X-MailFrom: gkurz@linux.vnet.ibm.com X-RcptTo: qemu-devel@nongnu.org Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 203AD2190061 for ; Wed, 26 Aug 2015 12:29:34 +0100 (BST) Received: from d06av12.portsmouth.uk.ibm.com (d06av12.portsmouth.uk.ibm.com [9.149.37.247]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t7QBU02232768012 for ; Wed, 26 Aug 2015 11:30:00 GMT Received: from d06av12.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t7QBTorn009104 for ; Wed, 26 Aug 2015 05:29:51 -0600 Received: from smtp.lab.toulouse-stg.fr.ibm.com (srv01.lab.toulouse-stg.fr.ibm.com [9.101.4.1]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t7QBToEa008911; Wed, 26 Aug 2015 05:29:50 -0600 Received: from bahia.local (icon-9-164-174-25.megacenter.de.ibm.com [9.164.174.25]) by smtp.lab.toulouse-stg.fr.ibm.com (Postfix) with ESMTP id 512A7220591; Wed, 26 Aug 2015 13:29:43 +0200 (CEST) Date: Wed, 26 Aug 2015 13:29:39 +0200 From: Greg Kurz To: Pierre Morel Message-ID: <20150826132939.42badc6f@bahia.local> In-Reply-To: <1440498810-17354-1-git-send-email-pmorel@linux.vnet.ibm.com> References: <1440498810-17354-1-git-send-email-pmorel@linux.vnet.ibm.com> Organization: IBM X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; x86_64-redhat-linux-gnu) MIME-Version: 1.0 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15082611-0017-0000-0000-0000053486AD X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.75.94.110 Cc: cornelia.huck@de.ibm.com, qemu-devel@nongnu.org, stefanha@redhat.com, mst@redhat.com Subject: Re: [Qemu-devel] [PATCH] virtio dataplane: adapt dataplane for virtio Version 1 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On Tue, 25 Aug 2015 12:33:30 +0200 Pierre Morel wrote: > Let dataplane allocate different region for the desc/avail/used > ring regions. > > Signed-off-by: Pierre Morel > --- Great ! It works ! Since we end up with 3 blocks of code that are identical save the ring region name, we can simplify further with a macro. I have pasted a patch below. You may fold it directly into your patch if people agree, In any case, you have: Acked-by: Greg Kurz Tested-by: Greg Kurz Merci Pierre ! --- Greg > 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 */ --- a/hw/virtio/dataplane/vring.c +++ b/hw/virtio/dataplane/vring.c @@ -64,49 +64,34 @@ static void vring_unmap(void *buffer, bool is_write) memory_region_unref(mr); } +#define MAP_VRING_DESCRIPTOR(d) { \ + hwaddr addr; \ + hwaddr size; \ + void *ptr; \ + \ + addr = virtio_queue_get_##d##_addr(vdev, n); \ + size = virtio_queue_get_##d## _size(vdev, n); \ + ptr = vring_map(&vring->mr_##d, addr, size, true); \ + if (!ptr) { \ + error_report("Failed to map vring "#d" " \ + "addr %#" HWADDR_PRIx " size %" HWADDR_PRIu, \ + addr, size); \ + goto out_err_##d; \ + } \ + vr->d = ptr; \ + } + /* Map the guest's vring to host memory */ bool vring_setup(Vring *vring, VirtIODevice *vdev, int 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_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 desc " - "addr %#" HWADDR_PRIx " size %" HWADDR_PRIu, - vring_addr, vring_size); - goto out_err_desc; - } - vr->desc = vring_ptr; - - 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; + MAP_VRING_DESCRIPTOR(desc); + MAP_VRING_DESCRIPTOR(avail); + MAP_VRING_DESCRIPTOR(used); vring->last_avail_idx = virtio_queue_get_last_avail_idx(vdev, n); vring->last_used_idx = vring_get_used_idx(vdev, vring);