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 1E31C1B519 for ; Fri, 23 Nov 2018 11:29:43 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 86CFF2D2BEB; Fri, 23 Nov 2018 10:29:42 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 24EDA6128A; Fri, 23 Nov 2018 10:29:40 +0000 (UTC) From: Kevin Traynor To: Tiwei Bie Cc: Maxime Coquelin , dpdk stable Date: Fri, 23 Nov 2018 10:26:36 +0000 Message-Id: <20181123102713.17309-32-ktraynor@redhat.com> In-Reply-To: <20181123102713.17309-1-ktraynor@redhat.com> References: <20181123102713.17309-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 23 Nov 2018 10:29:42 +0000 (UTC) Subject: [dpdk-stable] patch 'net/virtio-user: do not make vhost channel non-block' 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: Fri, 23 Nov 2018 10:29:43 -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/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 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 Reviewed-by: Maxime Coquelin --- 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 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@dpdk.org Signed-off-by: Tiwei Bie Reviewed-by: Maxime Coquelin @@ -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)