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 68183A054C for ; Fri, 14 Feb 2020 18:06:09 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5FA59F72; Fri, 14 Feb 2020 18:06:09 +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 4D5F6F72 for ; Fri, 14 Feb 2020 18:06:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581699967; 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=57JCLq1vDsbgFSv9XeHbfD6mNRp3YhXhoJZNrTOvV1Y=; b=QzqJBmyF7D0JoOQqDgrdlh8CEhPpZfqIWdza6N/ziQ0wcFB4eXABs4yQUliKkpSO8yg5CJ p7OTmBH/zTG6j9OBAK+lHgMebM4zCBtFpWE5BLdn49A/kusg0WId1PbSCIjSokcXLRmCA9 Lvwjij3dRAAXquJSn6I2PA4hxigNLRk= 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-223-17L9ttIPOoGgNmvEEy-pXQ-1; Fri, 14 Feb 2020 12:06:03 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 03CC2DB2A; Fri, 14 Feb 2020 17:06:01 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA20184BCD; Fri, 14 Feb 2020 17:05:58 +0000 (UTC) From: Kevin Traynor To: Adrian Moreno Cc: Tiwei Bie , dpdk stable Date: Fri, 14 Feb 2020 17:03:28 +0000 Message-Id: <20200214170337.25093-34-ktraynor@redhat.com> In-Reply-To: <20200214170337.25093-1-ktraynor@redhat.com> References: <20200214170337.25093-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: 17L9ttIPOoGgNmvEEy-pXQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'vhost: fix packed virtqueue ready condition' has been queued to LTS release 18.11.7 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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/20. 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/b4cb3953daab620904= b38b980f6a0911334bcd5b Thanks. Kevin. --- >From b4cb3953daab620904b38b980f6a0911334bcd5b Mon Sep 17 00:00:00 2001 From: Adrian Moreno Date: Sat, 25 Jan 2020 09:52:16 +0100 Subject: [PATCH] vhost: fix packed virtqueue ready condition [ upstream commit c5a910dd92ecbad24f86b4c59b4ff8105b5149fd ] Consider a virtqueue ready when, apart from the descriptor area, both event suppression areas have been mapped. Fixes: 2d1541e2b6b3 ("vhost: add vring address setup for packed queues") Signed-off-by: Adrian Moreno Reviewed-by: Tiwei Bie --- lib/librte_vhost/vhost_user.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 23a6bf8922..b9ecec5ba7 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -1271,5 +1271,6 @@ vq_is_ready(struct virtio_net *dev, struct vhost_virt= queue *vq) =20 =09if (vq_is_packed(dev)) -=09=09rings_ok =3D !!vq->desc_packed; +=09=09rings_ok =3D vq->desc_packed && vq->driver_event && +=09=09=09vq->device_event; =09else =09=09rings_ok =3D vq->desc && vq->avail && vq->used; --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-14 17:02:38.957538912 +0000 +++ 0034-vhost-fix-packed-virtqueue-ready-condition.patch=092020-02-14 17:0= 2:37.046405956 +0000 @@ -1 +1 @@ -From c5a910dd92ecbad24f86b4c59b4ff8105b5149fd Mon Sep 17 00:00:00 2001 +From b4cb3953daab620904b38b980f6a0911334bcd5b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c5a910dd92ecbad24f86b4c59b4ff8105b5149fd ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 69b84a8820..c9cc4d6489 100644 +index 23a6bf8922..b9ecec5ba7 100644 @@ -22 +23 @@ -@@ -1299,5 +1299,6 @@ vq_is_ready(struct virtio_net *dev, struct vhost_vir= tqueue *vq) +@@ -1271,5 +1271,6 @@ vq_is_ready(struct virtio_net *dev, struct vhost_vir= tqueue *vq)