d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFp4 bz_ipv6_fast:

Browse Source 
in_cksum.h required ip.h to be included for struct ip.  To be
  able to use some general checksum functions like in_addword()
  in a non-IPv4 context, limit the (also exported to user space)
  IPv4 specific functions to the times, when the ip.h header is
  present and IPVERSION is defined (to 4).

  We should consider more general checksum (updating) functions
  to also allow easier incremental checksum updates in the L3/4
  stack and firewalls, as well as ponder further requirements by
  certain NIC drivers needing slightly different pseudo values
  in offloading cases.  Thinking in terms of a better "library".

  Sponsored by:	The FreeBSD Foundation
  Sponsored by:	iXsystems

Reviewed by:	gnn (as part of the whole)
MFC After:	3 days
This commit is contained in:
Bjoern A. Zeeb 2012-05-24 22:00:48 +00:00
parent 8bed40c9fe
commit 920b965865
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=235941
7 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/amd64/include/in_cksum.h
View File

@ -43,6 +43,7 @@
#define in_cksum(m, len) in_cksum_skip(m, len, 0)
#if defined(IPVERSION) && (IPVERSION == 4)
/*
* It it useful to have an Internet checksum routine which is inlineable
* and optimized specifically for the task of computing IP header checksums
@ -69,9 +70,12 @@ in_cksum_update(struct ip *ip)
} while(0)
#endif
#endif
#ifdef _KERNEL
#if defined(IPVERSION) && (IPVERSION == 4)
u_int in_cksum_hdr(const struct ip *ip);
#endif
u_short in_addword(u_short sum, u_short b);
u_short in_pseudo(u_int sum, u_int b, u_int c);
u_short in_cksum_skip(struct mbuf *m, int len, int skip);

2
sys/arm/include/in_cksum.h
View File

@ -46,7 +46,9 @@ u_short in_cksum(struct mbuf *m, int len);
u_short in_addword(u_short sum, u_short b);
u_short in_cksum_skip(struct mbuf *m, int len, int skip);
u_int do_cksum(const void *, int);
#if defined(IPVERSION) && (IPVERSION == 4)
u_int in_cksum_hdr(const struct ip *);
#endif
static __inline u_short
in_pseudo(u_int sum, u_int b, u_int c)

6
sys/i386/include/in_cksum.h
View File

@ -54,6 +54,7 @@
* therefore always exactly five 32-bit words.
*/
#if defined(__GNUCLIKE_ASM) && !defined(__INTEL_COMPILER)
#if defined(IPVERSION) && (IPVERSION == 4)
static __inline u_int
in_cksum_hdr(const struct ip *ip)
{
@ -88,6 +89,7 @@ in_cksum_update(struct ip *ip)
__tmpsum = (int)ntohs(ip->ip_sum) + 256;
ip->ip_sum = htons(__tmpsum + (__tmpsum >> 16));
}
#endif
static __inline u_short
in_addword(u_short sum, u_short b)
@ -121,6 +123,7 @@ in_pseudo(u_int sum, u_int b, u_int c)
}
#else
#if defined(IPVERSION) && (IPVERSION == 4)
#define in_cksum_update(ip) \
do { \
int __tmpsum; \
@ -129,10 +132,13 @@ in_pseudo(u_int sum, u_int b, u_int c)
} while(0)
#endif
#endif
#ifdef _KERNEL
#if !defined(__GNUCLIKE_ASM) || defined(__INTEL_COMPILER)
#if defined(IPVERSION) && (IPVERSION == 4)
u_int in_cksum_hdr(const struct ip *ip);
#endif
u_short in_addword(u_short sum, u_short b);
u_short in_pseudo(u_int sum, u_int b, u_int c);
#endif

4
sys/ia64/include/in_cksum.h
View File

@ -39,6 +39,7 @@
#define in_cksum(m, len) in_cksum_skip(m, len, 0)
#if defined(IPVERSION) && (IPVERSION == 4)
/*
* It it useful to have an Internet checksum routine which is inlineable
* and optimized specifically for the task of computing IP header checksums
@ -65,9 +66,12 @@ in_cksum_update(struct ip *ip)
} while(0)
#endif
#endif
#ifdef _KERNEL
#if defined(IPVERSION) && (IPVERSION == 4)
u_int in_cksum_hdr(const struct ip *ip);
#endif
u_short in_addword(u_short sum, u_short b);
u_short in_pseudo(u_int sum, u_int b, u_int c);
u_short in_cksum_skip(struct mbuf *m, int len, int skip);

4
sys/mips/include/in_cksum.h
View File

@ -40,6 +40,7 @@
#define in_cksum(m, len) in_cksum_skip(m, len, 0)
#if defined(IPVERSION) && (IPVERSION == 4)
/*
* It it useful to have an Internet checksum routine which is inlineable
* and optimized specifically for the task of computing IP header checksums
@ -66,9 +67,12 @@ in_cksum_update(struct ip *ip)
} while(0)
#endif
#endif
#ifdef _KERNEL
#if defined(IPVERSION) && (IPVERSION == 4)
u_int in_cksum_hdr(const struct ip *ip);
#endif
u_short in_addword(u_short sum, u_short b);
u_short in_pseudo(u_int sum, u_int b, u_int c);
u_short in_cksum_skip(struct mbuf *m, int len, int skip);

4
sys/powerpc/include/in_cksum.h
View File

@ -39,6 +39,7 @@
#define in_cksum(m, len) in_cksum_skip(m, len, 0)
#if defined(IPVERSION) && (IPVERSION == 4)
/*
* It it useful to have an Internet checksum routine which is inlineable
* and optimized specifically for the task of computing IP header checksums
@ -65,9 +66,12 @@ in_cksum_update(struct ip *ip)
} while(0)
#endif
#endif
#ifdef _KERNEL
#if defined(IPVERSION) && (IPVERSION == 4)
u_int in_cksum_hdr(const struct ip *ip);
#endif
u_short in_addword(u_short sum, u_short b);
u_short in_pseudo(u_int sum, u_int b, u_int c);
u_short in_cksum_skip(struct mbuf *m, int len, int skip);

4
sys/sparc64/include/in_cksum.h
View File

@ -65,6 +65,7 @@
#define in_cksum(m, len) in_cksum_skip(m, len, 0)
#if defined(IPVERSION) && (IPVERSION == 4)
static __inline void
in_cksum_update(struct ip *ip)
{
@ -73,6 +74,7 @@ in_cksum_update(struct ip *ip)
__tmp = (int)ip->ip_sum + 1;
ip->ip_sum = __tmp + (__tmp >> 16);
}
#endif
static __inline u_short
in_addword(u_short sum, u_short b)
@ -106,6 +108,7 @@ in_pseudo(u_int sum, u_int b, u_int c)
return (sum);
}
#if defined(IPVERSION) && (IPVERSION == 4)
static __inline u_int
in_cksum_hdr(struct ip *ip)
{
@ -163,6 +166,7 @@ in_cksum_hdr(struct ip *ip)
#undef __LD_ADD
return (__ret);
}
#endif
#ifdef _KERNEL
u_short in_cksum_skip(struct mbuf *m, int len, int skip);