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>
This commit is contained in:
parent
c2dd4059dc
commit
67d7ebdeb2
@ -786,7 +786,7 @@ static bool ag71xx_check_dma_stuck(struct ag71xx *ag)
|
|||||||
return false;
|
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;
|
struct ag71xx_ring *ring = &ag->tx_ring;
|
||||||
int sent = 0, bytes_compl = 0, n = 0;
|
int sent = 0, bytes_compl = 0, n = 0;
|
||||||
@ -825,7 +825,7 @@ static int ag71xx_tx_packets(struct ag71xx *ag, bool flush)
|
|||||||
if (!skb)
|
if (!skb)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
dev_kfree_skb_any(skb);
|
napi_consume_skb(skb, budget);
|
||||||
ring->buf[i].tx.skb = NULL;
|
ring->buf[i].tx.skb = NULL;
|
||||||
|
|
||||||
bytes_compl += ring->buf[i].tx.len;
|
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);
|
mii_reg = ag71xx_rr(ag, AG71XX_REG_MII_CFG);
|
||||||
rx_ds = ag71xx_rr(ag, AG71XX_REG_RX_DESC);
|
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);
|
reset_control_assert(ag->mac_reset);
|
||||||
usleep_range(10, 20);
|
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_packets++;
|
||||||
ndev->stats.rx_bytes += pktlen;
|
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) {
|
if (!skb) {
|
||||||
skb_free_frag(ring->buf[i].rx.rx_buf);
|
skb_free_frag(ring->buf[i].rx.rx_buf);
|
||||||
goto next;
|
goto next;
|
||||||
@ -1703,7 +1703,7 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
|
|||||||
int tx_done, rx_done;
|
int tx_done, rx_done;
|
||||||
u32 status;
|
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");
|
netif_dbg(ag, rx_status, ndev, "processing RX ring\n");
|
||||||
rx_done = ag71xx_rx_packets(ag, limit);
|
rx_done = ag71xx_rx_packets(ag, limit);
|
||||||
|
Loading…
Reference in New Issue
Block a user