[dpdk-stable] patch 'net/virtio-user: do not make vhost channel non-block' has been queued to stable release 18.08.1

[Kevin Traynor]

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/29/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 aa188c690120aab8bf8aa9a10760dc65f97373b7 Mon Sep 17 00:00:00 2001
From: Tiwei Bie <tiwei.bie at intel.com>
Date: Mon, 29 Oct 2018 13:28:04 +0800
Subject: [PATCH] net/virtio-user: do not make vhost channel non-block

[ upstream commit 86d4b0618495faf58ef5e698b3c8ea76e82b54d6 ]

There is no need to make the vhost user channel nonblock, and
making it nonblock will make vhost_user_read() fail with EAGAIN
when vhost messages need a reply.

Fixes: bd8f50a45d0f ("net/virtio-user: support server mode")

Signed-off-by: Tiwei Bie <tiwei.bie at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/virtio/virtio_user_ethdev.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index 525d16cab..ba8e59e58 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -29,5 +29,4 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev)
 {
 	int ret;
-	int flag;
 	int connectfd;
 	struct rte_eth_dev *eth_dev = &rte_eth_devices[dev->port_id];
@@ -50,7 +49,4 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev)
 	dev->features &= dev->device_features;
 
-	flag = fcntl(connectfd, F_GETFD);
-	fcntl(connectfd, F_SETFL, flag | O_NONBLOCK);
-
 	ret = virtio_user_start_device(dev);
 	if (ret < 0)
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-23 10:22:55.087650036 +0000
+++ 0032-net-virtio-user-do-not-make-vhost-channel-non-block.patch	2018-11-23 10:22:54.000000000 +0000
@@ -1,14 +1,15 @@
-From 86d4b0618495faf58ef5e698b3c8ea76e82b54d6 Mon Sep 17 00:00:00 2001
+From aa188c690120aab8bf8aa9a10760dc65f97373b7 Mon Sep 17 00:00:00 2001
 From: Tiwei Bie <tiwei.bie at intel.com>
 Date: Mon, 29 Oct 2018 13:28:04 +0800
 Subject: [PATCH] net/virtio-user: do not make vhost channel non-block
 
+[ upstream commit 86d4b0618495faf58ef5e698b3c8ea76e82b54d6 ]
+
 There is no need to make the vhost user channel nonblock, and
 making it nonblock will make vhost_user_read() fail with EAGAIN
 when vhost messages need a reply.
 
 Fixes: bd8f50a45d0f ("net/virtio-user: support server mode")
-Cc: stable at dpdk.org
 
 Signed-off-by: Tiwei Bie <tiwei.bie at intel.com>
 Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
@@ -17,7 +18,7 @@
  1 file changed, 4 deletions(-)
 
 diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
-index 3cf8bc100..a31b9b44a 100644
+index 525d16cab..ba8e59e58 100644
 --- a/drivers/net/virtio/virtio_user_ethdev.c
 +++ b/drivers/net/virtio/virtio_user_ethdev.c
 @@ -29,5 +29,4 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev)