mirror of
https://github.com/torvalds/linux
synced 2024-10-17 00:39:37 +00:00
01cfbad79a
This patch updates all instances of csum_tcpudp_magic and csum_tcpudp_nofold to reflect the types that are usually used as the source inputs. For example the protocol field is populated based on nexthdr which is actually an unsigned 8 bit value. The length is usually populated based on skb->len which is an unsigned integer. This addresses an issue in which the IPv6 function csum_ipv6_magic was generating a checksum using the full 32b of skb->len while csum_tcpudp_magic was only using the lower 16 bits. As a result we could run into issues when attempting to adjust the checksum as there was no protocol agnostic way to update it. With this change the value is still truncated as many architectures use "(len + proto) << 8", however this truncation only occurs for values greater than 16776960 in length and as such is unlikely to occur as we stop the inner headers at ~64K in size. I did have to make a few minor changes in the arm, mn10300, nios2, and score versions of the function in order to support these changes as they were either using things such as an OR to combine the protocol and length, or were using ntohs to convert the length which would have truncated the value. I also updated a few spots in terms of whitespace and type differences for the addresses. Most of this was just to make sure all of the definitions were in sync going forward. Signed-off-by: Alexander Duyck <aduyck@mirantis.com> Signed-off-by: David S. Miller <davem@davemloft.net>
78 lines
2 KiB
C
78 lines
2 KiB
C
/*
|
|
* Copyright (C) 2010 Tobias Klauser <tklauser@distanz.ch>
|
|
* Copyright (C) 2004 Microtronix Datacom Ltd.
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*/
|
|
|
|
#ifndef _ASM_NIOS_CHECKSUM_H
|
|
#define _ASM_NIOS_CHECKSUM_H
|
|
|
|
/* Take these from lib/checksum.c */
|
|
extern __wsum csum_partial(const void *buff, int len, __wsum sum);
|
|
extern __wsum csum_partial_copy(const void *src, void *dst, int len,
|
|
__wsum sum);
|
|
extern __wsum csum_partial_copy_from_user(const void __user *src, void *dst,
|
|
int len, __wsum sum, int *csum_err);
|
|
#define csum_partial_copy_nocheck(src, dst, len, sum) \
|
|
csum_partial_copy((src), (dst), (len), (sum))
|
|
|
|
extern __sum16 ip_fast_csum(const void *iph, unsigned int ihl);
|
|
extern __sum16 ip_compute_csum(const void *buff, int len);
|
|
|
|
/*
|
|
* Fold a partial checksum
|
|
*/
|
|
static inline __sum16 csum_fold(__wsum sum)
|
|
{
|
|
__asm__ __volatile__(
|
|
"add %0, %1, %0\n"
|
|
"cmpltu r8, %0, %1\n"
|
|
"srli %0, %0, 16\n"
|
|
"add %0, %0, r8\n"
|
|
"nor %0, %0, %0\n"
|
|
: "=r" (sum)
|
|
: "r" (sum << 16), "0" (sum)
|
|
: "r8");
|
|
return (__force __sum16) sum;
|
|
}
|
|
|
|
/*
|
|
* computes the checksum of the TCP/UDP pseudo-header
|
|
* returns a 16-bit checksum, already complemented
|
|
*/
|
|
#define csum_tcpudp_nofold csum_tcpudp_nofold
|
|
static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
|
|
__u32 len, __u8 proto,
|
|
__wsum sum)
|
|
{
|
|
__asm__ __volatile__(
|
|
"add %0, %1, %0\n"
|
|
"cmpltu r8, %0, %1\n"
|
|
"add %0, %0, r8\n" /* add carry */
|
|
"add %0, %2, %0\n"
|
|
"cmpltu r8, %0, %2\n"
|
|
"add %0, %0, r8\n" /* add carry */
|
|
"add %0, %3, %0\n"
|
|
"cmpltu r8, %0, %3\n"
|
|
"add %0, %0, r8\n" /* add carry */
|
|
: "=r" (sum), "=r" (saddr)
|
|
: "r" (daddr), "r" ((len + proto) << 8),
|
|
"0" (sum),
|
|
"1" (saddr)
|
|
: "r8");
|
|
|
|
return sum;
|
|
}
|
|
|
|
static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
|
|
__u32 len, __u8 proto,
|
|
__wsum sum)
|
|
{
|
|
return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));
|
|
}
|
|
|
|
#endif /* _ASM_NIOS_CHECKSUM_H */
|