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 F36841B48B for ; Fri, 4 Jan 2019 14:26:19 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 629B07BDBF; Fri, 4 Jan 2019 13:26:19 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-13.ams2.redhat.com [10.36.117.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 778005C1A1; Fri, 4 Jan 2019 13:26:14 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Mohammed Gamal , dpdk stable Date: Fri, 4 Jan 2019 13:23:46 +0000 Message-Id: <20190104132455.15170-4-ktraynor@redhat.com> In-Reply-To: <20190104132455.15170-1-ktraynor@redhat.com> References: <20190104132455.15170-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 04 Jan 2019 13:26:19 +0000 (UTC) Subject: [dpdk-stable] patch 'bus/vmbus: fix race in subchannel creation' has been queued to LTS release 18.11.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, 04 Jan 2019 13:26:20 -0000 Hi, FYI, your patch has been queued to LTS release 18.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 01/11/19. 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. Kevin Traynor --- >>From 59573b60e2f8ff6ce07dacb023c8645266d8eadf Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 5 Dec 2018 14:11:56 -0800 Subject: [PATCH] bus/vmbus: fix race in subchannel creation [ upstream commit 4970103e89f4f828669acf3b465e984fdc891e1e ] When using multiple queues, there was a race with the kernel in setting up the second channel. This regression is due to a kernel change which does not allow accessing sysfs files for Hyper-V channels that are not opened. The fix is simple, just move the logic to detect not ready sub channels earlier in the existing loop. Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support") Reported-by: Mohammed Gamal Signed-off-by: Stephen Hemminger --- drivers/bus/vmbus/linux/vmbus_uio.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/bus/vmbus/linux/vmbus_uio.c b/drivers/bus/vmbus/linux/vmbus_uio.c index 12e97e3a4..38df4d724 100644 --- a/drivers/bus/vmbus/linux/vmbus_uio.c +++ b/drivers/bus/vmbus/linux/vmbus_uio.c @@ -358,4 +358,10 @@ int vmbus_uio_get_subchan(struct vmbus_channel *primary, } + if (!vmbus_isnew_subchannel(primary, relid)) + continue; /* Already know about you */ + + if (!vmbus_uio_ring_present(dev, relid)) + continue; /* Ring may not be ready yet */ + snprintf(subchan_path, sizeof(subchan_path), "%s/%lu", chan_path, relid); @@ -371,10 +377,4 @@ int vmbus_uio_get_subchan(struct vmbus_channel *primary, continue; /* skip primary channel */ - if (!vmbus_isnew_subchannel(primary, relid)) - continue; - - if (!vmbus_uio_ring_present(dev, relid)) - continue; /* Ring may not be ready yet */ - err = vmbus_uio_sysfs_read(subchan_path, "monitor_id", &monid, UINT8_MAX); -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-04 13:23:07.556190007 +0000 +++ 0004-bus-vmbus-fix-race-in-subchannel-creation.patch 2019-01-04 13:23:07.000000000 +0000 @@ -1,8 +1,10 @@ -From 4970103e89f4f828669acf3b465e984fdc891e1e Mon Sep 17 00:00:00 2001 +From 59573b60e2f8ff6ce07dacb023c8645266d8eadf Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 5 Dec 2018 14:11:56 -0800 Subject: [PATCH] bus/vmbus: fix race in subchannel creation +[ upstream commit 4970103e89f4f828669acf3b465e984fdc891e1e ] + When using multiple queues, there was a race with the kernel in setting up the second channel. This regression is due to a kernel change which does not allow accessing sysfs files for Hyper-V channels that are not opened. @@ -11,7 +13,6 @@ sub channels earlier in the existing loop. Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support") -Cc: stable@dpdk.org Reported-by: Mohammed Gamal Signed-off-by: Stephen Hemminger