From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by dpdk.org (Postfix) with ESMTP id 07D331CE91 for ; Fri, 6 Apr 2018 10:23:14 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3713A406E8A4; Fri, 6 Apr 2018 08:23:14 +0000 (UTC) Received: from localhost (dhcp-192-241.str.redhat.com [10.33.192.241]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C94C7AFD50; Fri, 6 Apr 2018 08:23:07 +0000 (UTC) Date: Fri, 6 Apr 2018 10:23:06 +0200 From: Jens Freimann To: Maxime Coquelin Cc: dev@dpdk.org, tiwei.bie@intel.com, yliu@fridaylinux.org, mst@redhat.com Message-ID: <20180406082306.ishktd2inb24qkp3@reserved-198-163.str.redhat.com> References: <20180405101031.26468-1-jfreimann@redhat.com> <20180405101031.26468-13-jfreimann@redhat.com> <377cd9c3-a023-bfab-b337-28c7b7385537@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <377cd9c3-a023-bfab-b337-28c7b7385537@redhat.com> User-Agent: NeoMutt/20180223 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 06 Apr 2018 08:23:14 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 06 Apr 2018 08:23:14 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jfreimann@redhat.com' RCPT:'' Subject: Re: [dpdk-dev] [PATCH v3 12/21] 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, 06 Apr 2018 08:23:15 -0000 On Fri, Apr 06, 2018 at 10:19:28AM +0200, Maxime Coquelin wrote: > > >On 04/05/2018 12:10 PM, Jens Freimann wrote: >>From: Yuanhan Liu >> >>Add code to set up packed queues when enabled. >> >>Signed-off-by: Yuanhan Liu >>Signed-off-by: Jens Freimann >>--- >> lib/librte_vhost/vhost.h | 1 + >> lib/librte_vhost/vhost_user.c | 21 ++++++++++++++++++++- >> 2 files changed, 21 insertions(+), 1 deletion(-) >> >>diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h >>index 3004c26c1..20d78f883 100644 >>--- a/lib/librte_vhost/vhost.h >>+++ b/lib/librte_vhost/vhost.h >>@@ -74,6 +74,7 @@ struct batch_copy_elem { >> */ >> struct vhost_virtqueue { >> struct vring_desc *desc; >>+ struct vring_desc_packed *desc_packed; >> struct vring_avail *avail; >> struct vring_used *used; >> uint32_t size; >>diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c >>index 157cf2f60..183893e46 100644 >>--- a/lib/librte_vhost/vhost_user.c >>+++ b/lib/librte_vhost/vhost_user.c >>@@ -469,6 +469,23 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index) >> struct vhost_virtqueue *vq = dev->virtqueue[vq_index]; >> struct vhost_vring_addr *addr = &vq->ring_addrs; >>+ if (dev->features & (1ULL << VIRTIO_F_RING_PACKED)) { >>+ vq->desc_packed = (struct vring_desc_packed *) ring_addr_to_vva >>+ (dev, vq, addr->desc_user_addr, sizeof(vq->desc_packed)); >sizeof(*vq->desc_packed) >or >sizeof(struct vring_desc_packed) for consitency. yes, will fix. thanks! regards, Jens > >>+ vq->desc = NULL; >>+ vq->avail = NULL; >>+ vq->used = NULL; >>+ vq->log_guest_addr = 0; >>+ >>+ if (vq->last_used_idx != 0) { >>+ RTE_LOG(WARNING, VHOST_CONFIG, >>+ "last_used_idx (%u) not 0\n", >>+ vq->last_used_idx); >>+ vq->last_used_idx = 0; >>+ } >>+ return dev; >>+ } >>+ >> /* The addresses are converted from QEMU virtual to Vhost virtual. */ >> if (vq->desc && vq->avail && vq->used) >> return dev; >>@@ -481,6 +498,7 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index) >> dev->vid); >> return dev; >> } >>+ vq->desc_packed = NULL; >> dev = numa_realloc(dev, vq_index); >> vq = dev->virtqueue[vq_index]; >>@@ -853,7 +871,8 @@ vhost_user_set_mem_table(struct virtio_net *dev, 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; >> } >>