Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69e61133 authored by Moni Shoua's avatar Moni Shoua Committed by David S. Miller
Browse files

net/bonding: Notify state change on slaves 



Use notifier chain to dispatch an event upon a change in slave state.
Event is dispatched with slave specific info.

Signed-off-by: default avatarMoni Shoua <monis@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 69a2338e

drivers/net/bonding/bond_main.c

+42 −0
Original line number Diff line number Diff line
@@ -1196,6 +1196,47 @@ static void bond_fill_ifslave(struct slave *slave, struct ifslave *info) 
	info->link_failure_count = slave->link_failure_count;

}



static void bond_netdev_notify(struct slave *slave, struct net_device *dev)

{

	struct bonding *bond = slave->bond;

	struct netdev_bonding_info bonding_info;



	rtnl_lock();

	/* make sure that slave is still valid */

	if (dev->priv_flags & IFF_BONDING) {

		bond_fill_ifslave(slave, &bonding_info.slave);

		bond_fill_ifbond(bond, &bonding_info.master);

		netdev_bonding_info_change(slave->dev, &bonding_info);

	}

	rtnl_unlock();

}



static void bond_netdev_notify_work(struct work_struct *_work)

{

	struct netdev_notify_work *w =

		container_of(_work, struct netdev_notify_work, work.work);



	bond_netdev_notify(w->slave, w->dev);

	dev_put(w->dev);

}



void bond_queue_slave_event(struct slave *slave)

{

	struct netdev_notify_work *nnw = kzalloc(sizeof(*nnw), GFP_ATOMIC);



	if (!nnw)

		return;



	INIT_DELAYED_WORK(&nnw->work, bond_netdev_notify_work);

	nnw->slave = slave;

	nnw->dev = slave->dev;



	if (queue_delayed_work(slave->bond->wq, &nnw->work, 0))

		dev_hold(slave->dev);

	else

		kfree(nnw);

}



/* enslave device <slave> to bond device <master> */

int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)

{
@@ -1590,6 +1631,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
		    new_slave->link != BOND_LINK_DOWN ? "an up" : "a down");



	/* enslave is successful */

	bond_queue_slave_event(new_slave);

	return 0;



/* Undo stages on error */

include/net/bonding.h

+12 −0
Original line number Diff line number Diff line
@@ -150,6 +150,12 @@ struct bond_parm_tbl { 
	int mode;

};



struct netdev_notify_work {

	struct delayed_work	work;

	struct slave		*slave;

	struct net_device	*dev;

};



struct slave {

	struct net_device *dev; /* first - useful for panic debug */

	struct bonding *bond; /* our master */
@@ -243,6 +249,8 @@ struct bonding { 
#define bond_slave_get_rtnl(dev) \

	((struct slave *) rtnl_dereference(dev->rx_handler_data))



void bond_queue_slave_event(struct slave *slave);



struct bond_vlan_tag {

	__be16		vlan_proto;

	unsigned short	vlan_id;
@@ -315,6 +323,7 @@ static inline void bond_set_active_slave(struct slave *slave) 
{

	if (slave->backup) {

		slave->backup = 0;

		bond_queue_slave_event(slave);

		rtmsg_ifinfo(RTM_NEWLINK, slave->dev, 0, GFP_ATOMIC);

	}

}
@@ -323,6 +332,7 @@ static inline void bond_set_backup_slave(struct slave *slave) 
{

	if (!slave->backup) {

		slave->backup = 1;

		bond_queue_slave_event(slave);

		rtmsg_ifinfo(RTM_NEWLINK, slave->dev, 0, GFP_ATOMIC);

	}

}
@@ -336,6 +346,7 @@ static inline void bond_set_slave_state(struct slave *slave, 
	slave->backup = slave_state;

	if (notify) {

		rtmsg_ifinfo(RTM_NEWLINK, slave->dev, 0, GFP_ATOMIC);

		bond_queue_slave_event(slave);

		slave->should_notify = 0;

	} else {

		if (slave->should_notify)
@@ -493,6 +504,7 @@ static inline bool bond_is_slave_inactive(struct slave *slave) 
static inline void bond_set_slave_link_state(struct slave *slave, int state)

{

	slave->link = state;

	bond_queue_slave_event(slave);

}



static inline __be32 bond_confirm_addr(struct net_device *dev, __be32 dst, __be32 local)