From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id BA0201B488 for ; Thu, 22 Nov 2018 17:51:43 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2D059882EA; Thu, 22 Nov 2018 16:51:43 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id A801384F7; Thu, 22 Nov 2018 16:51:36 +0000 (UTC) From: Kevin Traynor To: Tiwei Bie Cc: "Michael S . Tsirkin" , Maxime Coquelin , Jason Wang , dpdk stable Date: Thu, 22 Nov 2018 16:49:04 +0000 Message-Id: <20181122164957.13003-12-ktraynor@redhat.com> In-Reply-To: <20181122164957.13003-1-ktraynor@redhat.com> References: <20181122164957.13003-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 22 Nov 2018 16:51:43 +0000 (UTC) Subject: [dpdk-stable] patch 'vhost: fix notification for packed ring' has been queued to stable release 18.08.1 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: , X-List-Received-Date: Thu, 22 Nov 2018 16:51:44 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/28/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From 8a35e315bdc196458e1a547499b95ff7ef10fcac Mon Sep 17 00:00:00 2001 From: Tiwei Bie Date: Thu, 11 Oct 2018 22:22:34 +0800 Subject: [PATCH] vhost: fix notification for packed ring [ upstream commit cd9012c3f8d3905a8212da7945233a17633e796f ] The notification can't be disabled in packed ring when application tries to disable notification, because the device event flags field is overwritten by an unexpected value. This patch fixes this issue. Fixes: b1cce26af1dc ("vhost: add notification for packed ring") Signed-off-by: Tiwei Bie Reviewed-by: Michael S. Tsirkin Reviewed-by: Maxime Coquelin Acked-by: Jason Wang --- lib/librte_vhost/vhost.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c index 88b1781d5..8ba785068 100644 --- a/lib/librte_vhost/vhost.c +++ b/lib/librte_vhost/vhost.c @@ -667,6 +667,8 @@ vhost_enable_notify_packed(struct virtio_net *dev, uint16_t flags; - if (!enable) + if (!enable) { vq->device_event->flags = VRING_EVENT_F_DISABLE; + return; + } flags = VRING_EVENT_F_ENABLE; -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-22 16:47:32.586482928 +0000 +++ 0012-vhost-fix-notification-for-packed-ring.patch 2018-11-22 16:47:32.000000000 +0000 @@ -1,15 +1,16 @@ -From cd9012c3f8d3905a8212da7945233a17633e796f Mon Sep 17 00:00:00 2001 +From 8a35e315bdc196458e1a547499b95ff7ef10fcac Mon Sep 17 00:00:00 2001 From: Tiwei Bie Date: Thu, 11 Oct 2018 22:22:34 +0800 Subject: [PATCH] vhost: fix notification for packed ring +[ upstream commit cd9012c3f8d3905a8212da7945233a17633e796f ] + The notification can't be disabled in packed ring when application tries to disable notification, because the device event flags field is overwritten by an unexpected value. This patch fixes this issue. Fixes: b1cce26af1dc ("vhost: add notification for packed ring") -Cc: stable@dpdk.org Signed-off-by: Tiwei Bie Reviewed-by: Michael S. Tsirkin @@ -20,10 +21,10 @@ 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c -index e62f4c594..047ee535c 100644 +index 88b1781d5..8ba785068 100644 --- a/lib/librte_vhost/vhost.c +++ b/lib/librte_vhost/vhost.c -@@ -668,6 +668,8 @@ vhost_enable_notify_packed(struct virtio_net *dev, +@@ -667,6 +667,8 @@ vhost_enable_notify_packed(struct virtio_net *dev, uint16_t flags; - if (!enable)