Commit 75c78500 authored by Moni Shoua's avatar Moni Shoua Committed by David S. Miller
Browse files

bonding: remap muticast addresses without using dev_close() and dev_open() 



This patch fixes commit e36b9d16. The approach
there is to call dev_close()/dev_open() whenever the device type is changed in
order to remap the device IP multicast addresses to HW multicast addresses.
This approach suffers from 2 drawbacks:

*. It assumes tha the device is UP when calling dev_close(), or otherwise
   dev_close() has no affect. It is worth to mention that initscripts (Redhat)
   and sysconfig (Suse) doesn't act the same in this matter. 
*. dev_close() has other side affects, like deleting entries from the routing
   table, which might be unnecessary.

The fix here is to directly remap the IP multicast addresses to HW multicast
addresses for a bonding device that changes its type, and nothing else.
   
Reported-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: default avatarMoni Shoua <monis@voltaire.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 481a8199

drivers/net/bonding/bond_main.c

+6 −3
Original line number Diff line number Diff line
@@ -1211,7 +1211,7 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active) 
			write_unlock_bh(&bond->curr_slave_lock);

			read_unlock(&bond->lock);



			netdev_bonding_change(bond->dev);

			netdev_bonding_change(bond->dev, NETDEV_BONDING_FAILOVER);



			read_lock(&bond->lock);

			write_lock_bh(&bond->curr_slave_lock);
@@ -1469,14 +1469,17 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
	 */

	if (bond->slave_cnt == 0) {

		if (bond_dev->type != slave_dev->type) {

			dev_close(bond_dev);

			pr_debug("%s: change device type from %d to %d\n",

				bond_dev->name, bond_dev->type, slave_dev->type);



			netdev_bonding_change(bond_dev, NETDEV_BONDING_OLDTYPE);



			if (slave_dev->type != ARPHRD_ETHER)

				bond_setup_by_slave(bond_dev, slave_dev);

			else

				ether_setup(bond_dev);

			dev_open(bond_dev);



			netdev_bonding_change(bond_dev, NETDEV_BONDING_NEWTYPE);

		}

	} else if (bond_dev->type != slave_dev->type) {

		pr_err(DRV_NAME ": %s ether type (%d) is different "

include/linux/igmp.h

+2 −0
Original line number Diff line number Diff line
@@ -233,6 +233,8 @@ extern void ip_mc_init_dev(struct in_device *); 
extern void ip_mc_destroy_dev(struct in_device *);

extern void ip_mc_up(struct in_device *);

extern void ip_mc_down(struct in_device *);

extern void ip_mc_unmap(struct in_device *);

extern void ip_mc_remap(struct in_device *);

extern void ip_mc_dec_group(struct in_device *in_dev, __be32 addr);

extern void ip_mc_inc_group(struct in_device *in_dev, __be32 addr);

extern void ip_mc_rejoin_group(struct ip_mc_list *im);

include/linux/netdevice.h

+2 −1
Original line number Diff line number Diff line
@@ -1873,7 +1873,8 @@ extern void __dev_addr_unsync(struct dev_addr_list **to, int *to_count, struct 
extern int		dev_set_promiscuity(struct net_device *dev, int inc);

extern int		dev_set_allmulti(struct net_device *dev, int inc);

extern void		netdev_state_change(struct net_device *dev);

extern void		netdev_bonding_change(struct net_device *dev);

extern void		netdev_bonding_change(struct net_device *dev,

					      unsigned long event);

extern void		netdev_features_change(struct net_device *dev);

/* Load a device via the kmod */

extern void		dev_load(struct net *net, const char *name);

include/linux/notifier.h

+2 −0
Original line number Diff line number Diff line
@@ -199,6 +199,8 @@ static inline int notifier_to_errno(int ret) 
#define NETDEV_FEAT_CHANGE	0x000B

#define NETDEV_BONDING_FAILOVER 0x000C

#define NETDEV_PRE_UP		0x000D

#define NETDEV_BONDING_OLDTYPE  0x000E

#define NETDEV_BONDING_NEWTYPE  0x000F



#define SYS_DOWN	0x0001	/* Notify of system down */

#define SYS_RESTART	SYS_DOWN

include/net/addrconf.h

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ extern int __ipv6_dev_mc_dec(struct inet6_dev *idev, const struct in6_addr *addr 
extern int ipv6_dev_mc_dec(struct net_device *dev, const struct in6_addr *addr);

extern void ipv6_mc_up(struct inet6_dev *idev);

extern void ipv6_mc_down(struct inet6_dev *idev);

extern void ipv6_mc_unmap(struct inet6_dev *idev);

extern void ipv6_mc_remap(struct inet6_dev *idev);

extern void ipv6_mc_init_dev(struct inet6_dev *idev);

extern void ipv6_mc_destroy_dev(struct inet6_dev *idev);

extern void addrconf_dad_failure(struct inet6_ifaddr *ifp);

CRA Git | Maintained and supported by SUSTech CRA and CCSE