From patchwork Sun Apr 22 11:11:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 902611 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Rtx2c+dL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40TRkV57b3z9s0p for ; Sun, 22 Apr 2018 21:12:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751559AbeDVLL7 (ORCPT ); Sun, 22 Apr 2018 07:11:59 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:38613 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751234AbeDVLL6 (ORCPT ); Sun, 22 Apr 2018 07:11:58 -0400 Received: by mail-pf0-f195.google.com with SMTP id o76so2226346pfi.5 for ; Sun, 22 Apr 2018 04:11:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=v5KyfkTMUd3HjqgXaiHrPHDfuDc2GerheO24i7HvKwk=; b=Rtx2c+dLV7JR+5v2vZv/EyhijvL+0b2nyJkx6L7kLK7+gkoQrI601/K9DqSHR5wZpQ 5awh4uMG+zisSCSKHkRDyVVJ1YZx6ZtokX51Omi2vlem4ChlAAPKTOjKRviz48livj0M KqTKun6uGtcsVztDOhalH9Vy74jvahny8LiO1tk/XXIZyXPRNKUC4dKiPCw9Vnr6cfj7 MlpXdmJVcGoiNBS/lzdG0HgES5gBWI5GkNvvoggsj4zyGqklKfEWVHPaXH/gXQEy0UNL 4kefV27ftxWZ2dOiPVshSAE+8V+Qt0DsxvNOS1nch+c/5YZihJuR3/QI8n4KMWwsizeq l0jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=v5KyfkTMUd3HjqgXaiHrPHDfuDc2GerheO24i7HvKwk=; b=WNnQL2rPMLNKchbTJkXDY+H6AwIl+Om6C5vrnf8exXR8axJ3iJM7/ufFBvkrhXL+L6 44p9yaSWP1K6oHPrkuxrZdqqCBg8C/0XeeMKGqQn794aS2n9CMoRCY50YMeQdswaOxZ2 OyGgZl7S9QPR9CChpARbvrDCujk7NcsZuASaWKx2iWHIJvLrw6QxYLnQFHJRZRaaIDuS RWiHD947GjiuhV6NJpFPP7H3G3RrcceGMNR3I3Ie1d1uxlJtV3QQxBo5NgGDEM5lmxuO Vrw35SW3im8Wx3/np0POlaGRVK+mxpdUvwu3WiNHol8Aty61jyWaqmCPYs6MC9vG/MWh n/fw== X-Gm-Message-State: ALQs6tAc4oE5269kP2v+TfAMHaNQzFTKN8iLPbsitLw1M6qReWlRVaA7 D51d9JaKiDtkkGeDJyxMaT3Ga3Ld X-Google-Smtp-Source: AIpwx4+JdxccccWoo6BjiqhkVJsWDsde/O6/RDxRTvidX/he7SUfdpA8vjNggy5PaKSG5UGnDBveCA== X-Received: by 10.99.111.129 with SMTP id k123mr14016740pgc.115.1524395518079; Sun, 22 Apr 2018 04:11:58 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id h1sm18388884pgf.93.2018.04.22.04.11.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Apr 2018 04:11:57 -0700 (PDT) From: Xin Long To: network dev Cc: davem@davemloft.net, Andy Gospodarek , Jiri Pirko , Cong Wang Subject: [PATCH net] bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave Date: Sun, 22 Apr 2018 19:11:50 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- drivers/net/bonding/bond_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index b7b1130..718e491 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1660,8 +1660,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, } /* 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;