public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: Eric Dumazet <eric.dumazet@gmail.com>
To: Roland Stigge <stigge@antcom.de>
Cc: David Miller <davem@davemloft.net>,
	netdev@vger.kernel.org, kevin.wells@nxp.com,
	srinivas.bakki@nxp.com, aletes.xgr@gmail.com,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH net-next] net: lpc_eth: free skbs in start_xmit
Date: Wed, 13 Jun 2012 11:58:16 +0200	[thread overview]
Message-ID: <1339581496.22704.346.camel@edumazet-glaptop> (raw)
In-Reply-To: <4FD85D27.5090509@antcom.de>

From: Eric Dumazet <edumazet@google.com>

Transmitted skbs can be freed immediately in lpc_eth_hard_start_xmit()
instead of at TX completion, since driver copies the frames in DMA area.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Tested-by: Roland Stigge <stigge@antcom.de>
---
 drivers/net/ethernet/nxp/lpc_eth.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c
index 083d671..028dde4 100644
--- a/drivers/net/ethernet/nxp/lpc_eth.c
+++ b/drivers/net/ethernet/nxp/lpc_eth.c
@@ -440,7 +440,7 @@ struct netdata_local {
 	spinlock_t		lock;
 	void __iomem		*net_base;
 	u32			msg_enable;
-	struct sk_buff		*skb[ENET_TX_DESC];
+	unsigned int		skblen[ENET_TX_DESC];
 	unsigned int		last_tx_idx;
 	unsigned int		num_used_tx_buffs;
 	struct mii_bus		*mii_bus;
@@ -903,12 +903,11 @@ err_out:
 static void __lpc_handle_xmit(struct net_device *ndev)
 {
 	struct netdata_local *pldat = netdev_priv(ndev);
-	struct sk_buff *skb;
 	u32 txcidx, *ptxstat, txstat;
 
 	txcidx = readl(LPC_ENET_TXCONSUMEINDEX(pldat->net_base));
 	while (pldat->last_tx_idx != txcidx) {
-		skb = pldat->skb[pldat->last_tx_idx];
+		unsigned int skblen = pldat->skblen[pldat->last_tx_idx];
 
 		/* A buffer is available, get buffer status */
 		ptxstat = &pldat->tx_stat_v[pldat->last_tx_idx];
@@ -945,9 +944,8 @@ static void __lpc_handle_xmit(struct net_device *ndev)
 		} else {
 			/* Update stats */
 			ndev->stats.tx_packets++;
-			ndev->stats.tx_bytes += skb->len;
+			ndev->stats.tx_bytes += skblen;
 		}
-		dev_kfree_skb_irq(skb);
 
 		txcidx = readl(LPC_ENET_TXCONSUMEINDEX(pldat->net_base));
 	}
@@ -1132,7 +1130,7 @@ static int lpc_eth_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 	memcpy(pldat->tx_buff_v + txidx * ENET_MAXF_SIZE, skb->data, len);
 
 	/* Save the buffer and increment the buffer counter */
-	pldat->skb[txidx] = skb;
+	pldat->skblen[txidx] = len;
 	pldat->num_used_tx_buffs++;
 
 	/* Start transmit */
@@ -1147,6 +1145,7 @@ static int lpc_eth_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 
 	spin_unlock_irq(&pldat->lock);
 
+	dev_kfree_skb(skb);
 	return NETDEV_TX_OK;
 }
 

  reply	other threads:[~2012-06-13  9:58 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-11  8:03 [PATCH 1/3] net: lpc_eth: Replace WARN() trace with simple pr_warn() Roland Stigge
2012-06-11  8:03 ` [PATCH 2/3] net: lpc_eth: Increase number of TX descriptors Roland Stigge
2012-06-11  8:11   ` David Miller
2012-06-11  8:21   ` Eric Dumazet
2012-06-11  8:03 ` [PATCH 3/3] net: lpc_eth: Driver cleanup Roland Stigge
2012-06-11  8:10 ` [PATCH 1/3] net: lpc_eth: Replace WARN() trace with simple pr_warn() David Miller
2012-06-11  8:25 ` Eric Dumazet
2012-06-11  8:36   ` Roland Stigge
2012-06-11  8:53     ` Eric Dumazet
2012-06-11 17:21       ` [PATCH] net: lpc_eth: fix tx completion Eric Dumazet
2012-06-11 18:58         ` Roland Stigge
2012-06-11 20:13         ` David Miller
2012-06-11  9:03     ` [PATCH 1/3] net: lpc_eth: Replace WARN() trace with simple pr_warn() David Miller
2012-06-11  9:26       ` Roland Stigge
2012-06-11 19:18         ` Eric Dumazet
2012-06-13  6:16           ` Eric Dumazet
2012-06-13  9:28             ` Roland Stigge
2012-06-13  9:58               ` Eric Dumazet [this message]
2012-06-17 23:28                 ` [PATCH net-next] net: lpc_eth: free skbs in start_xmit David Miller
2012-06-11  8:39   ` [PATCH 1/3] net: lpc_eth: Replace WARN() trace with simple pr_warn() Eric Dumazet

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=1339581496.22704.346.camel@edumazet-glaptop \
    --to=eric.dumazet@gmail.com \
    --cc=aletes.xgr@gmail.com \
    --cc=davem@davemloft.net \
    --cc=kevin.wells@nxp.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=netdev@vger.kernel.org \
    --cc=srinivas.bakki@nxp.com \
    --cc=stigge@antcom.de \
    /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