From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jens Freimann Subject: [PATCH 14/14] vhost: enable packed virtqueues Date: Mon, 29 Jan 2018 15:11:43 +0100 Message-ID: <20180129141143.13437-15-jfreimann@redhat.com> References: <20180129141143.13437-1-jfreimann@redhat.com> Cc: tiwei.bie@intel.com, yliu@fridaylinux.org, maxime.coquelin@redhat.com, mst@redhat.com To: dev@dpdk.org Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 23D6D1B7D9 for ; Mon, 29 Jan 2018 15:13:29 +0100 (CET) In-Reply-To: <20180129141143.13437-1-jfreimann@redhat.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Yuanhan Liu This patch enables the code do enqueue and dequeue packed to/from a packed virtqueue. Add feature bit for packed virtqueues as defined in Virtio 1.1 draft. Signed-off-by: Jens Freimann Signed-off-by: Yuanhan Liu --- lib/librte_vhost/vhost.h | 1 + lib/librte_vhost/virtio_net.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h index a3d4214b6..fbde54f9a 100644 --- a/lib/librte_vhost/vhost.h +++ b/lib/librte_vhost/vhost.h @@ -181,6 +181,7 @@ struct vhost_msg { (1ULL << VIRTIO_NET_F_GUEST_ANNOUNCE) | \ (1ULL << VIRTIO_NET_F_MQ) | \ (1ULL << VIRTIO_F_VERSION_1) | \ + (1ULL << VIRTIO_F_PACKED) | \ (1ULL << VHOST_F_LOG_ALL) | \ (1ULL << VHOST_USER_F_PROTOCOL_FEATURES) | \ (1ULL << VIRTIO_NET_F_GSO) | \ diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c index c1b77fff5..309178b3e 100644 --- a/lib/librte_vhost/virtio_net.c +++ b/lib/librte_vhost/virtio_net.c @@ -824,7 +824,9 @@ rte_vhost_enqueue_burst(int vid, uint16_t queue_id, if (!dev) return 0; - if (dev->features & (1 << VIRTIO_NET_F_MRG_RXBUF)) + if (dev->features & (1ULL << VIRTIO_F_PACKED)) + return vhost_enqueue_burst_1_1(dev, queue_id, pkts, count); + else if (dev->features & (1 << VIRTIO_NET_F_MRG_RXBUF)) return virtio_dev_merge_rx(dev, queue_id, pkts, count); else return virtio_dev_rx(dev, queue_id, pkts, count); @@ -1456,6 +1458,9 @@ rte_vhost_dequeue_burst(int vid, uint16_t queue_id, if (unlikely(vq->enabled == 0)) goto out_access_unlock; + if (dev->features & (1ULL << VIRTIO_F_PACKED)) + return vhost_dequeue_burst_1_1(dev, vq, mbuf_pool, pkts, count); + vq->batch_copy_nb_elems = 0; if (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM)) -- 2.14.3