net: ag71xx: switch to napi_build_skb() to reuse skbuff_heads

napi_build_skb() reuses NAPI skbuff_head cache in order to save some
cycles on freeing/allocating skbuff_heads on every new Rx or completed
Tx.
Use napi_consume_skb() to feed the cache with skbuff_heads of completed
Tx, so it's never empty. The budget parameter is added to indicate NAPI
context, as a value of zero can be passed in the case of netpoll.

Signed-off-by: Sieng-Piaw Liew <liew.s.piaw@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c
index 1c6ea6766aa191249a49a986a2722857b0a12e3b..e461f47640660ca00365251ac2d88bb80e5f8bd1 100644 (file)
--- a/drivers/net/ethernet/atheros/ag71xx.c
+++ b/drivers/net/ethernet/atheros/ag71xx.c
@@ -786,7 +786,7 @@ static bool ag71xx_check_dma_stuck(struct ag71xx *ag)
        return false;
 }
 
-static int ag71xx_tx_packets(struct ag71xx *ag, bool flush)
+static int ag71xx_tx_packets(struct ag71xx *ag, bool flush, int budget)
 {
        struct ag71xx_ring *ring = &ag->tx_ring;
        int sent = 0, bytes_compl = 0, n = 0;
@@ -825,7 +825,7 @@ static int ag71xx_tx_packets(struct ag71xx *ag, bool flush)
                if (!skb)
                        continue;
 
-               dev_kfree_skb_any(skb);
+               napi_consume_skb(skb, budget);
                ring->buf[i].tx.skb = NULL;
 
                bytes_compl += ring->buf[i].tx.len;
@@ -970,7 +970,7 @@ static void ag71xx_fast_reset(struct ag71xx *ag)
        mii_reg = ag71xx_rr(ag, AG71XX_REG_MII_CFG);
        rx_ds = ag71xx_rr(ag, AG71XX_REG_RX_DESC);
 
-       ag71xx_tx_packets(ag, true);
+       ag71xx_tx_packets(ag, true, 0);
 
        reset_control_assert(ag->mac_reset);
        usleep_range(10, 20);
@@ -1657,7 +1657,7 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
                ndev->stats.rx_packets++;
                ndev->stats.rx_bytes += pktlen;
 
-               skb = build_skb(ring->buf[i].rx.rx_buf, ag71xx_buffer_size(ag));
+               skb = napi_build_skb(ring->buf[i].rx.rx_buf, ag71xx_buffer_size(ag));
                if (!skb) {
                        skb_free_frag(ring->buf[i].rx.rx_buf);
                        goto next;
@@ -1703,7 +1703,7 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
        int tx_done, rx_done;
        u32 status;
 
-       tx_done = ag71xx_tx_packets(ag, false);
+       tx_done = ag71xx_tx_packets(ag, false, limit);
 
        netif_dbg(ag, rx_status, ndev, "processing RX ring\n");
        rx_done = ag71xx_rx_packets(ag, limit);