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

Commit 6cf3f41e authored by Jay Vosburgh's avatar Jay Vosburgh Committed by David S. Miller
Browse files

bonding, net: Move last_rx update into bonding recv logic 



	The only user of the net_device->last_rx field is bonding.
This patch adds a conditional update of last_rx to the bonding special
logic in skb_bond_should_drop, causing last_rx to only be updated when
the ARP monitor is running.

	This frees network device drivers from the necessity of
updating last_rx, which can have cache line thrash issues.

Signed-off-by: default avatarJay Vosburgh <fubar@us.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 24f8b238

drivers/net/bonding/bond_main.c

+2 −0
Original line number Diff line number Diff line
@@ -4564,6 +4564,8 @@ static int bond_init(struct net_device *bond_dev, struct bond_params *params) 
	bond_dev->tx_queue_len = 0;

	bond_dev->flags |= IFF_MASTER|IFF_MULTICAST;

	bond_dev->priv_flags |= IFF_BONDING;

	if (bond->params.arp_interval)

		bond_dev->priv_flags |= IFF_MASTER_ARPMON;



	/* At first, we block adding VLANs. That's the only way to

	 * prevent problems that occur when adding VLANs over an

drivers/net/bonding/bond_sysfs.c

+3 −0
Original line number Diff line number Diff line
@@ -620,6 +620,8 @@ static ssize_t bonding_store_arp_interval(struct device *d, 
	       ": %s: Setting ARP monitoring interval to %d.\n",

	       bond->dev->name, new_value);

	bond->params.arp_interval = new_value;

	if (bond->params.arp_interval)

		bond->dev->priv_flags |= IFF_MASTER_ARPMON;

	if (bond->params.miimon) {

		printk(KERN_INFO DRV_NAME

		       ": %s: ARP monitoring cannot be used with MII monitoring. "
@@ -1039,6 +1041,7 @@ static ssize_t bonding_store_miimon(struct device *d, 
			       "ARP monitoring. Disabling ARP monitoring...\n",

			       bond->dev->name);

			bond->params.arp_interval = 0;

			bond->dev->priv_flags &= ~IFF_MASTER_ARPMON;

			if (bond->params.arp_validate) {

				bond_unregister_arp(bond);

				bond->params.arp_validate =

include/linux/if.h

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
#define IFF_BONDING	0x20		/* bonding master or slave	*/

#define IFF_SLAVE_NEEDARP 0x40		/* need ARPs for validation	*/

#define IFF_ISATAP	0x80		/* ISATAP interface (RFC4214)	*/

#define IFF_MASTER_ARPMON 0x100		/* bonding master, ARP mon in use */



#define IF_GET_IFACE	0x0001		/* for querying only */

#define IF_GET_PROTO	0x0002

include/linux/netdevice.h

+18 −14
Original line number Diff line number Diff line
@@ -1742,8 +1742,11 @@ static inline int skb_bond_should_drop(struct sk_buff *skb) 
	struct net_device *dev = skb->dev;

	struct net_device *master = dev->master;



	if (master &&

	    (dev->priv_flags & IFF_SLAVE_INACTIVE)) {

	if (master) {

		if (master->priv_flags & IFF_MASTER_ARPMON)

			dev->last_rx = jiffies;



		if (dev->priv_flags & IFF_SLAVE_INACTIVE) {

			if ((dev->priv_flags & IFF_SLAVE_NEEDARP) &&

			    skb->protocol == __constant_htons(ETH_P_ARP))

				return 0;
@@ -1759,6 +1762,7 @@ static inline int skb_bond_should_drop(struct sk_buff *skb) 


			return 1;

		}

	}

	return 0;

}