From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH net-next 4/9] net: r6040: Reclaim transmitted buffers in NAPI
Date: Mon, 4 Jul 2016 14:36:04 -0700 [thread overview]
Message-ID: <1467668169-31547-5-git-send-email-f.fainelli@gmail.com> (raw)
In-Reply-To: <1467668169-31547-1-git-send-email-f.fainelli@gmail.com>
Instead of taking one interrupt per packet transmitted, re-use the same
NAPI context to free transmitted buffers. Since we are no longer in hard
IRQ context replace dev_kfree_skb_irq() by dev_kfree_skb().
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/ethernet/rdc/r6040.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c
index 46ed093348da..4bf78f18a937 100644
--- a/drivers/net/ethernet/rdc/r6040.c
+++ b/drivers/net/ethernet/rdc/r6040.c
@@ -622,7 +622,7 @@ static void r6040_tx(struct net_device *dev)
pci_unmap_single(priv->pdev, le32_to_cpu(descptr->buf),
skb_ptr->len, PCI_DMA_TODEVICE);
/* Free buffer */
- dev_kfree_skb_irq(skb_ptr);
+ dev_kfree_skb(skb_ptr);
descptr->skb_ptr = NULL;
/* To next descriptor */
descptr = descptr->vndescp;
@@ -643,12 +643,15 @@ static int r6040_poll(struct napi_struct *napi, int budget)
void __iomem *ioaddr = priv->base;
int work_done;
+ r6040_tx(dev);
+
work_done = r6040_rx(dev, budget);
if (work_done < budget) {
napi_complete(napi);
- /* Enable RX interrupt */
- iowrite16(ioread16(ioaddr + MIER) | RX_INTS, ioaddr + MIER);
+ /* Enable RX/TX interrupt */
+ iowrite16(ioread16(ioaddr + MIER) | RX_INTS | TX_INTS,
+ ioaddr + MIER);
}
return work_done;
}
@@ -675,7 +678,7 @@ static irqreturn_t r6040_interrupt(int irq, void *dev_id)
}
/* RX interrupt request */
- if (status & RX_INTS) {
+ if (status & (RX_INTS | TX_INTS)) {
if (status & RX_NO_DESC) {
/* RX descriptor unavailable */
dev->stats.rx_dropped++;
@@ -686,15 +689,11 @@ static irqreturn_t r6040_interrupt(int irq, void *dev_id)
if (likely(napi_schedule_prep(&lp->napi))) {
/* Mask off RX interrupt */
- misr &= ~RX_INTS;
+ misr &= ~(RX_INTS | TX_INTS);
__napi_schedule(&lp->napi);
}
}
- /* TX interrupt request */
- if (status & TX_INTS)
- r6040_tx(dev);
-
/* Restore RDC MAC interrupt */
iowrite16(misr, ioaddr + MIER);
--
2.7.4
next prev parent reply other threads:[~2016-07-04 21:36 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-04 21:36 [PATCH net-next 0/9] net: r6040: Misc updates Florian Fainelli
2016-07-04 21:36 ` [PATCH net-next 1/9] net: r6040: Utilize phy_print_status Florian Fainelli
2016-07-04 21:36 ` [PATCH net-next 2/9] net: r6040: Increase statistics upon transmit completion Florian Fainelli
2016-07-04 21:36 ` [PATCH net-next 3/9] net: r6040: Utilize skb_put_padto() Florian Fainelli
2016-07-05 22:44 ` Francois Romieu
2016-07-04 21:36 ` Florian Fainelli [this message]
2016-07-04 21:36 ` [PATCH net-next 5/9] net: r6040: Check for skb->xmit_more Florian Fainelli
2016-07-04 21:36 ` [PATCH net-next 6/9] net: r6040: Utilize __napi_schedule_irqoff Florian Fainelli
2016-07-04 21:36 ` [PATCH net-next 7/9] net: r6040: Utilize napi_complete_done() Florian Fainelli
2016-07-04 21:36 ` [PATCH net-next 8/9] net: r6040: Update my email Florian Fainelli
2016-07-04 21:36 ` [PATCH net-next 9/9] net: r6040: Bump version and date Florian Fainelli
2016-07-05 7:12 ` [PATCH net-next 0/9] net: r6040: Misc updates David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1467668169-31547-5-git-send-email-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).