mirror of
https://passt.top/passt
synced 2025-06-16 04:15:34 +02:00
checksum: Don't export various functions
Several of the exposed functions in checksum.h are no longer directly used. Remove them from the header, and make static. In particular sum_16b() should not be used outside: generally csum_unfolded() should be used which will automatically use either the AVX2 optimized version or sum_16b() as necessary. csum_fold() and csum() could have external uses, but they're not used right now. We can expose them again if we need to. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
parent
e36c35c952
commit
12d5b36b2f
2 changed files with 17 additions and 20 deletions
34
checksum.c
34
checksum.c
|
@ -85,7 +85,7 @@
|
|||
*/
|
||||
/* NOLINTNEXTLINE(clang-diagnostic-unknown-attributes) */
|
||||
__attribute__((optimize("-fno-strict-aliasing")))
|
||||
uint32_t sum_16b(const void *buf, size_t len)
|
||||
static uint32_t sum_16b(const void *buf, size_t len)
|
||||
{
|
||||
const uint16_t *p = buf;
|
||||
uint32_t sum = 0;
|
||||
|
@ -107,7 +107,7 @@ uint32_t sum_16b(const void *buf, size_t len)
|
|||
*
|
||||
* Return: 16-bit folded sum
|
||||
*/
|
||||
uint16_t csum_fold(uint32_t sum)
|
||||
static uint16_t csum_fold(uint32_t sum)
|
||||
{
|
||||
while (sum >> 16)
|
||||
sum = (sum & 0xffff) + (sum >> 16);
|
||||
|
@ -161,6 +161,21 @@ uint32_t proto_ipv4_header_psum(uint16_t l4len, uint8_t protocol,
|
|||
return psum;
|
||||
}
|
||||
|
||||
/**
|
||||
* csum() - Compute TCP/IP-style checksum
|
||||
* @buf: Input buffer
|
||||
* @len: Input length
|
||||
* @init: Initial 32-bit checksum, 0 for no pre-computed checksum
|
||||
*
|
||||
* Return: 16-bit folded, complemented checksum
|
||||
*/
|
||||
/* NOLINTNEXTLINE(clang-diagnostic-unknown-attributes) */
|
||||
__attribute__((optimize("-fno-strict-aliasing"))) /* See csum_16b() */
|
||||
static uint16_t csum(const void *buf, size_t len, uint32_t init)
|
||||
{
|
||||
return (uint16_t)~csum_fold(csum_unfolded(buf, len, init));
|
||||
}
|
||||
|
||||
/**
|
||||
* csum_udp4() - Calculate and set checksum for a UDP over IPv4 packet
|
||||
* @udp4hr: UDP header, initialised apart from checksum
|
||||
|
@ -482,21 +497,6 @@ uint32_t csum_unfolded(const void *buf, size_t len, uint32_t init)
|
|||
}
|
||||
#endif /* !__AVX2__ */
|
||||
|
||||
/**
|
||||
* csum() - Compute TCP/IP-style checksum
|
||||
* @buf: Input buffer
|
||||
* @len: Input length
|
||||
* @init: Initial 32-bit checksum, 0 for no pre-computed checksum
|
||||
*
|
||||
* Return: 16-bit folded, complemented checksum
|
||||
*/
|
||||
/* NOLINTNEXTLINE(clang-diagnostic-unknown-attributes) */
|
||||
__attribute__((optimize("-fno-strict-aliasing"))) /* See csum_16b() */
|
||||
uint16_t csum(const void *buf, size_t len, uint32_t init)
|
||||
{
|
||||
return (uint16_t)~csum_fold(csum_unfolded(buf, len, init));
|
||||
}
|
||||
|
||||
/**
|
||||
* csum_iov_tail() - Calculate unfolded checksum for the tail of an IO vector
|
||||
* @tail: IO vector tail to checksum
|
||||
|
|
|
@ -11,8 +11,6 @@ struct icmphdr;
|
|||
struct icmp6hdr;
|
||||
struct iov_tail;
|
||||
|
||||
uint32_t sum_16b(const void *buf, size_t len);
|
||||
uint16_t csum_fold(uint32_t sum);
|
||||
uint16_t csum_unaligned(const void *buf, size_t len, uint32_t init);
|
||||
uint16_t csum_ip4_header(uint16_t l3len, uint8_t protocol,
|
||||
struct in_addr saddr, struct in_addr daddr);
|
||||
|
@ -32,7 +30,6 @@ void csum_icmp6(struct icmp6hdr *icmp6hr,
|
|||
const struct in6_addr *saddr, const struct in6_addr *daddr,
|
||||
const void *payload, size_t dlen);
|
||||
uint32_t csum_unfolded(const void *buf, size_t len, uint32_t init);
|
||||
uint16_t csum(const void *buf, size_t len, uint32_t init);
|
||||
uint16_t csum_iov_tail(struct iov_tail *tail, uint32_t init);
|
||||
|
||||
#endif /* CHECKSUM_H */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue