From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 187B21B78C for ; Mon, 29 Jan 2018 15:13:04 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 76D6E7E446; Mon, 29 Jan 2018 14:13:03 +0000 (UTC) Received: from localhost (dhcp-192-241.str.redhat.com [10.33.192.241]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EFCBB5D969; Mon, 29 Jan 2018 14:12:56 +0000 (UTC) From: Jens Freimann To: dev@dpdk.org Cc: tiwei.bie@intel.com, yliu@fridaylinux.org, maxime.coquelin@redhat.com, mst@redhat.com Date: Mon, 29 Jan 2018 15:11:39 +0100 Message-Id: <20180129141143.13437-11-jfreimann@redhat.com> In-Reply-To: <20180129141143.13437-1-jfreimann@redhat.com> References: <20180129141143.13437-1-jfreimann@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 29 Jan 2018 14:13:03 +0000 (UTC) Subject: [dpdk-dev] [PATCH 10/14] 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: Mon, 29 Jan 2018 14:13:04 -0000 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.c | 4 ++++ lib/librte_vhost/vhost.h | 1 + lib/librte_vhost/vhost_user.c | 17 ++++++++++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c index 1dd9adbc7..78913912c 100644 --- a/lib/librte_vhost/vhost.c +++ b/lib/librte_vhost/vhost.c @@ -536,6 +536,9 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable) { struct virtio_net *dev = get_device(vid); + if (dev->features & (1ULL << VIRTIO_F_PACKED)) + return 0; + if (dev == NULL) return -1; @@ -545,6 +548,7 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable) return -1; } + dev->virtqueue[queue_id]->used->flags = VRING_USED_F_NO_NOTIFY; return 0; } diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h index 152e8bce1..8554d51d8 100644 --- a/lib/librte_vhost/vhost.h +++ b/lib/librte_vhost/vhost.h @@ -68,6 +68,7 @@ struct batch_copy_elem { */ struct vhost_virtqueue { struct vring_desc *desc; + struct vring_desc_1_1 *desc_1_1; 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 1dd1a61b6..979bffe1a 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -414,6 +414,19 @@ 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_PACKED)) { + vq->desc_1_1 = (struct vring_desc_1_1 *) ring_addr_to_vva + (dev, vq, addr->desc_user_addr, sizeof(vq->desc_1_1)); + vq->desc = NULL; + vq->avail = NULL; + vq->used = NULL; + vq->log_guest_addr = 0; + + assert(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; @@ -426,6 +439,7 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index) dev->vid); return dev; } + vq->desc_1_1 = NULL; dev = numa_realloc(dev, vq_index); vq = dev->virtqueue[vq_index]; @@ -763,7 +777,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_1_1 || (vq->desc && vq->avail && vq->used)) && vq->kickfd != VIRTIO_UNINITIALIZED_EVENTFD && vq->callfd != VIRTIO_UNINITIALIZED_EVENTFD; } -- 2.14.3