4423eff71c
Commit 328e7e487a46 ("powerpc: force inlining of csum_partial() to avoid multiple csum_partial() with GCC10") inlined csum_partial(). Now that csum_partial() is inlined, GCC outlines csum_add() when called by csum_partial(). c064fb28 <csum_add>: c064fb28: 7c 63 20 14 addc r3,r3,r4 c064fb2c: 7c 63 01 94 addze r3,r3 c064fb30: 4e 80 00 20 blr c0665fb8 <csum_add>: c0665fb8: 7c 63 20 14 addc r3,r3,r4 c0665fbc: 7c 63 01 94 addze r3,r3 c0665fc0: 4e 80 00 20 blr c066719c: 7c 9a c0 2e lwzx r4,r26,r24 c06671a0: 38 60 00 00 li r3,0 c06671a4: 7f 1a c2 14 add r24,r26,r24 c06671a8: 4b ff ee 11 bl c0665fb8 <csum_add> c06671ac: 80 98 00 04 lwz r4,4(r24) c06671b0: 4b ff ee 09 bl c0665fb8 <csum_add> c06671b4: 80 98 00 08 lwz r4,8(r24) c06671b8: 4b ff ee 01 bl c0665fb8 <csum_add> c06671bc: a0 98 00 0c lhz r4,12(r24) c06671c0: 4b ff ed f9 bl c0665fb8 <csum_add> c06671c4: 7c 63 18 f8 not r3,r3 c06671c8: 81 3f 00 68 lwz r9,104(r31) c06671cc: 81 5f 00 a0 lwz r10,160(r31) c06671d0: 7d 29 18 14 addc r9,r9,r3 c06671d4: 7d 29 01 94 addze r9,r9 c06671d8: 91 3f 00 68 stw r9,104(r31) c06671dc: 7d 1a 50 50 subf r8,r26,r10 c06671e0: 83 01 00 10 lwz r24,16(r1) c06671e4: 83 41 00 18 lwz r26,24(r1) The sum with 0 is useless, should have been skipped. And there is even one completely unused instance of csum_add(). In file included from ./include/net/checksum.h:22, from ./include/linux/skbuff.h:28, from ./include/linux/icmp.h:16, from net/ipv6/ip6_tunnel.c:23: ./arch/powerpc/include/asm/checksum.h: In function '__ip6_tnl_rcv': ./arch/powerpc/include/asm/checksum.h:94:22: warning: inlining failed in call to 'csum_add': call is unlikely and code size would grow [-Winline] 94 | static inline __wsum csum_add(__wsum csum, __wsum addend) | ^~~~~~~~ ./arch/powerpc/include/asm/checksum.h:172:31: note: called from here 172 | sum = csum_add(sum, (__force __wsum)*(const u32 *)buff); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ./arch/powerpc/include/asm/checksum.h:94:22: warning: inlining failed in call to 'csum_add': call is unlikely and code size would grow [-Winline] 94 | static inline __wsum csum_add(__wsum csum, __wsum addend) | ^~~~~~~~ ./arch/powerpc/include/asm/checksum.h:177:31: note: called from here 177 | sum = csum_add(sum, (__force __wsum) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 178 | *(const u32 *)(buff + 4)); | ~~~~~~~~~~~~~~~~~~~~~~~~~ ./arch/powerpc/include/asm/checksum.h:94:22: warning: inlining failed in call to 'csum_add': call is unlikely and code size would grow [-Winline] 94 | static inline __wsum csum_add(__wsum csum, __wsum addend) | ^~~~~~~~ ./arch/powerpc/include/asm/checksum.h:183:31: note: called from here 183 | sum = csum_add(sum, (__force __wsum) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 184 | *(const u32 *)(buff + 8)); | ~~~~~~~~~~~~~~~~~~~~~~~~~ ./arch/powerpc/include/asm/checksum.h:94:22: warning: inlining failed in call to 'csum_add': call is unlikely and code size would grow [-Winline] 94 | static inline __wsum csum_add(__wsum csum, __wsum addend) | ^~~~~~~~ ./arch/powerpc/include/asm/checksum.h:186:31: note: called from here 186 | sum = csum_add(sum, (__force __wsum) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 187 | *(const u16 *)(buff + 12)); | ~~~~~~~~~~~~~~~~~~~~~~~~~~ Force inlining of csum_add(). 94c: 80 df 00 a0 lwz r6,160(r31) 950: 7d 28 50 2e lwzx r9,r8,r10 954: 7d 48 52 14 add r10,r8,r10 958: 80 aa 00 04 lwz r5,4(r10) 95c: 80 ff 00 68 lwz r7,104(r31) 960: 7d 29 28 14 addc r9,r9,r5 964: 7d 29 01 94 addze r9,r9 968: 7d 08 30 50 subf r8,r8,r6 96c: 80 aa 00 08 lwz r5,8(r10) 970: a1 4a 00 0c lhz r10,12(r10) 974: 7d 29 28 14 addc r9,r9,r5 978: 7d 29 01 94 addze r9,r9 97c: 7d 29 50 14 addc r9,r9,r10 980: 7d 29 01 94 addze r9,r9 984: 7d 29 48 f8 not r9,r9 988: 7c e7 48 14 addc r7,r7,r9 98c: 7c e7 01 94 addze r7,r7 990: 90 ff 00 68 stw r7,104(r31) In the non-inlined version, the first sum with 0 was performed. Here it is skipped. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Reviewed-by: Segher Boessenkool <segher@kernel.crashing.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/f7f4d4e364de6e473da874468b903da6e5d97adc.1620713272.git.christophe.leroy@csgroup.eu
215 lines
5.6 KiB
C
215 lines
5.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
#ifndef _ASM_POWERPC_CHECKSUM_H
|
|
#define _ASM_POWERPC_CHECKSUM_H
|
|
#ifdef __KERNEL__
|
|
|
|
/*
|
|
*/
|
|
|
|
#include <linux/bitops.h>
|
|
#include <linux/in6.h>
|
|
/*
|
|
* Computes the checksum of a memory block at src, length len,
|
|
* and adds in "sum" (32-bit), while copying the block to dst.
|
|
* If an access exception occurs on src or dst, it stores -EFAULT
|
|
* to *src_err or *dst_err respectively (if that pointer is not
|
|
* NULL), and, for an error on src, zeroes the rest of dst.
|
|
*
|
|
* Like csum_partial, this must be called with even lengths,
|
|
* except for the last fragment.
|
|
*/
|
|
extern __wsum csum_partial_copy_generic(const void *src, void *dst, int len);
|
|
|
|
#define _HAVE_ARCH_COPY_AND_CSUM_FROM_USER
|
|
extern __wsum csum_and_copy_from_user(const void __user *src, void *dst,
|
|
int len);
|
|
#define HAVE_CSUM_COPY_USER
|
|
extern __wsum csum_and_copy_to_user(const void *src, void __user *dst,
|
|
int len);
|
|
|
|
#define _HAVE_ARCH_CSUM_AND_COPY
|
|
#define csum_partial_copy_nocheck(src, dst, len) \
|
|
csum_partial_copy_generic((src), (dst), (len))
|
|
|
|
|
|
/*
|
|
* turns a 32-bit partial checksum (e.g. from csum_partial) into a
|
|
* 1's complement 16-bit checksum.
|
|
*/
|
|
static inline __sum16 csum_fold(__wsum sum)
|
|
{
|
|
unsigned int tmp;
|
|
|
|
/* swap the two 16-bit halves of sum */
|
|
__asm__("rlwinm %0,%1,16,0,31" : "=r" (tmp) : "r" (sum));
|
|
/* if there is a carry from adding the two 16-bit halves,
|
|
it will carry from the lower half into the upper half,
|
|
giving us the correct sum in the upper half. */
|
|
return (__force __sum16)(~((__force u32)sum + tmp) >> 16);
|
|
}
|
|
|
|
static inline u32 from64to32(u64 x)
|
|
{
|
|
return (x + ror64(x, 32)) >> 32;
|
|
}
|
|
|
|
static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len,
|
|
__u8 proto, __wsum sum)
|
|
{
|
|
#ifdef __powerpc64__
|
|
u64 s = (__force u32)sum;
|
|
|
|
s += (__force u32)saddr;
|
|
s += (__force u32)daddr;
|
|
#ifdef __BIG_ENDIAN__
|
|
s += proto + len;
|
|
#else
|
|
s += (proto + len) << 8;
|
|
#endif
|
|
return (__force __wsum) from64to32(s);
|
|
#else
|
|
__asm__("\n\
|
|
addc %0,%0,%1 \n\
|
|
adde %0,%0,%2 \n\
|
|
adde %0,%0,%3 \n\
|
|
addze %0,%0 \n\
|
|
"
|
|
: "=r" (sum)
|
|
: "r" (daddr), "r"(saddr), "r"(proto + len), "0"(sum));
|
|
return sum;
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* computes the checksum of the TCP/UDP pseudo-header
|
|
* returns a 16-bit checksum, already complemented
|
|
*/
|
|
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));
|
|
}
|
|
|
|
#define HAVE_ARCH_CSUM_ADD
|
|
static __always_inline __wsum csum_add(__wsum csum, __wsum addend)
|
|
{
|
|
#ifdef __powerpc64__
|
|
u64 res = (__force u64)csum;
|
|
#endif
|
|
if (__builtin_constant_p(csum) && csum == 0)
|
|
return addend;
|
|
if (__builtin_constant_p(addend) && addend == 0)
|
|
return csum;
|
|
|
|
#ifdef __powerpc64__
|
|
res += (__force u64)addend;
|
|
return (__force __wsum)((u32)res + (res >> 32));
|
|
#else
|
|
asm("addc %0,%0,%1;"
|
|
"addze %0,%0;"
|
|
: "+r" (csum) : "r" (addend) : "xer");
|
|
return csum;
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* This is a version of ip_compute_csum() optimized for IP headers,
|
|
* which always checksum on 4 octet boundaries. ihl is the number
|
|
* of 32-bit words and is always >= 5.
|
|
*/
|
|
static inline __wsum ip_fast_csum_nofold(const void *iph, unsigned int ihl)
|
|
{
|
|
const u32 *ptr = (const u32 *)iph + 1;
|
|
#ifdef __powerpc64__
|
|
unsigned int i;
|
|
u64 s = *(const u32 *)iph;
|
|
|
|
for (i = 0; i < ihl - 1; i++, ptr++)
|
|
s += *ptr;
|
|
return (__force __wsum)from64to32(s);
|
|
#else
|
|
__wsum sum, tmp;
|
|
|
|
asm("mtctr %3;"
|
|
"addc %0,%4,%5;"
|
|
"1: lwzu %1, 4(%2);"
|
|
"adde %0,%0,%1;"
|
|
"bdnz 1b;"
|
|
"addze %0,%0;"
|
|
: "=r" (sum), "=r" (tmp), "+b" (ptr)
|
|
: "r" (ihl - 2), "r" (*(const u32 *)iph), "r" (*ptr)
|
|
: "ctr", "xer", "memory");
|
|
|
|
return sum;
|
|
#endif
|
|
}
|
|
|
|
static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
|
|
{
|
|
return csum_fold(ip_fast_csum_nofold(iph, ihl));
|
|
}
|
|
|
|
/*
|
|
* computes the checksum of a memory block at buff, length len,
|
|
* and adds in "sum" (32-bit)
|
|
*
|
|
* returns a 32-bit number suitable for feeding into itself
|
|
* or csum_tcpudp_magic
|
|
*
|
|
* this function must be called with even lengths, except
|
|
* for the last fragment, which may be odd
|
|
*
|
|
* it's best to have buff aligned on a 32-bit boundary
|
|
*/
|
|
__wsum __csum_partial(const void *buff, int len, __wsum sum);
|
|
|
|
static __always_inline __wsum csum_partial(const void *buff, int len, __wsum sum)
|
|
{
|
|
if (__builtin_constant_p(len) && len <= 16 && (len & 1) == 0) {
|
|
if (len == 2)
|
|
sum = csum_add(sum, (__force __wsum)*(const u16 *)buff);
|
|
if (len >= 4)
|
|
sum = csum_add(sum, (__force __wsum)*(const u32 *)buff);
|
|
if (len == 6)
|
|
sum = csum_add(sum, (__force __wsum)
|
|
*(const u16 *)(buff + 4));
|
|
if (len >= 8)
|
|
sum = csum_add(sum, (__force __wsum)
|
|
*(const u32 *)(buff + 4));
|
|
if (len == 10)
|
|
sum = csum_add(sum, (__force __wsum)
|
|
*(const u16 *)(buff + 8));
|
|
if (len >= 12)
|
|
sum = csum_add(sum, (__force __wsum)
|
|
*(const u32 *)(buff + 8));
|
|
if (len == 14)
|
|
sum = csum_add(sum, (__force __wsum)
|
|
*(const u16 *)(buff + 12));
|
|
if (len >= 16)
|
|
sum = csum_add(sum, (__force __wsum)
|
|
*(const u32 *)(buff + 12));
|
|
} else if (__builtin_constant_p(len) && (len & 3) == 0) {
|
|
sum = csum_add(sum, ip_fast_csum_nofold(buff, len >> 2));
|
|
} else {
|
|
sum = __csum_partial(buff, len, sum);
|
|
}
|
|
return sum;
|
|
}
|
|
|
|
/*
|
|
* this routine is used for miscellaneous IP-like checksums, mainly
|
|
* in icmp.c
|
|
*/
|
|
static inline __sum16 ip_compute_csum(const void *buff, int len)
|
|
{
|
|
return csum_fold(csum_partial(buff, len, 0));
|
|
}
|
|
|
|
#define _HAVE_ARCH_IPV6_CSUM
|
|
__sum16 csum_ipv6_magic(const struct in6_addr *saddr,
|
|
const struct in6_addr *daddr,
|
|
__u32 len, __u8 proto, __wsum sum);
|
|
|
|
#endif /* __KERNEL__ */
|
|
#endif
|