From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 22E5EA00E6 for ; Tue, 16 Apr 2019 16:38:24 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1992A1B4D0; Tue, 16 Apr 2019 16:38:24 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id D8D6C1B4D0 for ; Tue, 16 Apr 2019 16:38:22 +0200 (CEST) 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 mx1.redhat.com (Postfix) with ESMTPS id 3F96E33025F; Tue, 16 Apr 2019 14:38:22 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-214.ams2.redhat.com [10.36.117.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id 271321001E93; Tue, 16 Apr 2019 14:38:13 +0000 (UTC) From: Kevin Traynor To: Maxime Coquelin Cc: Tiwei Bie , dpdk stable Date: Tue, 16 Apr 2019 15:36:47 +0100 Message-Id: <20190416143719.21601-29-ktraynor@redhat.com> In-Reply-To: <20190416143719.21601-1-ktraynor@redhat.com> References: <20190416143719.21601-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 16 Apr 2019 14:38:22 +0000 (UTC) Subject: [dpdk-stable] patch 'vhost: prevent disabled rings to be processed with zero-copy' has been queued to LTS release 18.11.2 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/24/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 rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Kevin Traynor --- >From 7dadea51de8e770dad51940d6a5efc347fd9b30c Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Thu, 28 Feb 2019 18:57:04 +0100 Subject: [PATCH] vhost: prevent disabled rings to be processed with zero-copy [ upstream commit 11d5253a3e93a38be14da65328dd19960fd8cb14 ] The vhost-user spec says that once the vring is disabled, the client has to stop processing it. But it can happen when dequeue zero-copy is enabled if outstanding descriptors buffers are still being processed by an external NIC or another guest. The fix consists in draining the zmbufs list to ensure no more descriptors buffers are in the wild. Note that this fix is only working in the case REPLY_ACK protocol feature is enabled, which is not the case by default for now (it is only enabled when IOMMU feature is enabled in the vhost library). Fixes: b0a985d1f340 ("vhost: add dequeue zero copy") Signed-off-by: Maxime Coquelin Reviewed-by: Tiwei Bie --- lib/librte_vhost/vhost_user.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index be4f3c6c8..2d1123e60 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -1346,4 +1346,8 @@ vhost_user_set_vring_enable(struct virtio_net **pdev, index, enable); + /* On disable, rings have to be stopped being processed. */ + if (!enable && dev->dequeue_zero_copy) + drain_zmbuf_list(dev->virtqueue[index]); + dev->virtqueue[index]->enabled = enable; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-16 15:34:26.487909570 +0100 +++ 0029-vhost-prevent-disabled-rings-to-be-processed-with-ze.patch 2019-04-16 15:34:25.174180083 +0100 @@ -1,8 +1,10 @@ -From 11d5253a3e93a38be14da65328dd19960fd8cb14 Mon Sep 17 00:00:00 2001 +From 7dadea51de8e770dad51940d6a5efc347fd9b30c Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Thu, 28 Feb 2019 18:57:04 +0100 Subject: [PATCH] vhost: prevent disabled rings to be processed with zero-copy +[ upstream commit 11d5253a3e93a38be14da65328dd19960fd8cb14 ] + The vhost-user spec says that once the vring is disabled, the client has to stop processing it. But it can happen when dequeue zero-copy is enabled if outstanding descriptors buffers @@ -17,7 +19,6 @@ the vhost library). Fixes: b0a985d1f340 ("vhost: add dequeue zero copy") -Cc: stable@dpdk.org Signed-off-by: Maxime Coquelin Reviewed-by: Tiwei Bie @@ -26,7 +27,7 @@ 1 file changed, 4 insertions(+) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c -index 36c0c676d..555d09ad9 100644 +index be4f3c6c8..2d1123e60 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -1346,4 +1346,8 @@ vhost_user_set_vring_enable(struct virtio_net **pdev,