From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZqnJDao6GzhgukkNCG+sA9OjM4WdskW7U+QAPqiGxHk+pYVUlop/pwcSB+ol0C95Nbz70Ce ARC-Seal: i=1; a=rsa-sha256; t=1524837871; cv=none; d=google.com; s=arc-20160816; b=xwNdeIuzgBjGMOPxs++gh8uuukIxUjvGPJfz+NMeiUth/Zzzd5G7O4fF05JWcUG5iL UXtjTkJWx2Lxj7bOPT/PbBaTuY1FOFed9NVes6APUM/lvCMX3HKhljUo3TLEHeHjLTBj 7mqEP78/JmYTP73qOk8EEgBl2LSv1Bqfrk4wAJX3BF+JVAYncpLK3Ba64QGWD60PMzoI mwmuS5jznA1Bx8iAWwwhzVeKk6JyKBYdnOkef61Z/P/WtyYWdkvBImkYFix3ZQghHOf6 8SBCz5SoP0c77tb0RHK9Xv0YIysubXemykybg5BMnImVKse+sCLYk5zQH5d0ihY7AraT 4VsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:dmarc-filter:arc-authentication-results; bh=Tpia8S4uxEvecXVZ43Rf4lQYHHPN+LAi7lT5yU0MYEs=; b=OWR78Qa6XSGb8E7097O4c9tlmbZ4Ol1Bw+GW+i57n6gaqx//shU/Vewcog0plVZbTE Wohzxy0bON/nvfERfo+HkH8Zb77fyRiNIIFU2XAYFrF3HYcVxrnmv/nHWnUMfiniImZk +xPKKaMp/f8LBgbFnJfBjGltrxRR5tVLwHbpfP3S3xr0cxGaKjx051Wn8d4dGDzfcfmR dVDMsizy0D9+uQC0uFgFdNJb+1Efa7HdNQVSva/7SVO9k980S0Ofbq2v+y05ESKwzbQm sWl9IveL3xSzCwvo5Tn496ZhozcD5is34O6aKpy1lTMILcl6zSehz2Udetrg3v9j7eTU kbzw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of srs0=4/0d=hq=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=4/0d=HQ=linuxfoundation.org=gregkh@kernel.org Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of srs0=4/0d=hq=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=4/0d=HQ=linuxfoundation.org=gregkh@kernel.org DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BF35621890 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=fail smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xin Long , "David S. Miller" Subject: [PATCH 4.9 47/74] bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave Date: Fri, 27 Apr 2018 15:58:37 +0200 Message-Id: <20180427135711.876315795@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180427135709.899303463@linuxfoundation.org> References: <20180427135709.899303463@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1598908146234977294?= X-GMAIL-MSGID: =?utf-8?q?1598908396416416360?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xin Long [ Upstream commit ddea788c63094f7c483783265563dd5b50052e28 ] After Commit 8a8efa22f51b ("bonding: sync netpoll code with bridge"), it would set slave_dev npinfo in slave_enable_netpoll when enslaving a dev if bond->dev->npinfo was set. However now slave_dev npinfo is set with bond->dev->npinfo before calling slave_enable_netpoll. With slave_dev npinfo set, __netpoll_setup called in slave_enable_netpoll will not call slave dev's .ndo_netpoll_setup(). It causes that the lower dev of this slave dev can't set its npinfo. One way to reproduce it: # modprobe bonding # brctl addbr br0 # brctl addif br0 eth1 # ifconfig bond0 192.168.122.1/24 up # ifenslave bond0 eth2 # systemctl restart netconsole # ifenslave bond0 br0 # ifconfig eth2 down # systemctl restart netconsole The netpoll won't really work. This patch is to remove that slave_dev npinfo setting in bond_enslave(). Fixes: 8a8efa22f51b ("bonding: sync netpoll code with bridge") Signed-off-by: Xin Long Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/bonding/bond_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1654,8 +1654,7 @@ int bond_enslave(struct net_device *bond } /* switch(bond_mode) */ #ifdef CONFIG_NET_POLL_CONTROLLER - slave_dev->npinfo = bond->dev->npinfo; - if (slave_dev->npinfo) { + if (bond->dev->npinfo) { if (slave_enable_netpoll(new_slave)) { netdev_info(bond_dev, "master_dev is using netpoll, but new slave device does not support netpoll\n"); res = -EBUSY;