bonding: add bond_tx_drop() helper

edumazet · davem330 · commit 31aa860e0aaf · 2014-10-31T16:09:03.000-04:00
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 ee63771 ("bonding: Simplify the xmit function for modes that use xmit_hash") for bond_3ad_xor_xmit() to other bonding modes. Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Mahesh Bandewar <maheshb@google.com> Reviewed-by: Nikolay Aleksandrov <nikolay@redhat.com> Acked-by: Mahesh Bandewar <maheshb@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
@@ -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;
 }
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
@@ -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;
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -1326,7 +1326,7 @@ static int bond_do_alb_xmit(struct sk_buff skb, struct bonding bond,`
`1326`	`1326`	`}`
`1327`	`1327`
`1328`	`1328`	`/* no suitable interface, frame not sent */`
`1329`		`- dev_kfree_skb_any(skb);`
	`1329`	`+ bond_tx_drop(bond->dev, skb);`
`1330`	`1330`	`out:`
`1331`	`1331`	`return NETDEV_TX_OK;`
`1332`	`1332`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3522,7 +3522,7 @@ static void bond_xmit_slave_id(struct bonding bond, struct sk_buff skb, int sl`
`3522`	`3522`	`}`
`3523`	`3523`	`}`
`3524`	`3524`	`/* no slave that can tx has been found */`
`3525`		`- dev_kfree_skb_any(skb);`
	`3525`	`+ bond_tx_drop(bond->dev, skb);`
`3526`	`3526`	`}`
`3527`	`3527`
`3528`	`3528`	`/**`
`@@ -3584,7 +3584,7 @@ static int bond_xmit_roundrobin(struct sk_buff skb, struct net_device bond_dev`
`3584`	`3584`	`slave_id = bond_rr_gen_slave_id(bond);`
`3585`	`3585`	`bond_xmit_slave_id(bond, skb, slave_id % slave_cnt);`
`3586`	`3586`	`} else {`
`3587`		`- dev_kfree_skb_any(skb);`
	`3587`	`+ bond_tx_drop(bond_dev, skb);`
`3588`	`3588`	`}`
`3589`	`3589`	`}`
`3590`	`3590`
`@@ -3603,7 +3603,7 @@ static int bond_xmit_activebackup(struct sk_buff skb, struct net_device bond_d`
`3603`	`3603`	`if (slave)`
`3604`	`3604`	`bond_dev_queue_xmit(bond, skb, slave->dev);`
`3605`	`3605`	`else`
`3606`		`- dev_kfree_skb_any(skb);`
	`3606`	`+ bond_tx_drop(bond_dev, skb);`
`3607`	`3607`
`3608`	`3608`	`return NETDEV_TX_OK;`
`3609`	`3609`	`}`
`@@ -3747,8 +3747,7 @@ int bond_3ad_xor_xmit(struct sk_buff skb, struct net_device dev)`
`3747`	`3747`	`slave = slaves->arr[bond_xmit_hash(bond, skb) % count];`
`3748`	`3748`	`bond_dev_queue_xmit(bond, skb, slave->dev);`
`3749`	`3749`	`} else {`
`3750`		`- dev_kfree_skb_any(skb);`
`3751`		`- atomic_long_inc(&dev->tx_dropped);`
	`3750`	`+ bond_tx_drop(dev, skb);`
`3752`	`3751`	`}`
`3753`	`3752`
`3754`	`3753`	`return NETDEV_TX_OK;`
`@@ -3778,7 +3777,7 @@ static int bond_xmit_broadcast(struct sk_buff skb, struct net_device bond_dev)`
`3778`	`3777`	`if (slave && bond_slave_is_up(slave) && slave->link == BOND_LINK_UP)`
`3779`	`3778`	`bond_dev_queue_xmit(bond, skb, slave->dev);`
`3780`	`3779`	`else`
`3781`		`- dev_kfree_skb_any(skb);`
	`3780`	`+ bond_tx_drop(bond_dev, skb);`
`3782`	`3781`
`3783`	`3782`	`return NETDEV_TX_OK;`
`3784`	`3783`	`}`
`@@ -3858,7 +3857,7 @@ static netdev_tx_t __bond_start_xmit(struct sk_buff skb, struct net_device dev`
`3858`	`3857`	`/* Should never happen, mode already checked */`
`3859`	`3858`	`netdev_err(dev, "Unknown bonding mode %d\n", BOND_MODE(bond));`
`3860`	`3859`	`WARN_ON_ONCE(1);`
`3861`		`- dev_kfree_skb_any(skb);`
	`3860`	`+ bond_tx_drop(dev, skb);`
`3862`	`3861`	`return NETDEV_TX_OK;`
`3863`	`3862`	`}`
`3864`	`3863`	`}`
`@@ -3878,7 +3877,7 @@ static netdev_tx_t bond_start_xmit(struct sk_buff skb, struct net_device dev)`
`3878`	`3877`	`if (bond_has_slaves(bond))`
`3879`	`3878`	`ret = __bond_start_xmit(skb, dev);`
`3880`	`3879`	`else`
`3881`		`- dev_kfree_skb_any(skb);`
	`3880`	`+ bond_tx_drop(dev, skb);`
`3882`	`3881`	`rcu_read_unlock();`
`3883`	`3882`
`3884`	`3883`	`return ret;`