Module Name: src
Committed By: tsutsui
Date: Sun Sep 19 01:35:43 UTC 2010
Modified Files:
src/sys/arch/m68k/conf: files.m68k
Added Files:
src/sys/arch/m68k/m68k: cpu_in_cksum.c
Log Message:
Add m68k MD cpu_in_cksum.c.
Based on sys/netinet/cpu_in_cksum.c but just modified
to use traditional MD m68k/oc_cksum.s.
Makes ~5% improvements of ttcp(1) xfer rates on ATARI TT030 + SMC_TT.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/m68k/conf/files.m68k
cvs rdiff -u -r0 -r1.1 src/sys/arch/m68k/m68k/cpu_in_cksum.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/m68k/conf/files.m68k
diff -u src/sys/arch/m68k/conf/files.m68k:1.46 src/sys/arch/m68k/conf/files.m68k:1.47
--- src/sys/arch/m68k/conf/files.m68k:1.46 Sun Jun 6 04:51:33 2010
+++ src/sys/arch/m68k/conf/files.m68k Sun Sep 19 01:35:43 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.m68k,v 1.46 2010/06/06 04:51:33 mrg Exp $
+# $NetBSD: files.m68k,v 1.47 2010/09/19 01:35:43 tsutsui Exp $
#
defflag opt_fpsp.h FPSP
@@ -13,6 +13,7 @@
file arch/m68k/m68k/copy.s
file arch/m68k/m68k/copypage.s
file arch/m68k/m68k/core_machdep.c coredump
+file arch/m68k/m68k/cpu_in_cksum.c (inet | inet6) & cpu_in_cksum
file arch/m68k/m68k/db_disasm.c ddb
file arch/m68k/m68k/db_interface.c ddb
file arch/m68k/m68k/db_trace.c ddb
@@ -21,7 +22,7 @@
file arch/m68k/m68k/lock_stubs.s
file arch/m68k/m68k/m68k_machdep.c
file arch/m68k/m68k/mappedcopy.c mappedcopy
-file arch/m68k/m68k/oc_cksum.s inet
+file arch/m68k/m68k/oc_cksum.s (inet | inet6) & cpu_in_cksum
file arch/m68k/m68k/process_machdep.c
file arch/m68k/m68k/reenter_syscall.s
file arch/m68k/m68k/regdump.c
Added files:
Index: src/sys/arch/m68k/m68k/cpu_in_cksum.c
diff -u /dev/null src/sys/arch/m68k/m68k/cpu_in_cksum.c:1.1
--- /dev/null Sun Sep 19 01:35:43 2010
+++ src/sys/arch/m68k/m68k/cpu_in_cksum.c Sun Sep 19 01:35:43 2010
@@ -0,0 +1,123 @@
+/* $NetBSD: cpu_in_cksum.c,v 1.1 2010/09/19 01:35:43 tsutsui Exp $ */
+/*-
+ * Copyright (c) 2008 Joerg Sonnenberger <[email protected]>.
+ * 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.
+ *
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: cpu_in_cksum.c,v 1.1 2010/09/19 01:35:43 tsutsui Exp $");
+
+#include <sys/param.h>
+#include <sys/mbuf.h>
+#include <sys/systm.h>
+
+#include <netinet/in.h>
+
+/*
+ * Taken from sys/netinet/cpu_in_cksum.c and modified to use old MD oc_cksum().
+ */
+
+/* in <m68k/m68k/oc_cksum.s> */
+extern int oc_cksum(uint8_t *, int, uint32_t);
+
+int
+cpu_in_cksum(struct mbuf *m, int len, int off, uint32_t initial_sum)
+{
+ int mlen;
+ uint32_t sum, partial;
+ unsigned int final_acc;
+ uint8_t *data;
+ bool needs_swap, started_on_odd;
+
+ KASSERT(len >= 0);
+ KASSERT(off >= 0);
+
+ needs_swap = false;
+ started_on_odd = false;
+ sum = (initial_sum >> 16) + (initial_sum & 0xffff);
+
+ for (;;) {
+ if (__predict_false(m == NULL)) {
+ printf("in_cksum: out of data\n");
+ return -1;
+ }
+ mlen = m->m_len;
+ if (mlen > off) {
+ mlen -= off;
+ data = mtod(m, uint8_t *) + off;
+ goto post_initial_offset;
+ }
+ off -= mlen;
+ if (len == 0)
+ break;
+ m = m->m_next;
+ }
+
+ for (; len > 0; m = m->m_next) {
+ if (__predict_false(m == NULL)) {
+ printf("in_cksum: out of data\n");
+ return -1;
+ }
+ mlen = m->m_len;
+ data = mtod(m, uint8_t *);
+ post_initial_offset:
+ if (mlen == 0)
+ continue;
+ if (mlen > len)
+ mlen = len;
+ len -= mlen;
+
+ partial = 0;
+ if ((uintptr_t)data & 1) {
+ /* Align on word boundary */
+ started_on_odd = !started_on_odd;
+ /* We are big endian */
+ partial = *data;
+ ++data;
+ --mlen;
+ }
+ needs_swap = started_on_odd;
+
+ /* A possbile trailing odd byte is handled in oc_cksum() */
+ if (mlen & 1)
+ started_on_odd = !started_on_odd;
+ /* 16 bit word alignment is enough on m68k */
+ partial = oc_cksum(data, mlen, partial);
+
+ if (needs_swap)
+ partial = (partial << 8) + (partial >> 24);
+ sum += (partial >> 16) + (partial & 0xffff);
+ /*
+ * Reduce sum to allow potential byte swap
+ * in the next iteration without carry.
+ */
+ sum = (sum >> 16) + (sum & 0xffff);
+ }
+ final_acc = ((sum >> 16) & 0xffff) + (sum & 0xffff);
+ final_acc = (final_acc >> 16) + (final_acc & 0xffff);
+ return ~final_acc & 0xffff;
+}
