[dpdk-stable] patch 'vhost: fix zero-copy server mode' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/24/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 1c2eaf9a985203f5c3b35a7f4d72f2e60db5e85d Mon Sep 17 00:00:00 2001
From: Xuan Ding <xuan.ding at intel.com>
Date: Tue, 19 May 2020 10:15:46 +0000
Subject: [PATCH] vhost: fix zero-copy server mode

[ upstream commit 22fa1bcbcbc7489304a711c39aea9a1593a873a5 ]

This patch fixes the situation where vhost-user cannot start as server
with dequeue_zero_copy enabled.

Using flag instead of vsocket->is_server to determine whether vhost-user
is in client mode. Because vsocket->is_server is not ready at this time.

Fixes: 715070ea10e6 ("vhost: prevent zero-copy with incompatible client mode")

Signed-off-by: Xuan Ding <xuan.ding at intel.com>
Acked-by: Xiaolong Ye <xiaolong.ye at intel.com>
Tested-by: Yinan Wang <yinan.wang at intel.com>
---
 lib/librte_vhost/socket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index 8a87c38c4e..2461549fea 100644
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -926,7 +926,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
 			ret = -1;
 			goto out_mutex;
 		}
-		if (!vsocket->is_server) {
+		if ((flags & RTE_VHOST_USER_CLIENT) != 0) {
 			RTE_LOG(ERR, VHOST_CONFIG,
 			"error: zero copy is incompatible with vhost client mode\n");
 			ret = -1;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-22 10:37:40.905462964 +0100
+++ 0043-vhost-fix-zero-copy-server-mode.patch	2020-05-22 10:37:39.276415366 +0100
@@ -1,8 +1,10 @@
-From 22fa1bcbcbc7489304a711c39aea9a1593a873a5 Mon Sep 17 00:00:00 2001
+From 1c2eaf9a985203f5c3b35a7f4d72f2e60db5e85d Mon Sep 17 00:00:00 2001
 From: Xuan Ding <xuan.ding at intel.com>
 Date: Tue, 19 May 2020 10:15:46 +0000
 Subject: [PATCH] vhost: fix zero-copy server mode
 
+[ upstream commit 22fa1bcbcbc7489304a711c39aea9a1593a873a5 ]
+
 This patch fixes the situation where vhost-user cannot start as server
 with dequeue_zero_copy enabled.
 
@@ -10,7 +12,6 @@
 is in client mode. Because vsocket->is_server is not ready at this time.
 
 Fixes: 715070ea10e6 ("vhost: prevent zero-copy with incompatible client mode")
-Cc: stable at dpdk.org
 
 Signed-off-by: Xuan Ding <xuan.ding at intel.com>
 Acked-by: Xiaolong Ye <xiaolong.ye at intel.com>
@@ -20,7 +21,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
-index bb8d0d7801..0a66ef9767 100644
+index 8a87c38c4e..2461549fea 100644
 --- a/lib/librte_vhost/socket.c
 +++ b/lib/librte_vhost/socket.c
 @@ -926,7 +926,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
@@ -29,7 +30,7 @@
  		}
 -		if (!vsocket->is_server) {
 +		if ((flags & RTE_VHOST_USER_CLIENT) != 0) {
- 			VHOST_LOG_CONFIG(ERR,
+ 			RTE_LOG(ERR, VHOST_CONFIG,
  			"error: zero copy is incompatible with vhost client mode\n");
  			ret = -1;
 --