CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: mrg Date: Fri Nov 15 08:42:18 UTC 2013 Modified Files: src/distrib/sets/lists/comp: mi Log Message: update gcc 4.8 support for 4.8.1 - 4.8.2. To generate a diff of this commit: cvs rdiff -u -r1.1858 -r1.1859 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1858 src/distrib/sets/lists/comp/mi:1.1859 --- src/distrib/sets/lists/comp/mi:1.1858 Wed Nov 13 22:09:55 2013 +++ src/distrib/sets/lists/comp/mi Fri Nov 15 08:42:18 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1858 2013/11/13 22:09:55 joerg Exp $ +# $NetBSD: mi,v 1.1859 2013/11/15 08:42:18 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1379,7 +1379,7 @@ ./usr/include/g++/ext/numeric comp-cxx-include gcc,cxx,libstdcxx ./usr/include/g++/ext/numeric_traits.h comp-cxx-include gcc=45,cxx,libstdcxx ./usr/include/g++/ext/numeric_traits.h comp-cxx-include gcc=48,cxx,libstdcxx -./usr/include/g++/ext/opt_random.h comp-cxx-include gcc=48,cxx,libstdcxx +./usr/include/g++/ext/opt_random.h comp-cxx-include gcc=48,obsolete ./usr/include/g++/ext/pb_ds/assoc_container.hpp comp-cxx-include gcc=48,cxx,libstdcxx ./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp comp-cxx-include gcc=48,cxx,libstdcxx ./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp comp-cxx-include gcc=48,cxx,libstdcxx @@ -1995,6 +1995,7 @@ ./usr/include/g++/profile/multiset.h comp-cxx-include gcc=48,cxx,libstdcxx ./usr/include/g++/profile/setcomp-cxx-include gcc=48,cxx,libstdcxx ./usr/include/g++/profile/set.hcomp-cxx-include gcc=48,cxx,libstdcxx +./usr/include/g++/profile/unordered_base.h comp-cxx-include gcc=48,cxx,libstdcxx ./usr/include/g++/profile/unordered_map comp-cxx-include gcc=48,cxx,libstdcxx ./usr/include/g++/profile/unordered_set comp-cxx-include gcc=48,cxx,libstdcxx ./usr/include/g++/profile/vector comp-cxx-include gcc=48,cxx,libstdcxx
CVS commit: src
Module Name:src
Committed By: msaitoh
Date: Fri Nov 15 08:47:55 UTC 2013
Modified Files:
src/sys/arch/x86/acpi: acpi_cpu_md.c
src/sys/arch/x86/include: specialreg.h
src/sys/arch/x86/pci: amdtemp.c
src/sys/arch/x86/x86: coretemp.c cpu.c cpu_topology.c cpu_ucode_amd.c
cpu_ucode_intel.c est.c identcpu.c intel_busclock.c lapic.c odcm.c
patch.c powernow.c tprof_amdpmi.c tprof_pmi.c tsc.c viac7temp.c
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
Modify some macros and add some new macros for CPU family and model
to reduce code duplication and to avoid bug.
CPUID_TO_STEPPING(cpuid)(not changed)
CPUID_TO_FAMILY(cpuid) (new)
CPUID_TO_MODEL(cpuid) (new)
Return the display family and the display model.
The macro names are the same as FreeBSD.
CPUID_TO_BASEFAMILY(cpuid) (The old name was CPUID2FAMILY)
CPUID_TO_BASEMODEL(cpuid) (The old name was CPUID2MODEL)
Only for the base field.
CPUID_TO_EXTFAMILY(cpuid) (The old name was CPUID2EXTFAMILY)
CPUID_TO_EXTMODEL(cpuid)(The old name was CPUID2EXTMODEL)
Only for the extended field.
See http://mail-index.netbsd.org/port-amd64/2013/11/12/msg001978.html
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/x86/acpi/acpi_cpu_md.c
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/x86/include/specialreg.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x86/pci/amdtemp.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/x86/x86/coretemp.c
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/x86/x86/cpu_topology.c \
src/sys/arch/x86/x86/powernow.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x86/x86/cpu_ucode_amd.c \
src/sys/arch/x86/x86/viac7temp.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x86/x86/cpu_ucode_intel.c \
src/sys/arch/x86/x86/tprof_amdpmi.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/x86/x86/est.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/x86/x86/identcpu.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/x86/x86/intel_busclock.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/x86/x86/lapic.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/x86/odcm.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/x86/x86/patch.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x86/x86/tprof_pmi.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/x86/x86/tsc.c
cvs rdiff -u -r1.49 -r1.50 src/usr.sbin/cpuctl/arch/i386.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/x86/acpi/acpi_cpu_md.c
diff -u src/sys/arch/x86/acpi/acpi_cpu_md.c:1.72 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.73
--- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.72 Thu Dec 6 04:43:29 2012
+++ src/sys/arch/x86/acpi/acpi_cpu_md.c Fri Nov 15 08:47:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_md.c,v 1.72 2012/12/06 04:43:29 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_md.c,v 1.73 2013/11/15 08:47:55 msaitoh Exp $ */
/*-
* Copyright (c) 2010, 2011 Jukka Ruohonen jruoho...@iki.fi
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.72 2012/12/06 04:43:29 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.73 2013/11/15 08:47:55 msaitoh Exp $);
#include sys/param.h
#include sys/bus.h
@@ -243,10 +243,7 @@ acpicpu_md_flags(void)
x86_cpuid(0x8007, regs);
- family = CPUID2FAMILY(ci-ci_signature);
-
- if (family == 0xf)
- family += CPUID2EXTFAMILY(ci-ci_signature);
+ family = CPUID_TO_FAMILY(ci-ci_signature);
switch (family) {
@@ -547,10 +544,7 @@ acpicpu_md_pstate_init(struct acpicpu_so
if ((sc-sc_flags ACPICPU_FLAG_P_FIDVID) != 0)
msr.ps_flags |= ACPICPU_FLAG_P_FIDVID;
- family = CPUID2FAMILY(ci-ci_signature);
-
- if (family == 0xf)
- family += CPUID2EXTFAMILY(ci-ci_signature);
+ family = CPUID_TO_FAMILY(ci-ci_signature);
switch (family) {
Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.71 src/sys/arch/x86/include/specialreg.h:1.72
--- src/sys/arch/x86/include/specialreg.h:1.71 Mon Oct 21 06:11:49 2013
+++ src/sys/arch/x86/include/specialreg.h Fri Nov 15 08:47:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: specialreg.h,v 1.71 2013/10/21 06:11:49 msaitoh Exp $ */
+/* $NetBSD: specialreg.h,v 1.72 2013/11/15 08:47:55 msaitoh Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -192,19 +192,30 @@
\31 DEADLINE \32 AES \33 XSAVE \34 OSXSAVE \
\35 AVX \36 F16C \37 RDRAND \40 RAZ
-#define CPUID2FAMILY(cpuid) (((cpuid) 8) 0xf)
-#define CPUID2MODEL(cpuid) (((cpuid) 4) 0xf)
-#define CPUID2STEPPING(cpuid) ((cpuid) 0xf)
+/* CPUID Fn0001 %eax */
+
+#define CPUID_TO_BASEFAMILY(cpuid) (((cpuid) 8) 0xf)
+#define CPUID_TO_BASEMODEL(cpuid) (((cpuid) 4) 0xf)
+#define CPUID_TO_STEPPING(cpuid) ((cpuid) 0xf)
/*
- * The Extended family bits should only be inspected when CPUID2FAMILY()
+ * The Extended
CVS commit: src/usr.sbin/fssconfig
Module Name:src Committed By: hannken Date: Fri Nov 15 09:13:57 UTC 2013 Modified Files: src/usr.sbin/fssconfig: fssconfig.8 Log Message: Describe the differences between file system internal and external snapshots. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/fssconfig/fssconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/fssconfig/fssconfig.8 diff -u src/usr.sbin/fssconfig/fssconfig.8:1.10 src/usr.sbin/fssconfig/fssconfig.8:1.11 --- src/usr.sbin/fssconfig/fssconfig.8:1.10 Tue Mar 5 23:01:06 2013 +++ src/usr.sbin/fssconfig/fssconfig.8 Fri Nov 15 09:13:57 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: fssconfig.8,v 1.10 2013/03/05 23:01:06 wiz Exp $ */ +.\ $NetBSD: fssconfig.8,v 1.11 2013/11/15 09:13:57 hannken Exp $ */ .\ .\ .\ Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -28,7 +28,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd June 11, 2012 +.Dd November 15, 2013 .Dt FSSCONFIG 8 .Os .Sh NAME @@ -63,6 +63,10 @@ resides on the snapshotted file system a This snapshot is active until .Ar backup is unlinked. +Persistent snapshots save the file system as if it had been unmounted. +Unlinked but open files get removed from the snapshot. +The time to create a persistent snapshot increases with the size of the +file system and decreases with the file system block size. This snapshot mode is only supported for FFS file systems. .Pp Otherwise data written through the @@ -80,6 +84,10 @@ Data is saved to in units of .Ar cluster bytes. +The snapshot is an image in time of the underlying block device. +Unlinked but open files are still present on the snapshot. +The time to create a snapshot is independent of the size of the +file system or the file system block size. .Pp Options indicate an action to be performed: .Bl -tag -width 3n
CVS commit: src/tests/lib/csu/arch/hppa
Module Name:src Committed By: skrll Date: Fri Nov 15 11:48:30 UTC 2013 Added Files: src/tests/lib/csu/arch/hppa: h_initfini_align.S Log Message: Check stack alignment on hppa. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/arch/hppa/h_initfini_align.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/tests/lib/csu/arch/hppa/h_initfini_align.S diff -u /dev/null src/tests/lib/csu/arch/hppa/h_initfini_align.S:1.1 --- /dev/null Fri Nov 15 11:48:30 2013 +++ src/tests/lib/csu/arch/hppa/h_initfini_align.S Fri Nov 15 11:48:30 2013 @@ -0,0 +1,12 @@ +/* $NetBSD: h_initfini_align.S,v 1.1 2013/11/15 11:48:30 skrll Exp $ */ + +#include machine/asm.h + +RCSID($NetBSD: h_initfini_align.S,v 1.1 2013/11/15 11:48:30 skrll Exp $) + +LEAF_ENTRY(check_stack_alignment) + extru %sp,31,6,%ret0 + comiclr, 0, %ret0, %ret0 + ldi 1,%ret0 + bv,n %r0(%r2) +EXIT(check_stack_alignment)
CVS commit: src/sys/net
Module Name:src Committed By: rmind Date: Fri Nov 15 13:56:21 UTC 2013 Modified Files: src/sys/net: bpfjit.c Log Message: Fix the bpfjit build. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/net/bpfjit.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/net/bpfjit.c diff -u src/sys/net/bpfjit.c:1.4 src/sys/net/bpfjit.c:1.5 --- src/sys/net/bpfjit.c:1.4 Fri Nov 15 00:12:44 2013 +++ src/sys/net/bpfjit.c Fri Nov 15 13:56:21 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: bpfjit.c,v 1.4 2013/11/15 00:12:44 rmind Exp $ */ +/* $NetBSD: bpfjit.c,v 1.5 2013/11/15 13:56:21 rmind Exp $ */ /*- * Copyright (c) 2011-2012 Alexander Nasonov. @@ -31,9 +31,9 @@ #include sys/cdefs.h #ifdef _KERNEL -__KERNEL_RCSID(0, $NetBSD: bpfjit.c,v 1.4 2013/11/15 00:12:44 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: bpfjit.c,v 1.5 2013/11/15 13:56:21 rmind Exp $); #else -__RCSID($NetBSD: bpfjit.c,v 1.4 2013/11/15 00:12:44 rmind Exp $); +__RCSID($NetBSD: bpfjit.c,v 1.5 2013/11/15 13:56:21 rmind Exp $); #endif #include sys/types.h @@ -63,6 +63,8 @@ __RCSID($NetBSD: bpfjit.c,v 1.4 2013/11 #include sys/module.h #endif +#define __BPF_PRIVATE +#include net/bpf.h #include net/bpfjit.h #include sljitLir.h
CVS commit: src/sys/nfs
Module Name:src Committed By: nisimura Date: Fri Nov 15 14:39:53 UTC 2013 Modified Files: src/sys/nfs: nfs_vnops.c Log Message: add one more __unused attribute to shut gcc4.8 off. To generate a diff of this commit: cvs rdiff -u -r1.300 -r1.301 src/sys/nfs/nfs_vnops.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/nfs/nfs_vnops.c diff -u src/sys/nfs/nfs_vnops.c:1.300 src/sys/nfs/nfs_vnops.c:1.301 --- src/sys/nfs/nfs_vnops.c:1.300 Sat Sep 14 22:29:08 2013 +++ src/sys/nfs/nfs_vnops.c Fri Nov 15 14:39:53 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs_vnops.c,v 1.300 2013/09/14 22:29:08 martin Exp $ */ +/* $NetBSD: nfs_vnops.c,v 1.301 2013/11/15 14:39:53 nisimura Exp $ */ /* * Copyright (c) 1989, 1993 @@ -39,7 +39,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: nfs_vnops.c,v 1.300 2013/09/14 22:29:08 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: nfs_vnops.c,v 1.301 2013/11/15 14:39:53 nisimura Exp $); #ifdef _KERNEL_OPT #include opt_nfs.h @@ -1164,7 +1164,7 @@ nfs_readrpc(struct vnode *vp, struct uio char *bpos, *dpos, *cp2; struct mbuf *mreq, *mrep, *md, *mb; struct nfsmount *nmp; - int error = 0, len, retlen, tsiz, eof, byte_count; + int error = 0, len, retlen, tsiz, eof __unused, byte_count; const int v3 = NFS_ISV3(vp); struct nfsnode *np = VTONFS(vp); #ifndef NFS_V2_ONLY
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: nisimura
Date: Fri Nov 15 14:52:11 UTC 2013
Modified Files:
src/sys/dev/ic: rtwphy.c
Log Message:
fix unused variable warning
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ic/rtwphy.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/dev/ic/rtwphy.c
diff -u src/sys/dev/ic/rtwphy.c:1.15 src/sys/dev/ic/rtwphy.c:1.16
--- src/sys/dev/ic/rtwphy.c:1.15 Mon Oct 19 23:19:39 2009
+++ src/sys/dev/ic/rtwphy.c Fri Nov 15 14:52:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwphy.c,v 1.15 2009/10/19 23:19:39 rmind Exp $ */
+/* $NetBSD: rtwphy.c,v 1.16 2013/11/15 14:52:11 nisimura Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
*
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rtwphy.c,v 1.15 2009/10/19 23:19:39 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: rtwphy.c,v 1.16 2013/11/15 14:52:11 nisimura Exp $);
#include sys/param.h
#include sys/systm.h
@@ -127,6 +127,7 @@ rtw_sa2400_txpower(struct rtw_rf *rf, ui
static void
verify_syna(u_int freq, uint32_t val)
{
+#ifdef DIAGNOSTIC
uint32_t expected_val = ~val;
switch (freq) {
@@ -174,6 +175,7 @@ verify_syna(u_int freq, uint32_t val)
break;
}
KASSERT(val == expected_val);
+#endif
}
/* freq is in MHz */
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Fri Nov 15 17:48:55 UTC 2013
Modified Files:
src/sys/kern: uipc_mbuf.c
Log Message:
remove trigger happy assertion. in m_adj negative lengths are valid.
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/sys/kern/uipc_mbuf.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/kern/uipc_mbuf.c
diff -u src/sys/kern/uipc_mbuf.c:1.156 src/sys/kern/uipc_mbuf.c:1.157
--- src/sys/kern/uipc_mbuf.c:1.156 Thu Nov 14 13:54:40 2013
+++ src/sys/kern/uipc_mbuf.c Fri Nov 15 12:48:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_mbuf.c,v 1.156 2013/11/14 18:54:40 christos Exp $ */
+/* $NetBSD: uipc_mbuf.c,v 1.157 2013/11/15 17:48:55 christos Exp $ */
/*-
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_mbuf.c,v 1.156 2013/11/14 18:54:40 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_mbuf.c,v 1.157 2013/11/15 17:48:55 christos Exp $);
#include opt_mbuftrace.h
#include opt_nmbclusters.h
@@ -940,7 +940,6 @@ m_adj(struct mbuf *mp, int req_len)
struct mbuf *m;
int count;
- KASSERT(len != M_COPYALL);
if ((m = mp) == NULL)
return;
if (len = 0) {
CVS commit: src/tests/lib/csu/arch/sparc64
Module Name:src Committed By: martin Date: Fri Nov 15 20:00:20 UTC 2013 Added Files: src/tests/lib/csu/arch/sparc64: h_initfini_align.S Log Message: Add stack alignement checking for sparc64 To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/tests/lib/csu/arch/sparc64/h_initfini_align.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/tests/lib/csu/arch/sparc64/h_initfini_align.S diff -u /dev/null src/tests/lib/csu/arch/sparc64/h_initfini_align.S:1.1 --- /dev/null Fri Nov 15 20:00:20 2013 +++ src/tests/lib/csu/arch/sparc64/h_initfini_align.S Fri Nov 15 20:00:20 2013 @@ -0,0 +1,11 @@ +/* $NetBSD: h_initfini_align.S,v 1.1 2013/11/15 20:00:20 martin Exp $ */ + +#include machine/asm.h + +RCSID($NetBSD: h_initfini_align.S,v 1.1 2013/11/15 20:00:20 martin Exp $) + +_ENTRY(check_stack_alignment) + add %sp, BIAS, %o1 + and %o1, 15, %o2 + retl + not %o2, %o0
CVS commit: src/sys/net
Module Name:src
Committed By: rmind
Date: Sat Nov 16 01:13:52 UTC 2013
Modified Files:
src/sys/net: bpf.c
Log Message:
bpf_deliver: convert to bpf_filter_ext().
To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 src/sys/net/bpf.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/net/bpf.c
diff -u src/sys/net/bpf.c:1.178 src/sys/net/bpf.c:1.179
--- src/sys/net/bpf.c:1.178 Fri Nov 15 00:12:44 2013
+++ src/sys/net/bpf.c Sat Nov 16 01:13:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.178 2013/11/15 00:12:44 rmind Exp $ */
+/* $NetBSD: bpf.c,v 1.179 2013/11/16 01:13:52 rmind Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bpf.c,v 1.178 2013/11/15 00:12:44 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: bpf.c,v 1.179 2013/11/16 01:13:52 rmind Exp $);
#if defined(_KERNEL_OPT)
#include opt_bpf.h
@@ -1377,6 +1377,13 @@ static inline void
bpf_deliver(struct bpf_if *bp, void *(*cpfn)(void *, const void *, size_t),
void *pkt, u_int pktlen, u_int buflen, const bool rcv)
{
+ bpf_ctx_t *bc = bpf_default_ctx();
+ bpf_args_t args = {
+ .pkt = pkt,
+ .wirelen = pktlen,
+ .buflen = buflen,
+ .arg = NULL
+ };
struct bpf_d *d;
struct timespec ts;
bool gottime = false;
@@ -1395,10 +1402,10 @@ bpf_deliver(struct bpf_if *bp, void *(*c
d-bd_rcount++;
bpf_gstats.bs_recv++;
- if (d-bd_jitcode != NULL)
+ if (d-bd_jitcode)
slen = d-bd_jitcode(pkt, pktlen, buflen);
else
- slen = bpf_filter(d-bd_filter, pkt, pktlen, buflen);
+ slen = bpf_filter_ext(bc, d-bd_filter, args);
if (!slen) {
continue;
CVS commit: src/sys/rump
Module Name:src
Committed By: rmind
Date: Sat Nov 16 01:23:37 UTC 2013
Added Files:
src/sys/rump/kern/lib/libsljit: Makefile shlib_version
src/sys/rump/net/lib/libbpfjit: Makefile shlib_version
Log Message:
Add rumpkern_sljit and rumpnet_bpfjit modules.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/kern/lib/libsljit/Makefile \
src/sys/rump/kern/lib/libsljit/shlib_version
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libbpfjit/Makefile \
src/sys/rump/net/lib/libbpfjit/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/rump/kern/lib/libsljit/Makefile
diff -u /dev/null src/sys/rump/kern/lib/libsljit/Makefile:1.1
--- /dev/null Sat Nov 16 01:23:37 2013
+++ src/sys/rump/kern/lib/libsljit/Makefile Sat Nov 16 01:23:37 2013
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2013/11/16 01:23:37 rmind Exp $
+#
+# Public Domain.
+#
+
+.PATH: ${.CURDIR}/../../../../external/bsd/sljit/sljit \
+ ${.CURDIR}/../../../../external/bsd/sljit/dist/sljit_src
+
+LIB= rumpkern_sljit
+
+SRCS= sljitLir.c sljit_mod.c
+
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/kern/lib/libsljit/shlib_version
diff -u /dev/null src/sys/rump/kern/lib/libsljit/shlib_version:1.1
--- /dev/null Sat Nov 16 01:23:37 2013
+++ src/sys/rump/kern/lib/libsljit/shlib_version Sat Nov 16 01:23:37 2013
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2013/11/16 01:23:37 rmind Exp $
+#
+major=0
+minor=0
Index: src/sys/rump/net/lib/libbpfjit/Makefile
diff -u /dev/null src/sys/rump/net/lib/libbpfjit/Makefile:1.1
--- /dev/null Sat Nov 16 01:23:37 2013
+++ src/sys/rump/net/lib/libbpfjit/Makefile Sat Nov 16 01:23:37 2013
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2013/11/16 01:23:37 rmind Exp $
+#
+# Public Domain.
+#
+
+.PATH: ${.CURDIR}/../../../../net
+
+LIB= rumpnet_bpfjit
+
+SRCS= bpfjit.c
+
+CPPFLAGS+= -I ${NETBSDSRCDIR}/sys/external/bsd/sljit/dist/sljit_src
+
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/net/lib/libbpfjit/shlib_version
diff -u /dev/null src/sys/rump/net/lib/libbpfjit/shlib_version:1.1
--- /dev/null Sat Nov 16 01:23:37 2013
+++ src/sys/rump/net/lib/libbpfjit/shlib_version Sat Nov 16 01:23:37 2013
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2013/11/16 01:23:37 rmind Exp $
+#
+major=0
+minor=0
CVS commit: src
Module Name:src Committed By: rmind Date: Sat Nov 16 01:39:18 UTC 2013 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: mi shl.mi src/distrib/sets/lists/debug: mi shl.mi src/sys/rump/kern: Makefile.rumpkerncomp src/sys/rump/net: Makefile.rumpnetcomp Log Message: Build rumpkern_sljit and rumpnet_bpfjit; include them into the sets. To generate a diff of this commit: cvs rdiff -u -r1.679 -r1.680 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.1859 -r1.1860 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.256 -r1.257 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.40 -r1.41 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.5 -r1.6 src/sys/rump/kern/Makefile.rumpkerncomp cvs rdiff -u -r1.8 -r1.9 src/sys/rump/net/Makefile.rumpnetcomp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.679 src/distrib/sets/lists/base/shl.mi:1.680 --- src/distrib/sets/lists/base/shl.mi:1.679 Wed Nov 13 09:49:08 2013 +++ src/distrib/sets/lists/base/shl.mi Sat Nov 16 01:39:17 2013 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.679 2013/11/13 09:49:08 mbalmer Exp $ +# $NetBSD: shl.mi,v 1.680 2013/11/16 01:39:17 rmind Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -637,6 +637,9 @@ ./usr/lib/librumpkern_ksem.so base-obsolete obsolete ./usr/lib/librumpkern_ksem.so.0 base-obsolete obsolete ./usr/lib/librumpkern_ksem.so.0.0 base-obsolete obsolete +./usr/lib/librumpkern_sljit.so base-rump-shlib rump +./usr/lib/librumpkern_sljit.so.0 base-rump-shlib rump +./usr/lib/librumpkern_sljit.so.0.0 base-rump-shlib rump ./usr/lib/librumpkern_solaris.so base-rump-shlib zfs,rump ./usr/lib/librumpkern_solaris.so.0 base-rump-shlib zfs,rump ./usr/lib/librumpkern_solaris.so.0.0 base-rump-shlib zfs,rump @@ -652,6 +655,9 @@ ./usr/lib/librumpnet_agr.so base-rump-shlib rump ./usr/lib/librumpnet_agr.so.0 base-rump-shlib rump ./usr/lib/librumpnet_agr.so.0.0 base-rump-shlib rump +./usr/lib/librumpnet_bpfjit.so base-rump-shlib rump +./usr/lib/librumpnet_bpfjit.so.0 base-rump-shlib rump +./usr/lib/librumpnet_bpfjit.so.0.0 base-rump-shlib rump ./usr/lib/librumpnet_bridge.so base-rump-shlib rump ./usr/lib/librumpnet_bridge.so.0 base-rump-shlib rump ./usr/lib/librumpnet_bridge.so.0.0 base-rump-shlib rump Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1859 src/distrib/sets/lists/comp/mi:1.1860 --- src/distrib/sets/lists/comp/mi:1.1859 Fri Nov 15 08:42:18 2013 +++ src/distrib/sets/lists/comp/mi Sat Nov 16 01:39:17 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1859 2013/11/15 08:42:18 mrg Exp $ +# $NetBSD: mi,v 1.1860 2013/11/16 01:39:17 rmind Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3834,6 +3834,8 @@ ./usr/lib/librumpkern_crypto_p.a comp-c-proflib profile,rump ./usr/lib/librumpkern_ksem.a comp-obsolete obsolete ./usr/lib/librumpkern_ksem_p.a comp-obsolete obsolete +./usr/lib/librumpkern_sljit.a comp-c-lib rump +./usr/lib/librumpkern_sljit_p.a comp-c-proflib profile,rump ./usr/lib/librumpkern_solaris.a comp-c-lib zfs,rump ./usr/lib/librumpkern_solaris_p.a comp-c-proflib profile,zfs,rump ./usr/lib/librumpkern_tty.a comp-c-lib rump @@ -3843,6 +3845,8 @@ ./usr/lib/librumpnet.acomp-c-lib rump ./usr/lib/librumpnet_agr.a comp-c-lib rump ./usr/lib/librumpnet_agr_p.a comp-c-proflib profile,rump +./usr/lib/librumpnet_bpfjit.a comp-c-lib rump +./usr/lib/librumpnet_bpfjit_p.a comp-c-proflib profile,rump ./usr/lib/librumpnet_bridge.a comp-c-lib rump ./usr/lib/librumpnet_bridge_p.a comp-c-proflib profile,rump ./usr/lib/librumpnet_local.a comp-c-lib rump Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.256 src/distrib/sets/lists/comp/shl.mi:1.257 --- src/distrib/sets/lists/comp/shl.mi:1.256 Fri Nov 1 07:48:31 2013 +++ src/distrib/sets/lists/comp/shl.mi Sat Nov 16 01:39:18 2013 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.256 2013/11/01 07:48:31 mrg Exp $ +# $NetBSD: shl.mi,v 1.257 2013/11/16 01:39:18 rmind Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -203,10 +203,12 @@ ./usr/lib/librumphijack_pic.a comp-c-piclib rump ./usr/lib/librumpkern_crypto_pic.a comp-c-piclib rump ./usr/lib/librumpkern_ksem_pic.a comp-obsolete obsolete +./usr/lib/librumpkern_sljit_pic.a comp-c-piclib rump ./usr/lib/librumpkern_solaris_pic.a comp-c-piclib zfs,rump ./usr/lib/librumpkern_tty_pic.a comp-c-piclib rump ./usr/lib/librumpkern_z_pic.a comp-c-piclib rump ./usr/lib/librumpnet_agr_pic.a comp-c-piclib rump +./usr/lib/librumpnet_bpfjit_pic.a
CVS commit: src/usr.sbin/npf/npftest
Module Name:src
Committed By: rmind
Date: Sat Nov 16 01:41:43 UTC 2013
Modified Files:
src/usr.sbin/npf/npftest: Makefile
src/usr.sbin/npf/npftest/libnpftest: Makefile npf_bpf_test.c
Log Message:
Enable bpfjit for npftest.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/npf/npftest/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/npf/npftest/libnpftest/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/npf/npftest/libnpftest/npf_bpf_test.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npftest/Makefile
diff -u src/usr.sbin/npf/npftest/Makefile:1.4 src/usr.sbin/npf/npftest/Makefile:1.5
--- src/usr.sbin/npf/npftest/Makefile:1.4 Sat Feb 9 03:35:33 2013
+++ src/usr.sbin/npf/npftest/Makefile Sat Nov 16 01:41:43 2013
@@ -12,12 +12,13 @@ LIBNPFTEST!= cd ${.CURDIR}/libnpftest
DPADD+= ${LIBNPFTEST}/libnpftest.a
LDADD+= -L${LIBNPFTEST} -lnpftest
-LDADD+= -lrump -lrumpvfs -lrumpnet -lrumpnet_net -lrumpnet_npf
-LDADD+= -lrumpdev_bpf
+LDADD+= -lrump -lrumpvfs -lrumpnet -lrumpnet_net
+LDADD+= -lrumpdev_bpf -lrumpkern_sljit -lrumpnet_bpfjit
+LDADD+= -lrumpnet_npf
LDADD+= -lpcap -lprop -lpthread
-WARNS= 4
+WARNS= 5
NOMAN= # no man page
NOLINT= # disabled (note: deliberately)
Index: src/usr.sbin/npf/npftest/libnpftest/Makefile
diff -u src/usr.sbin/npf/npftest/libnpftest/Makefile:1.7 src/usr.sbin/npf/npftest/libnpftest/Makefile:1.8
--- src/usr.sbin/npf/npftest/libnpftest/Makefile:1.7 Tue Sep 24 02:04:21 2013
+++ src/usr.sbin/npf/npftest/libnpftest/Makefile Sat Nov 16 01:41:43 2013
@@ -24,7 +24,7 @@ CPPFLAGS+= -D_NPF_TESTING
CPPFLAGS+= -I${.CURDIR}/../../../../sys/net/npf
CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
-WARNS= 4
+WARNS= 5
.include ${RUMPTOP}/Makefile.rump
.include bsd.lib.mk
Index: src/usr.sbin/npf/npftest/libnpftest/npf_bpf_test.c
diff -u src/usr.sbin/npf/npftest/libnpftest/npf_bpf_test.c:1.2 src/usr.sbin/npf/npftest/libnpftest/npf_bpf_test.c:1.3
--- src/usr.sbin/npf/npftest/libnpftest/npf_bpf_test.c:1.2 Fri Nov 8 00:38:27 2013
+++ src/usr.sbin/npf/npftest/libnpftest/npf_bpf_test.c Sat Nov 16 01:41:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_bpf_test.c,v 1.2 2013/11/08 00:38:27 rmind Exp $ */
+/* $NetBSD: npf_bpf_test.c,v 1.3 2013/11/16 01:41:43 rmind Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -40,6 +40,8 @@
#include npf_impl.h
#include npf_test.h
+static bool lverbose = false;
+
static struct mbuf *
fill_packet(int proto)
{
@@ -57,13 +59,14 @@ fill_packet(int proto)
}
static int
-test_bpf_code(const void *code)
+test_bpf_code(void *code, size_t size)
{
ifnet_t *dummy_ifp = npf_test_addif(IFNAME_TEST, false, false);
npf_cache_t npc = { .npc_info = 0 };
struct mbuf *m;
nbuf_t nbuf;
- int ret;
+ int ret, jret;
+ void *jcode;
/* Layer 3 (IP + TCP). */
m = fill_packet(IPPROTO_TCP);
@@ -71,6 +74,16 @@ test_bpf_code(const void *code)
npf_cache_all(npc, nbuf);
ret = npf_bpf_filter(npc, nbuf, code, NULL);
+
+ /* JIT-compiled code. */
+ jcode = npf_bpf_compile(code, size);
+ if (jcode) {
+ jret = npf_bpf_filter(npc, nbuf, NULL, jcode);
+ assert(ret == jret);
+ bpf_jit_freecode(jcode);
+ } else if (lverbose) {
+ printf(JIT-compilation failed\n);
+ }
m_freem(m);
return ret;
@@ -84,7 +97,7 @@ npf_bpfcop_run(u_int reg)
BPF_STMT(BPF_LD+BPF_W+BPF_MEM, reg),
BPF_STMT(BPF_RET+BPF_A, 0),
};
- return test_bpf_code(insns_npf_bpfcop);
+ return test_bpf_code(insns_npf_bpfcop, sizeof(insns_npf_bpfcop));
}
static bool
@@ -97,7 +110,7 @@ npf_bpfcop_test(void)
BPF_STMT(BPF_MISC+BPF_COP, NPF_COP_L3),
BPF_STMT(BPF_RET+BPF_A, 0),
};
- fail |= (test_bpf_code(insns_ipver) != IPVERSION);
+ fail |= (test_bpf_code(insns_ipver, sizeof(insns_ipver)) != IPVERSION);
/* BPF_MW_IPVERI - IP version */
fail |= (npf_bpfcop_run(BPF_MW_IPVER) != IPVERSION);
@@ -116,6 +129,8 @@ npf_bpf_test(bool verbose)
{
bool fail = false;
+ lverbose = verbose;
+
fail |= npf_bpfcop_test();
return !fail;
