From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fugang Duan Subject: RE: [PATCH net 1/1] net: fec: update dirty_tx even if no skb Date: Mon, 9 May 2016 02:02:46 +0000 Message-ID: References: <1461290434-18462-1-git-send-email-troy.kisky@boundarydevices.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT Cc: Fabio Estevam , "l.stach@pengutronix.de" , "andrew@lunn.ch" , "tremyfr@gmail.com" , "gerg@uclinux.org" , "linux-arm-kernel@lists.infradead.org" , "johannes@sipsolutions.net" , "stillcompiling@gmail.com" , "sergei.shtylyov@cogentembedded.com" , "arnd@arndb.de" , "holgerschurig@gmail.com" To: Troy Kisky , "netdev@vger.kernel.org" , "davem@davemloft.net" , "lznuaa@gmail.com" Return-path: Received: from mail-am1on0100.outbound.protection.outlook.com ([157.56.112.100]:53808 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750872AbcEICCu convert rfc822-to-8bit (ORCPT ); Sun, 8 May 2016 22:02:50 -0400 In-Reply-To: <1461290434-18462-1-git-send-email-troy.kisky@boundarydevices.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: From: Troy Kisky Sent: Friday, April 22, 2016 10:01 AM > To: netdev@vger.kernel.org; davem@davemloft.net; Fugang Duan > ; lznuaa@gmail.com > Cc: Fabio Estevam ; l.stach@pengutronix.de; > andrew@lunn.ch; tremyfr@gmail.com; gerg@uclinux.org; linux-arm- > kernel@lists.infradead.org; johannes@sipsolutions.net; > stillcompiling@gmail.com; sergei.shtylyov@cogentembedded.com; > arnd@arndb.de; holgerschurig@gmail.com; Troy Kisky > > Subject: [PATCH net 1/1] net: fec: update dirty_tx even if no skb > > 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 > Tested-by: > --- > 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 Thanks. Acked-by: Fugang Duan From mboxrd@z Thu Jan 1 00:00:00 1970 From: fugang.duan@nxp.com (Fugang Duan) Date: Mon, 9 May 2016 02:02:46 +0000 Subject: [PATCH net 1/1] net: fec: update dirty_tx even if no skb In-Reply-To: <1461290434-18462-1-git-send-email-troy.kisky@boundarydevices.com> References: <1461290434-18462-1-git-send-email-troy.kisky@boundarydevices.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Troy Kisky Sent: Friday, April 22, 2016 10:01 AM > To: netdev at vger.kernel.org; davem at davemloft.net; Fugang Duan > ; lznuaa at gmail.com > Cc: Fabio Estevam ; l.stach at pengutronix.de; > andrew at lunn.ch; tremyfr at gmail.com; gerg at uclinux.org; linux-arm- > kernel at lists.infradead.org; johannes at sipsolutions.net; > stillcompiling at gmail.com; sergei.shtylyov at cogentembedded.com; > arnd at arndb.de; holgerschurig at gmail.com; Troy Kisky > > Subject: [PATCH net 1/1] net: fec: update dirty_tx even if no skb > > 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 > Tested-by: > --- > 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 Thanks. Acked-by: Fugang Duan