From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 97B371B5AB for ; Fri, 29 Jun 2018 17:59:30 +0200 (CEST) X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jun 2018 08:59:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,285,1526367600"; d="scan'208";a="53922682" Received: from debian.sh.intel.com (HELO debian) ([10.67.104.228]) by orsmga006.jf.intel.com with ESMTP; 29 Jun 2018 08:59:27 -0700 Date: Fri, 29 Jun 2018 23:59:29 +0800 From: Tiwei Bie To: Maxime Coquelin Cc: zhihong.wang@intel.com, jfreimann@redhat.com, dev@dpdk.org, mst@redhat.com, jasowang@redhat.com, wexu@redhat.com, Yuanhan Liu , Jens Freimann Message-ID: <20180629155929.GC31010@debian> References: <20180622134327.18973-1-maxime.coquelin@redhat.com> <20180622134327.18973-4-maxime.coquelin@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20180622134327.18973-4-maxime.coquelin@redhat.com> User-Agent: Mutt/1.9.5 (2018-04-13) Subject: Re: [dpdk-dev] [PATCH v5 03/15] vhost: vring address setup for packed queues X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2018 15:59:31 -0000 On Fri, Jun 22, 2018 at 03:43:15PM +0200, Maxime Coquelin wrote: > From: Yuanhan Liu > > Add code to set up packed queues when enabled. > > Signed-off-by: Yuanhan Liu > Signed-off-by: Jens Freimann > Signed-off-by: Maxime Coquelin > --- > lib/librte_vhost/vhost.c | 44 ++++++++++++++++++++++++++++++++++++++----- > lib/librte_vhost/vhost.h | 7 ++++++- > lib/librte_vhost/vhost_user.c | 29 +++++++++++++++++++++++++++- > 3 files changed, 73 insertions(+), 7 deletions(-) > > diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c > index afded4952..a85c6646f 100644 > --- a/lib/librte_vhost/vhost.c > +++ b/lib/librte_vhost/vhost.c > @@ -23,6 +23,7 @@ > #include "iotlb.h" > #include "vhost.h" > #include "vhost_user.h" > +#include "virtio-packed.h" > > struct virtio_net *vhost_devices[MAX_VHOST_DEVICE]; > > @@ -115,14 +116,11 @@ free_device(struct virtio_net *dev) > rte_free(dev); > } > > -int > -vring_translate(struct virtio_net *dev, struct vhost_virtqueue *vq) > +static int > +vring_translate_split(struct virtio_net *dev, struct vhost_virtqueue *vq) > { > uint64_t req_size, size; > > - if (!(dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM))) > - goto out; > - > req_size = sizeof(struct vring_desc) * vq->size; > size = req_size; > vq->desc = (struct vring_desc *)(uintptr_t)vhost_iova_to_vva(dev, vq, > @@ -153,6 +151,40 @@ vring_translate(struct virtio_net *dev, struct vhost_virtqueue *vq) > if (!vq->used || size != req_size) > return -1; > > + return 0; > +} > + > +static int > +vring_translate_packed(struct virtio_net *dev, struct vhost_virtqueue *vq) > +{ > + uint64_t req_size, size; > + > + req_size = sizeof(struct vring_desc_packed) * vq->size; > + size = req_size; > + vq->desc_packed = > + (struct vring_desc_packed *)(uintptr_t)vhost_iova_to_vva(dev, > + vq, vq->ring_addrs.desc_user_addr, > + &size, VHOST_ACCESS_RW); > + if (!vq->desc || size != req_size) Should check vq->desc_packed instead of vq->desc. > + return -1; Also need to get vq->driver_event and vq->device_event. Maybe shouldn't do it in this patch. But it's missing in the whole patch set. > + > + return 0; > +} > + > +int > +vring_translate(struct virtio_net *dev, struct vhost_virtqueue *vq) > +{ > + > + if (!(dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM))) > + goto out; > + > + if (vq_is_packed(dev)) { > + if (vring_translate_packed(dev, vq) < 0) > + return -1; > + } else { > + if (vring_translate_split(dev, vq) < 0) > + return -1; > + } > out: > vq->access_ok = 1; > > @@ -234,6 +266,8 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx) > dev->virtqueue[vring_idx] = vq; > init_vring_queue(dev, vring_idx); > rte_spinlock_init(&vq->access_lock); > + vq->avail_wrap_counter = 1; > + vq->used_wrap_counter = 1; > > dev->nr_vring += 1; > > diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h > index 34a614c97..671b4b3bf 100644 > --- a/lib/librte_vhost/vhost.h > +++ b/lib/librte_vhost/vhost.h > @@ -84,7 +84,10 @@ struct log_cache_entry { > * Structure contains variables relevant to RX/TX virtqueues. > */ > struct vhost_virtqueue { > - struct vring_desc *desc; > + union { > + struct vring_desc *desc; > + struct vring_desc_packed *desc_packed; > + }; > struct vring_avail *avail; > struct vring_used *used; > uint32_t size; > @@ -122,6 +125,8 @@ struct vhost_virtqueue { > > struct batch_copy_elem *batch_copy_elems; > uint16_t batch_copy_nb_elems; > + uint16_t used_wrap_counter; > + uint16_t avail_wrap_counter; Not quite sure about this. Do you think it will be better to define wrap counters as bool (as only 0 or 1 are available)? > > struct log_cache_entry log_cache[VHOST_LOG_CACHE_NR]; > uint16_t log_cache_nb_elem; > diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c > index 947290fc3..b6097c085 100644 > --- a/lib/librte_vhost/vhost_user.c > +++ b/lib/librte_vhost/vhost_user.c > @@ -39,6 +39,7 @@ > #include "iotlb.h" > #include "vhost.h" > #include "vhost_user.h" > +#include "virtio-packed.h" > > #define VIRTIO_MIN_MTU 68 > #define VIRTIO_MAX_MTU 65535 > @@ -477,6 +478,30 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index) > struct vhost_vring_addr *addr = &vq->ring_addrs; > uint64_t len; > > + if (vq_is_packed(dev)) { > + len = sizeof(struct vring_desc_packed) * vq->size; > + vq->desc_packed = (struct vring_desc_packed *) ring_addr_to_vva > + (dev, vq, addr->desc_user_addr, &len); > + vq->desc = NULL; `vq->desc = NULL` will set vq->desc_packed to NULL. > + vq->avail = NULL; > + vq->used = NULL; > + vq->log_guest_addr = 0; > + if (vq->desc_packed == 0 || It's better to compare with NULL. > + len != sizeof(struct vring_desc_packed) * > + vq->size) { > + RTE_LOG(DEBUG, VHOST_CONFIG, > + "(%d) failed to map desc_packed ring.\n", > + dev->vid); > + return dev; > + } > + > + dev = numa_realloc(dev, vq_index); > + vq = dev->virtqueue[vq_index]; > + addr = &vq->ring_addrs; > + > + return dev; > + } > + > /* The addresses are converted from QEMU virtual to Vhost virtual. */ > if (vq->desc && vq->avail && vq->used) > return dev; > @@ -490,6 +515,7 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index) > dev->vid); > return dev; > } > + vq->desc_packed = NULL; It seems that above assignment isn't needed. > > dev = numa_realloc(dev, vq_index); > vq = dev->virtqueue[vq_index]; > @@ -888,7 +914,8 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *pmsg) > static int > vq_is_ready(struct vhost_virtqueue *vq) > { > - return vq && vq->desc && vq->avail && vq->used && > + return vq && > + (vq->desc_packed || (vq->desc && vq->avail && vq->used)) && > vq->kickfd != VIRTIO_UNINITIALIZED_EVENTFD && > vq->callfd != VIRTIO_UNINITIALIZED_EVENTFD; > } > -- > 2.14.4 >