CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Mon Mar 11 09:35:38 UTC 2013 Modified Files: src/sys/dev/usb: if_smsc.c Log Message: Comments corrections. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/usb/if_smsc.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/usb/if_smsc.c diff -u src/sys/dev/usb/if_smsc.c:1.7 src/sys/dev/usb/if_smsc.c:1.8 --- src/sys/dev/usb/if_smsc.c:1.7 Sat Jan 26 07:52:16 2013 +++ src/sys/dev/usb/if_smsc.c Mon Mar 11 09:35:38 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_smsc.c,v 1.7 2013/01/26 07:52:16 skrll Exp $ */ +/* $NetBSD: if_smsc.c,v 1.8 2013/03/11 09:35:38 skrll Exp $ */ /* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */ /* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */ @@ -56,7 +56,7 @@ * go through the packet data and decode the headers prior to sending. * On Linux they generally provide cues to the location of the csum and the * area to calculate it over, on FreeBSD we seem to have to do it all ourselves, - * hence this is not as optimal and therefore h/w tX checksum is currently not + * hence this is not as optimal and therefore h/w TX checksum is currently not * implemented. */ @@ -798,7 +798,7 @@ smsc_chip_init(struct smsc_softc *sc) * There is a so called 'turbo mode' that the linux driver supports, it * seems to allow you to jam multiple frames per Rx transaction. * By default this driver supports that and therefore allows multiple - * frames per URB. + * frames per USB transfer. * * The xfer buffer size needs to reflect this as well, therefore based * on the calculations in the Linux driver the RX bufsize is set to @@ -832,7 +832,7 @@ smsc_chip_init(struct smsc_softc *sc) } /* - * The following setings are used for 'turbo mode', a.k.a multiple + * The following settings are used for 'turbo mode', a.k.a multiple * frames per Rx transaction (again info taken form Linux driver). */ #ifdef SMSC_TURBO
CVS commit: src/lib/libc/iconv
Module Name:src Committed By: yamt Date: Mon Mar 11 10:44:44 UTC 2013 Modified Files: src/lib/libc/iconv: iconv.3 Log Message: fix rev.1.13 To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/lib/libc/iconv/iconv.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/iconv/iconv.3 diff -u src/lib/libc/iconv/iconv.3:1.18 src/lib/libc/iconv/iconv.3:1.19 --- src/lib/libc/iconv/iconv.3:1.18 Tue Jan 8 19:55:43 2013 +++ src/lib/libc/iconv/iconv.3 Mon Mar 11 10:44:43 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: iconv.3,v 1.18 2013/01/08 19:55:43 wiz Exp $ +.\ $NetBSD: iconv.3,v 1.19 2013/03/11 10:44:43 yamt Exp $ .\ .\ Copyright (c)2003 Citrus Project, .\ All rights reserved. @@ -24,7 +24,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd January 8, 2013 +.Dd March 11, 2013 .Dt ICONV 3 .Os .\ -- @@ -118,11 +118,15 @@ and the conversion is continued. returns the number of such .Dq invalid conversions . .Pp -If the source and/or destination codesets are stateful, +If +.Fa src +or +.Fa *src +is +.Dv NULL +and the source and/or destination codesets are stateful, .Fn iconv places these into their initial state. -There are two special cases of -.Fn iconv : .Bl -enum -offset indent .It If both
CVS commit: src/sys/lib/libkern
Module Name:src
Committed By: christos
Date: Mon Mar 11 11:44:48 UTC 2013
Modified Files:
src/sys/lib/libkern: Makefile.libkern
Log Message:
amend previous sparc64 fix: rump does not know about memcpyset.s
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/lib/libkern/Makefile.libkern
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libkern/Makefile.libkern
diff -u src/sys/lib/libkern/Makefile.libkern:1.20 src/sys/lib/libkern/Makefile.libkern:1.21
--- src/sys/lib/libkern/Makefile.libkern:1.20 Sun Mar 10 03:31:03 2013
+++ src/sys/lib/libkern/Makefile.libkern Mon Mar 11 07:44:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libkern,v 1.20 2013/03/10 07:31:03 christos Exp $
+# $NetBSD: Makefile.libkern,v 1.21 2013/03/11 11:44:48 christos Exp $
#
# Variable definitions for libkern.
@@ -74,7 +74,8 @@ SRCS+= memmove.c
SRCS+= strchr.c strrchr.c
SRCS+= memcmp.c
-.if (${MACHINE_ARCH} != sparc64) # provided by memcpyset.s
+.if (${MACHINE_ARCH} != sparc64) || defined(RUMPTOP)
+# provided by memcpyset.s on sparc64, but RUMP does not know about it.
SRCS+= memcpy.c
.if empty(SRCS:Mmemset2.*)
SRCS+= memset.c
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Mon Mar 11 15:53:05 UTC 2013 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 src/distrib/sets/lists/debug: ad.mips64eb ad.mips64el md.amd64 md.sparc64 src/distrib/sets/lists/modules: md.evbppc mi Log Message: more npf sets lossage. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/distrib/sets/lists/base/ad.mips64eb \ src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.192 -r1.193 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.180 -r1.181 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/debug/ad.mips64eb cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/debug/ad.mips64el \ src/distrib/sets/lists/debug/md.amd64 \ src/distrib/sets/lists/debug/md.sparc64 cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/modules/md.evbppc cvs rdiff -u -r1.50 -r1.51 src/distrib/sets/lists/modules/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/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.115 src/distrib/sets/lists/base/ad.mips64eb:1.116 --- src/distrib/sets/lists/base/ad.mips64eb:1.115 Fri Mar 1 13:15:36 2013 +++ src/distrib/sets/lists/base/ad.mips64eb Mon Mar 11 11:53:04 2013 @@ -1,4 +1,26 @@ -# $NetBSD: ad.mips64eb,v 1.115 2013/03/01 18:15:36 pooka Exp $ +# $NetBSD: ad.mips64eb,v 1.116 2013/03/11 15:53:04 christos Exp $ +./lib/64 base-compat-shlib compat +./lib/64/npf base-npf-shlib compat +./lib/64/npf/ext_log.sobase-npf-shlib compat,pic +./lib/64/npf/ext_log.so.0 base-npf-shlib compat,pic +./lib/64/npf/ext_log.so.0.0 base-npf-shlib compat,pic +./lib/64/npf/ext_normalize.so base-npf-shlib compat,pic +./lib/64/npf/ext_normalize.so.0 base-npf-shlib compat,pic +./lib/64/npf/ext_normalize.so.0.0 base-npf-shlib compat,pic +./lib/64/npf/ext_rndblock.so base-npf-shlib compat,pic +./lib/64/npf/ext_rndblock.so.0 base-npf-shlib compat,pic +./lib/64/npf/ext_rndblock.so.0.0 base-npf-shlib compat,pic +./lib/o32/npf base-compat-shlib compat +./lib/o32/npf base-npf-shlib compat +./lib/o32/npf/ext_log.so base-npf-shlib compat,pic +./lib/o32/npf/ext_log.so.0 base-npf-shlib compat,pic +./lib/o32/npf/ext_log.so.0.0 base-npf-shlib compat,pic +./lib/o32/npf/ext_normalize.so base-npf-shlib compat,pic +./lib/o32/npf/ext_normalize.so.0 base-npf-shlib compat,pic +./lib/o32/npf/ext_normalize.so.0.0 base-npf-shlib compat,pic +./lib/o32/npf/ext_rndblock.so base-npf-shlib compat,pic +./lib/o32/npf/ext_rndblock.so.0 base-npf-shlib compat,pic +./lib/o32/npf/ext_rndblock.so.0.0 base-npf-shlib compat,pic ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -292,16 +314,16 @@ ./usr/lib/64/lua/5.1base-compat-shlib compat ./usr/lib/64/lua/5.1/gpio.so base-compat-shlib compat,pic ./usr/lib/64/lua/5.1/sqlite.so base-compat-shlib compat,pic -./usr/lib/64/npfbase-npf-shlib compat -./usr/lib/64/npf/ext_log.so base-npf-shlib compat,pic -./usr/lib/64/npf/ext_log.so.0 base-npf-shlib compat,pic -./usr/lib/64/npf/ext_log.so.0.0 base-npf-shlib compat,pic -./usr/lib/64/npf/ext_normalise.so base-npf-shlib compat,pic -./usr/lib/64/npf/ext_normalise.so.0 base-npf-shlib compat,pic -./usr/lib/64/npf/ext_normalise.so.0.0 base-npf-shlib compat,pic -./usr/lib/64/npf/ext_rndblock.so base-npf-shlib compat,pic -./usr/lib/64/npf/ext_rndblock.so.0 base-npf-shlib compat,pic -./usr/lib/64/npf/ext_rndblock.so.0.0 base-npf-shlib compat,pic +./usr/lib/64/npfbase-obsolete obsolete +./usr/lib/64/npf/ext_log.so base-obsolete obsolete +./usr/lib/64/npf/ext_log.so.0 base-obsolete obsolete +./usr/lib/64/npf/ext_log.so.0.0 base-obsolete obsolete +./usr/lib/64/npf/ext_normalise.so base-obsolete obsolete +./usr/lib/64/npf/ext_normalise.so.0 base-obsolete obsolete +./usr/lib/64/npf/ext_normalise.so.0.0 base-obsolete obsolete +./usr/lib/64/npf/ext_rndblock.so base-obsolete obsolete +./usr/lib/64/npf/ext_rndblock.so.0 base-obsolete obsolete +./usr/lib/64/npf/ext_rndblock.so.0.0 base-obsolete obsolete ./usr/lib/64/securitybase-compat-shlib ./usr/lib/64/security/pam_afslog.so.3 base-compat-shlib compat,pic,kerberos,pam ./usr/lib/64/security/pam_chroot.so.3 base-compat-shlib compat,pic,pam @@ -610,16 +632,16 @@ ./usr/lib/o32/lua/5.1base-compat-shlib compat ./usr/lib/o32/lua/5.1/gpio.so base-compat-shlib compat,pic ./usr/lib/o32/lua/5.1/sqlite.so base-compat-shlib compat,pic -./usr/lib/o32/npfbase-npf-shlib compat -./usr/lib/o32/npf/ext_log.so base-npf-shlib compat,pic -./usr/lib/o32/npf/ext_log.so.0 base-npf-shlib compat,pic -./usr/lib/o32/npf/ext_log.so.0.0 base-npf-shlib compat,pic
CVS commit: src/sys/net/npf
Module Name:src Committed By: christos Date: Mon Mar 11 16:37:44 UTC 2013 Modified Files: src/sys/net/npf: npf.h npf_ext_log.c npf_ext_normalise.c npf_ext_rndblock.c Log Message: - avoid trailing , in dependencies when there are none other the npf module itself. - remove if_npflog dependency from npf_ext_log. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/net/npf/npf.h cvs rdiff -u -r1.4 -r1.5 src/sys/net/npf/npf_ext_log.c cvs rdiff -u -r1.2 -r1.3 src/sys/net/npf/npf_ext_normalise.c cvs rdiff -u -r1.1 -r1.2 src/sys/net/npf/npf_ext_rndblock.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/npf/npf.h diff -u src/sys/net/npf/npf.h:1.27 src/sys/net/npf/npf.h:1.28 --- src/sys/net/npf/npf.h:1.27 Sun Feb 10 18:47:37 2013 +++ src/sys/net/npf/npf.h Mon Mar 11 12:37:43 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: npf.h,v 1.27 2013/02/10 23:47:37 rmind Exp $ */ +/* $NetBSD: npf.h,v 1.28 2013/03/11 16:37:43 christos Exp $ */ /*- * Copyright (c) 2009-2013 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ typedef uint8_t npf_netmask_t; #define NPF_DECISION_PASS 1 #define NPF_EXT_MODULE(name, req) \ -MODULE(MODULE_CLASS_MISC, name, npf, req) +MODULE(MODULE_CLASS_MISC, name, req ? (npf, req) : npf) /* * Packet information cache. Index: src/sys/net/npf/npf_ext_log.c diff -u src/sys/net/npf/npf_ext_log.c:1.4 src/sys/net/npf/npf_ext_log.c:1.5 --- src/sys/net/npf/npf_ext_log.c:1.4 Sun Mar 10 21:42:12 2013 +++ src/sys/net/npf/npf_ext_log.c Mon Mar 11 12:37:43 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: npf_ext_log.c,v 1.4 2013/03/11 01:42:12 christos Exp $ */ +/* $NetBSD: npf_ext_log.c,v 1.5 2013/03/11 16:37:43 christos Exp $ */ /*- * Copyright (c) 2010-2012 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: npf_ext_log.c,v 1.4 2013/03/11 01:42:12 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: npf_ext_log.c,v 1.5 2013/03/11 16:37:43 christos Exp $); #include sys/types.h #include sys/module.h @@ -51,7 +51,7 @@ __KERNEL_RCSID(0, $NetBSD: npf_ext_log. #include npf_impl.h -NPF_EXT_MODULE(npf_ext_log, if_npflog); +NPF_EXT_MODULE(npf_ext_log, NULL); #define NPFEXT_LOG_VER 1 Index: src/sys/net/npf/npf_ext_normalise.c diff -u src/sys/net/npf/npf_ext_normalise.c:1.2 src/sys/net/npf/npf_ext_normalise.c:1.3 --- src/sys/net/npf/npf_ext_normalise.c:1.2 Mon Dec 24 14:05:42 2012 +++ src/sys/net/npf/npf_ext_normalise.c Mon Mar 11 12:37:43 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: npf_ext_normalise.c,v 1.2 2012/12/24 19:05:42 rmind Exp $ */ +/* $NetBSD: npf_ext_normalise.c,v 1.3 2013/03/11 16:37:43 christos Exp $ */ /*- * Copyright (c) 2009-2012 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: npf_ext_normalise.c,v 1.2 2012/12/24 19:05:42 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: npf_ext_normalise.c,v 1.3 2013/03/11 16:37:43 christos Exp $); #include sys/types.h #include sys/module.h @@ -44,7 +44,7 @@ __KERNEL_RCSID(0, $NetBSD: npf_ext_norm /* * NPF extension module definition and the identifier. */ -NPF_EXT_MODULE(npf_ext_normalise, ); +NPF_EXT_MODULE(npf_ext_normalise, NULL); #define NPFEXT_NORMALISE_VER 1 Index: src/sys/net/npf/npf_ext_rndblock.c diff -u src/sys/net/npf/npf_ext_rndblock.c:1.1 src/sys/net/npf/npf_ext_rndblock.c:1.2 --- src/sys/net/npf/npf_ext_rndblock.c:1.1 Sun Dec 9 19:32:23 2012 +++ src/sys/net/npf/npf_ext_rndblock.c Mon Mar 11 12:37:43 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: npf_ext_rndblock.c,v 1.1 2012/12/10 00:32:23 rmind Exp $ */ +/* $NetBSD: npf_ext_rndblock.c,v 1.2 2013/03/11 16:37:43 christos Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: npf_ext_rndblock.c,v 1.1 2012/12/10 00:32:23 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: npf_ext_rndblock.c,v 1.2 2013/03/11 16:37:43 christos Exp $); #include sys/types.h #include sys/cprng.h @@ -45,7 +45,7 @@ __KERNEL_RCSID(0, $NetBSD: npf_ext_rndb /* * NPF extension module definition and the identifier. */ -NPF_EXT_MODULE(npf_ext_rndblock, ); +NPF_EXT_MODULE(npf_ext_rndblock, NULL); #define NPFEXT_RNDBLOCK_VER 1
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src Committed By: christos Date: Mon Mar 11 16:38:31 UTC 2013 Modified Files: src/usr.sbin/npf/npfctl: todo Log Message: one more fixed To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/npf/npfctl/todo 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/npfctl/todo diff -u src/usr.sbin/npf/npfctl/todo:1.6 src/usr.sbin/npf/npfctl/todo:1.7 --- src/usr.sbin/npf/npfctl/todo:1.6 Sun Mar 10 22:12:15 2013 +++ src/usr.sbin/npf/npfctl/todo Mon Mar 11 12:38:31 2013 @@ -15,7 +15,6 @@ for system failures is probably not good enough. For example if a module failed to autoload, it is probably an error and it should be reported differently? --- fix 'ifconfig npflog0 destroy; modunload if_npflog' ok npf and dependent modules should autoload automagically as they are used ok have a way to register cloners? through a mapping file? consistently naming @@ -31,3 +30,5 @@ ok fix usage ok get better messages from the kernel when things fail: Ok with DEBUG/DIAGNOSTIC, you get the file/line in the kernel that failed which is good enough. +ok 'ifconfig npflog0 destroy; modunload if_npflog'. Remove dependency + on npf_ext_log module, since if_npflog can load and unload independently.
CVS commit: src/sys/net/npf
Module Name:src Committed By: christos Date: Mon Mar 11 17:03:55 UTC 2013 Modified Files: src/sys/net/npf: npf.h npf_ext_log.c npf_ext_normalise.c npf_ext_rndblock.c Log Message: * is not constant according to gcc. So we move the responsibility for adding a , to the users of the macro. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/net/npf/npf.h cvs rdiff -u -r1.5 -r1.6 src/sys/net/npf/npf_ext_log.c cvs rdiff -u -r1.3 -r1.4 src/sys/net/npf/npf_ext_normalise.c cvs rdiff -u -r1.2 -r1.3 src/sys/net/npf/npf_ext_rndblock.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/npf/npf.h diff -u src/sys/net/npf/npf.h:1.28 src/sys/net/npf/npf.h:1.29 --- src/sys/net/npf/npf.h:1.28 Mon Mar 11 12:37:43 2013 +++ src/sys/net/npf/npf.h Mon Mar 11 13:03:55 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: npf.h,v 1.28 2013/03/11 16:37:43 christos Exp $ */ +/* $NetBSD: npf.h,v 1.29 2013/03/11 17:03:55 christos Exp $ */ /*- * Copyright (c) 2009-2013 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ typedef uint8_t npf_netmask_t; #define NPF_DECISION_PASS 1 #define NPF_EXT_MODULE(name, req) \ -MODULE(MODULE_CLASS_MISC, name, req ? (npf, req) : npf) +MODULE(MODULE_CLASS_MISC, name, npf req) /* * Packet information cache. Index: src/sys/net/npf/npf_ext_log.c diff -u src/sys/net/npf/npf_ext_log.c:1.5 src/sys/net/npf/npf_ext_log.c:1.6 --- src/sys/net/npf/npf_ext_log.c:1.5 Mon Mar 11 12:37:43 2013 +++ src/sys/net/npf/npf_ext_log.c Mon Mar 11 13:03:55 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: npf_ext_log.c,v 1.5 2013/03/11 16:37:43 christos Exp $ */ +/* $NetBSD: npf_ext_log.c,v 1.6 2013/03/11 17:03:55 christos Exp $ */ /*- * Copyright (c) 2010-2012 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: npf_ext_log.c,v 1.5 2013/03/11 16:37:43 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: npf_ext_log.c,v 1.6 2013/03/11 17:03:55 christos Exp $); #include sys/types.h #include sys/module.h @@ -51,7 +51,7 @@ __KERNEL_RCSID(0, $NetBSD: npf_ext_log. #include npf_impl.h -NPF_EXT_MODULE(npf_ext_log, NULL); +NPF_EXT_MODULE(npf_ext_log, ); #define NPFEXT_LOG_VER 1 Index: src/sys/net/npf/npf_ext_normalise.c diff -u src/sys/net/npf/npf_ext_normalise.c:1.3 src/sys/net/npf/npf_ext_normalise.c:1.4 --- src/sys/net/npf/npf_ext_normalise.c:1.3 Mon Mar 11 12:37:43 2013 +++ src/sys/net/npf/npf_ext_normalise.c Mon Mar 11 13:03:55 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: npf_ext_normalise.c,v 1.3 2013/03/11 16:37:43 christos Exp $ */ +/* $NetBSD: npf_ext_normalise.c,v 1.4 2013/03/11 17:03:55 christos Exp $ */ /*- * Copyright (c) 2009-2012 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: npf_ext_normalise.c,v 1.3 2013/03/11 16:37:43 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: npf_ext_normalise.c,v 1.4 2013/03/11 17:03:55 christos Exp $); #include sys/types.h #include sys/module.h @@ -44,7 +44,7 @@ __KERNEL_RCSID(0, $NetBSD: npf_ext_norm /* * NPF extension module definition and the identifier. */ -NPF_EXT_MODULE(npf_ext_normalise, NULL); +NPF_EXT_MODULE(npf_ext_normalise, ); #define NPFEXT_NORMALISE_VER 1 Index: src/sys/net/npf/npf_ext_rndblock.c diff -u src/sys/net/npf/npf_ext_rndblock.c:1.2 src/sys/net/npf/npf_ext_rndblock.c:1.3 --- src/sys/net/npf/npf_ext_rndblock.c:1.2 Mon Mar 11 12:37:43 2013 +++ src/sys/net/npf/npf_ext_rndblock.c Mon Mar 11 13:03:55 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: npf_ext_rndblock.c,v 1.2 2013/03/11 16:37:43 christos Exp $ */ +/* $NetBSD: npf_ext_rndblock.c,v 1.3 2013/03/11 17:03:55 christos Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: npf_ext_rndblock.c,v 1.2 2013/03/11 16:37:43 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: npf_ext_rndblock.c,v 1.3 2013/03/11 17:03:55 christos Exp $); #include sys/types.h #include sys/cprng.h @@ -45,7 +45,7 @@ __KERNEL_RCSID(0, $NetBSD: npf_ext_rndb /* * NPF extension module definition and the identifier. */ -NPF_EXT_MODULE(npf_ext_rndblock, NULL); +NPF_EXT_MODULE(npf_ext_rndblock, ); #define NPFEXT_RNDBLOCK_VER 1
CVS commit: src/sys/net/npf
Module Name:src Committed By: christos Date: Mon Mar 11 17:20:02 UTC 2013 Modified Files: src/sys/net/npf: npf.h Log Message: use sizeof(req) to find if it was empty or not (from uwe) To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/net/npf/npf.h 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/npf/npf.h diff -u src/sys/net/npf/npf.h:1.29 src/sys/net/npf/npf.h:1.30 --- src/sys/net/npf/npf.h:1.29 Mon Mar 11 13:03:55 2013 +++ src/sys/net/npf/npf.h Mon Mar 11 13:20:02 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: npf.h,v 1.29 2013/03/11 17:03:55 christos Exp $ */ +/* $NetBSD: npf.h,v 1.30 2013/03/11 17:20:02 christos Exp $ */ /*- * Copyright (c) 2009-2013 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ typedef uint8_t npf_netmask_t; #define NPF_DECISION_PASS 1 #define NPF_EXT_MODULE(name, req) \ -MODULE(MODULE_CLASS_MISC, name, npf req) +MODULE(MODULE_CLASS_MISC, name, (sizeof(req) - 1) ? (npf, req) : npf) /* * Packet information cache.
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Mon Mar 11 21:37:54 UTC 2013
Modified Files:
src/sys/kern: subr_pool.c
Log Message:
In pool_cache_put_slow(), pool_get() can block (it does mutex_enter()),
so we need to retry if curlwp took a context switch during the call.
Otherwise, CPU-local invariants can get screwed up:
panic: kernel diagnostic assertion cur-pcg_avail == cur-pcg_size failed
This is (was) very easy to reproduce by just running:
while : ; do RUMP_NCPU=32 ./a.out ; done
where a.out only calls rump_init(). But, any situation there's contention
and a pool doesn't have emptygroups would do.
To generate a diff of this commit:
cvs rdiff -u -r1.199 -r1.200 src/sys/kern/subr_pool.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/subr_pool.c
diff -u src/sys/kern/subr_pool.c:1.199 src/sys/kern/subr_pool.c:1.200
--- src/sys/kern/subr_pool.c:1.199 Sat Feb 9 00:31:21 2013
+++ src/sys/kern/subr_pool.c Mon Mar 11 21:37:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pool.c,v 1.199 2013/02/09 00:31:21 christos Exp $ */
+/* $NetBSD: subr_pool.c,v 1.200 2013/03/11 21:37:54 pooka Exp $ */
/*-
* Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_pool.c,v 1.199 2013/02/09 00:31:21 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_pool.c,v 1.200 2013/03/11 21:37:54 pooka Exp $);
#include opt_ddb.h
#include opt_lockdebug.h
@@ -2261,6 +2261,7 @@ pool_cache_get_paddr(pool_cache_t pc, in
static bool __noinline
pool_cache_put_slow(pool_cache_cpu_t *cc, int s, void *object)
{
+ struct lwp *l = curlwp;
pcg_t *pcg, *cur;
uint64_t ncsw;
pool_cache_t pc;
@@ -2271,6 +2272,7 @@ pool_cache_put_slow(pool_cache_cpu_t *cc
pc = cc-cc_cache;
pcg = NULL;
cc-cc_misses++;
+ ncsw = l-l_ncsw;
/*
* If there are no empty groups in the cache then allocate one
@@ -2280,6 +2282,16 @@ pool_cache_put_slow(pool_cache_cpu_t *cc
if (__predict_true(!pool_cache_disable)) {
pcg = pool_get(pc-pc_pcgpool, PR_NOWAIT);
}
+ /*
+ * If pool_get() blocked, then our view of
+ * the per-CPU data is invalid: retry.
+ */
+ if (__predict_false(l-l_ncsw != ncsw)) {
+ if (pcg != NULL) {
+pool_put(pc-pc_pcgpool, pcg);
+ }
+ return true;
+ }
if (__predict_true(pcg != NULL)) {
pcg-pcg_avail = 0;
pcg-pcg_size = pc-pc_pcgsize;
@@ -2288,7 +2300,6 @@ pool_cache_put_slow(pool_cache_cpu_t *cc
/* Lock the cache. */
if (__predict_false(!mutex_tryenter(pc-pc_lock))) {
- ncsw = curlwp-l_ncsw;
mutex_enter(pc-pc_lock);
pc-pc_contended++;
@@ -2296,7 +2307,7 @@ pool_cache_put_slow(pool_cache_cpu_t *cc
* If we context switched while locking, then our view of
* the per-CPU data is invalid: retry.
*/
- if (__predict_false(curlwp-l_ncsw != ncsw)) {
+ if (__predict_false(l-l_ncsw != ncsw)) {
mutex_exit(pc-pc_lock);
if (pcg != NULL) {
pool_put(pc-pc_pcgpool, pcg);
CVS commit: src/etc/mtree
Module Name:src Committed By: christos Date: Mon Mar 11 23:17:35 UTC 2013 Modified Files: src/etc/mtree: special Log Message: fix typo, from Henning Petersen To generate a diff of this commit: cvs rdiff -u -r1.143 -r1.144 src/etc/mtree/special Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/special diff -u src/etc/mtree/special:1.143 src/etc/mtree/special:1.144 --- src/etc/mtree/special:1.143 Fri Mar 8 09:31:28 2013 +++ src/etc/mtree/special Mon Mar 11 19:17:34 2013 @@ -1,4 +1,4 @@ -# $NetBSD: special,v 1.143 2013/03/08 14:31:28 christos Exp $ +# $NetBSD: special,v 1.144 2013/03/11 23:17:34 christos Exp $ # @(#)special 8.2 (Berkeley) 1/23/94 # # This file may be overwritten on upgrades. @@ -310,8 +310,8 @@ ./etc/ssh/ssh_config type=file mode=0644 optional ./etc/ssh/ssh_host_dsa_key type=file mode=0600 optional tags=nodiff ./etc/ssh/ssh_host_dsa_key.pub type=file mode=0644 optional -./etc/ssh/ssh_host_edsa_key type=file mode=0600 optional tags=nodiff -./etc/ssh/ssh_host_edsa_key.pub type=file mode=0644 optional +./etc/ssh/ssh_host_ecdsa_key type=file mode=0600 optional tags=nodiff +./etc/ssh/ssh_host_ecdsa_key.pub type=file mode=0644 optional ./etc/ssh/ssh_host_key type=file mode=0600 optional tags=nodiff ./etc/ssh/ssh_host_key.pub type=file mode=0644 optional ./etc/ssh/ssh_host_rsa_key type=file mode=0600 optional tags=nodiff
CVS commit: src/tools/host-mkdep
Module Name:src
Committed By: christos
Date: Tue Mar 12 01:52:20 UTC 2013
Modified Files:
src/tools/host-mkdep: host-mkdep.in
Log Message:
Perform shell fd gymnastics to capture the error in the pipeline and exit.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/tools/host-mkdep/host-mkdep.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/host-mkdep/host-mkdep.in
diff -u src/tools/host-mkdep/host-mkdep.in:1.24 src/tools/host-mkdep/host-mkdep.in:1.25
--- src/tools/host-mkdep/host-mkdep.in:1.24 Mon Mar 4 22:06:21 2013
+++ src/tools/host-mkdep/host-mkdep.in Mon Mar 11 21:52:20 2013
@@ -1,6 +1,6 @@
#!@BSHELL@ -
#
-# $NetBSD: host-mkdep.in,v 1.24 2013/03/05 03:06:21 christos Exp $
+# $NetBSD: host-mkdep.in,v 1.25 2013/03/12 01:52:20 christos Exp $
#
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
@@ -69,6 +69,13 @@ set_objlist()
fi
}
+# Send the command output to 4, and a command to set the exit code to 5
+exec 51
+run_cmd() {
+ $@ 14 4-
+ echo rv=$? 15 5-
+}
+
# A getopt compatible command line parser in shell comands.
# (don't trust the shell builtin getopts to be in a known state on error)
while [ $# -gt 0 ]; do
@@ -226,12 +233,13 @@ if $MERGE; then
done $f
done $TMP
else
+ exec 51
for f in $SRCS; do
file=${f##*/}
file=${file%.*}
set_objlist $file
- @CPP@ $@ $f | @AWK@ '
+ eval $( (run_cmd @CPP@ $@ $f 41 | @AWK@ '
/^#/ {
# Be as tolerant as possible.
sub(/^#(line)? [ 0-9]*\?/, )
@@ -247,7 +255,11 @@ else
print '$objlist' : $0
'$AWK_OPTIONAL'
}
- ' $TMP
+ ' $TMP) 51)
+ case $rv in
+ 0);;
+ *) exit $rv;;
+ esac
done
fi
CVS commit: src/tools/compat/sys
Module Name:src Committed By: christos Date: Tue Mar 12 01:52:56 UTC 2013 Modified Files: src/tools/compat/sys: sha1.h Log Message: not a good place to include nbtool_config.h To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tools/compat/sys/sha1.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/sys/sha1.h diff -u src/tools/compat/sys/sha1.h:1.1 src/tools/compat/sys/sha1.h:1.2 --- src/tools/compat/sys/sha1.h:1.1 Sun Oct 29 01:17:08 2006 +++ src/tools/compat/sys/sha1.h Mon Mar 11 21:52:55 2013 @@ -1,5 +1,4 @@ -/* $NetBSD: sha1.h,v 1.1 2006/10/29 06:17:08 dogcow Exp $ */ +/* $NetBSD: sha1.h,v 1.2 2013/03/12 01:52:55 christos Exp $ */ /* We unconditionally use the NetBSD SHA1 in libnbcompat. */ -#include nbtool_config.h #include ../../sys/sys/sha1.h
CVS commit: src/tools/host-mkdep
Module Name:src
Committed By: christos
Date: Tue Mar 12 01:55:33 UTC 2013
Modified Files:
src/tools/host-mkdep: host-mkdep.in
Log Message:
re-directing once is good enough.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/tools/host-mkdep/host-mkdep.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/host-mkdep/host-mkdep.in
diff -u src/tools/host-mkdep/host-mkdep.in:1.25 src/tools/host-mkdep/host-mkdep.in:1.26
--- src/tools/host-mkdep/host-mkdep.in:1.25 Mon Mar 11 21:52:20 2013
+++ src/tools/host-mkdep/host-mkdep.in Mon Mar 11 21:55:33 2013
@@ -1,6 +1,6 @@
#!@BSHELL@ -
#
-# $NetBSD: host-mkdep.in,v 1.25 2013/03/12 01:52:20 christos Exp $
+# $NetBSD: host-mkdep.in,v 1.26 2013/03/12 01:55:33 christos Exp $
#
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
@@ -70,7 +70,6 @@ set_objlist()
}
# Send the command output to 4, and a command to set the exit code to 5
-exec 51
run_cmd() {
$@ 14 4-
echo rv=$? 15 5-
