From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757202AbaCEXZy (ORCPT ); Wed, 5 Mar 2014 18:25:54 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:39187 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757025AbaCEXZu (ORCPT ); Wed, 5 Mar 2014 18:25:50 -0500 Message-ID: <1394061949.2861.1.camel@deadeye.wl.decadent.org.uk> Subject: Re: [PATCH v3 2/2] net: macb: DMA-unmap full rx-buffer From: Ben Hutchings To: Soren Brinkmann Cc: Nicolas Ferre , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Vinod Koul , Dan Williams , "David S. Miller" , Michal Simek Date: Wed, 05 Mar 2014 23:25:49 +0000 In-Reply-To: <1393951600-26039-2-git-send-email-soren.brinkmann@xilinx.com> References: <1393951600-26039-1-git-send-email-soren.brinkmann@xilinx.com> <1393951600-26039-2-git-send-email-soren.brinkmann@xilinx.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-ymGjDS8j123qs3E5gZhf" X-Mailer: Evolution 3.8.5-2+b3 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.4.244 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --=-ymGjDS8j123qs3E5gZhf Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2014-03-04 at 08:46 -0800, Soren Brinkmann wrote: > When allocating RX buffers a fixed size is used, while freeing is based > on actually received bytes, resulting in the following kernel warning > when CONFIG_DMA_API_DEBUG is enabled: > WARNING: CPU: 0 PID: 0 at lib/dma-debug.c:1051 check_unmap+0x258/0x894() > macb e000b000.ethernet: DMA-API: device driver frees DMA memory with dif= ferent size [device address=3D0x000000002d170040] [map size=3D1536 bytes] [= unmap size=3D60 bytes] > Modules linked in: > CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.14.0-rc3-xilinx-00220-g49f84= 081ce4f #65 > [] (unwind_backtrace) from [] (show_stack+0x10/0x14) > [] (show_stack) from [] (dump_stack+0x7c/0xc8) > [] (dump_stack) from [] (warn_slowpath_common+0x60/0= x84) > [] (warn_slowpath_common) from [] (warn_slowpath_fmt= +0x2c/0x3c) > [] (warn_slowpath_fmt) from [] (check_unmap+0x258/0x= 894) > [] (check_unmap) from [] (debug_dma_unmap_page+0x64/= 0x70) > [] (debug_dma_unmap_page) from [] (gem_rx+0x118/0x17= 0) > [] (gem_rx) from [] (macb_poll+0x24/0x94) > [] (macb_poll) from [] (net_rx_action+0x6c/0x188) > [] (net_rx_action) from [] (__do_softirq+0x108/0x280= ) > [] (__do_softirq) from [] (irq_exit+0x84/0xf8) > [] (irq_exit) from [] (handle_IRQ+0x68/0x8c) > [] (handle_IRQ) from [] (gic_handle_irq+0x3c/0x60) > [] (gic_handle_irq) from [] (__irq_svc+0x44/0x78) > Exception stack(0xc056df20 to 0xc056df68) > df20: 00000001 c0577430 00000000 c0577430 04ce8e0d 00000002 edfce238 000= 00000 > df40: 04e20f78 00000002 c05981f4 00000000 00000008 c056df68 c0064008 c02= d7658 > df60: 20000013 ffffffff > [] (__irq_svc) from [] (cpuidle_enter_state+0x54/0xf= 8) > [] (cpuidle_enter_state) from [] (cpuidle_idle_call+= 0xe0/0x138) > [] (cpuidle_idle_call) from [] (arch_cpu_idle+0x8/0x= 3c) > [] (arch_cpu_idle) from [] (cpu_startup_entry+0xbc/0= x124) > [] (cpu_startup_entry) from [] (start_kernel+0x350/0= x3b0) > ---[ end trace d5fdc38641bd3a11 ]--- > Mapped at: > [] debug_dma_map_page+0x48/0x11c > [] gem_rx_refill+0x154/0x1f8 > [] macb_open+0x270/0x3e0 > [] __dev_open+0x7c/0xfc > [] __dev_change_flags+0x8c/0x140 >=20 > Fixing this by passing the same size which is passed during mapping the > memory to the unmap function as well. >=20 > Signed-off-by: Soren Brinkmann Reviewed-by: Ben Hutchings > --- > v3: > - no changes > v2: > - no changes >=20 > Signed-off-by: Soren Brinkmann > --- > drivers/net/ethernet/cadence/macb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/c= adence/macb.c > index 1f03e2041e86..d0c38e01e99f 100644 > --- a/drivers/net/ethernet/cadence/macb.c > +++ b/drivers/net/ethernet/cadence/macb.c > @@ -730,7 +730,7 @@ static int gem_rx(struct macb *bp, int budget) > skb_put(skb, len); > addr =3D MACB_BF(RX_WADDR, MACB_BFEXT(RX_WADDR, addr)); > dma_unmap_single(&bp->pdev->dev, addr, > - len, DMA_FROM_DEVICE); > + bp->rx_buffer_size, DMA_FROM_DEVICE); > =20 > skb->protocol =3D eth_type_trans(skb, bp->dev); > skb_checksum_none_assert(skb); --=20 Ben Hutchings For every complex problem there is a solution that is simple, neat, and wrong. --=-ymGjDS8j123qs3E5gZhf Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIVAwUAUxeyfee/yOyVhhEJAQqMBBAAqklZDNlttZSQjBmOrDacPt702ryP1q7q F6Ri02vSNml0AmwPXoCputvpD3Zcah+yNtj+FjgXoO60n1gp0ECUFIPuNlwScZoD xW+ofC+O6w4wjKFSc+w6VLx0mvhadvlWoq5esNXhyYZXXfU4oT+JFQueZIdAGLe+ YztAsr+74LmyRsgEg16THZTeMmNVkSgy8qwTaWUzMXnxTsVnqYitxI5QIl5tT3hG usyDmPhJE2VEfDr+ufgl7fRGxOLBdn+9k2a7ZWj3zEs9rv8y/jS6UmQ32ZC1hfhW tlVdmib+UtJhSlqSp94q5DmrJ0tWzCqQ2AZlIocXLptdoZTo62SH23JKMDGdYbNn ODriV7aJAFNjKv58BpfAGiVuQHr+Z3WMZNUrQ+71MMHniNdFi1opU252nDR2FKFR W9Meov0x+HSXeAukZCwUyvThhNuzuqYwVBKJ2zec3QY6HY3bbwIjdpA0B2o8JElt fHEd/FAtrBrsz9khGxekR9lyPAkwIHKJtBeF6BZ7dRFVzTg7ozmWTxRBlpalHh9p MLaHyE/dnjX0vUNGRmhkoSfBOHLo+7ICpb3rcd9Yd4fMgDgQejeFlgvlxtDTwWeK nhbacWSqPDA39/aNR1K4sjPTM7yCdDSeH4Y1JsKnWuOomJN0ByJheZBBw9lGDJqK y16WoSZJ020= =Qlab -----END PGP SIGNATURE----- --=-ymGjDS8j123qs3E5gZhf--