Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753827AbaJHFRv (ORCPT ); Wed, 8 Oct 2014 01:17:51 -0400 Received: from mail.karo-electronics.de ([81.173.242.67]:51650 "EHLO mail.karo-electronics.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752281AbaJHFRu convert rfc822-to-8bit (ORCPT ); Wed, 8 Oct 2014 01:17:50 -0400 Date: Wed, 8 Oct 2014 07:01:47 +0200 From: Lothar =?UTF-8?B?V2HDn21hbm4=?= To: David Laight Cc: "'Eric Dumazet'" , "netdev@vger.kernel.org" , "David S. Miller" , Russell King , Frank Li , Fabio Estevam , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH] net: fec: fix regression on i.MX28 introduced by rx_copybreak support Message-ID: <20141008070147.2f3b5319@ipc1.ka-ro> In-Reply-To: <063D6719AE5E284EB5DD2968C1650D6D174C6116@AcuExch.aculab.com> References: <1412687977-11742-1-git-send-email-LW@KARO-electronics.de> <1412692034.11091.122.camel@edumazet-glaptop2.roam.corp.google.com> <063D6719AE5E284EB5DD2968C1650D6D174C6116@AcuExch.aculab.com> Organization: Ka-Ro electronics GmbH X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.10; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, David Laight wrote: > From: Eric Dumazet > > On Tue, 2014-10-07 at 15:19 +0200, Lothar Wamann wrote: > > > commit 1b7bde6d659d ("net: fec: implement rx_copybreak to improve rx performance") > > > introduced a regression for i.MX28. The swap_buffer() function doing > > > the endian conversion of the received data on i.MX28 may access memory > > > beyond the actual packet size in the DMA buffer. fec_enet_copybreak() > > > does not copy those bytes, so that the last bytes of a packet may be > > > filled with invalid data after swapping. > > > This will likely lead to checksum errors on received packets. > > > E.g. when trying to mount an NFS rootfs: > > > UDP: bad checksum. From 192.168.1.225:111 to 192.168.100.73:44662 ulen 36 > > > > > > Do the byte swapping and copying to the new skb in one go if > > > necessary. > > > > > > Signed-off-by: Lothar Wamann > > > --- > > > drivers/net/ethernet/freescale/fec_main.c | 25 +++++++++++++++++++++---- > > > 1 file changed, 21 insertions(+), 4 deletions(-) > > > > > > diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c > > > index 87975b5..eaaebad 100644 > > > --- a/drivers/net/ethernet/freescale/fec_main.c > > > +++ b/drivers/net/ethernet/freescale/fec_main.c > > > @@ -339,6 +339,18 @@ static void *swap_buffer(void *bufaddr, int len) > > > return bufaddr; > > > } > > > > > > +static void *swap_buffer2(void *dst_buf, void *src_buf, int len) > > > +{ > > > + int i; > > > + unsigned int *src = src_buf; > > > + unsigned int *dst = dst_buf; > > > + > > > + for (i = 0; i < DIV_ROUND_UP(len, 4); i++, src++, dst++) > > > + *dst = cpu_to_be32(*src); > > > > No need for the DIV : > > > > for (i = 0; i < len; i += sizeof(*dst), src++, dst++) > > *dst = cpu_to_be32(*src); > > > > Also are you sure both src/dst are aligned to word boundaries, or is > > this architecture OK with possible misalignment ? > > I wondered about that as well. > I wouldn't have expected ppc to support misaligned transfers, and you'd also > want to make sure that cpu_to_be(*src) was using a byte-swapping instruction. > Hmmm... cpu_to_be() doesn't sound like the right 'swap' macro name. > ??? So what is cpu_to_be32() then? The new swap function is an exact copy of the original one already in use except for the fact that it uses distinct source and destination buffers. Lothar Waßmann -- ___________________________________________________________ Ka-Ro electronics GmbH | Pascalstraße 22 | D - 52076 Aachen Phone: +49 2408 1402-0 | Fax: +49 2408 1402-10 Geschäftsführer: Matthias Kaussen Handelsregistereintrag: Amtsgericht Aachen, HRB 4996 www.karo-electronics.de | info@karo-electronics.de ___________________________________________________________ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/