Reimplement in4_cksum to not copy data, but sum up directly.
Tested on sparc and m68k by martin@.
This commit is contained in:
joerg
parent
96da5b3142
commit
80b711a35e
@ -1,116 +1,104 @@
|
||||
/* $NetBSD: in4_cksum.c,v 1.15 2008/01/25 21:12:15 joerg Exp $ */
|
||||
/* $NetBSD: in4_cksum.c,v 1.16 2008/02/07 22:45:20 joerg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1999 WIDE Project.
|
||||
/*-
|
||||
* Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the project nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
||||
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988, 1992, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)in_cksum.c 8.1 (Berkeley) 6/10/93
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: in4_cksum.c,v 1.15 2008/01/25 21:12:15 joerg Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: in4_cksum.c,v 1.16 2008/02/07 22:45:20 joerg Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/socket.h>
|
||||
#include <net/route.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/in_systm.h>
|
||||
#include <netinet/ip.h>
|
||||
#include <netinet/ip_var.h>
|
||||
|
||||
/*
|
||||
* Checksum routine for Internet Protocol family headers (Portable Version).
|
||||
* This is only for IPv4 pseudo header checksum.
|
||||
* No need to clear non-pseudo-header fields in IPv4 header.
|
||||
* len is for actual payload size, and does not include IPv4 header and
|
||||
* skipped header chain (off + len should be equal to the whole packet).
|
||||
* Checksum of the IPv4 pseudo header.
|
||||
*
|
||||
* off is supposed to be the skipped IPv4 header, len is the payload size.
|
||||
*/
|
||||
|
||||
int
|
||||
in4_cksum(struct mbuf *m, u_int8_t nxt, int off, int len)
|
||||
{
|
||||
uint32_t sum;
|
||||
union {
|
||||
struct ipovly ipov;
|
||||
uint16_t w[10];
|
||||
} u;
|
||||
uint16_t *w;
|
||||
|
||||
sum = 0;
|
||||
if (off < sizeof(struct ip))
|
||||
panic("in4_cksum: offset too short for IP header");
|
||||
if (m->m_len < sizeof(struct ip))
|
||||
panic("in4_cksum: mbuf too short for IP header");
|
||||
|
||||
if (nxt == 0)
|
||||
goto skip_phdr;
|
||||
return cpu_in_cksum(m, len, off, 0);
|
||||
|
||||
/* pseudo header */
|
||||
if (off < sizeof(struct ipovly))
|
||||
panic("in4_cksum: offset too short");
|
||||
if (m->m_len < sizeof(struct ip))
|
||||
panic("in4_cksum: bad mbuf chain");
|
||||
bzero(&u.ipov, sizeof(u.ipov));
|
||||
u.ipov.ih_len = htons(len);
|
||||
u.ipov.ih_pr = nxt;
|
||||
u.ipov.ih_src = mtod(m, struct ip *)->ip_src;
|
||||
u.ipov.ih_dst = mtod(m, struct ip *)->ip_dst;
|
||||
w = u.w;
|
||||
/* assumes sizeof(ipov) == 20 */
|
||||
sum += w[0]; sum += w[1]; sum += w[2]; sum += w[3]; sum += w[4];
|
||||
sum += w[5]; sum += w[6]; sum += w[7]; sum += w[8]; sum += w[9];
|
||||
/*
|
||||
* Compute the equivalent of:
|
||||
* struct ipovly ip;
|
||||
*
|
||||
* bzero(sizeof(*ip));
|
||||
* ip.ih_pr = nxt;
|
||||
* ip.ip_len = htons(len);
|
||||
* ip.ih_src = mtod(m, struct ip *)->ip_src;
|
||||
* ip.ih_dst = mtod(m, struct ip *)->ip_dst;
|
||||
* sum = one_add(&ip);
|
||||
*/
|
||||
|
||||
#if BYTE_ORDER == LITTLE_ENDIAN
|
||||
sum = ((len & 0xffff) + nxt) << 8;
|
||||
#else
|
||||
sum = (len & 0xffff) + nxt;
|
||||
#endif
|
||||
w = (uint16_t *)(mtod(m, char *) + offsetof(struct ip, ip_src));
|
||||
if (__predict_true((uintptr_t)w % 2 == 0)) {
|
||||
sum += w[0];
|
||||
sum += w[1];
|
||||
sum += w[2];
|
||||
sum += w[3];
|
||||
} else {
|
||||
uint32_t partial;
|
||||
w = (void *)((uintptr_t)w - 1);
|
||||
#if BYTE_ORDER == LITTLE_ENDIAN
|
||||
partial = w[0] & 0xff00;
|
||||
#else
|
||||
partial = w[0] & 0x00ff;
|
||||
#endif
|
||||
partial += w[1];
|
||||
partial += w[2];
|
||||
partial += w[3];
|
||||
#if BYTE_ORDER == LITTLE_ENDIAN
|
||||
partial += w[4] & 0x00ff;
|
||||
#else
|
||||
partial += w[4] & 0xff00;
|
||||
#endif
|
||||
sum += partial << 8;
|
||||
}
|
||||
|
||||
skip_phdr:
|
||||
return cpu_in_cksum(m, len, off, sum);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user