[dpdk-stable] patch 'vhost: fix inflight resubmit check' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.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 02/19/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 f07186f3291858a6b8e64c3233a54762d87497e2 Mon Sep 17 00:00:00 2001
From: Jin Yu <jin.yu at intel.com>
Date: Wed, 25 Dec 2019 22:18:35 +0800
Subject: [PATCH] vhost: fix inflight resubmit check

[ upstream commit c47edd040a6a409de6bc86a31f44e86e5fa55b19 ]

The frontend may not send the get_inflight_fd and
set_inflight_fd although we negotiate the protocol
feature. When we meet this situation just return OK.

Fixes: ad0a4ae491fe ("vhost: checkout resubmit inflight information")

Signed-off-by: Jin Yu <jin.yu at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 lib/librte_vhost/vhost_user.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index d224932dda..8a33510a47 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1645,8 +1645,11 @@ vhost_check_queue_inflights_split(struct virtio_net *dev,
 	    (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)))
 		return RTE_VHOST_MSG_RESULT_OK;
 
+	/* The frontend may still not support the inflight feature
+	 * although we negotiate the protocol feature.
+	 */
 	if ((!vq->inflight_split))
-		return RTE_VHOST_MSG_RESULT_ERR;
+		return RTE_VHOST_MSG_RESULT_OK;
 
 	if (!vq->inflight_split->version) {
 		vq->inflight_split->version = INFLIGHT_VERSION;
@@ -1726,8 +1729,11 @@ vhost_check_queue_inflights_packed(struct virtio_net *dev,
 	    (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)))
 		return RTE_VHOST_MSG_RESULT_OK;
 
+	/* The frontend may still not support the inflight feature
+	 * although we negotiate the protocol feature.
+	 */
 	if ((!vq->inflight_packed))
-		return RTE_VHOST_MSG_RESULT_ERR;
+		return RTE_VHOST_MSG_RESULT_OK;
 
 	if (!vq->inflight_packed->version) {
 		vq->inflight_packed->version = INFLIGHT_VERSION;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-17 17:00:16.482548378 +0000
+++ 0042-vhost-fix-inflight-resubmit-check.patch	2020-02-17 17:00:15.363951249 +0000
@@ -1,14 +1,15 @@
-From c47edd040a6a409de6bc86a31f44e86e5fa55b19 Mon Sep 17 00:00:00 2001
+From f07186f3291858a6b8e64c3233a54762d87497e2 Mon Sep 17 00:00:00 2001
 From: Jin Yu <jin.yu at intel.com>
 Date: Wed, 25 Dec 2019 22:18:35 +0800
 Subject: [PATCH] vhost: fix inflight resubmit check
 
+[ upstream commit c47edd040a6a409de6bc86a31f44e86e5fa55b19 ]
+
 The frontend may not send the get_inflight_fd and
 set_inflight_fd although we negotiate the protocol
 feature. When we meet this situation just return OK.
 
 Fixes: ad0a4ae491fe ("vhost: checkout resubmit inflight information")
-Cc: stable at dpdk.org
 
 Signed-off-by: Jin Yu <jin.yu at intel.com>
 Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
@@ -17,7 +18,7 @@
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
-index 91482ccd67..9a7b8b3088 100644
+index d224932dda..8a33510a47 100644
 --- a/lib/librte_vhost/vhost_user.c
 +++ b/lib/librte_vhost/vhost_user.c
 @@ -1645,8 +1645,11 @@ vhost_check_queue_inflights_split(struct virtio_net *dev,