CVS commit: src
Module Name:src Committed By: thorpej Date: Tue Jun 16 01:29:01 UTC 2020 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man9: Makefile vmem.9 src/sys/kern: subr_vmem.c src/sys/sys: vmem.h Log Message: Add vmem_xfreeall(), which frees all allocated regions in the specified arena. All outstanding allocations MUST have been performed with vmem_xalloc() or else the behavior is undefined. (This also implies that the arena must also not have a quantum cache; note this in the documentation.) To generate a diff of this commit: cvs rdiff -u -r1.2337 -r1.2338 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.450 -r1.451 src/share/man/man9/Makefile cvs rdiff -u -r1.19 -r1.20 src/share/man/man9/vmem.9 cvs rdiff -u -r1.103 -r1.104 src/sys/kern/subr_vmem.c cvs rdiff -u -r1.20 -r1.21 src/sys/sys/vmem.h 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.2337 src/distrib/sets/lists/comp/mi:1.2338 --- src/distrib/sets/lists/comp/mi:1.2337 Mon Jun 15 23:41:55 2020 +++ src/distrib/sets/lists/comp/mi Tue Jun 16 01:29:01 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2337 2020/06/15 23:41:55 christos Exp $ +# $NetBSD: mi,v 1.2338 2020/06/16 01:29:01 thorpej Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -12439,6 +12439,7 @@ ./usr/share/man/cat9/vmem_free.0 comp-sys-catman .cat ./usr/share/man/cat9/vmem_xalloc.0 comp-sys-catman .cat ./usr/share/man/cat9/vmem_xfree.0 comp-sys-catman .cat +./usr/share/man/cat9/vmem_xfreeall.0 comp-sys-catman .cat ./usr/share/man/cat9/vn_bwrite.0 comp-sys-catman .cat ./usr/share/man/cat9/vn_close.0 comp-sys-catman .cat ./usr/share/man/cat9/vn_closefile.0 comp-sys-catman .cat @@ -20543,6 +20544,7 @@ ./usr/share/man/html9/vmem_free.html comp-sys-htmlman html ./usr/share/man/html9/vmem_xalloc.html comp-sys-htmlman html ./usr/share/man/html9/vmem_xfree.html comp-sys-htmlman html +./usr/share/man/html9/vmem_xfreeall.html comp-sys-htmlman html ./usr/share/man/html9/vn_bwrite.html comp-sys-htmlman html ./usr/share/man/html9/vn_close.html comp-sys-htmlman html ./usr/share/man/html9/vn_closefile.html comp-sys-htmlman html @@ -28886,6 +2,7 @@ ./usr/share/man/man9/vmem_free.9 comp-sys-man .man ./usr/share/man/man9/vmem_xalloc.9 comp-sys-man .man ./usr/share/man/man9/vmem_xfree.9 comp-sys-man .man +./usr/share/man/man9/vmem_xfreeall.9 comp-sys-man .man ./usr/share/man/man9/vn_bwrite.9 comp-sys-man .man ./usr/share/man/man9/vn_close.9 comp-sys-man .man ./usr/share/man/man9/vn_closefile.9 comp-sys-man .man Index: src/share/man/man9/Makefile diff -u src/share/man/man9/Makefile:1.450 src/share/man/man9/Makefile:1.451 --- src/share/man/man9/Makefile:1.450 Fri May 1 21:43:24 2020 +++ src/share/man/man9/Makefile Tue Jun 16 01:29:00 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.450 2020/05/01 21:43:24 jdolecek Exp $ +# $NetBSD: Makefile,v 1.451 2020/06/16 01:29:00 thorpej Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -1030,7 +1030,8 @@ MLINKS+=vmem.9 vmem_alloc.9 \ vmem.9 vmem_destroy.9 \ vmem.9 vmem_free.9 \ vmem.9 vmem_xalloc.9 \ - vmem.9 vmem_xfree.9 + vmem.9 vmem_xfree.9 \ + vmem.9 vmem_xfreeall.9 MLINKS+=vnode.9 vref.9 \ vnode.9 vrele.9 \ vnode.9 vrele_async.9 \ Index: src/share/man/man9/vmem.9 diff -u src/share/man/man9/vmem.9:1.19 src/share/man/man9/vmem.9:1.20 --- src/share/man/man9/vmem.9:1.19 Wed Nov 6 11:55:18 2019 +++ src/share/man/man9/vmem.9 Tue Jun 16 01:29:00 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: vmem.9,v 1.19 2019/11/06 11:55:18 wiz Exp $ +.\" $NetBSD: vmem.9,v 1.20 2020/06/16 01:29:00 thorpej Exp $ .\" .\" Copyright (c)2006 YAMAMOTO Takashi, .\" All rights reserved. @@ -25,7 +25,7 @@ .\" SUCH DAMAGE. .\" .\" -.Dd November 5, 2019 +.Dd June 15, 2020 .Dt VMEM 9 .Os .\" @@ -63,6 +63,9 @@ .Ft void .Fn vmem_xfree "vmem_t *vm" "vmem_addr_t addr" "vmem_size_t size" .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +.Ft void +.Fn vmem_xfreeall "vmem_t *vm" +.\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .Ft int .Fn vmem_alloc "vmem_t *vm" "vmem_size_t size" "vm_flag_t flags" "vmem_addr_t *addrp" .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -407,6 +410,24 @@ argument used for .El .Pp .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +.Fn vmem_xfreeall +frees all resources that have been allocated by +.Fn vmem_xalloc +to the arena. +.Bl -tag -offset indent -width addr +.It Fa vm +The arena which we free to. +Note that this function is may not be used on arenas +where resources have been allocated
CVS commit: src
Module Name:src Committed By: thorpej Date: Tue Jun 16 01:29:01 UTC 2020 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man9: Makefile vmem.9 src/sys/kern: subr_vmem.c src/sys/sys: vmem.h Log Message: Add vmem_xfreeall(), which frees all allocated regions in the specified arena. All outstanding allocations MUST have been performed with vmem_xalloc() or else the behavior is undefined. (This also implies that the arena must also not have a quantum cache; note this in the documentation.) To generate a diff of this commit: cvs rdiff -u -r1.2337 -r1.2338 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.450 -r1.451 src/share/man/man9/Makefile cvs rdiff -u -r1.19 -r1.20 src/share/man/man9/vmem.9 cvs rdiff -u -r1.103 -r1.104 src/sys/kern/subr_vmem.c cvs rdiff -u -r1.20 -r1.21 src/sys/sys/vmem.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl2/groff/dist/src/roff
Module Name:src
Committed By: christos
Date: Tue Jun 16 00:47:21 UTC 2020
Modified Files:
src/external/gpl2/groff/dist/src/roff/groff: groff.cpp
src/external/gpl2/groff/dist/src/roff/troff: input.cpp
Log Message:
Add --timestamp for reproducible builds.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl2/groff/dist/src/roff/groff/groff.cpp
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl2/groff/dist/src/roff/troff/input.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/groff/dist/src/roff/groff/groff.cpp
diff -u src/external/gpl2/groff/dist/src/roff/groff/groff.cpp:1.1.1.1 src/external/gpl2/groff/dist/src/roff/groff/groff.cpp:1.2
--- src/external/gpl2/groff/dist/src/roff/groff/groff.cpp:1.1.1.1 Wed Jan 13 13:41:48 2016
+++ src/external/gpl2/groff/dist/src/roff/groff/groff.cpp Mon Jun 15 20:47:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: groff.cpp,v 1.1.1.1 2016/01/13 18:41:48 christos Exp $ */
+/* $NetBSD: groff.cpp,v 1.2 2020/06/16 00:47:21 christos Exp $ */
// -*- C++ -*-
/* Copyright (C) 1989-2000, 2001, 2002, 2003, 2004
@@ -126,11 +126,12 @@ int main(int argc, char **argv)
commands[TROFF_INDEX].set_name(command_prefix, "troff");
static const struct option long_options[] = {
{ "help", no_argument, 0, 'h' },
+{ "timestamp", required_argument, 0, 'Y' },
{ "version", no_argument, 0, 'v' },
{ NULL, 0, 0, 0 }
};
while ((opt = getopt_long(argc, argv,
- "abcCd:eEf:F:gGhiI:lL:m:M:n:No:pP:r:RsStT:UvVw:W:XzZ",
+ "abcCd:eEf:F:gGhiI:lL:m:M:n:No:pP:r:RsStT:UvVw:W:XY:zZ",
long_options, NULL))
!= EOF) {
char buf[3];
@@ -281,6 +282,9 @@ int main(int argc, char **argv)
usage(stderr);
exit(1);
break;
+case 'Y':
+ commands[TROFF_INDEX].append_arg(buf, optarg);
+ break;
default:
assert(0);
break;
Index: src/external/gpl2/groff/dist/src/roff/troff/input.cpp
diff -u src/external/gpl2/groff/dist/src/roff/troff/input.cpp:1.4 src/external/gpl2/groff/dist/src/roff/troff/input.cpp:1.5
--- src/external/gpl2/groff/dist/src/roff/troff/input.cpp:1.4 Sat Oct 8 19:40:52 2016
+++ src/external/gpl2/groff/dist/src/roff/troff/input.cpp Mon Jun 15 20:47:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: input.cpp,v 1.4 2016/10/08 23:40:52 joerg Exp $ */
+/* $NetBSD: input.cpp,v 1.5 2020/06/16 00:47:21 christos Exp $ */
// -*- C++ -*-
/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005
@@ -7242,6 +7242,14 @@ void usage(FILE *stream, const char *pro
" -rcn -Tname -Fdir -Idir -Mdir [files...]\n",
prog);
}
+
+static
+#ifdef LONG_FOR_TIME_T
+long
+#else /* not LONG_FOR_TIME_T */
+time_t
+#endif /* not LONG_FOR_TIME_T */
+timestamp;
int main(int argc, char **argv)
{
@@ -7273,6 +7281,7 @@ int main(int argc, char **argv)
}
static const struct option long_options[] = {
{ "help", no_argument, 0, CHAR_MAX + 1 },
+{ "timestamp", required_argument, 0, 'Y' },
{ "version", no_argument, 0, 'v' },
{ 0, 0, 0, 0 }
};
@@ -7280,7 +7289,7 @@ int main(int argc, char **argv)
#define DEBUG_OPTION "D"
#endif
while ((c = getopt_long(argc, argv,
- "abciI:vw:W:zCEf:m:n:o:r:d:F:M:T:tqs:RU"
+ "abciI:vw:W:zCEf:m:n:o:r:d:F:M:T:tqs:RUY:"
DEBUG_OPTION, long_options, 0))
!= EOF)
switch(c) {
@@ -7383,6 +7392,9 @@ int main(int argc, char **argv)
usage(stdout, argv[0]);
exit(0);
break;
+case 'Y': // --timestamp
+ timestamp = strtoul(optarg, NULL, 0);
+ break;
case '?':
usage(stderr, argv[0]);
exit(1);
@@ -7485,7 +7497,7 @@ static void init_registers()
#else /* not LONG_FOR_TIME_T */
time_t
#endif /* not LONG_FOR_TIME_T */
-t = time(0);
+t = timestamp ? timestamp : time(0);
// Use struct here to work around misfeature in old versions of g++.
struct tm *tt = localtime();
set_number_reg("seconds", int(tt->tm_sec));
CVS commit: src/external/gpl2/groff/dist/src/roff
Module Name:src Committed By: christos Date: Tue Jun 16 00:47:21 UTC 2020 Modified Files: src/external/gpl2/groff/dist/src/roff/groff: groff.cpp src/external/gpl2/groff/dist/src/roff/troff: input.cpp Log Message: Add --timestamp for reproducible builds. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl2/groff/dist/src/roff/groff/groff.cpp cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl2/groff/dist/src/roff/troff/input.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes
Module Name:src
Committed By: christos
Date: Tue Jun 16 00:45:56 UTC 2020
Modified Files:
src/distrib/notes: Makefile.inc
Log Message:
For MKREPRO builds:
1. compute cur_date from the timestamp
2. pass the date to groff so that it can set its registers
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/distrib/notes/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/Makefile.inc
diff -u src/distrib/notes/Makefile.inc:1.54 src/distrib/notes/Makefile.inc:1.55
--- src/distrib/notes/Makefile.inc:1.54 Thu Jan 23 18:59:53 2020
+++ src/distrib/notes/Makefile.inc Mon Jun 15 20:45:56 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.54 2020/01/23 23:59:53 uwe Exp $
+# $NetBSD: Makefile.inc,v 1.55 2020/06/16 00:45:56 christos Exp $
#
# Ross Harvey
@@ -6,6 +6,11 @@
.include # So we get /etc/mk.conf vars.
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+GROFF_TIMESTAMP=--timestamp=${MKREPRO_TIMESTAMP}
+DATE_TIMESTAMP=-r ${MKREPRO_TIMESTAMP}
+.endif
+
# Whether or not to regenerate tables of contents
#
MKTOCS?=yes
@@ -55,7 +60,7 @@ curdate!= env LANG="C" date -d "${BUILDI
.if ${NETBSD_OFFICIAL_RELEASE:Uno} == "yes"
.error "No release date could be derived from BUILDID"
.else
-curdate!= env LANG="C" date "+%b %d, %Y"
+curdate!= env LANG="C" date ${DATE_TIMESTAMP} "+%b %d, %Y"
.endif
.endif
PRESET+= -dcur_date="${curdate}"
@@ -86,7 +91,7 @@ TOC.more= ${TOCS:M*.more.*}
REMOVE_CREATION_DATE= ${TOOL_SED} -e '/^%%CreationDate:/d'
${TARG}.ps: ${SRCS} ${TOC.ps} ${DISTRIBVERDEP}
- ${TOOL_GROFF} ${ARGS_PS} -mdoc ${MAIN} \
+ ${TOOL_GROFF} ${ARGS_PS} ${GROFF_TIMESTAMP} -mdoc ${MAIN} \
${${MKREPRO:Uno} == "yes":? | ${REMOVE_CREATION_DATE} :} \
> $@
@@ -94,13 +99,13 @@ ${TARG}.pdf: ${TARG}.ps
ps2pdf ${TARG}.ps $@
${TARG}.txt: ${SRCS} ${TOC.txt} ${DISTRIBVERDEP}
- ${TOOL_GROFF} ${ARGS_TXT} -mdoc ${MAIN} > $@
+ ${TOOL_GROFF} ${ARGS_TXT} ${GROFF_TIMESTAMP} -mdoc ${MAIN} > $@
${TARG}.html: ${SRCS} ${TOC.html} ${DISTRIBVERDEP}
- ${TOOL_GROFF} ${ARGS_HTML} -mdoc2html ${MAIN} > $@
+ ${TOOL_GROFF} ${ARGS_HTML} ${GROFF_TIMESTAMP} -mdoc2html ${MAIN} > $@
${TARG}.more: ${SRCS} ${TOC.more} ${DISTRIBVERDEP}
- ${TOOL_GROFF} ${ARGS_MORE} -mdoc ${MAIN} > $@
+ ${TOOL_GROFF} ${ARGS_MORE} ${GROFF_TIMESTAMP} -mdoc ${MAIN} > $@
# Rules to build the table of contents (.toc) files. For the
@@ -108,21 +113,21 @@ ${TARG}.more: ${SRCS} ${TOC.more} ${DIST
# space taken by the TOC itself. Other versions are not paginated.
${TARG}.PostScript.toc: ${SRCS}
- ${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} > /dev/null
+ ${TOOL_GROFF} -dTOC=1 ${ARGS_PS} ${GROFF_TIMESTAMP} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
- ${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} > /dev/null
+ ${TOOL_GROFF} -dTOC=1 ${ARGS_PS} ${GROFF_TIMESTAMP} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
${TARG}.ASCII.toc: ${SRCS}
- ${TOOL_GROFF} -dTOC=1 ${ARGS_TXT} -mdoc ${MAIN} > /dev/null
+ ${TOOL_GROFF} -dTOC=1 ${ARGS_TXT} ${GROFF_TIMESTAMP} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
${TARG}.HTML.toc: ${SRCS}
- ${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc2html ${MAIN} > /dev/null
+ ${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} ${GROFF_TIMESTAMP} -mdoc2html ${MAIN} > /dev/null
mv -f $@.tmp $@
${TARG}.more.toc: ${SRCS}
- ${TOOL_GROFF} -dTOC=1 ${ARGS_MORE} -mdoc ${MAIN} > /dev/null
+ ${TOOL_GROFF} -dTOC=1 ${ARGS_MORE} ${GROFF_TIMESTAMP} -mdoc ${MAIN} > /dev/null
mv -f $@.tmp $@
CVS commit: src/distrib/notes
Module Name:src Committed By: christos Date: Tue Jun 16 00:45:56 UTC 2020 Modified Files: src/distrib/notes: Makefile.inc Log Message: For MKREPRO builds: 1. compute cur_date from the timestamp 2. pass the date to groff so that it can set its registers To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/distrib/notes/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src Committed By: roy Date: Mon Jun 15 23:41:35 UTC 2020 Modified Files: src/sys/netinet: icmp6.h Log Message: icmp6.h: #define ND_RA_FLAG_PROXY RFC 4389, experimental. Maybe someone will implement it one day. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/netinet/icmp6.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Mon Jun 15 23:41:55 UTC 2020 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 Log Message: Add compatfile to libblacklist To generate a diff of this commit: cvs rdiff -u -r1.893 -r1.894 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.2336 -r1.2337 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.335 -r1.336 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.316 -r1.317 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.255 -r1.256 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Mon Jun 15 23:41:55 UTC 2020 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 Log Message: Add compatfile to libblacklist To generate a diff of this commit: cvs rdiff -u -r1.893 -r1.894 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.2336 -r1.2337 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.335 -r1.336 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.316 -r1.317 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.255 -r1.256 src/distrib/sets/lists/debug/shl.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/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.893 src/distrib/sets/lists/base/shl.mi:1.894 --- src/distrib/sets/lists/base/shl.mi:1.893 Sun Jun 14 21:57:29 2020 +++ src/distrib/sets/lists/base/shl.mi Mon Jun 15 19:41:55 2020 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.893 2020/06/15 01:57:29 christos Exp $ +# $NetBSD: shl.mi,v 1.894 2020/06/15 23:41:55 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -16,9 +16,9 @@ ./lib/libavl.so base-zfs-shlib dynamicroot,zfs ./lib/libavl.so.0base-zfs-shlib dynamicroot,zfs ./lib/libavl.so.0.0 base-zfs-shlib dynamicroot,zfs -./lib/libblacklist.sobase-obsolete obsolete -./lib/libblacklist.so.0base-obsolete obsolete -./lib/libblacklist.so.0.0 base-obsolete obsolete +./lib/libblacklist.sobase-obsolete obsolete,compatfile +./lib/libblacklist.so.0base-obsolete obsolete,compatfile +./lib/libblacklist.so.0.0 base-obsolete obsolete,compatfile ./lib/libblocklist.sobase-sys-shlib dynamicroot ./lib/libblocklist.so.0base-sys-shlib dynamicroot ./lib/libblocklist.so.0.0 base-sys-shlib dynamicroot @@ -232,9 +232,9 @@ ./usr/lib/libbind9.sobase-bind-shlib compatfile ./usr/lib/libbind9.so.14base-bind-shlib compatfile ./usr/lib/libbind9.so.14.0 base-bind-shlib compatfile -./usr/lib/libblacklist.so base-obsolete obsolete -./usr/lib/libblacklist.so.0 base-obsolete obsolete -./usr/lib/libblacklist.so.0.0 base-obsolete obsolete +./usr/lib/libblacklist.so base-obsolete obsolete,compatfile +./usr/lib/libblacklist.so.0 base-obsolete obsolete,compatfile +./usr/lib/libblacklist.so.0.0 base-obsolete obsolete,compatfile ./usr/lib/libblocklist.so base-sys-shlib compatfile ./usr/lib/libblocklist.so.0 base-sys-shlib compatfile ./usr/lib/libblocklist.so.0.0 base-sys-shlib compatfile Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2336 src/distrib/sets/lists/comp/mi:1.2337 --- src/distrib/sets/lists/comp/mi:1.2336 Sun Jun 14 21:57:29 2020 +++ src/distrib/sets/lists/comp/mi Mon Jun 15 19:41:55 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2336 2020/06/15 01:57:29 christos Exp $ +# $NetBSD: mi,v 1.2337 2020/06/15 23:41:55 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -3439,8 +3439,8 @@ ./usr/lib/libbfd.acomp-obsolete obsolete ./usr/lib/libbind9.acomp-bind-lib compatfile ./usr/lib/libbind9_p.acomp-bind-proflib compatfile,profile -./usr/lib/libblacklist.a comp-obsolete obsolete -./usr/lib/libblacklist_p.a comp-obsolete obsolete +./usr/lib/libblacklist.a comp-obsolete obsolete,compatfile +./usr/lib/libblacklist_p.a comp-obsolete obsolete,compatfile ./usr/lib/libblocklist.a comp-c-lib compatfile ./usr/lib/libblocklist_p.a comp-c-proflib compatfile,profile ./usr/lib/libbluetooth.a comp-c-lib compatfile Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.335 src/distrib/sets/lists/comp/shl.mi:1.336 --- src/distrib/sets/lists/comp/shl.mi:1.335 Sun Jun 14 21:57:29 2020 +++ src/distrib/sets/lists/comp/shl.mi Mon Jun 15 19:41:55 2020 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.335 2020/06/15 01:57:29 christos Exp $ +# $NetBSD: shl.mi,v 1.336 2020/06/15 23:41:55 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -14,7 +14,7 @@ ./usr/lib/libatf_pic.acomp-obsolete obsolete ./usr/lib/libavl_pic.acomp-zfs-piclib compatfile,picinstall,zfs ./usr/lib/libbind9_pic.a comp-bind-piclib compatfile,picinstall -./usr/lib/libblacklist_pic.a comp-obsolete obsolete +./usr/lib/libblacklist_pic.a comp-obsolete obsolete,compatfile ./usr/lib/libblocklist_pic.a comp-c-piclib compatfile,picinstall ./usr/lib/libbluetooth_pic.a comp-c-piclib compatfile,picinstall ./usr/lib/libbozohttpd_pic.a comp-c-piclib compatfile,picinstall Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.316 src/distrib/sets/lists/debug/mi:1.317 --- src/distrib/sets/lists/debug/mi:1.316 Sun
CVS commit: src/sys/netinet
Module Name:src
Committed By: roy
Date: Mon Jun 15 23:41:35 UTC 2020
Modified Files:
src/sys/netinet: icmp6.h
Log Message:
icmp6.h: #define ND_RA_FLAG_PROXY
RFC 4389, experimental. Maybe someone will implement it one day.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/netinet/icmp6.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/netinet/icmp6.h
diff -u src/sys/netinet/icmp6.h:1.55 src/sys/netinet/icmp6.h:1.56
--- src/sys/netinet/icmp6.h:1.55 Mon Jun 15 23:38:17 2020
+++ src/sys/netinet/icmp6.h Mon Jun 15 23:41:35 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.h,v 1.55 2020/06/15 23:38:17 roy Exp $ */
+/* $NetBSD: icmp6.h,v 1.56 2020/06/15 23:41:35 roy Exp $ */
/* $KAME: icmp6.h,v 1.84 2003/04/23 10:26:51 itojun Exp $ */
@@ -233,6 +233,7 @@ struct nd_router_advert { /* router adve
#define ND_RA_FLAG_MANAGED 0x80
#define ND_RA_FLAG_OTHER 0x40
#define ND_RA_FLAG_HOME_AGENT 0x20
+#define ND_RA_FLAG_PROXY 0x04
/*
* Router preference values based on RFC4191.
CVS commit: src/sys/netinet
Module Name:src Committed By: roy Date: Mon Jun 15 23:38:17 UTC 2020 Modified Files: src/sys/netinet: icmp6.h Log Message: icmp6.h: #define ND_OPT_PI_FLAG_ROUTER We already define ND_RA_FLAG_HOME_AGENT and that kind of requires ND_OPT_PI_FLAG_ROUTER. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/netinet/icmp6.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src
Committed By: roy
Date: Mon Jun 15 23:38:17 UTC 2020
Modified Files:
src/sys/netinet: icmp6.h
Log Message:
icmp6.h: #define ND_OPT_PI_FLAG_ROUTER
We already define ND_RA_FLAG_HOME_AGENT and that kind of requires
ND_OPT_PI_FLAG_ROUTER.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/netinet/icmp6.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/netinet/icmp6.h
diff -u src/sys/netinet/icmp6.h:1.54 src/sys/netinet/icmp6.h:1.55
--- src/sys/netinet/icmp6.h:1.54 Fri Jun 12 11:04:45 2020
+++ src/sys/netinet/icmp6.h Mon Jun 15 23:38:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.h,v 1.54 2020/06/12 11:04:45 roy Exp $ */
+/* $NetBSD: icmp6.h,v 1.55 2020/06/15 23:38:17 roy Exp $ */
/* $KAME: icmp6.h,v 1.84 2003/04/23 10:26:51 itojun Exp $ */
@@ -335,6 +335,7 @@ struct nd_opt_prefix_info { /* prefix in
#define ND_OPT_PI_FLAG_ONLINK 0x80
#define ND_OPT_PI_FLAG_AUTO 0x40
+#define ND_OPT_PI_FLAG_ROUTER 0x20
struct nd_opt_rd_hdr { /* redirected header */
u_int8_t nd_opt_rh_type;
CVS commit: src/sys/arch/arc
Module Name:src Committed By: tsutsui Date: Mon Jun 15 22:03:39 UTC 2020 Modified Files: src/sys/arch/arc/conf: files.arc src/sys/arch/arc/include: disklabel.h Removed Files: src/sys/arch/arc/arc: disksubr.c Log Message: Drop compat support for OpenBSD/arc disks. Note OpenBSD/arc was discontinued after 1998. Tested on GXemul and ok'ed by soda@. To generate a diff of this commit: cvs rdiff -u -r1.30 -r0 src/sys/arch/arc/arc/disksubr.c cvs rdiff -u -r1.65 -r1.66 src/sys/arch/arc/conf/files.arc cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arc/include/disklabel.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arc
Module Name:src
Committed By: tsutsui
Date: Mon Jun 15 22:03:39 UTC 2020
Modified Files:
src/sys/arch/arc/conf: files.arc
src/sys/arch/arc/include: disklabel.h
Removed Files:
src/sys/arch/arc/arc: disksubr.c
Log Message:
Drop compat support for OpenBSD/arc disks.
Note OpenBSD/arc was discontinued after 1998.
Tested on GXemul and ok'ed by soda@.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r0 src/sys/arch/arc/arc/disksubr.c
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/arc/conf/files.arc
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arc/include/disklabel.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/arch/arc/conf/files.arc
diff -u src/sys/arch/arc/conf/files.arc:1.65 src/sys/arch/arc/conf/files.arc:1.66
--- src/sys/arch/arc/conf/files.arc:1.65 Sun Jul 20 10:22:54 2014
+++ src/sys/arch/arc/conf/files.arc Mon Jun 15 22:03:39 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.arc,v 1.65 2014/07/20 10:22:54 alnsn Exp $
+# $NetBSD: files.arc,v 1.66 2020/06/15 22:03:39 tsutsui Exp $
# $OpenBSD: files.arc,v 1.21 1999/09/11 10:20:20 niklas Exp $
#
# maxpartitions must be first item in files.${ARCH}
@@ -63,9 +63,9 @@ file arch/arc/arc/platform.c
##
## Required files
##
+file kern/subr_disk_mbr.c
file arch/arc/arc/autoconf.c
-file arch/arc/arc/disksubr.c
file arch/arc/arc/machdep.c
#file arch/arc/arc/minidebug.c
file arch/arc/arc/timer.c
Index: src/sys/arch/arc/include/disklabel.h
diff -u src/sys/arch/arc/include/disklabel.h:1.12 src/sys/arch/arc/include/disklabel.h:1.13
--- src/sys/arch/arc/include/disklabel.h:1.12 Thu May 16 19:06:44 2013
+++ src/sys/arch/arc/include/disklabel.h Mon Jun 15 22:03:39 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.12 2013/05/16 19:06:44 christos Exp $ */
+/* $NetBSD: disklabel.h,v 1.13 2020/06/15 22:03:39 tsutsui Exp $ */
/* $OpenBSD: disklabel.h,v 1.14 1999/03/23 16:36:17 millert Exp $ */
/* NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp */
@@ -41,8 +41,6 @@
#define MAXPARTITIONS 16 /* number of partitions */
#define RAW_PART 3 /* raw partition: ie. XX?d (XXX) */
-#define OPENBSD_RAW_PART 2 /* raw partition: XX?c */
-
/* Pull in MBR partition definitions. */
#if HAVE_NBTOOL_CONFIG_H
#include
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: christos Date: Mon Jun 15 21:56:50 UTC 2020 Modified Files: src/usr.sbin/postinstall: postinstall.in Log Message: handle /etc/blacklistd.conf To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/postinstall/postinstall.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: christos
Date: Mon Jun 15 21:56:50 UTC 2020
Modified Files:
src/usr.sbin/postinstall: postinstall.in
Log Message:
handle /etc/blacklistd.conf
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/postinstall/postinstall.in
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/postinstall/postinstall.in
diff -u src/usr.sbin/postinstall/postinstall.in:1.26 src/usr.sbin/postinstall/postinstall.in:1.27
--- src/usr.sbin/postinstall/postinstall.in:1.26 Mon Jun 15 17:51:13 2020
+++ src/usr.sbin/postinstall/postinstall.in Mon Jun 15 17:56:49 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall.in,v 1.26 2020/06/15 21:51:13 christos Exp $
+# $NetBSD: postinstall.in,v 1.27 2020/06/15 21:56:49 christos Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -851,7 +851,7 @@ fixblock() {
fi
local p=$(stat -f %Lp "$i")
chmod u+w "$i"
- sed -i -e s/black/block/g "$i"
+ sed -i -e 's/\([bB]\)lack/\1lock/g' "$i"
chmod "$p" "$i"
done
}
@@ -868,6 +868,10 @@ do_blocklist()
if [ -f /var/db/blacklist.db ]; then
mv /var/db/blacklist.db /var/db/blocklist.db
fi
+ if [ -f /etc/blacklistd.conf ]; then
+ mv /etc/blacklistd.conf /etc/blocklistd.conf
+ fixblock /etc/blocklistd.conf
+ fi
# if we have fixed the rc files we are done
if ! grep -qs $rcfiles; then
CVS commit: src
Module Name:src Committed By: christos Date: Mon Jun 15 21:52:03 UTC 2020 Modified Files: src: UPDATING Log Message: blocklist migration has been automated. To generate a diff of this commit: cvs rdiff -u -r1.309 -r1.310 src/UPDATING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: christos Date: Mon Jun 15 21:51:13 UTC 2020 Modified Files: src/usr.sbin/postinstall: postinstall.in Log Message: correct blocklist script - removal of rc file is handled by obsolete - use grep to find if we need more changes - fix rc population To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/postinstall/postinstall.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: christos
Date: Mon Jun 15 21:52:03 UTC 2020
Modified Files:
src: UPDATING
Log Message:
blocklist migration has been automated.
To generate a diff of this commit:
cvs rdiff -u -r1.309 -r1.310 src/UPDATING
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/UPDATING
diff -u src/UPDATING:1.309 src/UPDATING:1.310
--- src/UPDATING:1.309 Sun Jun 14 23:39:00 2020
+++ src/UPDATING Mon Jun 15 17:52:03 2020
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.309 2020/06/15 03:39:00 christos Exp $
+$NetBSD: UPDATING,v 1.310 2020/06/15 21:52:03 christos Exp $
This file (UPDATING) is intended to be a brief reference to recent
changes that might cause problems in the build process, and a guide for
@@ -20,10 +20,8 @@ Recent changes:
^^^
20200614:
- blacklist* has been renamed to blocklist*. You need to manually:
- mv /var/db/bl{a,o}cklist.db
- fix npf rules that mention blacklist
- fix rc.conf variables
+ blacklist* has been renamed to blocklist*. postinstall(8)
+ should handle the migration
20200601:
Due to a mistake in LIBISPRIVATE handling, .so libraries were
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: christos
Date: Mon Jun 15 21:51:13 UTC 2020
Modified Files:
src/usr.sbin/postinstall: postinstall.in
Log Message:
correct blocklist script
- removal of rc file is handled by obsolete
- use grep to find if we need more changes
- fix rc population
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/postinstall/postinstall.in
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/postinstall/postinstall.in
diff -u src/usr.sbin/postinstall/postinstall.in:1.25 src/usr.sbin/postinstall/postinstall.in:1.26
--- src/usr.sbin/postinstall/postinstall.in:1.25 Mon Jun 15 10:32:07 2020
+++ src/usr.sbin/postinstall/postinstall.in Mon Jun 15 17:51:13 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall.in,v 1.25 2020/06/15 14:32:07 christos Exp $
+# $NetBSD: postinstall.in,v 1.26 2020/06/15 21:51:13 christos Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -862,18 +862,19 @@ fixblock() {
additem blocklist "rename old files to blocklist"
do_blocklist()
{
+ local rcfiles="/etc/rc.conf /etc/npf.conf /etc/defaults/rc.conf"
+
# if we are actually using blocklistd
if [ -f /var/db/blacklist.db ]; then
mv /var/db/blacklist.db /var/db/blocklist.db
fi
# if we have fixed the rc files we are done
- if [ ! -f /etc/rc.d/blacklist ]; then
+ if ! grep -qs $rcfiles; then
return
fi
- fixblock /etc/rc.conf /etc/npf.conf /etc/defaults/rc.conf
- rm -f /etc/rc.d/blacklist
+ fixblock $rcfiles
}
#
@@ -1618,7 +1619,7 @@ do_rc()
fi
# Directories of external programs that have rc files (in bsd)
- local rc_external_files="blacklist nsd unbound"
+ local rc_external_files="blocklist nsd unbound"
# rc* files in /etc/
# XXX: at least rc.conf and rc.local shouldn't be updated. PR/54741
CVS commit: src/external/bsd/blocklist
Module Name:src Committed By: christos Date: Mon Jun 15 21:27:57 UTC 2020 Modified Files: src/external/bsd/blocklist: README src/external/bsd/blocklist/etc: blocklistd.conf src/external/bsd/blocklist/lib: libblocklist.3 Log Message: s/Black/Block To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/blocklist/README cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/blocklist/etc/blocklistd.conf cvs rdiff -u -r1.2 -r1.3 src/external/bsd/blocklist/lib/libblocklist.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/blocklist/README diff -u src/external/bsd/blocklist/README:1.1.1.1 src/external/bsd/blocklist/README:1.2 --- src/external/bsd/blocklist/README:1.1.1.1 Sun Jun 14 21:52:52 2020 +++ src/external/bsd/blocklist/README Mon Jun 15 17:27:57 2020 @@ -1,4 +1,4 @@ -# $NetBSD: README,v 1.1.1.1 2020/06/15 01:52:52 christos Exp $ +# $NetBSD: README,v 1.2 2020/06/15 21:27:57 christos Exp $ This package contains library that can be used by network daemons to communicate with a packet filter via a daemon to enforce opening and @@ -52,7 +52,7 @@ peer information to blocklistd via: The configuration file contains entries of the form: -# Blacklist rule +# Blocklist rule # host/Port type protocol owner name nfail disable 192.168.1.1:ssh stream tcp * -int 10 1m 8.8.8.8:ssh stream tcp * -ext 6 60m Index: src/external/bsd/blocklist/etc/blocklistd.conf diff -u src/external/bsd/blocklist/etc/blocklistd.conf:1.1.1.1 src/external/bsd/blocklist/etc/blocklistd.conf:1.2 --- src/external/bsd/blocklist/etc/blocklistd.conf:1.1.1.1 Sun Jun 14 21:52:53 2020 +++ src/external/bsd/blocklist/etc/blocklistd.conf Mon Jun 15 17:27:57 2020 @@ -1,4 +1,4 @@ -# Blacklist rule +# Blocklist rule # adr/mask:port type proto owner name nfail disable [local] ssh stream * * * 3 6h Index: src/external/bsd/blocklist/lib/libblocklist.3 diff -u src/external/bsd/blocklist/lib/libblocklist.3:1.2 src/external/bsd/blocklist/lib/libblocklist.3:1.3 --- src/external/bsd/blocklist/lib/libblocklist.3:1.2 Sun Jun 14 22:29:45 2020 +++ src/external/bsd/blocklist/lib/libblocklist.3 Mon Jun 15 17:27:57 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: libblocklist.3,v 1.2 2020/06/15 02:29:45 christos Exp $ +.\" $NetBSD: libblocklist.3,v 1.3 2020/06/15 21:27:57 christos Exp $ .\" .\" Copyright (c) 2015 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -37,7 +37,7 @@ .Nm blocklist , .Nm blocklist_sa , .Nm blocklist_sa_r -.Nd Blacklistd notification library +.Nd Blocklistd notification library .Sh LIBRARY .Lb libblocklist .Sh SYNOPSIS
CVS commit: src/external/bsd/blocklist
Module Name:src Committed By: christos Date: Mon Jun 15 21:27:57 UTC 2020 Modified Files: src/external/bsd/blocklist: README src/external/bsd/blocklist/etc: blocklistd.conf src/external/bsd/blocklist/lib: libblocklist.3 Log Message: s/Black/Block To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/blocklist/README cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/blocklist/etc/blocklistd.conf cvs rdiff -u -r1.2 -r1.3 src/external/bsd/blocklist/lib/libblocklist.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/hdaudioctl
Module Name:src
Committed By: riastradh
Date: Mon Jun 15 20:29:29 UTC 2020
Modified Files:
src/usr.sbin/hdaudioctl: hdaudioctl.c
Log Message:
Nix trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/hdaudioctl/hdaudioctl.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/hdaudioctl/hdaudioctl.c
diff -u src/usr.sbin/hdaudioctl/hdaudioctl.c:1.3 src/usr.sbin/hdaudioctl/hdaudioctl.c:1.4
--- src/usr.sbin/hdaudioctl/hdaudioctl.c:1.3 Mon Jun 15 13:06:39 2020
+++ src/usr.sbin/hdaudioctl/hdaudioctl.c Mon Jun 15 20:29:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudioctl.c,v 1.3 2020/06/15 13:06:39 sborrill Exp $ */
+/* $NetBSD: hdaudioctl.c,v 1.4 2020/06/15 20:29:29 riastradh Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd
@@ -94,7 +94,7 @@ usage(void)
{
const char *prog;
prog = getprogname();
-
+
fprintf(stderr, "usage: %s [-f dev] list\n", prog);
fprintf(stderr, " %s [-f dev] show \n", prog);
fprintf(stderr, " %s [-f dev] get \n", prog);
@@ -308,7 +308,6 @@ hdaudioctl_show(int fd, int argc, char *
printf("%3d %08X %2d %3d %-14s %-5s %-7s %-10s %-7s %4X\n",
nid, config, ((config >> 4U) & 0xf), (config & 0xf),
device, conn, jack, loc, color, ((config >> 8U) & 0xf));
-
}
prop_object_release(array);
prop_object_release(response);
@@ -324,7 +323,7 @@ main(int argc, char *argv[])
int fd, error;
int ch;
const char *devpath = DEVPATH_HDAUDIO;
-
+
while ((ch = getopt(argc, argv, "f:h")) != -1) {
switch (ch) {
case 'f':
@@ -348,7 +347,7 @@ main(int argc, char *argv[])
strerror(errno));
return EXIT_FAILURE;
}
-
+
error = 0;
if (strcmp(argv[0], "list") == 0)
error = hdaudioctl_list(fd);
CVS commit: src/usr.sbin/hdaudioctl
Module Name:src Committed By: riastradh Date: Mon Jun 15 20:29:29 UTC 2020 Modified Files: src/usr.sbin/hdaudioctl: hdaudioctl.c Log Message: Nix trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/hdaudioctl/hdaudioctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: riastradh Date: Mon Jun 15 20:27:31 UTC 2020 Modified Files: src/sys/arch/amd64/amd64: cpufunc.S src/sys/arch/x86/x86: tsc.c Log Message: Nix trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/arch/amd64/amd64/cpufunc.S cvs rdiff -u -r1.51 -r1.52 src/sys/arch/x86/x86/tsc.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/amd64/amd64/cpufunc.S diff -u src/sys/arch/amd64/amd64/cpufunc.S:1.61 src/sys/arch/amd64/amd64/cpufunc.S:1.62 --- src/sys/arch/amd64/amd64/cpufunc.S:1.61 Mon Jun 15 09:09:23 2020 +++ src/sys/arch/amd64/amd64/cpufunc.S Mon Jun 15 20:27:30 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc.S,v 1.61 2020/06/15 09:09:23 msaitoh Exp $ */ +/* $NetBSD: cpufunc.S,v 1.62 2020/06/15 20:27:30 riastradh Exp $ */ /* * Copyright (c) 1998, 2007, 2008, 2020 The NetBSD Foundation, Inc. @@ -220,7 +220,7 @@ END(x86_hotpatch) #define RSIZE_counter32 4 #define RSIZE_counter 8 - + #define CPU_COUNTER_FENCE(counter, fence) \ ENTRY(cpu_ ## counter ## _ ## fence) ;\ movq CPUVAR(CURLWP), %rcx ;\ Index: src/sys/arch/x86/x86/tsc.c diff -u src/sys/arch/x86/x86/tsc.c:1.51 src/sys/arch/x86/x86/tsc.c:1.52 --- src/sys/arch/x86/x86/tsc.c:1.51 Mon Jun 15 09:09:24 2020 +++ src/sys/arch/x86/x86/tsc.c Mon Jun 15 20:27:30 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: tsc.c,v 1.51 2020/06/15 09:09:24 msaitoh Exp $ */ +/* $NetBSD: tsc.c,v 1.52 2020/06/15 20:27:30 riastradh Exp $ */ /*- * Copyright (c) 2008, 2020 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.51 2020/06/15 09:09:24 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.52 2020/06/15 20:27:30 riastradh Exp $"); #include #include @@ -183,7 +183,6 @@ tsc_setfunc(struct cpu_info *ci) cpu_counter = cpu_counter_##fence; \ cpu_counter32 = cpu_counter32_##fence; \ } while (/* CONSTCOND */ 0) - if (use_lfence) TSC_SETFUNC(lfence);
CVS commit: src/sys/arch
Module Name:src Committed By: riastradh Date: Mon Jun 15 20:27:31 UTC 2020 Modified Files: src/sys/arch/amd64/amd64: cpufunc.S src/sys/arch/x86/x86: tsc.c Log Message: Nix trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/arch/amd64/amd64/cpufunc.S cvs rdiff -u -r1.51 -r1.52 src/sys/arch/x86/x86/tsc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm
Module Name:src Committed By: ad Date: Mon Jun 15 18:57:39 UTC 2020 Modified Files: src/sys/arch/arm/acpi: acpi_pci_graviton.c acpi_pci_layerscape_gen4.c acpi_pci_machdep.c acpi_pci_n1sdp.c acpipchb.c src/sys/arch/arm/imx: imxgpio.c Log Message: Use sys/cpu.h so that curcpu defined in terms of curlwp->l_cpu works too. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/acpi/acpi_pci_graviton.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/acpi/acpi_pci_layerscape_gen4.c \ src/sys/arch/arm/acpi/acpi_pci_n1sdp.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/acpi/acpi_pci_machdep.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/acpi/acpipchb.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/imx/imxgpio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm
Module Name:src Committed By: ad Date: Mon Jun 15 18:57:39 UTC 2020 Modified Files: src/sys/arch/arm/acpi: acpi_pci_graviton.c acpi_pci_layerscape_gen4.c acpi_pci_machdep.c acpi_pci_n1sdp.c acpipchb.c src/sys/arch/arm/imx: imxgpio.c Log Message: Use sys/cpu.h so that curcpu defined in terms of curlwp->l_cpu works too. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/acpi/acpi_pci_graviton.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/acpi/acpi_pci_layerscape_gen4.c \ src/sys/arch/arm/acpi/acpi_pci_n1sdp.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/acpi/acpi_pci_machdep.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/acpi/acpipchb.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/imx/imxgpio.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/arm/acpi/acpi_pci_graviton.c diff -u src/sys/arch/arm/acpi/acpi_pci_graviton.c:1.1 src/sys/arch/arm/acpi/acpi_pci_graviton.c:1.2 --- src/sys/arch/arm/acpi/acpi_pci_graviton.c:1.1 Fri Jan 17 17:06:33 2020 +++ src/sys/arch/arm/acpi/acpi_pci_graviton.c Mon Jun 15 18:57:39 2020 @@ -1,7 +1,7 @@ -/* $NetBSD: acpi_pci_graviton.c,v 1.1 2020/01/17 17:06:33 jmcneill Exp $ */ +/* $NetBSD: acpi_pci_graviton.c,v 1.2 2020/06/15 18:57:39 ad Exp $ */ /*- - * Copyright (c) 2018 The NetBSD Foundation, Inc. + * Copyright (c) 2018, 2020 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_pci_graviton.c,v 1.1 2020/01/17 17:06:33 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_pci_graviton.c,v 1.2 2020/06/15 18:57:39 ad Exp $"); #include #include @@ -40,8 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_pci_gra #include #include #include - -#include +#include #include #include Index: src/sys/arch/arm/acpi/acpi_pci_layerscape_gen4.c diff -u src/sys/arch/arm/acpi/acpi_pci_layerscape_gen4.c:1.2 src/sys/arch/arm/acpi/acpi_pci_layerscape_gen4.c:1.3 --- src/sys/arch/arm/acpi/acpi_pci_layerscape_gen4.c:1.2 Sun Feb 2 16:44:25 2020 +++ src/sys/arch/arm/acpi/acpi_pci_layerscape_gen4.c Mon Jun 15 18:57:39 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_pci_layerscape_gen4.c,v 1.2 2020/02/02 16:44:25 jmcneill Exp $ */ +/* $NetBSD: acpi_pci_layerscape_gen4.c,v 1.3 2020/06/15 18:57:39 ad Exp $ */ /*- * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_pci_layerscape_gen4.c,v 1.2 2020/02/02 16:44:25 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_pci_layerscape_gen4.c,v 1.3 2020/06/15 18:57:39 ad Exp $"); #include #include @@ -45,8 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_pci_lay #include #include #include - -#include +#include #include #include Index: src/sys/arch/arm/acpi/acpi_pci_n1sdp.c diff -u src/sys/arch/arm/acpi/acpi_pci_n1sdp.c:1.2 src/sys/arch/arm/acpi/acpi_pci_n1sdp.c:1.3 --- src/sys/arch/arm/acpi/acpi_pci_n1sdp.c:1.2 Thu Feb 13 00:02:40 2020 +++ src/sys/arch/arm/acpi/acpi_pci_n1sdp.c Mon Jun 15 18:57:39 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_pci_n1sdp.c,v 1.2 2020/02/13 00:02:40 jmcneill Exp $ */ +/* $NetBSD: acpi_pci_n1sdp.c,v 1.3 2020/06/15 18:57:39 ad Exp $ */ /*- * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_pci_n1sdp.c,v 1.2 2020/02/13 00:02:40 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_pci_n1sdp.c,v 1.3 2020/06/15 18:57:39 ad Exp $"); #include #include @@ -40,8 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_pci_n1s #include #include #include - -#include +#include #include #include Index: src/sys/arch/arm/acpi/acpi_pci_machdep.c diff -u src/sys/arch/arm/acpi/acpi_pci_machdep.c:1.16 src/sys/arch/arm/acpi/acpi_pci_machdep.c:1.17 --- src/sys/arch/arm/acpi/acpi_pci_machdep.c:1.16 Thu Feb 13 00:02:21 2020 +++ src/sys/arch/arm/acpi/acpi_pci_machdep.c Mon Jun 15 18:57:39 2020 @@ -1,7 +1,7 @@ -/* $NetBSD: acpi_pci_machdep.c,v 1.16 2020/02/13 00:02:21 jmcneill Exp $ */ +/* $NetBSD: acpi_pci_machdep.c,v 1.17 2020/06/15 18:57:39 ad Exp $ */ /*- - * Copyright (c) 2018 The NetBSD Foundation, Inc. + * Copyright (c) 2018, 2020 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -32,7 +32,7 @@ #define _INTR_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: acpi_pci_machdep.c,v 1.16 2020/02/13 00:02:21 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_pci_machdep.c,v 1.17 2020/06/15 18:57:39 ad Exp $"); #include #include @@ -44,8 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_pci_mac #include #include #include - -#include +#include #include Index: src/sys/arch/arm/acpi/acpipchb.c diff -u src/sys/arch/arm/acpi/acpipchb.c:1.18 src/sys/arch/arm/acpi/acpipchb.c:1.19 ---
CVS commit: src/sys/kern
Module Name:src
Committed By: ad
Date: Mon Jun 15 18:44:10 UTC 2020
Modified Files:
src/sys/kern: vfs_lookup.c
Log Message:
lookup_fastforward():
- If the root vnode of a mount is being reclaimed concurrent to a lookup,
it's possbile to become confounded and bail out of the loop with both
foundobj=NULL and searchdir=NULL (causing a NULL pointer deref). If that
happens everything should be rolled back to the start for retry. Problem
found and debugged by hannken@.
- If the terminal node was !VDIR then searchdir was needlessly referenced.
No functional impact.
To generate a diff of this commit:
cvs rdiff -u -r1.223 -r1.224 src/sys/kern/vfs_lookup.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/vfs_lookup.c
diff -u src/sys/kern/vfs_lookup.c:1.223 src/sys/kern/vfs_lookup.c:1.224
--- src/sys/kern/vfs_lookup.c:1.223 Thu Jun 4 03:12:26 2020
+++ src/sys/kern/vfs_lookup.c Mon Jun 15 18:44:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lookup.c,v 1.223 2020/06/04 03:12:26 riastradh Exp $ */
+/* $NetBSD: vfs_lookup.c,v 1.224 2020/06/15 18:44:10 ad Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.223 2020/06/04 03:12:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.224 2020/06/15 18:44:10 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_magiclinks.h"
@@ -1382,6 +1382,9 @@ lookup_fastforward(struct namei_state *s
if (error != 0) {
foundobj = NULL;
error = EOPNOTSUPP;
+ } else {
+terminal = (foundobj->v_type != VLNK &&
+(cnp->cn_flags & ISLASTCN) != 0);
}
break;
}
@@ -1458,7 +1461,16 @@ lookup_fastforward(struct namei_state *s
* fastforward to the beginning and let lookup_once() take
* care of it.
*/
- error2 = vcache_tryvget(searchdir);
+ if (searchdir == NULL) {
+ /*
+ * It's possible for searchdir to be NULL in the
+ * case of a root vnode being reclaimed while
+ * trying to cross a mount.
+ */
+ error2 = EOPNOTSUPP;
+ } else {
+ error2 = vcache_tryvget(searchdir);
+ }
KASSERT(plock != NULL);
rw_exit(plock);
if (__predict_true(error2 == 0)) {
CVS commit: src/sys/kern
Module Name:src Committed By: ad Date: Mon Jun 15 18:44:10 UTC 2020 Modified Files: src/sys/kern: vfs_lookup.c Log Message: lookup_fastforward(): - If the root vnode of a mount is being reclaimed concurrent to a lookup, it's possbile to become confounded and bail out of the loop with both foundobj=NULL and searchdir=NULL (causing a NULL pointer deref). If that happens everything should be rolled back to the start for retry. Problem found and debugged by hannken@. - If the terminal node was !VDIR then searchdir was needlessly referenced. No functional impact. To generate a diff of this commit: cvs rdiff -u -r1.223 -r1.224 src/sys/kern/vfs_lookup.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: ad Date: Mon Jun 15 18:04:42 UTC 2020 Modified Files: src/sys/sys: cpu.h Log Message: Fix a comment. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/sys/cpu.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/sys/cpu.h diff -u src/sys/sys/cpu.h:1.50 src/sys/sys/cpu.h:1.51 --- src/sys/sys/cpu.h:1.50 Sat Feb 15 07:20:40 2020 +++ src/sys/sys/cpu.h Mon Jun 15 18:04:42 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.50 2020/02/15 07:20:40 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.51 2020/06/15 18:04:42 ad Exp $ */ /*- * Copyright (c) 2007 YAMAMOTO Takashi, @@ -135,8 +135,8 @@ int cpu_ucode_md_open(firmware_handle_t #endif /* !_LOCORE */ /* - * Flags for cpu_need_resched. RESCHED_KERNEL must be greater than - * RESCHED_USER; see sched_resched_cpu(). + * Flags for cpu_need_resched. RESCHED_KPREEMPT must be greater than + * RESCHED_UPREEMPT; see sched_resched_cpu(). */ #define RESCHED_REMOTE 0x01 /* request is for a remote CPU */ #define RESCHED_IDLE 0x02 /* idle LWP observed */
CVS commit: src/sys/sys
Module Name:src Committed By: ad Date: Mon Jun 15 18:04:42 UTC 2020 Modified Files: src/sys/sys: cpu.h Log Message: Fix a comment. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/sys/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: roy Date: Mon Jun 15 17:04:03 UTC 2020 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-9.1.2 To generate a diff of this commit: cvs rdiff -u -r1.1730 -r1.1731 src/doc/3RDPARTY cvs rdiff -u -r1.2702 -r1.2703 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1730 src/doc/3RDPARTY:1.1731 --- src/doc/3RDPARTY:1.1730 Mon Jun 15 01:57:30 2020 +++ src/doc/3RDPARTY Mon Jun 15 17:04:03 2020 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1730 2020/06/15 01:57:30 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1731 2020/06/15 17:04:03 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -353,12 +353,12 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 9.1.1 -Current Vers: 9.1.1 +Version: 9.1.2 +Current Vers: 9.1.2 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ -Date: 2020-06-04 +Date: 2020-06-15 Mailing List: dhcpcd-disc...@marples.name License: BSD (2-clause) Location: external/bsd/dhcpcd/dist Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2702 src/doc/CHANGES:1.2703 --- src/doc/CHANGES:1.2702 Mon Jun 15 01:57:30 2020 +++ src/doc/CHANGES Mon Jun 15 17:04:03 2020 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2702 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2703 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -220,3 +220,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: inet6: in-kernel Router Advertisment handling removed. [roy 20200612] file(1): Upgraded to 5.39. [christos 20200614] blocklist: import current version [christos 20200614] + dhcpcd: Import version 9.1.2 [roy 20200615]
CVS commit: src/doc
Module Name:src Committed By: roy Date: Mon Jun 15 17:04:03 UTC 2020 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-9.1.2 To generate a diff of this commit: cvs rdiff -u -r1.1730 -r1.1731 src/doc/3RDPARTY cvs rdiff -u -r1.2702 -r1.2703 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/dhcpcd/sbin/dhcpcd
Module Name:src Committed By: roy Date: Mon Jun 15 17:02:58 UTC 2020 Modified Files: src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile Log Message: dhcpcd: Build privsep resource limited sandbox. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/dhcpcd/sbin/dhcpcd
Module Name:src Committed By: roy Date: Mon Jun 15 17:02:58 UTC 2020 Modified Files: src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile Log Message: dhcpcd: Build privsep resource limited sandbox. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.53 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.54 --- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.53 Thu Jun 11 16:05:54 2020 +++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Mon Jun 15 17:02:58 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2020/06/11 16:05:54 roy Exp $ +# $NetBSD: Makefile,v 1.54 2020/06/15 17:02:58 roy Exp $ # WARNS?= 6 @@ -17,7 +17,7 @@ SRCS+= if-bsd.c # This should be fine for ramdisk based installers .if !defined(SMALLPROG) CPPFLAGS+= -DPRIVSEP -DPRIVSEP_USER=\"_dhcpcd\" -SRCS+= privsep.c privsep-root.c privsep-inet.c +SRCS+= privsep.c privsep-root.c privsep-inet.c privsep-control.c SRCS+= privsep-bsd.c .endif
CVS commit: src/external/bsd/dhcpcd/dist/src
Module Name:src Committed By: roy Date: Mon Jun 15 16:59:05 UTC 2020 Modified Files: src/external/bsd/dhcpcd/dist/src: bpf.c dhcp6.c dhcpcd.c if-bsd.c if-options.c ipv6nd.c logerr.c privsep.c script.c Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/external/bsd/dhcpcd/dist/src/bpf.c cvs rdiff -u -r1.20 -r1.21 src/external/bsd/dhcpcd/dist/src/dhcp6.c \ src/external/bsd/dhcpcd/dist/src/ipv6nd.c cvs rdiff -u -r1.38 -r1.39 src/external/bsd/dhcpcd/dist/src/dhcpcd.c cvs rdiff -u -r1.21 -r1.22 src/external/bsd/dhcpcd/dist/src/if-bsd.c cvs rdiff -u -r1.24 -r1.25 src/external/bsd/dhcpcd/dist/src/if-options.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcpcd/dist/src/logerr.c \ src/external/bsd/dhcpcd/dist/src/privsep.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/dhcpcd/dist/src/script.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/dhcpcd/dist/src
Module Name:src
Committed By: roy
Date: Mon Jun 15 16:59:05 UTC 2020
Modified Files:
src/external/bsd/dhcpcd/dist/src: bpf.c dhcp6.c dhcpcd.c if-bsd.c
if-options.c ipv6nd.c logerr.c privsep.c script.c
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/dhcpcd/dist/src/bpf.c
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/dhcpcd/dist/src/dhcp6.c \
src/external/bsd/dhcpcd/dist/src/ipv6nd.c
cvs rdiff -u -r1.38 -r1.39 src/external/bsd/dhcpcd/dist/src/dhcpcd.c
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/dhcpcd/dist/src/if-bsd.c
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/dhcpcd/dist/src/if-options.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcpcd/dist/src/logerr.c \
src/external/bsd/dhcpcd/dist/src/privsep.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/dhcpcd/dist/src/script.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/dist/src/bpf.c
diff -u src/external/bsd/dhcpcd/dist/src/bpf.c:1.15 src/external/bsd/dhcpcd/dist/src/bpf.c:1.16
--- src/external/bsd/dhcpcd/dist/src/bpf.c:1.15 Sun May 31 12:52:11 2020
+++ src/external/bsd/dhcpcd/dist/src/bpf.c Mon Jun 15 16:59:05 2020
@@ -703,6 +703,14 @@ bpf_bootp(const struct bpf *bpf, __unuse
return -1;
return 0;
#else
+#ifdef PRIVSEP
+#if defined(__sun) /* Solaris cannot send via BPF. */
+#elif defined(BIOCSETF)
+#warning No BIOCSETWF support - a compromised BPF can be used as a raw socket
+#else
+#warning A compromised PF_PACKET socket can be used as a raw socket
+#endif
+#endif
return bpf_bootp_rw(bpf, true);
#endif
}
Index: src/external/bsd/dhcpcd/dist/src/dhcp6.c
diff -u src/external/bsd/dhcpcd/dist/src/dhcp6.c:1.20 src/external/bsd/dhcpcd/dist/src/dhcp6.c:1.21
--- src/external/bsd/dhcpcd/dist/src/dhcp6.c:1.20 Thu Jun 4 13:08:13 2020
+++ src/external/bsd/dhcpcd/dist/src/dhcp6.c Mon Jun 15 16:59:05 2020
@@ -541,12 +541,12 @@ dhcp6_delegateaddr(struct in6_addr *addr
state->reason = "DELEGATED6";
}
- if (sla == NULL || sla->sla_set == 0) {
+ if (sla == NULL || !sla->sla_set) {
/* No SLA set, so make an assumption of
* desired SLA and prefix length. */
asla.sla = ifp->index;
asla.prefix_len = 0;
- asla.sla_set = 0;
+ asla.sla_set = false;
sla =
} else if (sla->prefix_len == 0) {
/* An SLA was given, but prefix length was not.
@@ -554,7 +554,7 @@ dhcp6_delegateaddr(struct in6_addr *addr
* potentially more than one interface. */
asla.sla = sla->sla;
asla.prefix_len = 0;
- asla.sla_set = 0;
+ asla.sla_set = sla->sla_set;
sla =
}
@@ -562,16 +562,15 @@ dhcp6_delegateaddr(struct in6_addr *addr
uint32_t sla_max;
int bits;
- if (ia->sla_max == 0) {
+ sla_max = ia->sla_max;
+ if (sla_max == 0 && (sla == NULL || !sla->sla_set)) {
const struct interface *ifi;
- sla_max = 0;
TAILQ_FOREACH(ifi, ifp->ctx->ifaces, next) {
if (ifi->index > sla_max)
sla_max = ifi->index;
}
- } else
- sla_max = ia->sla_max;
+ }
bits = fls32(sla_max);
@@ -1727,6 +1726,7 @@ dhcp6_fail(struct interface *ifp)
if (state->old != NULL)
script_runreason(ifp, "EXPIRE6");
dhcp_unlink(ifp->ctx, state->leasefile);
+ dhcp6_addrequestedaddrs(ifp);
}
if (!dhcp6_startdiscoinform(ifp)) {
@@ -2672,6 +2672,7 @@ ex:
free(state->new);
state->new = NULL;
state->new_len = 0;
+ dhcp6_addrequestedaddrs(ifp);
return bytes == 0 ? 0 : -1;
}
Index: src/external/bsd/dhcpcd/dist/src/ipv6nd.c
diff -u src/external/bsd/dhcpcd/dist/src/ipv6nd.c:1.20 src/external/bsd/dhcpcd/dist/src/ipv6nd.c:1.21
--- src/external/bsd/dhcpcd/dist/src/ipv6nd.c:1.20 Sun May 31 12:52:11 2020
+++ src/external/bsd/dhcpcd/dist/src/ipv6nd.c Mon Jun 15 16:59:05 2020
@@ -1100,7 +1100,7 @@ ipv6nd_handlera(struct dhcpcd_ctx *ctx,
bool new_ia;
#endif
- if (ifp == NULL) {
+ if (ifp == NULL || RS_STATE(ifp) == NULL) {
#ifdef DEBUG_RS
logdebugx("RA for unexpected interface from %s", sfrom);
#endif
@@ -1155,10 +1155,8 @@ ipv6nd_handlera(struct dhcpcd_ctx *ctx,
if (ifp == rap->iface)
break;
}
- if (rap != NULL && rap->willexpire) {
- logerrx("settng def RA");
+ if (rap != NULL && rap->willexpire)
ipv6nd_applyra(ifp);
- }
#endif
TAILQ_FOREACH(rap, ctx->ra_routers, next) {
Index: src/external/bsd/dhcpcd/dist/src/dhcpcd.c
diff -u src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.38 src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.39
--- src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.38 Thu Jun 4 13:08:13 2020
+++ src/external/bsd/dhcpcd/dist/src/dhcpcd.c Mon Jun 15 16:59:05 2020
@@ -943,9 +943,12 @@ dhcpcd_startinterface(void *arg)
}
#ifdef DHCP6
- if (ifo->options & DHCPCD_DHCP6) {
+ /* DHCPv6 could be turned off, but the interface
+ * is still delegated to. */
+ if (ifp->active)
dhcp6_find_delegates(ifp);
+ if (ifo->options & DHCPCD_DHCP6) {
if (ifp->active == IF_ACTIVE_USER) {
enum DH6S d6_state;
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Mon Jun 15 16:58:03 UTC 2020 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3520 Log Message: Update to dhcpcd-9.1.2 with the following changes: * NetBSD: free ARP state once IPv4LL address announced * NetBSD: Mark RA dervied addresses as AUTOCONF * BSD: Only mark static routes from dhcpcd.conf as static * DHCP6: Ensure requested addresses are requested * DHCP6: Fix prefix length calculation when no prefix specified * privsep: Implement a resource limited sandbox Status: Vendor Tag: ROY Release Tags: dhcpcd-9_1_2 U src/external/bsd/dhcpcd/dist/LICENSE U src/external/bsd/dhcpcd/dist/README.md U src/external/bsd/dhcpcd/dist/src/defs.h U src/external/bsd/dhcpcd/dist/src/common.c U src/external/bsd/dhcpcd/dist/src/control.c C src/external/bsd/dhcpcd/dist/src/dhcpcd.c U src/external/bsd/dhcpcd/dist/src/duid.c U src/external/bsd/dhcpcd/dist/src/eloop.c C src/external/bsd/dhcpcd/dist/src/logerr.c U src/external/bsd/dhcpcd/dist/src/if.c C src/external/bsd/dhcpcd/dist/src/if-options.c U src/external/bsd/dhcpcd/dist/src/sa.c U src/external/bsd/dhcpcd/dist/src/route.c U src/external/bsd/dhcpcd/dist/src/dhcp-common.c C src/external/bsd/dhcpcd/dist/src/script.c U src/external/bsd/dhcpcd/dist/src/auth.c C src/external/bsd/dhcpcd/dist/src/if-bsd.c U src/external/bsd/dhcpcd/dist/src/dhcp.c U src/external/bsd/dhcpcd/dist/src/ipv4.c C src/external/bsd/dhcpcd/dist/src/bpf.c U src/external/bsd/dhcpcd/dist/src/arp.c U src/external/bsd/dhcpcd/dist/src/ipv4ll.c U src/external/bsd/dhcpcd/dist/src/ipv6.c C src/external/bsd/dhcpcd/dist/src/ipv6nd.c C src/external/bsd/dhcpcd/dist/src/dhcp6.c U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.c C src/external/bsd/dhcpcd/dist/src/privsep.c U src/external/bsd/dhcpcd/dist/src/privsep-root.c N src/external/bsd/dhcpcd/dist/src/privsep-control.c U src/external/bsd/dhcpcd/dist/src/privsep-inet.c U src/external/bsd/dhcpcd/dist/src/privsep-bpf.c U src/external/bsd/dhcpcd/dist/src/privsep-bsd.c U src/external/bsd/dhcpcd/dist/src/common.h U src/external/bsd/dhcpcd/dist/src/control.h U src/external/bsd/dhcpcd/dist/src/dhcpcd.h U src/external/bsd/dhcpcd/dist/src/duid.h U src/external/bsd/dhcpcd/dist/src/eloop.h U src/external/bsd/dhcpcd/dist/src/logerr.h U src/external/bsd/dhcpcd/dist/src/if.h U src/external/bsd/dhcpcd/dist/src/if-options.h U src/external/bsd/dhcpcd/dist/src/sa.h U src/external/bsd/dhcpcd/dist/src/route.h U src/external/bsd/dhcpcd/dist/src/dhcp-common.h U src/external/bsd/dhcpcd/dist/src/script.h U src/external/bsd/dhcpcd/dist/src/auth.h U src/external/bsd/dhcpcd/dist/src/dhcp.h U src/external/bsd/dhcpcd/dist/src/ipv4.h U src/external/bsd/dhcpcd/dist/src/bpf.h U src/external/bsd/dhcpcd/dist/src/arp.h U src/external/bsd/dhcpcd/dist/src/ipv4ll.h U src/external/bsd/dhcpcd/dist/src/ipv6.h U src/external/bsd/dhcpcd/dist/src/ipv6nd.h U src/external/bsd/dhcpcd/dist/src/dhcp6.h U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.h U src/external/bsd/dhcpcd/dist/src/privsep.h U src/external/bsd/dhcpcd/dist/src/privsep-root.h N src/external/bsd/dhcpcd/dist/src/privsep-control.h U src/external/bsd/dhcpcd/dist/src/privsep-inet.h U src/external/bsd/dhcpcd/dist/src/privsep-bpf.h U src/external/bsd/dhcpcd/dist/src/dev.h U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/src/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf U src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.in U src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/hooks/01-test U src/external/bsd/dhcpcd/dist/hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/hooks/15-timezone U src/external/bsd/dhcpcd/dist/hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/hooks/30-hostname.in U src/external/bsd/dhcpcd/dist/hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/hooks/50-ypbind.in 9 conflicts created by this import. Use the following command to help the merge: cvs checkout -jROY:yesterday -jROY src/external/bsd/dhcpcd/dist
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Mon Jun 15 16:58:03 UTC 2020 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3520 Log Message: Update to dhcpcd-9.1.2 with the following changes: * NetBSD: free ARP state once IPv4LL address announced * NetBSD: Mark RA dervied addresses as AUTOCONF * BSD: Only mark static routes from dhcpcd.conf as static * DHCP6: Ensure requested addresses are requested * DHCP6: Fix prefix length calculation when no prefix specified * privsep: Implement a resource limited sandbox Status: Vendor Tag: ROY Release Tags: dhcpcd-9_1_2 U src/external/bsd/dhcpcd/dist/LICENSE U src/external/bsd/dhcpcd/dist/README.md U src/external/bsd/dhcpcd/dist/src/defs.h U src/external/bsd/dhcpcd/dist/src/common.c U src/external/bsd/dhcpcd/dist/src/control.c C src/external/bsd/dhcpcd/dist/src/dhcpcd.c U src/external/bsd/dhcpcd/dist/src/duid.c U src/external/bsd/dhcpcd/dist/src/eloop.c C src/external/bsd/dhcpcd/dist/src/logerr.c U src/external/bsd/dhcpcd/dist/src/if.c C src/external/bsd/dhcpcd/dist/src/if-options.c U src/external/bsd/dhcpcd/dist/src/sa.c U src/external/bsd/dhcpcd/dist/src/route.c U src/external/bsd/dhcpcd/dist/src/dhcp-common.c C src/external/bsd/dhcpcd/dist/src/script.c U src/external/bsd/dhcpcd/dist/src/auth.c C src/external/bsd/dhcpcd/dist/src/if-bsd.c U src/external/bsd/dhcpcd/dist/src/dhcp.c U src/external/bsd/dhcpcd/dist/src/ipv4.c C src/external/bsd/dhcpcd/dist/src/bpf.c U src/external/bsd/dhcpcd/dist/src/arp.c U src/external/bsd/dhcpcd/dist/src/ipv4ll.c U src/external/bsd/dhcpcd/dist/src/ipv6.c C src/external/bsd/dhcpcd/dist/src/ipv6nd.c C src/external/bsd/dhcpcd/dist/src/dhcp6.c U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.c C src/external/bsd/dhcpcd/dist/src/privsep.c U src/external/bsd/dhcpcd/dist/src/privsep-root.c N src/external/bsd/dhcpcd/dist/src/privsep-control.c U src/external/bsd/dhcpcd/dist/src/privsep-inet.c U src/external/bsd/dhcpcd/dist/src/privsep-bpf.c U src/external/bsd/dhcpcd/dist/src/privsep-bsd.c U src/external/bsd/dhcpcd/dist/src/common.h U src/external/bsd/dhcpcd/dist/src/control.h U src/external/bsd/dhcpcd/dist/src/dhcpcd.h U src/external/bsd/dhcpcd/dist/src/duid.h U src/external/bsd/dhcpcd/dist/src/eloop.h U src/external/bsd/dhcpcd/dist/src/logerr.h U src/external/bsd/dhcpcd/dist/src/if.h U src/external/bsd/dhcpcd/dist/src/if-options.h U src/external/bsd/dhcpcd/dist/src/sa.h U src/external/bsd/dhcpcd/dist/src/route.h U src/external/bsd/dhcpcd/dist/src/dhcp-common.h U src/external/bsd/dhcpcd/dist/src/script.h U src/external/bsd/dhcpcd/dist/src/auth.h U src/external/bsd/dhcpcd/dist/src/dhcp.h U src/external/bsd/dhcpcd/dist/src/ipv4.h U src/external/bsd/dhcpcd/dist/src/bpf.h U src/external/bsd/dhcpcd/dist/src/arp.h U src/external/bsd/dhcpcd/dist/src/ipv4ll.h U src/external/bsd/dhcpcd/dist/src/ipv6.h U src/external/bsd/dhcpcd/dist/src/ipv6nd.h U src/external/bsd/dhcpcd/dist/src/dhcp6.h U src/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.h U src/external/bsd/dhcpcd/dist/src/privsep.h U src/external/bsd/dhcpcd/dist/src/privsep-root.h N src/external/bsd/dhcpcd/dist/src/privsep-control.h U src/external/bsd/dhcpcd/dist/src/privsep-inet.h U src/external/bsd/dhcpcd/dist/src/privsep-bpf.h U src/external/bsd/dhcpcd/dist/src/dev.h U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/src/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/src/dhcpcd.conf U src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.in U src/external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/hooks/01-test U src/external/bsd/dhcpcd/dist/hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/hooks/15-timezone U src/external/bsd/dhcpcd/dist/hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/hooks/30-hostname.in U src/external/bsd/dhcpcd/dist/hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/hooks/50-ypbind.in 9 conflicts created by this import. Use the following command to help the merge: cvs checkout -jROY:yesterday -jROY src/external/bsd/dhcpcd/dist
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jdolecek
Date: Mon Jun 15 15:29:46 UTC 2020
Modified Files:
src/sys/dev/acpi: acpi_ec.c
Log Message:
only install space handler and enable interrupt for EC if ACPI
claims the device is actually present, it's not enough when there
is entry for it in the ACPI tables
fixes interrupt storm triggered on Dell PowerEdge R220 by enabling
GPE interrupt on a non-enabled EC (for which _REG call later
fails), reported and fix tested by Dima Veselov:
http://mail-index.netbsd.org/netbsd-users/2020/03/02/msg024166.html
XXX pullup netbsd-9
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/acpi/acpi_ec.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/acpi/acpi_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.83 src/sys/dev/acpi/acpi_ec.c:1.84
--- src/sys/dev/acpi/acpi_ec.c:1.83 Mon May 4 20:06:38 2020
+++ src/sys/dev/acpi/acpi_ec.c Mon Jun 15 15:29:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.83 2020/05/04 20:06:38 jdolecek Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.84 2020/06/15 15:29:46 jdolecek Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger .
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.83 2020/05/04 20:06:38 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.84 2020/06/15 15:29:46 jdolecek Exp $");
#include
#include
@@ -268,6 +268,11 @@ acpiec_attach(device_t parent, device_t
goto fail0;
}
+ if (!acpi_device_present(aa->aa_node->ad_handle)) {
+ aprint_normal(": not present\n");
+ goto fail0;
+ }
+
if (!acpiec_parse_gpe_package(self, aa->aa_node->ad_handle,
_handle, ))
goto fail0;
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jdolecek Date: Mon Jun 15 15:29:46 UTC 2020 Modified Files: src/sys/dev/acpi: acpi_ec.c Log Message: only install space handler and enable interrupt for EC if ACPI claims the device is actually present, it's not enough when there is entry for it in the ACPI tables fixes interrupt storm triggered on Dell PowerEdge R220 by enabling GPE interrupt on a non-enabled EC (for which _REG call later fails), reported and fix tested by Dima Veselov: http://mail-index.netbsd.org/netbsd-users/2020/03/02/msg024166.html XXX pullup netbsd-9 To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/sys/dev/acpi/acpi_ec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Mon Jun 15 14:46:28 UTC 2020 Modified Files: src/usr.bin/make: str.c src/usr.bin/make/unit-tests: modmatch.mk Log Message: make(1): fix performance problem in specially crafted :M modifier This fix was previously suspected to make the vax build fail. The next build succeeded though, and it started 2 hours before this fix was reverted. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/usr.bin/make/str.c cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/modmatch.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Mon Jun 15 14:46:28 UTC 2020
Modified Files:
src/usr.bin/make: str.c
src/usr.bin/make/unit-tests: modmatch.mk
Log Message:
make(1): fix performance problem in specially crafted :M modifier
This fix was previously suspected to make the vax build fail. The next
build succeeded though, and it started 2 hours before this fix was
reverted.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/usr.bin/make/str.c
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/modmatch.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/str.c
diff -u src/usr.bin/make/str.c:1.47 src/usr.bin/make/str.c:1.48
--- src/usr.bin/make/str.c:1.47 Sun Jun 14 23:13:21 2020
+++ src/usr.bin/make/str.c Mon Jun 15 14:46:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: str.c,v 1.47 2020/06/14 23:13:21 rillig Exp $ */
+/* $NetBSD: str.c,v 1.48 2020/06/15 14:46:28 rillig Exp $ */
/*-
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: str.c,v 1.47 2020/06/14 23:13:21 rillig Exp $";
+static char rcsid[] = "$NetBSD: str.c,v 1.48 2020/06/15 14:46:28 rillig Exp $";
#else
#include
#ifndef lint
#if 0
static char sccsid[] = "@(#)str.c 5.8 (Berkeley) 6/1/90";
#else
-__RCSID("$NetBSD: str.c,v 1.47 2020/06/14 23:13:21 rillig Exp $");
+__RCSID("$NetBSD: str.c,v 1.48 2020/06/15 14:46:28 rillig Exp $");
#endif
#endif/* not lint */
#endif
@@ -355,6 +355,8 @@ Str_Match(const char *string, const char
*/
if (*pattern == '*') {
pattern++;
+ while (*pattern == '*')
+pattern++;
if (*pattern == 0)
return 1;
while (*string != 0) {
Index: src/usr.bin/make/unit-tests/modmatch.mk
diff -u src/usr.bin/make/unit-tests/modmatch.mk:1.5 src/usr.bin/make/unit-tests/modmatch.mk:1.6
--- src/usr.bin/make/unit-tests/modmatch.mk:1.5 Sun Jun 14 23:13:21 2020
+++ src/usr.bin/make/unit-tests/modmatch.mk Mon Jun 15 14:46:28 2020
@@ -36,4 +36,4 @@ check-cclass:
# Before 2020-06-13, this expression took quite a long time in Str_Match,
# calling itself 601080390 times for 16 asterisks.
slow: .PHONY
-# @:;: ${:U:Mb:Q}
+ @:;: ${:U:Mb:Q}
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: christos Date: Mon Jun 15 14:32:08 UTC 2020 Modified Files: src/usr.sbin/postinstall: postinstall.in Log Message: fix reversed mv, pointed out by wiz@ To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/postinstall/postinstall.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: christos
Date: Mon Jun 15 14:32:08 UTC 2020
Modified Files:
src/usr.sbin/postinstall: postinstall.in
Log Message:
fix reversed mv, pointed out by wiz@
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/postinstall/postinstall.in
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/postinstall/postinstall.in
diff -u src/usr.sbin/postinstall/postinstall.in:1.24 src/usr.sbin/postinstall/postinstall.in:1.25
--- src/usr.sbin/postinstall/postinstall.in:1.24 Mon Jun 15 10:25:40 2020
+++ src/usr.sbin/postinstall/postinstall.in Mon Jun 15 10:32:07 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall.in,v 1.24 2020/06/15 14:25:40 christos Exp $
+# $NetBSD: postinstall.in,v 1.25 2020/06/15 14:32:07 christos Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -864,7 +864,7 @@ do_blocklist()
{
# if we are actually using blocklistd
if [ -f /var/db/blacklist.db ]; then
- mv /var/db/blocklist.db /var/db/blacklist.db
+ mv /var/db/blacklist.db /var/db/blocklist.db
fi
# if we have fixed the rc files we are done
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: christos Date: Mon Jun 15 14:25:40 UTC 2020 Modified Files: src/usr.sbin/postinstall: postinstall.in Log Message: deal with blacklist -> blocklist To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/postinstall/postinstall.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: christos
Date: Mon Jun 15 14:25:40 UTC 2020
Modified Files:
src/usr.sbin/postinstall: postinstall.in
Log Message:
deal with blacklist -> blocklist
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/postinstall/postinstall.in
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/postinstall/postinstall.in
diff -u src/usr.sbin/postinstall/postinstall.in:1.23 src/usr.sbin/postinstall/postinstall.in:1.24
--- src/usr.sbin/postinstall/postinstall.in:1.23 Wed Jun 3 07:47:46 2020
+++ src/usr.sbin/postinstall/postinstall.in Mon Jun 15 10:25:40 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall.in,v 1.23 2020/06/03 11:47:46 roy Exp $
+# $NetBSD: postinstall.in,v 1.24 2020/06/15 14:25:40 christos Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -844,6 +844,38 @@ do_bluetooth()
return ${failed}
}
+fixblock() {
+ for i; do
+ if [ ! -f "$i" ]; then
+ continue
+ fi
+ local p=$(stat -f %Lp "$i")
+ chmod u+w "$i"
+ sed -i -e s/black/block/g "$i"
+ chmod "$p" "$i"
+ done
+}
+
+#
+# blocklist update
+#
+additem blocklist "rename old files to blocklist"
+do_blocklist()
+{
+ # if we are actually using blocklistd
+ if [ -f /var/db/blacklist.db ]; then
+ mv /var/db/blocklist.db /var/db/blacklist.db
+ fi
+
+ # if we have fixed the rc files we are done
+ if [ ! -f /etc/rc.d/blacklist ]; then
+ return
+ fi
+
+ fixblock /etc/rc.conf /etc/npf.conf /etc/defaults/rc.conf
+ rm -f /etc/rc.d/blacklist
+}
+
#
# ddbonpanic
#
CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: christos
Date: Mon Jun 15 13:57:45 UTC 2020
Modified Files:
src/tests/lib/libc/sys: t_wait_noproc.c
Log Message:
language sensitivity
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/sys/t_wait_noproc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/t_wait_noproc.c
diff -u src/tests/lib/libc/sys/t_wait_noproc.c:1.5 src/tests/lib/libc/sys/t_wait_noproc.c:1.6
--- src/tests/lib/libc/sys/t_wait_noproc.c:1.5 Wed Nov 9 12:50:19 2016
+++ src/tests/lib/libc/sys/t_wait_noproc.c Mon Jun 15 09:57:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: t_wait_noproc.c,v 1.5 2016/11/09 17:50:19 kamil Exp $ */
+/* $NetBSD: t_wait_noproc.c,v 1.6 2020/06/15 13:57:45 christos Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_wait_noproc.c,v 1.5 2016/11/09 17:50:19 kamil Exp $");
+__RCSID("$NetBSD: t_wait_noproc.c,v 1.6 2020/06/15 13:57:45 christos Exp $");
#include
#include
@@ -141,7 +141,7 @@ get_options6(size_t pos)
*/
const int matrix[] = {
- WNOWAIT, /* First in order to blacklist it easily */
+ WNOWAIT, /* First in order to exclude it easily */
WEXITED,
WUNTRACED,
WSTOPPED, /* SUS compatibility, equal to WUNTRACED */
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: christos Date: Mon Jun 15 13:57:45 UTC 2020 Modified Files: src/tests/lib/libc/sys: t_wait_noproc.c Log Message: language sensitivity To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/sys/t_wait_noproc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sgimips/conf
Module Name:src Committed By: tsutsui Date: Mon Jun 15 13:18:48 UTC 2020 Modified Files: src/sys/arch/sgimips/conf: INSTALL32_IP2x Log Message: Follow ipfilter -> npf changes. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sgimips/conf/INSTALL32_IP2x Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sgimips/conf
Module Name:src Committed By: tsutsui Date: Mon Jun 15 13:18:48 UTC 2020 Modified Files: src/sys/arch/sgimips/conf: INSTALL32_IP2x Log Message: Follow ipfilter -> npf changes. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sgimips/conf/INSTALL32_IP2x 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/sgimips/conf/INSTALL32_IP2x diff -u src/sys/arch/sgimips/conf/INSTALL32_IP2x:1.11 src/sys/arch/sgimips/conf/INSTALL32_IP2x:1.12 --- src/sys/arch/sgimips/conf/INSTALL32_IP2x:1.11 Thu Feb 7 04:33:58 2019 +++ src/sys/arch/sgimips/conf/INSTALL32_IP2x Mon Jun 15 13:18:47 2020 @@ -63,7 +63,7 @@ no lpt* no pseudo-device ccd no pseudo-device fss -no pseudo-device ipfilter +no pseudo-device npf no pseudo-device bridge no pseudo-device accf_data no pseudo-device accf_http
CVS commit: src/usr.sbin/hdaudioctl
Module Name:src
Committed By: sborrill
Date: Mon Jun 15 13:06:39 UTC 2020
Modified Files:
src/usr.sbin/hdaudioctl: graph.c hdaudioctl.8 hdaudioctl.c hdaudioctl.h
Log Message:
Add show subcommand that displays the codec configuration in
human-readable tabulated form
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/hdaudioctl/graph.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/hdaudioctl/hdaudioctl.8
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/hdaudioctl/hdaudioctl.c \
src/usr.sbin/hdaudioctl/hdaudioctl.h
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/hdaudioctl/graph.c
diff -u src/usr.sbin/hdaudioctl/graph.c:1.4 src/usr.sbin/hdaudioctl/graph.c:1.5
--- src/usr.sbin/hdaudioctl/graph.c:1.4 Sun Jun 7 00:56:05 2020
+++ src/usr.sbin/hdaudioctl/graph.c Mon Jun 15 13:06:39 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: graph.c,v 1.4 2020/06/07 00:56:05 thorpej Exp $ */
+/* $NetBSD: graph.c,v 1.5 2020/06/15 13:06:39 sborrill Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd
@@ -45,13 +45,6 @@
#include "hdaudioctl.h"
-static const char *pin_devices[16] = {
- "Line Out", "Speaker", "HP Out", "CD",
- "SPDIF Out", "Digital Out", "Modem Line", "Modem Handset",
- "Line In", "AUX", "Mic In", "Telephony",
- "SPDIF In", "Digital In", "Reserved", "Other"
-};
-
int
hdaudioctl_graph(int fd, int argc, char *argv[])
{
Index: src/usr.sbin/hdaudioctl/hdaudioctl.8
diff -u src/usr.sbin/hdaudioctl/hdaudioctl.8:1.6 src/usr.sbin/hdaudioctl/hdaudioctl.8:1.7
--- src/usr.sbin/hdaudioctl/hdaudioctl.8:1.6 Tue Mar 18 18:20:46 2014
+++ src/usr.sbin/hdaudioctl/hdaudioctl.8 Mon Jun 15 13:06:39 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: hdaudioctl.8,v 1.6 2014/03/18 18:20:46 riastradh Exp $
+.\" $NetBSD: hdaudioctl.8,v 1.7 2020/06/15 13:06:39 sborrill Exp $
.\"
.\" Copyright (c) 2009 Precedence Technologies Ltd
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd October 6, 2009
+.Dd June 12, 2020
.Dt HDAUDIOCTL 8
.Os
.Sh NAME
@@ -55,6 +55,8 @@ Valid commands are:
For each child codec of the chosen
.Xr hdaudio 4
device, display the nid, vendor, product, subsystem and device IDs.
+.It show
+Retrieve and display the current codec configuration in human-readable form.
.It get Ar codecid Ar nid
Retrieve and display the current codec configuration as a
.Xr proplib 3
Index: src/usr.sbin/hdaudioctl/hdaudioctl.c
diff -u src/usr.sbin/hdaudioctl/hdaudioctl.c:1.2 src/usr.sbin/hdaudioctl/hdaudioctl.c:1.3
--- src/usr.sbin/hdaudioctl/hdaudioctl.c:1.2 Sat Mar 28 14:09:59 2015
+++ src/usr.sbin/hdaudioctl/hdaudioctl.c Mon Jun 15 13:06:39 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudioctl.c,v 1.2 2015/03/28 14:09:59 jmcneill Exp $ */
+/* $NetBSD: hdaudioctl.c,v 1.3 2020/06/15 13:06:39 sborrill Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd
@@ -49,6 +49,46 @@
#define DEVPATH_HDAUDIO "/dev/hdaudio0"
+const char *pin_devices[16] = {
+ "Line out", "Speaker", "Headphones", "CD",
+ "SPDIF Out", "Digital Out", "Modem Line", "Modem Handset",
+ "Line In", "AUX", "Mic In", "Telephony",
+ "SPDIF In", "Digital In", "Reserved", "Other"
+};
+static const char *pin_jacks[16] = {
+ "Unknown", "1/8\"", "1/4\"", "ATAPI",
+ "RCA", "Optic", "Digital", "Analog",
+ "DIN", "XLR", "RJ-11", "Combo",
+ "0xC", "0xD", "0xE", "Other"
+};
+static const char *pin_connections[4] = {
+ "Jack", "None", "Fixed", "Both"
+};
+static const char *pin_colors[16] = {
+ "Unknown", "Black", "Grey", "Blue",
+ "Green", "Red", "Orange", "Yellow",
+ "Purple", "Pink", "Res. A", "Res. B",
+ "Res. C", "Res. D", "White", "Other"
+};
+static const char *pin_locations[64] = {
+ "0x00", "Rear", "Front", "Left",
+ "Right", "Top", "Bottom", "Rear-panel",
+ "Drive-bay", "0x09", "0x0a", "0x0b",
+ "0x0c", "0x0d", "0x0e", "0x0f",
+ "Internal", "0x11", "0x12", "0x13",
+ "0x14", "0x15", "0x16", "Riser",
+ "0x18", "Onboard", "0x1a", "0x1b",
+ "0x1c", "0x1d", "0x1e", "0x1f",
+ "External", "Ext-Rear", "Ext-Front", "Ext-Left",
+ "Ext-Right", "Ext-Top", "Ext-Bottom", "0x07",
+ "0x28", "0x29", "0x2a", "0x2b",
+ "0x2c", "0x2d", "0x2e", "0x2f",
+ "Other", "0x31", "0x32", "0x33",
+ "0x34", "0x35", "Other-Bott", "Lid-In",
+ "Lid-Out", "0x39", "0x3a", "0x3b",
+ "0x3c", "0x3d", "0x3e", "0x3f"
+};
+
void
usage(void)
{
@@ -56,6 +96,7 @@ usage(void)
prog = getprogname();
fprintf(stderr, "usage: %s [-f dev] list\n", prog);
+ fprintf(stderr, " %s [-f dev] show \n", prog);
fprintf(stderr, " %s [-f dev] get \n", prog);
fprintf(stderr, " %s [-f dev] set [plist]\n",
prog);
@@ -203,6 +244,79 @@ hdaudioctl_set(int fd, int argc, char *a
return 0;
}
+/* Based on page 178 onwards:
+ * https://www.intel.com/content/dam/www/public/us/en/documents/product-specifications/high-definition-audio-specification.pdf
+ *
CVS commit: src/usr.sbin/hdaudioctl
Module Name:src Committed By: sborrill Date: Mon Jun 15 13:06:39 UTC 2020 Modified Files: src/usr.sbin/hdaudioctl: graph.c hdaudioctl.8 hdaudioctl.c hdaudioctl.h Log Message: Add show subcommand that displays the codec configuration in human-readable tabulated form To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/hdaudioctl/graph.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/hdaudioctl/hdaudioctl.8 cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/hdaudioctl/hdaudioctl.c \ src/usr.sbin/hdaudioctl/hdaudioctl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: sevan Date: Mon Jun 15 12:57:51 UTC 2020 Modified Files: src/games/fortune/datfiles: fortunes Log Message: A revision of "The purpose of computing is insight, not numbers" by Richard Hamming. >From The Art of Doing Science and Engineering To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/games/fortune/datfiles/fortunes Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/fortunes diff -u src/games/fortune/datfiles/fortunes:1.90 src/games/fortune/datfiles/fortunes:1.91 --- src/games/fortune/datfiles/fortunes:1.90 Mon May 18 20:19:08 2020 +++ src/games/fortune/datfiles/fortunes Mon Jun 15 12:57:51 2020 @@ -16302,3 +16302,5 @@ Bell has two patents on UNIX a) set-user-id bit b) on "typo" ! -- John Lions, Australian UNIX Users Group Newsletter, Oct 1978 +% +The purpose of computing numbers is not yet in sight
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: sevan Date: Mon Jun 15 12:57:51 UTC 2020 Modified Files: src/games/fortune/datfiles: fortunes Log Message: A revision of "The purpose of computing is insight, not numbers" by Richard Hamming. >From The Art of Doing Science and Engineering To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/games/fortune/datfiles/fortunes Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: msaitoh Date: Mon Jun 15 09:09:24 UTC 2020 Modified Files: src/sys/arch/amd64/amd64: cpufunc.S src/sys/arch/i386/i386: cpufunc.S src/sys/arch/x86/include: cpu_counter.h cpufunc.h src/sys/arch/x86/x86: cpu.c hyperv.c tsc.c tsc.h src/sys/rump/librump/rumpkern/arch/x86: rump_x86_cpu_counter.c Log Message: Serialize rdtsc using with lfence, mfence or cpuid to read TSC more precisely. x86/x86/tsc.c rev. 1.67 reduced cache problem and got big improvement, but it still has room. I measured the effect of lfence, mfence, cpuid and rdtscp. The impact to TSC skew and/or drift is: AMD: mfence > rdtscp > cpuid > lfence-serialize > lfence = nomodify Intel: lfence > rdtscp > cpuid > nomodify So, mfence is the best on AMD and lfence is the best on Intel. If it has no SSE2, we can use cpuid. NOTE: - An AMD's document says DE_CFG_LFENCE_SERIALIZE bit can be used for serializing, but it's not so good. - On Intel i386(not amd64), it seems the improvement is very little. - rdtscp instruct can be used as serializing instruction + rdtsc, but it's not good as [lm]fence. Both Intel and AMD's document say that the latency of rdtscp is bigger than rdtsc, so I suspect the difference of the result comes from it. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/arch/amd64/amd64/cpufunc.S cvs rdiff -u -r1.46 -r1.47 src/sys/arch/i386/i386/cpufunc.S cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x86/include/cpu_counter.h cvs rdiff -u -r1.40 -r1.41 src/sys/arch/x86/include/cpufunc.h cvs rdiff -u -r1.193 -r1.194 src/sys/arch/x86/x86/cpu.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/x86/hyperv.c cvs rdiff -u -r1.50 -r1.51 src/sys/arch/x86/x86/tsc.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x86/x86/tsc.h cvs rdiff -u -r1.1 -r1.2 \ src/sys/rump/librump/rumpkern/arch/x86/rump_x86_cpu_counter.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: msaitoh Date: Mon Jun 15 09:09:24 UTC 2020 Modified Files: src/sys/arch/amd64/amd64: cpufunc.S src/sys/arch/i386/i386: cpufunc.S src/sys/arch/x86/include: cpu_counter.h cpufunc.h src/sys/arch/x86/x86: cpu.c hyperv.c tsc.c tsc.h src/sys/rump/librump/rumpkern/arch/x86: rump_x86_cpu_counter.c Log Message: Serialize rdtsc using with lfence, mfence or cpuid to read TSC more precisely. x86/x86/tsc.c rev. 1.67 reduced cache problem and got big improvement, but it still has room. I measured the effect of lfence, mfence, cpuid and rdtscp. The impact to TSC skew and/or drift is: AMD: mfence > rdtscp > cpuid > lfence-serialize > lfence = nomodify Intel: lfence > rdtscp > cpuid > nomodify So, mfence is the best on AMD and lfence is the best on Intel. If it has no SSE2, we can use cpuid. NOTE: - An AMD's document says DE_CFG_LFENCE_SERIALIZE bit can be used for serializing, but it's not so good. - On Intel i386(not amd64), it seems the improvement is very little. - rdtscp instruct can be used as serializing instruction + rdtsc, but it's not good as [lm]fence. Both Intel and AMD's document say that the latency of rdtscp is bigger than rdtsc, so I suspect the difference of the result comes from it. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/arch/amd64/amd64/cpufunc.S cvs rdiff -u -r1.46 -r1.47 src/sys/arch/i386/i386/cpufunc.S cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x86/include/cpu_counter.h cvs rdiff -u -r1.40 -r1.41 src/sys/arch/x86/include/cpufunc.h cvs rdiff -u -r1.193 -r1.194 src/sys/arch/x86/x86/cpu.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/x86/hyperv.c cvs rdiff -u -r1.50 -r1.51 src/sys/arch/x86/x86/tsc.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x86/x86/tsc.h cvs rdiff -u -r1.1 -r1.2 \ src/sys/rump/librump/rumpkern/arch/x86/rump_x86_cpu_counter.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/amd64/amd64/cpufunc.S diff -u src/sys/arch/amd64/amd64/cpufunc.S:1.60 src/sys/arch/amd64/amd64/cpufunc.S:1.61 --- src/sys/arch/amd64/amd64/cpufunc.S:1.60 Sat Jun 13 23:58:51 2020 +++ src/sys/arch/amd64/amd64/cpufunc.S Mon Jun 15 09:09:23 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc.S,v 1.60 2020/06/13 23:58:51 ad Exp $ */ +/* $NetBSD: cpufunc.S,v 1.61 2020/06/15 09:09:23 msaitoh Exp $ */ /* * Copyright (c) 1998, 2007, 2008, 2020 The NetBSD Foundation, Inc. @@ -207,38 +207,62 @@ END(x86_hotpatch) #endif /* !XENPV */ /* - * Could be exact same as cpu_counter, but KMSAN needs to have the correct - * size of the return value. + * cpu_counter and cpu_counter32 could be exact same, but KMSAN needs to have + * the correct size of the return value. */ -ENTRY(cpu_counter32) - movq CPUVAR(CURLWP), %rcx -1: - movq L_NCSW(%rcx), %rdi - rdtsc - addl CPUVAR(CC_SKEW), %eax - cmpq %rdi, L_NCSW(%rcx) - jne 2f - KMSAN_INIT_RET(4) - ret -2: - jmp 1b -END(cpu_counter32) +#define SERIALIZE_lfence lfence +#define SERIALIZE_mfence mfence -ENTRY(cpu_counter) - movq CPUVAR(CURLWP), %rcx -1: - movq L_NCSW(%rcx), %rdi - rdtsc - shlq $32, %rdx - orq %rdx, %rax - addq CPUVAR(CC_SKEW), %rax - cmpq %rdi, L_NCSW(%rcx) - jne 2f - KMSAN_INIT_RET(8) - ret -2: - jmp 1b -END(cpu_counter) +#define ADD_counter32 addl CPUVAR(CC_SKEW), %eax +#define ADD_counter shlq $32, %rdx ;\ + orq %rdx, %rax ;\ + addq CPUVAR(CC_SKEW), %rax + +#define RSIZE_counter32 4 +#define RSIZE_counter 8 + +#define CPU_COUNTER_FENCE(counter, fence) \ +ENTRY(cpu_ ## counter ## _ ## fence) ;\ + movq CPUVAR(CURLWP), %rcx ;\ +1: ;\ + movq L_NCSW(%rcx), %rdi ;\ + SERIALIZE_ ## fence ;\ + rdtsc ;\ + ADD_ ## counter;\ + cmpq %rdi, L_NCSW(%rcx) ;\ + jne 2f;\ + KMSAN_INIT_RET(RSIZE_ ## counter) ;\ + ret ;\ +2: ;\ + jmp 1b;\ +END(cpu_ ## counter ## _ ## fence) + +CPU_COUNTER_FENCE(counter, lfence) +CPU_COUNTER_FENCE(counter, mfence) +CPU_COUNTER_FENCE(counter32, lfence) +CPU_COUNTER_FENCE(counter32, mfence) + +#define CPU_COUNTER_CPUID(counter) \ +ENTRY(cpu_ ## counter ## _cpuid) ;\ + movq %rbx, %r9 ;\ + movq CPUVAR(CURLWP), %r8 ;\ +1: ;\ + movq L_NCSW(%r8), %rdi ;\ + xor %eax, %eax ;\ + cpuid ;\ + rdtsc ;\ + ADD_ ## counter;\ + cmpq %rdi, L_NCSW(%r8) ;\ + jne 2f;\ + movq %r9, %rbx ;\ + KMSAN_INIT_RET(RSIZE_ ## counter) ;\ + ret ;\ +2: ;\ + jmp 1b;\ +END(cpu_ ## counter ## _cpuid) + +CPU_COUNTER_CPUID(counter) +CPU_COUNTER_CPUID(counter32) ENTRY(rdmsr_safe) movq CPUVAR(CURLWP), %r8 Index: src/sys/arch/i386/i386/cpufunc.S diff -u src/sys/arch/i386/i386/cpufunc.S:1.46 src/sys/arch/i386/i386/cpufunc.S:1.47 --- src/sys/arch/i386/i386/cpufunc.S:1.46 Sat Jun 13 23:58:52 2020 +++ src/sys/arch/i386/i386/cpufunc.S Mon Jun 15 09:09:23 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc.S,v 1.46 2020/06/13 23:58:52 ad Exp $ */ +/* $NetBSD: cpufunc.S,v 1.47
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: simonb Date: Mon Jun 15 07:55:45 UTC 2020 Modified Files: src/sys/arch/mips/mips: mips_machdep.c Log Message: KNF- wrap some long lines. To generate a diff of this commit: cvs rdiff -u -r1.292 -r1.293 src/sys/arch/mips/mips/mips_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/mips
Module Name:src
Committed By: simonb
Date: Mon Jun 15 07:55:45 UTC 2020
Modified Files:
src/sys/arch/mips/mips: mips_machdep.c
Log Message:
KNF- wrap some long lines.
To generate a diff of this commit:
cvs rdiff -u -r1.292 -r1.293 src/sys/arch/mips/mips/mips_machdep.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/mips/mips/mips_machdep.c
diff -u src/sys/arch/mips/mips/mips_machdep.c:1.292 src/sys/arch/mips/mips/mips_machdep.c:1.293
--- src/sys/arch/mips/mips/mips_machdep.c:1.292 Mon Jun 15 07:48:12 2020
+++ src/sys/arch/mips/mips/mips_machdep.c Mon Jun 15 07:55:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_machdep.c,v 1.292 2020/06/15 07:48:12 simonb Exp $ */
+/* $NetBSD: mips_machdep.c,v 1.293 2020/06/15 07:55:45 simonb Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -111,7 +111,7 @@
*/
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.292 2020/06/15 07:48:12 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.293 2020/06/15 07:55:45 simonb Exp $");
#define __INTR_PRIVATE
#include "opt_cputype.h"
@@ -1528,7 +1528,8 @@ cpu_identify(device_t dev)
else if (opts->mips_cpu->cpu_cid == MIPS_PRID_CID_INGENIC) {
aprint_normal("Ingenic ");
} else {
- aprint_normal("Unknown Company ID - 0x%x", opts->mips_cpu->cpu_cid);
+ aprint_normal("Unknown Company ID - 0x%x",
+ opts->mips_cpu->cpu_cid);
aprint_normal_dev(dev, "");
}
}
@@ -1560,9 +1561,10 @@ cpu_identify(device_t dev)
if (MIPS_PRID_CID(cpu_id) == MIPS_PRID_CID_PREHISTORIC &&
MIPS_PRID_RSVD(cpu_id) != 0) {
- aprint_normal_dev(dev, "NOTE: top 8 bits of prehistoric PRID not 0!\n");
- aprint_normal_dev(dev, "Please mail port-m...@netbsd.org with %s "
- "dmesg lines.\n", device_xname(dev));
+ aprint_normal_dev(dev,
+ "NOTE: top 8 bits of prehistoric PRID not 0!\n");
+ aprint_normal_dev(dev, "Please mail port-m...@netbsd.org "
+ "with %s dmesg lines.\n", device_xname(dev));
}
switch (opts->mips_cpu_arch) {
CVS commit: src/sys/arch
Module Name:src
Committed By: simonb
Date: Mon Jun 15 07:48:12 UTC 2020
Modified Files:
src/sys/arch/evbmips/cavium: machdep.c
src/sys/arch/mips/cavium: octeonvar.h
src/sys/arch/mips/cavium/dev: octeon_uart.c
src/sys/arch/mips/conf: files.octeon
src/sys/arch/mips/mips: mips_machdep.c
Added Files:
src/sys/arch/mips/cavium: octeon_misc.c octeonreg.h
Log Message:
Finish CPU core support for Octeon Cavium CN70XX:
- decode actual CPU name
- per CPU core reset logic (partially adapted from OpenBSD)
- handle Octeon 3 ioclock rate differences to other cores (from OpenBSD)
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbmips/cavium/machdep.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/mips/cavium/octeon_misc.c \
src/sys/arch/mips/cavium/octeonreg.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/cavium/octeonvar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/cavium/dev/octeon_uart.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/conf/files.octeon
cvs rdiff -u -r1.291 -r1.292 src/sys/arch/mips/mips/mips_machdep.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/evbmips/cavium/machdep.c
diff -u src/sys/arch/evbmips/cavium/machdep.c:1.13 src/sys/arch/evbmips/cavium/machdep.c:1.14
--- src/sys/arch/evbmips/cavium/machdep.c:1.13 Fri Jun 5 07:17:38 2020
+++ src/sys/arch/evbmips/cavium/machdep.c Mon Jun 15 07:48:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.13 2020/06/05 07:17:38 simonb Exp $ */
+/* $NetBSD: machdep.c,v 1.14 2020/06/15 07:48:12 simonb Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -115,7 +115,7 @@
#include "opt_cavium.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.13 2020/06/05 07:17:38 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2020/06/15 07:48:12 simonb Exp $");
#include
#include
@@ -191,7 +191,6 @@ void
mach_init(uint64_t arg0, uint64_t arg1, uint64_t arg2, uint64_t arg3)
{
uint64_t btinfo_paddr;
- int corefreq;
/* clear the BSS segment */
memset(edata, 0, end - edata);
@@ -205,20 +204,10 @@ mach_init(uint64_t arg0, uint64_t arg1,
(struct octeon_btinfo *)MIPS_PHYS_TO_KSEG0(btinfo_paddr),
sizeof(octeon_btinfo));
- corefreq = octeon_btinfo.obt_eclock_hz;
+ octeon_cal_timer(octeon_btinfo.obt_eclock_hz);
- octeon_cal_timer(corefreq);
-
- switch (MIPS_PRID_IMPL(mips_options.mips_cpu_id)) {
- case 0: cpu_setmodel("Cavium Octeon CN38XX/CN36XX"); break;
- case 1: cpu_setmodel("Cavium Octeon CN31XX/CN3020"); break;
- case 2: cpu_setmodel("Cavium Octeon CN3005/CN3010"); break;
- case 3: cpu_setmodel("Cavium Octeon CN58XX"); break;
- case 4: cpu_setmodel("Cavium Octeon CN5[4-7]XX"); break;
- case 6: cpu_setmodel("Cavium Octeon CN50XX"); break;
- case 7: cpu_setmodel("Cavium Octeon CN52XX"); break;
- default: cpu_setmodel("Cavium Octeon"); break;
- }
+ cpu_setmodel("Cavium Octeon %s",
+ octeon_cpu_model(mips_options.mips_cpu_id));
mach_init_vector();
@@ -459,11 +448,7 @@ haltsys:
*/
delay(8);
- /* initiate chip soft-reset */
- uint64_t fuse = octeon_read_csr(CIU_FUSE);
- octeon_write_csr(CIU_SOFT_BIST, fuse);
- octeon_read_csr(CIU_SOFT_RST);
- octeon_write_csr(CIU_SOFT_RST, fuse);
+ octeon_soft_reset();
delay(100);
Index: src/sys/arch/mips/cavium/octeonvar.h
diff -u src/sys/arch/mips/cavium/octeonvar.h:1.9 src/sys/arch/mips/cavium/octeonvar.h:1.10
--- src/sys/arch/mips/cavium/octeonvar.h:1.9 Fri Jun 5 09:18:35 2020
+++ src/sys/arch/mips/cavium/octeonvar.h Mon Jun 15 07:48:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: octeonvar.h,v 1.9 2020/06/05 09:18:35 simonb Exp $ */
+/* $NetBSD: octeonvar.h,v 1.10 2020/06/15 07:48:12 simonb Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -63,6 +63,14 @@
(((uint64_t)(subbits) << name##_SHIFT) & name)
#endif
+#ifdef _KERNEL
+extern int octeon_core_ver;
+#endif /* _KERNEL */
+#define OCTEON_1 1
+#define OCTEON_PLUS 10 /* arbitary, keep sequence for others */
+#define OCTEON_2 2
+#define OCTEON_3 3
+
struct octeon_config {
struct mips_bus_space mc_iobus_bust;
struct mips_bus_space mc_bootbus_bust;
@@ -221,24 +229,28 @@ struct octfau_map {
#ifdef _KERNEL
extern struct octeon_config octeon_configuration;
#ifdef MULTIPROCESSOR
-extern kcpuset_t *cpus_booted;
+extern kcpuset_t *cpus_booted;
extern struct cpu_softc octeon_cpu1_softc;
#endif
-void octeon_bus_io_init(bus_space_tag_t, void *);
-void octeon_bus_mem_init(bus_space_tag_t, void *);
-void octeon_cal_timer(int);
-void octeon_dma_init(struct octeon_config *);
-void octeon_intr_init(struct cpu_info *);
-void octeon_iointr(int, vaddr_t, uint32_t);
-void octpci_init(pci_chipset_tag_t, struct octeon_config *);
-void *octeon_intr_establish(int, int, int (*)(void *), void *);
-void octeon_intr_disestablish(void *cookie);
-
-void octeon_reset_vector(void);
-uint64_t mips_cp0_cvmctl_read(void);
CVS commit: src/sys/arch
Module Name:src Committed By: simonb Date: Mon Jun 15 07:48:12 UTC 2020 Modified Files: src/sys/arch/evbmips/cavium: machdep.c src/sys/arch/mips/cavium: octeonvar.h src/sys/arch/mips/cavium/dev: octeon_uart.c src/sys/arch/mips/conf: files.octeon src/sys/arch/mips/mips: mips_machdep.c Added Files: src/sys/arch/mips/cavium: octeon_misc.c octeonreg.h Log Message: Finish CPU core support for Octeon Cavium CN70XX: - decode actual CPU name - per CPU core reset logic (partially adapted from OpenBSD) - handle Octeon 3 ioclock rate differences to other cores (from OpenBSD) To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbmips/cavium/machdep.c cvs rdiff -u -r0 -r1.1 src/sys/arch/mips/cavium/octeon_misc.c \ src/sys/arch/mips/cavium/octeonreg.h cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/cavium/octeonvar.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/cavium/dev/octeon_uart.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/conf/files.octeon cvs rdiff -u -r1.291 -r1.292 src/sys/arch/mips/mips/mips_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
