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

Commit 31aa860e authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

bonding: add bond_tx_drop() helper 



Because bonding stats are usually sum of slave stats, it was
not easy to account for tx drops at bonding layer.

We can use dev->tx_dropped for this, as this counter is later
added to the device stats (in dev_get_stats())

This extends the idea we had in commit ee637714 ("bonding: Simplify
the xmit function for modes that use xmit_hash") for bond_3ad_xor_xmit()
to other bonding modes.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Mahesh Bandewar <maheshb@google.com>
Reviewed-by: default avatarNikolay Aleksandrov <nikolay@redhat.com>
Acked-by: default avatarMahesh Bandewar <maheshb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f0c65567

drivers/net/bonding/bond_alb.c

+1 −1
Original line number Diff line number Diff line
@@ -1326,7 +1326,7 @@ static int bond_do_alb_xmit(struct sk_buff *skb, struct bonding *bond, 
	}



	/* no suitable interface, frame not sent */

	dev_kfree_skb_any(skb);

	bond_tx_drop(bond->dev, skb);

out:

	return NETDEV_TX_OK;

}

drivers/net/bonding/bond_main.c

+7 −8
Original line number Diff line number Diff line
@@ -3522,7 +3522,7 @@ static void bond_xmit_slave_id(struct bonding *bond, struct sk_buff *skb, int sl 
		}

	}

	/* no slave that can tx has been found */

	dev_kfree_skb_any(skb);

	bond_tx_drop(bond->dev, skb);

}



/**
@@ -3584,7 +3584,7 @@ static int bond_xmit_roundrobin(struct sk_buff *skb, struct net_device *bond_dev 
			slave_id = bond_rr_gen_slave_id(bond);

			bond_xmit_slave_id(bond, skb, slave_id % slave_cnt);

		} else {

			dev_kfree_skb_any(skb);

			bond_tx_drop(bond_dev, skb);

		}

	}
@@ -3603,7 +3603,7 @@ static int bond_xmit_activebackup(struct sk_buff *skb, struct net_device *bond_d 
	if (slave)

		bond_dev_queue_xmit(bond, skb, slave->dev);

	else

		dev_kfree_skb_any(skb);

		bond_tx_drop(bond_dev, skb);



	return NETDEV_TX_OK;

}
@@ -3747,8 +3747,7 @@ int bond_3ad_xor_xmit(struct sk_buff *skb, struct net_device *dev) 
		slave = slaves->arr[bond_xmit_hash(bond, skb) % count];

		bond_dev_queue_xmit(bond, skb, slave->dev);

	} else {

		dev_kfree_skb_any(skb);

		atomic_long_inc(&dev->tx_dropped);

		bond_tx_drop(dev, skb);

	}



	return NETDEV_TX_OK;
@@ -3778,7 +3777,7 @@ static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *bond_dev) 
	if (slave && bond_slave_is_up(slave) && slave->link == BOND_LINK_UP)

		bond_dev_queue_xmit(bond, skb, slave->dev);

	else

		dev_kfree_skb_any(skb);

		bond_tx_drop(bond_dev, skb);



	return NETDEV_TX_OK;

}
@@ -3858,7 +3857,7 @@ static netdev_tx_t __bond_start_xmit(struct sk_buff *skb, struct net_device *dev 
		/* Should never happen, mode already checked */

		netdev_err(dev, "Unknown bonding mode %d\n", BOND_MODE(bond));

		WARN_ON_ONCE(1);

		dev_kfree_skb_any(skb);

		bond_tx_drop(dev, skb);

		return NETDEV_TX_OK;

	}

}
@@ -3878,7 +3877,7 @@ static netdev_tx_t bond_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	if (bond_has_slaves(bond))

		ret = __bond_start_xmit(skb, dev);

	else

		dev_kfree_skb_any(skb);

		bond_tx_drop(dev, skb);

	rcu_read_unlock();



	return ret;

drivers/net/bonding/bonding.h

+6 −0
Original line number Diff line number Diff line
@@ -645,4 +645,10 @@ extern struct bond_parm_tbl ad_select_tbl[]; 
/* exported from bond_netlink.c */

extern struct rtnl_link_ops bond_link_ops;



static inline void bond_tx_drop(struct net_device *dev, struct sk_buff *skb)

{

	atomic_long_inc(&dev->tx_dropped);

	dev_kfree_skb_any(skb);

}



#endif /* _LINUX_BONDING_H */