bonding: prevent netpoll over bonded interfaces (c22d7ac8) · Commits · 戴 / test

Support for netpoll over bonded interfaces was added here: commit Author: WANG Cong <amwang@redhat.com> Date: Thu May 6 00:48:51 2010 -0700 bonding: make bonding support netpoll but it is bad enough that we should probably just disable netpoll over bonding until some of the locking logic in the bonding driver is changed or converted completely to RCU. Simple actions like changing the active slave in active-backup mode will hang the box if a high enough printk debugging level is enabled. Keeping the old code around will be good for anyone that wants to work on it (and for after the RCU conversion), so I propose this small patch rather than ripping it all out. Signed-off-by:

Andy Gospodarek <andy@greyhouse.net> Signed-off-by:

Jay Vosburgh <fubar@us.ibm.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/bonding/bond_main.c

+22 −11

Original line number	Diff line number	Diff line
		@@ -168,7 +168,7 @@ static int arp_ip_count;
		static int bond_mode = BOND_MODE_ROUNDROBIN;
		static int xmit_hashtype = BOND_XMIT_POLICY_LAYER2;
		static int lacp_fast;

		static int disable_netpoll = 1;

		const struct bond_parm_tbl bond_lacp_tbl[] = {
		{ "slow", AD_LACP_SLOW},
		@@ -1742,6 +1742,13 @@ int bond_enslave(struct net_device bond_dev, struct net_device slave_dev)
		bond_set_carrier(bond);

		#ifdef CONFIG_NET_POLL_CONTROLLER
		/*
		* Netpoll and bonding is broken, make sure it is not initialized
		* until it is fixed.
		*/
		if (disable_netpoll) {
		bond_dev->priv_flags \|= IFF_DISABLE_NETPOLL;
		} else {
		if (slaves_support_netpoll(bond_dev)) {
		bond_dev->priv_flags &= ~IFF_DISABLE_NETPOLL;
		if (bond_dev->npinfo)
		@@ -1752,6 +1759,7 @@ int bond_enslave(struct net_device bond_dev, struct net_device slave_dev)
		slave_dev->name);
		pr_info("Disabling netpoll support for %s\n", bond_dev->name);
		}
		}
		#endif
		read_unlock(&bond->lock);

		@@ -1950,6 +1958,9 @@ int bond_release(struct net_device bond_dev, struct net_device slave_dev)

		#ifdef CONFIG_NET_POLL_CONTROLLER
		read_lock_bh(&bond->lock);

		/* Make sure netpoll over stays disabled until fixed. */
		if (!disable_netpoll)
		if (slaves_support_netpoll(bond_dev))
		bond_dev->priv_flags &= ~IFF_DISABLE_NETPOLL;
		read_unlock_bh(&bond->lock);

Admin message