From 3939255eeda47d9f70d5d54729ef94a27ae8b803 Mon Sep 17 00:00:00 2001 From: Marvin Liu Date: Wed, 30 Oct 2019 17:24:21 +0800 Subject: [PATCH] vhost: do not limit packed ring size Virtio spec only set rule that packed ring maximum size is up to 2^15 entries. Should not limit packed ring size to power of two. Fixes: 708e14d8b9ac ("vhost: advertize packed ring layout support") Cc: stable@dpdk.org Signed-off-by: Marvin Liu Reviewed-by: Tiwei Bie Reviewed-by: Maxime Coquelin --- lib/librte_vhost/vhost_user.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 2a9fa7c6ca..3f649c802c 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -363,8 +363,20 @@ vhost_user_set_vring_num(struct virtio_net **pdev, * * Queue Size value is always a power of 2. The maximum Queue Size * value is 32768. + * + * VIRTIO 1.1 2.7 Virtqueues says: + * + * Packed virtqueues support up to 2^15 entries each. */ - if ((vq->size & (vq->size - 1)) || vq->size > 32768) { + if (!vq_is_packed(dev)) { + if (vq->size & (vq->size - 1)) { + RTE_LOG(ERR, VHOST_CONFIG, + "invalid virtqueue size %u\n", vq->size); + return RTE_VHOST_MSG_RESULT_ERR; + } + } + + if (vq->size > 32768) { RTE_LOG(ERR, VHOST_CONFIG, "invalid virtqueue size %u\n", vq->size); return RTE_VHOST_MSG_RESULT_ERR; -- 2.20.1