Received: by 2002:a17:90a:9307:0:0:0:0 with SMTP id p7csp3961032pjo; Tue, 3 Mar 2020 10:08:14 -0800 (PST) X-Google-Smtp-Source: ADFU+vv0f0vVv/Bsz+d/Sl0ur65UHwSm5TC2armpOSvvrs+5XZZAP7v27ecXtMe8fEMUdwqjUcsu X-Received: by 2002:aca:ac86:: with SMTP id v128mr3307184oie.178.1583258894791; Tue, 03 Mar 2020 10:08:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583258894; cv=none; d=google.com; s=arc-20160816; b=O5SIpd62/3pXZOk4yVw2zcP4MT8yFx3dhywgZ8l6nIKX4OxAB3dLc1rYoqJ0A+52gN BID6+EuIbz58SeC8yMR8oCNRQQcc7aORFz9cXP/Mmj/RK6fLl2iBf7g7WY1TzUU+hwAx VwNV0JDVALgFqR6wjf0Jjpwvqu2zXIGRy2kOjlhvsiNHR8d4IumYMm+zbBfB8Imq28ZE wi8SWnoyyv/q/CKMGQjjhM9aS/HHQiyRTTMpFi4IRyk9G4A3J63trzJLtrDoTBqngbqm VV6H8HwyFABkCn8UXCZ2f4lyZg4rGxj/boHVYYgOL5qmwiJch58EhLGNzf3r8C7sRuuQ Cwpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7fN/JUxp/OeSnQh/7XJ63vQn+g/GH+vJuFIOqUdsKrY=; b=T914AHfwWjdebwR4CtiFawhJ5Y4jCBT/XxTr4mGiTG56xuxE3HeutbDYVyjJmbrjFz pzhzJnueqfBboE/9OzanldycunmhMoyCFST5EknY9GO4/Q79scIM4E6JKM+1Z8+frqL6 YQCt5IMwThcEQ21lsl1GzE/3gi+3VW6q/zBPvv9Y9mTT3XiEE0te78pKhW2VFNZclVEr qAKXX/a6vRot8B+LjBTtrPHU3czKl2SvI86c0MeVNjXKSxLArWLSHqxZhhFrbAAZwGbf 6O6dVSvS8LNrxi7aolrCVBc8VApd2pich6ZsxRpMYtphqeRrHZmpnTJfYZ/spD99VCFa VicQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vrw79tlv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p16si3338943ota.41.2020.03.03.10.08.01; Tue, 03 Mar 2020 10:08:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vrw79tlv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388256AbgCCSGf (ORCPT + 99 others); Tue, 3 Mar 2020 13:06:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:38408 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732592AbgCCR4U (ORCPT ); Tue, 3 Mar 2020 12:56:20 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A1060206D5; Tue, 3 Mar 2020 17:56:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258179; bh=3ZksyE+x5cTFHGDdxLkl57aHEzfo6Y3b4uDTj2f8a0k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vrw79tlv35tB5DBgoEMxWeKSGqmj0JS6KOwWJOalsaykOU/WX41QsD+gZYtZnbbjP wLxmCdIAEVhsco0ZYQWIGW3ZGZXVyZl8CqAsY1MXeeBjKB7tcfOQuvs9ZYzeBh0spw SdjXX7ALkKx2huW5qDe8h9jSphzz/+WZC39//4jQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Haiyang Zhang , "David S. Miller" Subject: [PATCH 5.4 102/152] hv_netvsc: Fix unwanted wakeup in netvsc_attach() Date: Tue, 3 Mar 2020 18:43:20 +0100 Message-Id: <20200303174314.173454019@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174302.523080016@linuxfoundation.org> References: <20200303174302.523080016@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Haiyang Zhang commit f6f13c125e05603f68f5bf31f045b95e6d493598 upstream. When netvsc_attach() is called by operations like changing MTU, etc., an extra wakeup may happen while netvsc_attach() calling rndis_filter_device_add() which sends rndis messages when queue is stopped in netvsc_detach(). The completion message will wake up queue 0. We can reproduce the issue by changing MTU etc., then the wake_queue counter from "ethtool -S" will increase beyond stop_queue counter: stop_queue: 0 wake_queue: 1 The issue causes queue wake up, and counter increment, no other ill effects in current code. So we didn't see any network problem for now. To fix this, initialize tx_disable to true, and set it to false when the NIC is ready to be attached or registered. Fixes: 7b2ee50c0cd5 ("hv_netvsc: common detach logic") Signed-off-by: Haiyang Zhang Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/hyperv/netvsc.c | 2 +- drivers/net/hyperv/netvsc_drv.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -99,7 +99,7 @@ static struct netvsc_device *alloc_net_d init_waitqueue_head(&net_device->wait_drain); net_device->destroy = false; - net_device->tx_disable = false; + net_device->tx_disable = true; net_device->max_pkt = RNDIS_MAX_PKT_DEFAULT; net_device->pkt_align = RNDIS_PKT_ALIGN_DEFAULT; --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -973,6 +973,7 @@ static int netvsc_attach(struct net_devi } /* In any case device is now ready */ + nvdev->tx_disable = false; netif_device_attach(ndev); /* Note: enable and attach happen when sub-channels setup */ @@ -2350,6 +2351,8 @@ static int netvsc_probe(struct hv_device else net->max_mtu = ETH_DATA_LEN; + nvdev->tx_disable = false; + ret = register_netdevice(net); if (ret != 0) { pr_err("Unable to register netdev.\n");