All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH net 1/1] net: fec: update dirty_tx even if no skb
@ 2016-04-22  2:00 ` Troy Kisky
  0 siblings, 0 replies; 16+ messages in thread
From: Troy Kisky @ 2016-04-22  2:00 UTC (permalink / raw)
  To: netdev, davem, fugang.duan, lznuaa
  Cc: fabio.estevam, l.stach, andrew, tremyfr, gerg, linux-arm-kernel,
	johannes, stillcompiling, sergei.shtylyov, arnd, holgerschurig,
	Troy Kisky

If dirty_tx isn't updated, then dma_unmap_single
will be called twice.

This fixes a
[   58.420980] ------------[ cut here ]------------
[   58.425667] WARNING: CPU: 0 PID: 377 at /home/schurig/d/mkarm/linux-4.5/lib/dma-debug.c:1096 check_unmap+0x9d0/0xab8()
[   58.436405] fec 2188000.ethernet: DMA-API: device driver tries to free DMA memory it has not allocated [device address=0x0000000000000000] [size=66 bytes]

encountered by Holger

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Tested-by: <holgerschurig@gmail.com>
---
 drivers/net/ethernet/freescale/fec_main.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 08243c2..b71654c 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1197,10 +1197,8 @@ fec_enet_tx_queue(struct net_device *ndev, u16 queue_id)
 					 fec16_to_cpu(bdp->cbd_datlen),
 					 DMA_TO_DEVICE);
 		bdp->cbd_bufaddr = cpu_to_fec32(0);
-		if (!skb) {
-			bdp = fec_enet_get_nextdesc(bdp, &txq->bd);
-			continue;
-		}
+		if (!skb)
+			goto skb_done;
 
 		/* Check for errors. */
 		if (status & (BD_ENET_TX_HB | BD_ENET_TX_LC |
@@ -1239,7 +1237,7 @@ fec_enet_tx_queue(struct net_device *ndev, u16 queue_id)
 
 		/* Free the sk buffer associated with this last transmit */
 		dev_kfree_skb_any(skb);
-
+skb_done:
 		/* Make sure the update to bdp and tx_skbuff are performed
 		 * before dirty_tx
 		 */
-- 
2.5.0

^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2016-05-09  2:02 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-22  2:00 [PATCH net 1/1] net: fec: update dirty_tx even if no skb Troy Kisky
2016-04-22  2:00 ` Troy Kisky
2016-04-22  5:59 ` Fugang Duan
2016-04-22  5:59   ` Fugang Duan
2016-04-22 16:11   ` Troy Kisky
2016-04-22 16:11     ` Troy Kisky
2016-04-25  1:57     ` Fugang Duan
2016-04-25  1:57       ` Fugang Duan
2016-04-25  6:28       ` Fugang Duan
2016-04-25  6:28         ` Fugang Duan
2016-05-07 18:56   ` Troy Kisky
2016-05-07 18:56     ` Troy Kisky
2016-05-09  2:00     ` Fugang Duan
2016-05-09  2:00       ` Fugang Duan
2016-05-09  2:02 ` Fugang Duan
2016-05-09  2:02   ` Fugang Duan

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.