net: b44: replace dev_kfree_skb_xxx by dev_consume_skb_xxx for drop profiles

Yang Wei · davem330 · commit 0f0ed8282e5b · 2019-01-29T10:11:42.000-08:00
The skb should be freed by dev_consume_skb_any() in b44_start_xmit()
when bounce_skb is used. The skb is be replaced by bounce_skb, so the
original skb should be consumed(not drop).

dev_consume_skb_irq() should be called in b44_tx() when skb xmit
done. It makes drop profiles(dropwatch, perf) more friendly.

Signed-off-by: Yang Wei &lt;yang.wei9@zte.com.cn&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
@@ -638,7 +638,7 @@ static void b44_tx(struct b44 *bp)
 		bytes_compl += skb->len;
 		pkts_compl++;
 
-		dev_kfree_skb_irq(skb);
+		dev_consume_skb_irq(skb);
 	}
 
 	netdev_completed_queue(bp->dev, pkts_compl, bytes_compl);
@@ -1012,7 +1012,7 @@ static netdev_tx_t b44_start_xmit(struct sk_buff *skb, struct net_device *dev)
 		}
 
 		skb_copy_from_linear_data(skb, skb_put(bounce_skb, len), len);
-		dev_kfree_skb_any(skb);
+		dev_consume_skb_any(skb);
 		skb = bounce_skb;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -638,7 +638,7 @@ static void b44_tx(struct b44 *bp)`
`638`	`638`	`bytes_compl += skb->len;`
`639`	`639`	`pkts_compl++;`
`640`	`640`
`641`		`- dev_kfree_skb_irq(skb);`
	`641`	`+ dev_consume_skb_irq(skb);`
`642`	`642`	`}`
`643`	`643`
`644`	`644`	`netdev_completed_queue(bp->dev, pkts_compl, bytes_compl);`
`@@ -1012,7 +1012,7 @@ static netdev_tx_t b44_start_xmit(struct sk_buff skb, struct net_device dev)`
`1012`	`1012`	`}`
`1013`	`1013`
`1014`	`1014`	`skb_copy_from_linear_data(skb, skb_put(bounce_skb, len), len);`
`1015`		`- dev_kfree_skb_any(skb);`
	`1015`	`+ dev_consume_skb_any(skb);`
`1016`	`1016`	`skb = bounce_skb;`
`1017`	`1017`	`}`
`1018`	`1018`