Received: by 2002:a25:c205:0:0:0:0:0 with SMTP id s5csp3653796ybf; Tue, 3 Mar 2020 09:52:01 -0800 (PST) X-Google-Smtp-Source: ADFU+vsVAwu3PnJyvPWwvyzLal0AMsgvkwj/sYFZmaJH1oNBEZfnqf0RZKgZNiYcSHMvoeh1l1bD X-Received: by 2002:a9d:da5:: with SMTP id 34mr4041475ots.226.1583257921434; Tue, 03 Mar 2020 09:52:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583257921; cv=none; d=google.com; s=arc-20160816; b=bZr8feEmNbkyjsd2fsiyZX2s8RMDQ0AtshWyRhlHhwWIZxQAuMc/IX/4/pnUYjCIGi UI49WTcNXWr/orW2YmJYqju2+l9f42PAH6X8as430HCDFIrJ48AGiumT6bjB3Dcc5JdL z0KifRZ2JDem65C/mrrYttF4AvZXiVONKASW/Ku/+BEs2wGHUkUJcmBZFdKkQa2Yr5FO 202MD0RQ0LfG/TYCzdkHt8uQaV2mcN88vpCFT8udSDul+1S3KzBcMor95abOh2h0NG71 RG9f1lBa8mv4GdMS7gJm4xIzlBdZA4Qz5ukEZZPDdQRBTnIOqAPkY3QDHgHNCuhfdiD1 1tTg== 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=HrpYErIpnjrRLi1yyiFJ5del0YReXm4qcXMb49nOwOE=; b=F3cPh3z4531nD5wo4dYbL/kC7VT1KDk049drmesfdZm4CwureXLtMW1JMdYIhm4O+M m3PLNNd+RQncayvpF+F/oFdRfAN1nMxYxxehQ9qTPpaUZraBxJkaRUdlb1RdTLWgvoA1 sHbkM2BGbjLft9SK+2jj+iU5bmjAz9RGmS2oCK8C0xy7maQKasIrEx2G13VYYTuF7Bm9 5q6M1XbSZhosLRuSSw5emdRO8keblv34zoArY6NGbXd+5AjUXH2u8XlUm95BRRYkNZrb S4R0I+HX6VxiPNEAUCtOk2f7u1Ob4ggMBtBxJlznS0jKaGuTQDJ/Fq1sWjm8mMzNt+DB J/Sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MCHIlWjL; 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 5si9923604otm.88.2020.03.03.09.51.49; Tue, 03 Mar 2020 09:52:01 -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=MCHIlWjL; 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 S1731790AbgCCRta (ORCPT + 99 others); Tue, 3 Mar 2020 12:49:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:56790 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730888AbgCCRt2 (ORCPT ); Tue, 3 Mar 2020 12:49:28 -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 E2FBE214D8; Tue, 3 Mar 2020 17:49:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583257768; bh=Orqhdsj+el0e+3aAklsOAruIoqI8KBC5eVMvDcRwEIQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MCHIlWjLpz0NUtSzMD34VrDSomvwqNV7HMV5SFo1IC3MK0wPwnhuRTrPJEEuzVZah KramnHotoHbueMPNlBeW1gbM2EVaFnHw+G5CFoLY8aeLDtIWYIHPHj0a9ba7e0CGO+ EJWPcaVDh+4u6mOOC7CtY0R643YfvhvVmgT3TcQM= 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.5 121/176] hv_netvsc: Fix unwanted wakeup in netvsc_attach() Date: Tue, 3 Mar 2020 18:43:05 +0100 Message-Id: <20200303174318.789628532@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174304.593872177@linuxfoundation.org> References: <20200303174304.593872177@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 @@ -977,6 +977,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 */ @@ -2354,6 +2355,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");