diff mbox

virtio dataplane: adapt dataplane for virtio Version 1

Message ID 1440498810-17354-1-git-send-email-pmorel@linux.vnet.ibm.com
State New
Headers show

Commit Message

Pierre Morel Aug. 25, 2015, 10:33 a.m. UTC 
Let dataplane allocate different region for the desc/avail/used
ring regions.

Signed-off-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
---
 hw/virtio/dataplane/vring.c         |   54 ++++++++++++++++++++++++++++------
 include/hw/virtio/dataplane/vring.h |    4 ++-
 2 files changed, 47 insertions(+), 11 deletions(-)

Comments

Stefan Hajnoczi Aug. 26, 2015, 12:50 p.m. UTC | #1 
On Tue, Aug 25, 2015 at 12:33:30PM +0200, Pierre Morel wrote:
> -    vring_init(&vring->vr, virtio_queue_get_num(vdev, n), vring_ptr, 4096);

vring_init() is no longer used.  Please delete it.
Cornelia Huck Aug. 26, 2015, 12:55 p.m. UTC | #2 
On Wed, 26 Aug 2015 13:50:52 +0100
Stefan Hajnoczi <stefanha@redhat.com> wrote:

> On Tue, Aug 25, 2015 at 12:33:30PM +0200, Pierre Morel wrote:
> > -    vring_init(&vring->vr, virtio_queue_get_num(vdev, n), vring_ptr, 4096);
> 
> vring_init() is no longer used.  Please delete it.
> 

vring_init() is defined in a header imported from Linux.
Stefan Hajnoczi Sept. 3, 2015, 5:08 p.m. UTC | #3 
On Wed, Aug 26, 2015 at 02:55:45PM +0200, Cornelia Huck wrote:
> On Wed, 26 Aug 2015 13:50:52 +0100
> Stefan Hajnoczi <stefanha@redhat.com> wrote:
> 
> > On Tue, Aug 25, 2015 at 12:33:30PM +0200, Pierre Morel wrote:
> > > -    vring_init(&vring->vr, virtio_queue_get_num(vdev, n), vring_ptr, 4096);
> > 
> > vring_init() is no longer used.  Please delete it.
> > 
> 
> vring_init() is defined in a header imported from Linux.

You are right, I was confused.  The grep output shows we have two
vring_init() in QEMU:

include/standard-headers/linux/virtio_ring.h:static inline void vring_init(struct vring *vr, unsigned int num, void *p,
pc-bios/s390-ccw/virtio.c:static void vring_init(struct vring *vr, unsigned int num, void *p,
Cornelia Huck Sept. 4, 2015, 6:37 a.m. UTC | #4 
On Thu, 3 Sep 2015 18:08:42 +0100
Stefan Hajnoczi <stefanha@gmail.com> wrote:

> On Wed, Aug 26, 2015 at 02:55:45PM +0200, Cornelia Huck wrote:
> > On Wed, 26 Aug 2015 13:50:52 +0100
> > Stefan Hajnoczi <stefanha@redhat.com> wrote:
> > 
> > > On Tue, Aug 25, 2015 at 12:33:30PM +0200, Pierre Morel wrote:
> > > > -    vring_init(&vring->vr, virtio_queue_get_num(vdev, n), vring_ptr, 4096);
> > > 
> > > vring_init() is no longer used.  Please delete it.
> > > 
> > 
> > vring_init() is defined in a header imported from Linux.
> 
> You are right, I was confused.  The grep output shows we have two
> vring_init() in QEMU:
> 
> include/standard-headers/linux/virtio_ring.h:static inline void vring_init(struct vring *vr, unsigned int num, void *p,
> pc-bios/s390-ccw/virtio.c:static void vring_init(struct vring *vr, unsigned int num, void *p,
> 

Yes, the ccw bios has its own definitions for various things.
diff mbox

Patch

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 */