| Message ID | 1422439091-31413-1-git-send-email-karl.beldan@rivierawaves.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, 2015-01-28 at 10:58 +0100, Karl Beldan wrote: > The carry from the 64->32bits folding was dropped, e.g with: > saddr=0xFFFFFFFF daddr=0xFF0000FF len=0xFFFF proto=0 sum=1, > csum_tcpudp_nofold returned 0 instead of 1. > > Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com> > Cc: Al Viro <viro@ZenIV.linux.org.uk> > Cc: Eric Dumazet <eric.dumazet@gmail.com> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Mike Frysinger <vapier@gentoo.org> > Cc: netdev@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Cc: stable@vger.kernel.org > --- > lib/checksum.c | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) Signed-off-by: Eric Dumazet <edumazet@google.com> Thanks ! -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Karl Beldan <karl.beldan@gmail.com> Date: Wed, 28 Jan 2015 10:58:11 +0100 > The carry from the 64->32bits folding was dropped, e.g with: > saddr=0xFFFFFFFF daddr=0xFF0000FF len=0xFFFF proto=0 sum=1, > csum_tcpudp_nofold returned 0 instead of 1. > > Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Jan 28, 2015 at 10:32:49PM -0800, David Miller wrote: > From: Karl Beldan <karl.beldan@gmail.com> > Date: Wed, 28 Jan 2015 10:58:11 +0100 > > > The carry from the 64->32bits folding was dropped, e.g with: > > saddr=0xFFFFFFFF daddr=0xFF0000FF len=0xFFFF proto=0 sum=1, > > csum_tcpudp_nofold returned 0 instead of 1. > > > > Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com> > > Applied, thanks. Fengguang's robot reported I managed to break the build, this occurs when using non-generic do_csum and generic csum_tcpudp_nofold. I guess a v3 is irrelevant now, should I send another patch for the build fix only ? Sorry for that. Karl -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/lib/checksum.c b/lib/checksum.c index 129775e..fcf3894 100644 --- a/lib/checksum.c +++ b/lib/checksum.c @@ -47,6 +47,15 @@ static inline unsigned short from32to16(unsigned int x) return x; } +static inline u32 from64to32(u64 x) +{ + /* add up 32-bit and 32-bit for 32+c bit */ + x = (x & 0xffffffff) + (x >> 32); + /* add up carry.. */ + x = (x & 0xffffffff) + (x >> 32); + return (u32)x; +} + static unsigned int do_csum(const unsigned char *buff, int len) { int odd; @@ -195,8 +204,7 @@ __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, #else s += (proto + len) << 8; #endif - s += (s >> 32); - return (__force __wsum)s; + return (__force __wsum)from64to32(s); } EXPORT_SYMBOL(csum_tcpudp_nofold); #endif
The carry from the 64->32bits folding was dropped, e.g with: saddr=0xFFFFFFFF daddr=0xFF0000FF len=0xFFFF proto=0 sum=1, csum_tcpudp_nofold returned 0 instead of 1. Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com> Cc: Al Viro <viro@ZenIV.linux.org.uk> Cc: Eric Dumazet <eric.dumazet@gmail.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Mike Frysinger <vapier@gentoo.org> Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org --- lib/checksum.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)