[dpdk-stable] patch 'vhost: fix virtio ready flag check' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/26/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 rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 385684bc4e054f7119841a2503a79a393d5b5ea0 Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin at redhat.com>
Date: Mon, 6 Jul 2020 13:24:45 +0200
Subject: [PATCH] vhost: fix virtio ready flag check

[ upstream commit 1c3df72bda9893784267d02d2c6a3fd0047c38cd ]

Before checking whether the device is ready is done
a check on whether the RUNNING flag is set. Then the
READY flag is set if virtio_is_ready() returns true.

While it seems to not cause any issue, it makes more
sense to check whether the READY flag is set and not
the RUNNING one.

Fixes: c0674b1bc898 ("vhost: move the device ready check at proper place")

Signed-off-by: Maxime Coquelin <maxime.coquelin at redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia at intel.com>
---
 lib/librte_vhost/vhost_user.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 31080be2b..82270c514 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -2792,7 +2792,7 @@ skip_to_post_handle:
 		return -1;
 	}
 
-	if (!(dev->flags & VIRTIO_DEV_RUNNING) && virtio_is_ready(dev)) {
+	if (!(dev->flags & VIRTIO_DEV_READY) && virtio_is_ready(dev)) {
 		dev->flags |= VIRTIO_DEV_READY;
 
 		if (!(dev->flags & VIRTIO_DEV_RUNNING)) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:53.502580306 +0100
+++ 0129-vhost-fix-virtio-ready-flag-check.patch	2020-07-24 12:53:48.423008994 +0100
@@ -1,8 +1,10 @@
-From 1c3df72bda9893784267d02d2c6a3fd0047c38cd Mon Sep 17 00:00:00 2001
+From 385684bc4e054f7119841a2503a79a393d5b5ea0 Mon Sep 17 00:00:00 2001
 From: Maxime Coquelin <maxime.coquelin at redhat.com>
 Date: Mon, 6 Jul 2020 13:24:45 +0200
 Subject: [PATCH] vhost: fix virtio ready flag check
 
+[ upstream commit 1c3df72bda9893784267d02d2c6a3fd0047c38cd ]
+
 Before checking whether the device is ready is done
 a check on whether the RUNNING flag is set. Then the
 READY flag is set if virtio_is_ready() returns true.
@@ -12,7 +14,6 @@
 the RUNNING one.
 
 Fixes: c0674b1bc898 ("vhost: move the device ready check at proper place")
-Cc: stable at dpdk.org
 
 Signed-off-by: Maxime Coquelin <maxime.coquelin at redhat.com>
 Reviewed-by: Chenbo Xia <chenbo.xia at intel.com>
@@ -21,13 +22,13 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
-index aa8605523..bac3e8971 100644
+index 31080be2b..82270c514 100644
 --- a/lib/librte_vhost/vhost_user.c
 +++ b/lib/librte_vhost/vhost_user.c
-@@ -2842,7 +2842,7 @@ skip_to_post_handle:
+@@ -2792,7 +2792,7 @@ skip_to_post_handle:
+ 		return -1;
  	}
  
- 
 -	if (!(dev->flags & VIRTIO_DEV_RUNNING) && virtio_is_ready(dev)) {
 +	if (!(dev->flags & VIRTIO_DEV_READY) && virtio_is_ready(dev)) {
  		dev->flags |= VIRTIO_DEV_READY;