From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D4656A04F5 for ; Wed, 11 Dec 2019 22:27:55 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CAFD92C6A; Wed, 11 Dec 2019 22:27:55 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id D42972C6A for ; Wed, 11 Dec 2019 22:27:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576099674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SzBZa16/1s6y21UQ73n88b/CvZBIqDUZFqevFG5IKcA=; b=Llb46AQ4RkEp6dES3z+Fj+EOl6UKe6pc+XX0JqTP12+ckRZh5Pw1ZGzhaiR39LTPlRcHgW rH9k6FYAzJGpoV2hKVvTxUIY43avJJSKLB2EgA61Jox93lBFIqg4OJlPSTTejBfHUxtw3d nQE8ihZuBRvqhTZIApCFogSjkCi16gM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-203-NnlR1w_iPGqT67Pjfd4ncQ-1; Wed, 11 Dec 2019 16:27:50 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 72199DBE5; Wed, 11 Dec 2019 21:27:49 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id D3F6F10016DA; Wed, 11 Dec 2019 21:27:45 +0000 (UTC) From: Kevin Traynor To: Marvin Liu Cc: Tiwei Bie , Maxime Coquelin , dpdk stable Date: Wed, 11 Dec 2019 21:26:02 +0000 Message-Id: <20191211212702.27851-10-ktraynor@redhat.com> In-Reply-To: <20191211212702.27851-1-ktraynor@redhat.com> References: <20191211212702.27851-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: NnlR1w_iPGqT67Pjfd4ncQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'vhost: do not limit packed ring size' has been queued to LTS release 18.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/17/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/8b66c5008ebaeec850= 9d56c42957f1e0c9d54cd6 Thanks. Kevin. --- >From 8b66c5008ebaeec8509d56c42957f1e0c9d54cd6 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 [ upstream commit 3939255eeda47d9f70d5d54729ef94a27ae8b803 ] 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") 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 b5de73b4f..23a6bf892 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -385,6 +385,18 @@ vhost_user_set_vring_num(struct virtio_net **pdev, =09 * Queue Size value is always a power of 2. The maximum Queue Size =09 * value is 32768. +=09 * +=09 * VIRTIO 1.1 2.7 Virtqueues says: +=09 * +=09 * Packed virtqueues support up to 2^15 entries each. =09 */ -=09if ((vq->size & (vq->size - 1)) || vq->size > 32768) { +=09if (!vq_is_packed(dev)) { +=09=09if (vq->size & (vq->size - 1)) { +=09=09=09RTE_LOG(ERR, VHOST_CONFIG, +=09=09=09=09"invalid virtqueue size %u\n", vq->size); +=09=09=09return VH_RESULT_ERR; +=09=09} +=09} + +=09if (vq->size > 32768) { =09=09RTE_LOG(ERR, VHOST_CONFIG, =09=09=09"invalid virtqueue size %u\n", vq->size); --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-11 21:24:13.564721484 +0000 +++ 0010-vhost-do-not-limit-packed-ring-size.patch=092019-12-11 21:24:12.58= 9652829 +0000 @@ -1 +1 @@ -From 3939255eeda47d9f70d5d54729ef94a27ae8b803 Mon Sep 17 00:00:00 2001 +From 8b66c5008ebaeec8509d56c42957f1e0c9d54cd6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3939255eeda47d9f70d5d54729ef94a27ae8b803 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 2a9fa7c6c..3f649c802 100644 +index b5de73b4f..23a6bf892 100644 @@ -23 +24 @@ -@@ -364,6 +364,18 @@ vhost_user_set_vring_num(struct virtio_net **pdev, +@@ -385,6 +385,18 @@ vhost_user_set_vring_num(struct virtio_net **pdev, @@ -36 +37 @@ -+=09=09=09return RTE_VHOST_MSG_RESULT_ERR; ++=09=09=09return VH_RESULT_ERR;