CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Wed Jul 24 09:58:37 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Tickets #766 - #768 To generate a diff of this commit: cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/doc/CHANGES-10.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-10.1 diff -u src/doc/CHANGES-10.1:1.1.2.18 src/doc/CHANGES-10.1:1.1.2.19 --- src/doc/CHANGES-10.1:1.1.2.18 Sat Jul 20 16:05:52 2024 +++ src/doc/CHANGES-10.1 Wed Jul 24 09:58:37 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.1,v 1.1.2.18 2024/07/20 16:05:52 martin Exp $ +# $NetBSD: CHANGES-10.1,v 1.1.2.19 2024/07/24 09:58:37 martin Exp $ A complete list of changes from the NetBSD 10.0 release on 2024-03-28 until the 10.1 release: @@ -935,3 +935,21 @@ sys/modules/Makefile1.291 modules: Build `ipl` module only if MKIPFILTER is enabled. [rin, ticket #765] +distrib/amd64/ramdisks/Makefile 1.6 + + PR 58316 and 57948: only enable the build of ramdisk-zfsroot if + ZFS is enabled. + [ozaki-r, ticket #766] + +distrib/sets/lists/comp/mi 1.2465 +share/man/man9/Makefile1.472 + + crashme(9): install man page. + [rin, ticket #767] + +lib/libcurses/screen.c1.39 +tests/lib/libcurses/tests/curs_set 1.2 + + curses: PR 58090, PR 58313: init old_mode to 1 (normal visible cursor). + [uwe, ticket #768] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Wed Jul 24 09:58:37 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Tickets #766 - #768 To generate a diff of this commit: cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/doc/CHANGES-10.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src
Module Name:src
Committed By: martin
Date: Wed Jul 24 09:57:13 UTC 2024
Modified Files:
src/lib/libcurses [netbsd-10]: screen.c
src/tests/lib/libcurses/tests [netbsd-10]: curs_set
Log Message:
Pull up following revision(s) (requested by uwe in ticket #768):
tests/lib/libcurses/tests/curs_set: revision 1.2
lib/libcurses/screen.c: revision 1.39
curses: init old_mode to 1 (normal visible cursor)
PR bin/58090: Ctrl-Z, fg makes blinking cursor in vi
ok blymn@
adjust initial cursor state to reflect reality
Missed in PR bin/58090
Fixes PR lib/58313
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.37.2.1 src/lib/libcurses/screen.c
cvs rdiff -u -r1.1 -r1.1.54.1 src/tests/lib/libcurses/tests/curs_set
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/screen.c
diff -u src/lib/libcurses/screen.c:1.37 src/lib/libcurses/screen.c:1.37.2.1
--- src/lib/libcurses/screen.c:1.37 Fri Apr 8 10:17:52 2022
+++ src/lib/libcurses/screen.c Wed Jul 24 09:57:13 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: screen.c,v 1.37 2022/04/08 10:17:52 andvar Exp $ */
+/* $NetBSD: screen.c,v 1.37.2.1 2024/07/24 09:57:13 martin Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)screen.c 8.2 (blymn) 11/27/2001";
#else
-__RCSID("$NetBSD: screen.c,v 1.37 2022/04/08 10:17:52 andvar Exp $");
+__RCSID("$NetBSD: screen.c,v 1.37.2.1 2024/07/24 09:57:13 martin Exp $");
#endif
#endif /* not lint */
@@ -156,7 +156,7 @@ newterm(char *type, FILE *outfd, FILE *i
new_screen->nca = A_NORMAL;
new_screen->color_type = COLOR_NONE;
new_screen->COLOR_PAIRS = 0;
- new_screen->old_mode = 2;
+ new_screen->old_mode = 1;
new_screen->stdbuf = NULL;
new_screen->stdscr = NULL;
new_screen->curscr = NULL;
Index: src/tests/lib/libcurses/tests/curs_set
diff -u src/tests/lib/libcurses/tests/curs_set:1.1 src/tests/lib/libcurses/tests/curs_set:1.1.54.1
--- src/tests/lib/libcurses/tests/curs_set:1.1 Sun Apr 10 09:55:10 2011
+++ src/tests/lib/libcurses/tests/curs_set Wed Jul 24 09:57:13 2024
@@ -1,5 +1,5 @@
include start
-call 2 curs_set 0
+call 1 curs_set 0
compare curs_set1.chk
call 0 curs_set 1
compare curs_set2.chk
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Wed Jul 24 09:57:13 UTC 2024 Modified Files: src/lib/libcurses [netbsd-10]: screen.c src/tests/lib/libcurses/tests [netbsd-10]: curs_set Log Message: Pull up following revision(s) (requested by uwe in ticket #768): tests/lib/libcurses/tests/curs_set: revision 1.2 lib/libcurses/screen.c: revision 1.39 curses: init old_mode to 1 (normal visible cursor) PR bin/58090: Ctrl-Z, fg makes blinking cursor in vi ok blymn@ adjust initial cursor state to reflect reality Missed in PR bin/58090 Fixes PR lib/58313 To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.37.2.1 src/lib/libcurses/screen.c cvs rdiff -u -r1.1 -r1.1.54.1 src/tests/lib/libcurses/tests/curs_set Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Wed Jul 24 09:54:51 UTC 2024 Modified Files: src/distrib/sets/lists/comp [netbsd-10]: mi src/share/man/man9 [netbsd-10]: Makefile Log Message: Pull up following revision(s) (requested by rin in ticket #767): share/man/man9/Makefile: revision 1.472 distrib/sets/lists/comp/mi: revision 1.2465 crashme(9): Install man page Suggested by ozaki-r@ To generate a diff of this commit: cvs rdiff -u -r1.2425.2.5 -r1.2425.2.6 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.465.2.2 -r1.465.2.3 src/share/man/man9/Makefile 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.2425.2.5 src/distrib/sets/lists/comp/mi:1.2425.2.6 --- src/distrib/sets/lists/comp/mi:1.2425.2.5 Sat Jul 20 15:47:50 2024 +++ src/distrib/sets/lists/comp/mi Wed Jul 24 09:54:51 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2425.2.5 2024/07/20 15:47:50 martin Exp $ +# $NetBSD: mi,v 1.2425.2.6 2024/07/24 09:54:51 martin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -11773,6 +11773,7 @@ ./usr/share/man/cat9/crypto_newsession.0 comp-sys-catman .cat ./usr/share/man/cat9/crypto_register.0 comp-sys-catman .cat ./usr/share/man/cat9/crypto_unregister.0 comp-sys-catman .cat +./usr/share/man/cat9/crashme.0 comp-sys-catman .cat ./usr/share/man/cat9/csf.0 comp-sys-catman .cat ./usr/share/man/cat9/ctob.0 comp-sys-catman .cat ./usr/share/man/cat9/ctod.0 comp-sys-catman .cat @@ -20132,6 +20133,7 @@ ./usr/share/man/html9/crypto_newsession.html comp-sys-htmlman html ./usr/share/man/html9/crypto_register.html comp-sys-htmlman html ./usr/share/man/html9/crypto_unregister.html comp-sys-htmlman html +./usr/share/man/html9/crashme.html comp-sys-htmlman html ./usr/share/man/html9/csf.html comp-sys-htmlman html ./usr/share/man/html9/ctob.html comp-sys-htmlman html ./usr/share/man/html9/ctod.html comp-sys-htmlman html @@ -28628,6 +28630,7 @@ ./usr/share/man/man9/crypto_newsession.9 comp-sys-man .man ./usr/share/man/man9/crypto_register.9 comp-sys-man .man ./usr/share/man/man9/crypto_unregister.9 comp-sys-man .man +./usr/share/man/man9/crashme.9 comp-sys-man .man ./usr/share/man/man9/csf.9 comp-sys-man .man ./usr/share/man/man9/ctob.9 comp-sys-man .man ./usr/share/man/man9/ctod.9 comp-sys-man .man Index: src/share/man/man9/Makefile diff -u src/share/man/man9/Makefile:1.465.2.2 src/share/man/man9/Makefile:1.465.2.3 --- src/share/man/man9/Makefile:1.465.2.2 Sat Jul 20 15:47:50 2024 +++ src/share/man/man9/Makefile Wed Jul 24 09:54:51 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.465.2.2 2024/07/20 15:47:50 martin Exp $ +# $NetBSD: Makefile,v 1.465.2.3 2024/07/24 09:54:51 martin Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -14,7 +14,7 @@ MAN= accept_filter.9 accf_data.9 accf_ht cpu_idle.9 cpu_initclocks.9 cpu_need_resched.9 \ cpu_number.9 cpu_reboot.9 cpu_rootconf.9 \ cpu_startup.9 cpu_switchto.9 cpufreq.9 \ - csf.9 ctod.9 \ + crashme.9 csf.9 ctod.9 \ curproc.9 \ ddb.9 ddc.9 \ delay.9 devsw_attach.9 disk.9 disklabel.9 dksubr.9 dofileread.9 \
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Wed Jul 24 09:54:51 UTC 2024 Modified Files: src/distrib/sets/lists/comp [netbsd-10]: mi src/share/man/man9 [netbsd-10]: Makefile Log Message: Pull up following revision(s) (requested by rin in ticket #767): share/man/man9/Makefile: revision 1.472 distrib/sets/lists/comp/mi: revision 1.2465 crashme(9): Install man page Suggested by ozaki-r@ To generate a diff of this commit: cvs rdiff -u -r1.2425.2.5 -r1.2425.2.6 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.465.2.2 -r1.465.2.3 src/share/man/man9/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/distrib/amd64/ramdisks
Module Name:src
Committed By: martin
Date: Wed Jul 24 09:52:52 UTC 2024
Modified Files:
src/distrib/amd64/ramdisks [netbsd-10]: Makefile
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #766):
distrib/amd64/ramdisks/Makefile: revision 1.6
ramdisk-zfsroot: Only enable if zfs is enabled.
PR port-amd64/58316
PR port-amd64/57948 (followup pullup)
To generate a diff of this commit:
cvs rdiff -u -r1.4.20.1 -r1.4.20.2 src/distrib/amd64/ramdisks/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/ramdisks/Makefile
diff -u src/distrib/amd64/ramdisks/Makefile:1.4.20.1 src/distrib/amd64/ramdisks/Makefile:1.4.20.2
--- src/distrib/amd64/ramdisks/Makefile:1.4.20.1 Fri Feb 23 18:07:24 2024
+++ src/distrib/amd64/ramdisks/Makefile Wed Jul 24 09:52:52 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4.20.1 2024/02/23 18:07:24 martin Exp $
+# $NetBSD: Makefile,v 1.4.20.2 2024/07/24 09:52:52 martin Exp $
SUBDIR=
SUBDIR+= ramdisk
SUBDIR+= ramdisk-cgdroot
-SUBDIR+= ramdisk-zfsroot
+SUBDIR+= ${${MKZFS} != "no":?ramdisk-zfsroot:}
TARGETS+= release
CVS commit: [netbsd-10] src/distrib/amd64/ramdisks
Module Name:src Committed By: martin Date: Wed Jul 24 09:52:52 UTC 2024 Modified Files: src/distrib/amd64/ramdisks [netbsd-10]: Makefile Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #766): distrib/amd64/ramdisks/Makefile: revision 1.6 ramdisk-zfsroot: Only enable if zfs is enabled. PR port-amd64/58316 PR port-amd64/57948 (followup pullup) To generate a diff of this commit: cvs rdiff -u -r1.4.20.1 -r1.4.20.2 src/distrib/amd64/ramdisks/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Sat Jul 20 16:57:52 UTC 2024
Modified Files:
src/distrib/sets/lists/comp [netbsd-9]: mi
src/share/man/man9 [netbsd-9]: Makefile imax.9
Log Message:
Pull up following revision(s) (requested by rin in ticket #1857):
share/man/man9/imax.9: revision 1.7
share/man/man9/imax.9: revision 1.8
share/man/man9/Makefile: revision 1.471
distrib/sets/lists/comp/mi: revision 1.2463
imax(9): Belatedly catch up with min/max --> uimin/uimax renaming
done almost 6 years ago:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/lib/libkern/libkern.h#rev1.130
Thanks asahi at iij for pointing this out :)
imax.9: Additional fixes for previous...
man9: Provide all combinations of {,u}{i,l}{max,min}(9)
sets/lists: Add all combinations of {,u}{i,l}{max,min}(9)
To generate a diff of this commit:
cvs rdiff -u -r1.2278.2.7 -r1.2278.2.8 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.437.2.3 -r1.437.2.4 src/share/man/man9/Makefile
cvs rdiff -u -r1.6 -r1.6.48.1 src/share/man/man9/imax.9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Sat Jul 20 16:57:52 UTC 2024
Modified Files:
src/distrib/sets/lists/comp [netbsd-9]: mi
src/share/man/man9 [netbsd-9]: Makefile imax.9
Log Message:
Pull up following revision(s) (requested by rin in ticket #1857):
share/man/man9/imax.9: revision 1.7
share/man/man9/imax.9: revision 1.8
share/man/man9/Makefile: revision 1.471
distrib/sets/lists/comp/mi: revision 1.2463
imax(9): Belatedly catch up with min/max --> uimin/uimax renaming
done almost 6 years ago:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/lib/libkern/libkern.h#rev1.130
Thanks asahi at iij for pointing this out :)
imax.9: Additional fixes for previous...
man9: Provide all combinations of {,u}{i,l}{max,min}(9)
sets/lists: Add all combinations of {,u}{i,l}{max,min}(9)
To generate a diff of this commit:
cvs rdiff -u -r1.2278.2.7 -r1.2278.2.8 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.437.2.3 -r1.437.2.4 src/share/man/man9/Makefile
cvs rdiff -u -r1.6 -r1.6.48.1 src/share/man/man9/imax.9
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.2278.2.7 src/distrib/sets/lists/comp/mi:1.2278.2.8
--- src/distrib/sets/lists/comp/mi:1.2278.2.7 Thu Feb 29 12:36:06 2024
+++ src/distrib/sets/lists/comp/mi Sat Jul 20 16:57:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2278.2.7 2024/02/29 12:36:06 martin Exp $
+# $NetBSD: mi,v 1.2278.2.8 2024/07/20 16:57:51 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.compcomp-sys-root
@@ -11309,6 +11309,8 @@
./usr/share/man/cat9/le64enc.0 comp-sys-catman .cat
./usr/share/man/cat9/le64toh.0 comp-sys-catman .cat
./usr/share/man/cat9/linedisc.0 comp-sys-catman .cat
+./usr/share/man/cat9/lmax.0 comp-sys-catman .cat
+./usr/share/man/cat9/lmin.0 comp-sys-catman .cat
./usr/share/man/cat9/localcount.0 comp-sys-catman .cat
./usr/share/man/cat9/lock.0 comp-sys-catman .cat
./usr/share/man/cat9/locking.0 comp-sys-catman .cat
@@ -11969,7 +11971,11 @@
./usr/share/man/cat9/ufetch_long.0 comp-sys-catman .cat
./usr/share/man/cat9/ufetch_ptr.0 comp-sys-catman .cat
./usr/share/man/cat9/ufetch_short.0 comp-sys-catman .cat
+./usr/share/man/cat9/uimax.0 comp-sys-catman .cat
+./usr/share/man/cat9/uimin.0 comp-sys-catman .cat
./usr/share/man/cat9/uiomove.0 comp-sys-catman .cat
+./usr/share/man/cat9/ulmax.0 comp-sys-catman .cat
+./usr/share/man/cat9/ulmin.0 comp-sys-catman .cat
./usr/share/man/cat9/ungetnewvnode.0 comp-obsolete obsolete
./usr/share/man/cat9/untimeout.0 comp-sys-catman .cat
./usr/share/man/cat9/uprintf.0 comp-sys-catman .cat
@@ -19230,6 +19236,8 @@
./usr/share/man/html9/le64enc.html comp-sys-htmlman html
./usr/share/man/html9/le64toh.html comp-sys-htmlman html
./usr/share/man/html9/linedisc.html comp-sys-htmlman html
+./usr/share/man/html9/lmax.html comp-sys-htmlman html
+./usr/share/man/html9/lmin.html comp-sys-htmlman html
./usr/share/man/html9/localcount.html comp-sys-htmlman html
./usr/share/man/html9/lock.html comp-sys-htmlman html
./usr/share/man/html9/locking.html comp-sys-htmlman html
@@ -19863,7 +19871,11 @@
./usr/share/man/html9/ufetch_long.html comp-sys-htmlman html
./usr/share/man/html9/ufetch_ptr.html comp-sys-htmlman html
./usr/share/man/html9/ufetch_short.html comp-sys-htmlman html
+./usr/share/man/html9/uimax.html comp-sys-htmlman html
+./usr/share/man/html9/uimin.html comp-sys-htmlman html
./usr/share/man/html9/uiomove.html comp-sys-htmlman html
+./usr/share/man/html9/ulmax.html comp-sys-htmlman html
+./usr/share/man/html9/ulmin.html comp-sys-htmlman html
./usr/share/man/html9/ungetnewvnode.html comp-obsolete obsolete
./usr/share/man/html9/untimeout.html comp-sys-htmlman html
./usr/share/man/html9/uprintf.html comp-sys-htmlman html
@@ -27304,6 +27316,8 @@
./usr/share/man/man9/le64enc.9 comp-sys-man .man
./usr/share/man/man9/le64toh.9 comp-sys-man .man
./usr/share/man/man9/linedisc.9 comp-sys-man .man
+./usr/share/man/man9/lmax.9 comp-sys-man .man
+./usr/share/man/man9/lmin.9 comp-sys-man .man
./usr/share/man/man9/localcount.9 comp-sys-man .man
./usr/share/man/man9/lock.9 comp-sys-man .man
./usr/share/man/man9/locking.9 comp-sys-man .man
@@ -27964,7 +27978,11 @@
./usr/share/man/man9/ufetch_long.9 comp-sys-man .man
./usr/share/man/man9/ufetch_ptr.9 comp-sys-man .man
./usr/share/man/man9/ufetch_short.9 comp-sys-man .man
+./usr/share/man/man9/uimax.9 comp-sys-man .man
+./usr/share/man/man9/uimin.9 comp-sys-man .man
./usr/share/man/man9/uiomove.9 comp-sys-man .man
+./usr/share/man/man9/ulmax.9 comp-sys-man .man
+./usr/share/man/man9/ulmin.9 comp-sys-man .man
./usr/share/man/man9/ungetnewvnode.9 comp-obsolete obsolete
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Sat Jul 20 16:11:27 UTC 2024 Modified Files: src/common/lib/libc/arch/i386/atomic [netbsd-10]: atomic.S src/common/lib/libc/arch/x86_64/atomic [netbsd-10]: atomic.S src/sys/arch/amd64/amd64 [netbsd-10]: cpufunc.S src/sys/arch/i386/i386 [netbsd-10]: cpufunc.S src/sys/arch/xen/include [netbsd-10]: hypervisor.h xenring.h Log Message: Pull up following revision(s) (requested by riastradh in ticket #764): common/lib/libc/arch/i386/atomic/atomic.S: revision 1.37 sys/arch/xen/include/xenring.h: revision 1.8 sys/arch/i386/i386/cpufunc.S: revision 1.52 sys/arch/amd64/amd64/cpufunc.S: revision 1.68 sys/arch/xen/include/hypervisor.h: revision 1.60 common/lib/libc/arch/x86_64/atomic/atomic.S: revision 1.30 xen: Don't hotpatch away LOCK prefix in xen_mb, even on UP boots. Both xen_mb and membar_sync are designed to provide store-before-load ordering, but xen_mb has to provide it in synchronizing guest with hypervisor, while membar_sync only has to provide it in synchronizing one (guest) CPU with another (guest) CPU. It is safe to hotpatch away the LOCK prefix in membar_sync on a uniprocessor boot because membar_sync is only designed to coordinate between normal memory on multiple CPUs, and is never necessary when there's only one CPU involved. But xen_mb is used to coordinate between the guest and the `device' implemented by a hypervisor, which might be running on another _physical_ CPU even if the NetBSD guest only sees one `CPU', i.e., one _virtual_ CPU. So even on `uniprocessor' boots, xen_mb must still issue an instruction with store-before-load ordering on multiprocessor systems, such as a LOCK ADD (or MFENCE, but MFENCE is costlier for no benefit here). No need to change xen_wmb (release ordering, load/store-before-store) or xen_rmb (acquire ordering, load-before-load/store) because every x86 store is a store-release and every x86 load is a load-acquire, even on multiprocessor systems, so there's no hotpatching involved anyway. PR kern/57199 To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.36.2.1 src/common/lib/libc/arch/i386/atomic/atomic.S cvs rdiff -u -r1.29 -r1.29.2.1 \ src/common/lib/libc/arch/x86_64/atomic/atomic.S cvs rdiff -u -r1.65 -r1.65.18.1 src/sys/arch/amd64/amd64/cpufunc.S cvs rdiff -u -r1.49 -r1.49.20.1 src/sys/arch/i386/i386/cpufunc.S cvs rdiff -u -r1.55.4.3 -r1.55.4.4 src/sys/arch/xen/include/hypervisor.h cvs rdiff -u -r1.6.20.1 -r1.6.20.2 src/sys/arch/xen/include/xenring.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/i386/atomic/atomic.S diff -u src/common/lib/libc/arch/i386/atomic/atomic.S:1.36 src/common/lib/libc/arch/i386/atomic/atomic.S:1.36.2.1 --- src/common/lib/libc/arch/i386/atomic/atomic.S:1.36 Sat Jul 30 14:11:00 2022 +++ src/common/lib/libc/arch/i386/atomic/atomic.S Sat Jul 20 16:11:26 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic.S,v 1.36 2022/07/30 14:11:00 riastradh Exp $ */ +/* $NetBSD: atomic.S,v 1.36.2.1 2024/07/20 16:11:26 martin Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -211,6 +211,8 @@ ENTRY(_membar_sync) * https://pvk.ca/Blog/2014/10/19/performance-optimisation-~-writing-an-essay/ * https://shipilev.net/blog/2014/on-the-fence-with-dependencies/ * https://www.agner.org/optimize/instruction_tables.pdf + * + * Sync with xen_mb in sys/arch/i386/i386/cpufunc.S. */ LOCK addl $0, -4(%esp) Index: src/common/lib/libc/arch/x86_64/atomic/atomic.S diff -u src/common/lib/libc/arch/x86_64/atomic/atomic.S:1.29 src/common/lib/libc/arch/x86_64/atomic/atomic.S:1.29.2.1 --- src/common/lib/libc/arch/x86_64/atomic/atomic.S:1.29 Sat Jul 30 14:11:00 2022 +++ src/common/lib/libc/arch/x86_64/atomic/atomic.S Sat Jul 20 16:11:27 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic.S,v 1.29 2022/07/30 14:11:00 riastradh Exp $ */ +/* $NetBSD: atomic.S,v 1.29.2.1 2024/07/20 16:11:27 martin Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -279,6 +279,8 @@ ENTRY(_membar_sync) * https://pvk.ca/Blog/2014/10/19/performance-optimisation-~-writing-an-essay/ * https://shipilev.net/blog/2014/on-the-fence-with-dependencies/ * https://www.agner.org/optimize/instruction_tables.pdf + * + * Sync with xen_mb in sys/arch/amd64/amd64/cpufunc.S. */ LOCK addq $0, -8(%rsp) Index: src/sys/arch/amd64/amd64/cpufunc.S diff -u src/sys/arch/amd64/amd64/cpufunc.S:1.65 src/sys/arch/amd64/amd64/cpufunc.S:1.65.18.1 --- src/sys/arch/amd64/amd64/cpufunc.S:1.65 Mon Nov 30 17:02:27 2020 +++ src/sys/arch/amd64/amd64/cpufunc.S Sat Jul 20 16:11:26 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc.S,v 1.65 2020/11/30 17:02:27 bouyer Exp $ */ +/* $NetBSD: cpufunc.S,v 1.65.18.1 2024/07/20 16:11:26 martin Exp $ */ /* * Copyright (c) 1998, 2007, 2008, 2020 The NetBSD Foundation, Inc. @@ -60,6
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Sat Jul 20 16:11:27 UTC 2024 Modified Files: src/common/lib/libc/arch/i386/atomic [netbsd-10]: atomic.S src/common/lib/libc/arch/x86_64/atomic [netbsd-10]: atomic.S src/sys/arch/amd64/amd64 [netbsd-10]: cpufunc.S src/sys/arch/i386/i386 [netbsd-10]: cpufunc.S src/sys/arch/xen/include [netbsd-10]: hypervisor.h xenring.h Log Message: Pull up following revision(s) (requested by riastradh in ticket #764): common/lib/libc/arch/i386/atomic/atomic.S: revision 1.37 sys/arch/xen/include/xenring.h: revision 1.8 sys/arch/i386/i386/cpufunc.S: revision 1.52 sys/arch/amd64/amd64/cpufunc.S: revision 1.68 sys/arch/xen/include/hypervisor.h: revision 1.60 common/lib/libc/arch/x86_64/atomic/atomic.S: revision 1.30 xen: Don't hotpatch away LOCK prefix in xen_mb, even on UP boots. Both xen_mb and membar_sync are designed to provide store-before-load ordering, but xen_mb has to provide it in synchronizing guest with hypervisor, while membar_sync only has to provide it in synchronizing one (guest) CPU with another (guest) CPU. It is safe to hotpatch away the LOCK prefix in membar_sync on a uniprocessor boot because membar_sync is only designed to coordinate between normal memory on multiple CPUs, and is never necessary when there's only one CPU involved. But xen_mb is used to coordinate between the guest and the `device' implemented by a hypervisor, which might be running on another _physical_ CPU even if the NetBSD guest only sees one `CPU', i.e., one _virtual_ CPU. So even on `uniprocessor' boots, xen_mb must still issue an instruction with store-before-load ordering on multiprocessor systems, such as a LOCK ADD (or MFENCE, but MFENCE is costlier for no benefit here). No need to change xen_wmb (release ordering, load/store-before-store) or xen_rmb (acquire ordering, load-before-load/store) because every x86 store is a store-release and every x86 load is a load-acquire, even on multiprocessor systems, so there's no hotpatching involved anyway. PR kern/57199 To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.36.2.1 src/common/lib/libc/arch/i386/atomic/atomic.S cvs rdiff -u -r1.29 -r1.29.2.1 \ src/common/lib/libc/arch/x86_64/atomic/atomic.S cvs rdiff -u -r1.65 -r1.65.18.1 src/sys/arch/amd64/amd64/cpufunc.S cvs rdiff -u -r1.49 -r1.49.20.1 src/sys/arch/i386/i386/cpufunc.S cvs rdiff -u -r1.55.4.3 -r1.55.4.4 src/sys/arch/xen/include/hypervisor.h cvs rdiff -u -r1.6.20.1 -r1.6.20.2 src/sys/arch/xen/include/xenring.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sat Jul 20 16:05:52 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Tickets #738 - #765 To generate a diff of this commit: cvs rdiff -u -r1.1.2.17 -r1.1.2.18 src/doc/CHANGES-10.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-10.1 diff -u src/doc/CHANGES-10.1:1.1.2.17 src/doc/CHANGES-10.1:1.1.2.18 --- src/doc/CHANGES-10.1:1.1.2.17 Wed Jul 3 19:16:46 2024 +++ src/doc/CHANGES-10.1 Sat Jul 20 16:05:52 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.1,v 1.1.2.17 2024/07/03 19:16:46 martin Exp $ +# $NetBSD: CHANGES-10.1,v 1.1.2.18 2024/07/20 16:05:52 martin Exp $ A complete list of changes from the NetBSD 10.0 release on 2024-03-28 until the 10.1 release: @@ -761,3 +761,177 @@ sys/altq/altq_rmclass.c1.31 altq, cbq: take care of borrowed classes on sleeping. [ozaki-r, ticket #736] +sys/arch/x86/include/specialreg.h 1.212 +sys/arch/x86/x86/identcpu.c 1.129,1.130 + + x86: PR 58370: VIA CPU probe fixes. + [andvar, ticket #738] + +sys/conf/copts.mk1.12 (patch) +sys/net/zlib.c 1.39 + + Avoid errors for newer gcc -Wimplicit-fallthrough warnings in + net/zlib.c + [rin, ticket #739] + +sys/netinet6/ip6_output.c 1.232 +sys/netipsec/ipsec.c1.178 +sys/netipsec/ipsec_input.c 1.79 +sys/netipsec/ipsec_output.c 1.86 + + ipsec: remove unnecessary splsoftnet protection, the code is + already MP-safe. + [rin, ticket #740] + +sys/kern/uipc_socket.c1.309 + + PR 55690: make kqfilter() behave the same with option PIPE_SOCKETPAIR + pipe as it does for standard one - refuse EVFILT_WRITE if the reader + is already disconnected. + [jdolecek, ticket #741] + +bin/cp/utils.c 1.50 + + cp(1): PR 57857: always copy regular files, even if they appear to + be zero-sized. + [rin, ticket #742] + +bin/ls/ls.c 1.78 + + ls(1): PR 57892: print full pathname in error messages. + [rin, ticket #743] + +common/lib/libc/arch/aarch64/string/bcopy.S 1.3 + + aarch64: PR 57388: minor bug fix in bcopy.S. + [rin, ticket #744] + +common/lib/libc/arch/arm/string/memcpy_arm.S 1.6,1.7 +common/lib/libc/arch/arm/string/memcpy_neon.S 1.2 +common/lib/libc/arch/arm/string/memcpy_xscale.S 1.6 +common/lib/libc/arch/arm/string/memmove.S 1.11 +common/lib/libc/arch/arm/string/memset.S 1.9 +common/lib/libc/arch/arm/string/memset_naive.S 1.2 +common/lib/libc/arch/arm/string/strlen_neon.S 1.4 + + arm: string: Use unsigned comparison for pointers and size_t values. + [rin, ticket #745] + +etc/services 1.105,1.106 + + /etc/services: resolve a conflict for port 2049 and restore local + additions. PR 57759. + [rin, ticket #746] + +external/bsd/libproc/dist/proc_sym.c 1.5,1.6 + + libproc: sanitize process symbols so binary doesn't end up in dtrace + profiling. + [rin, ticket #747] + +lib/libc/atomic/atomic_ops.3 1.9 + + atomic_ops(3): note that aarch64 implements CAS. + [rin, ticket #748] + +lib/libc/gdtoa/strtod.c1.19 + + libc: PR 55668: remove workarounds for older gcc versions + for the internal routine used by strtod(3). + [rin, ticket #749] + +lib/libc/gen/err.31.24 + + err(3): improve the manual page. + [rin, ticket #750] + +lib/libc/gen/usleep.31.22 + + usleep(3): PR 58184: add CAVEATS for NetBSD before 10.1. + [rin, ticket #751] + +share/man/man4/options.4 1.531 + + options(4): update `file-system UDF' description, it is not considered + experimental any more. + [reinoud, ticket #752] + +lib/libc/net/getaddrinfo.3 1.61 + + freeaddrinfo(3): note that a call with NULL argument causes + a segmentation fault. + [rin, ticket #753] + +lib/libc/stdio/fvwrite.c 1.31 + + fvwrite: optimize for unbuffered write. + [rin, ticket #754] + +lib/libc/sys/stat.21.60 + + stat(2): improve manual page. + [rin, ticket #755] + +lib/libcurses/refresh.c1.127 + + curses(3): fix random application crashes. + [rin, ticket #756] + +lib/libpthread/pthread.c 1.182 + + libpthread: avoid deadlocks in snprintf(3). + [rin, ticket #757] + +lib/libpthread/pthread_attr_getguardsize.3 1.6 +lib/libpthread/pthread_attr_getstack.3 1.9 + + pthread: PR 57721: document the setstack vs setguardsize bug. + Suggest the safe, compatible workaround. + [rin, ticket #758] + +lib/libutil/stat_flags.3 1.9 + + stat_flags(3): improve manual page. + [rin, ticket #759] + +sbin/mount_procfs/mount_procfs.8 1.39 + + mount_procfs(8): document the format of the region descriptor + lines contained in the 'map' and 'maps' special files. + [rin, ticket #760] + +bin/sh/histedit.c1.68 + + sh(1): ignore non-numeric values for HISTSIZE. + [kre, ticket #761] + +distrib/sets/lists/comp/mi 1.2463 +share/man/man9/Makefile1.471 +share/man/man9/imax.91.7,1.8 + + imax(9): document the renaming from max/min to uimax/uimin. + [rin, ticket #762] + +sys/net/if_bridge.c1.192 + + bridge(4): add missing curlwp_bind() for pppoe. + [rin, ticket #763] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sat Jul 20 16:05:52 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Tickets #738 - #765 To generate a diff of this commit: cvs rdiff -u -r1.1.2.17 -r1.1.2.18 src/doc/CHANGES-10.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src
Module Name:src
Committed By: martin
Date: Sat Jul 20 16:03:23 UTC 2024
Modified Files:
src/distrib/sets/lists/debug [netbsd-10]: module.mi
src/distrib/sets/lists/modules [netbsd-10]: mi
src/sys/modules [netbsd-10]: Makefile
Log Message:
Pull up following revision(s) (requested by rin in ticket #765):
sys/modules/Makefile: revision 1.291
distrib/sets/lists/modules/mi: revision 1.160
distrib/sets/lists/debug/module.mi: revision 1.27
modules: Build `ipl` module only if MKIPFILTER is enabled
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.2.1 src/distrib/sets/lists/debug/module.mi
cvs rdiff -u -r1.157 -r1.157.2.1 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.274.2.3 -r1.274.2.4 src/sys/modules/Makefile
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/debug/module.mi
diff -u src/distrib/sets/lists/debug/module.mi:1.23 src/distrib/sets/lists/debug/module.mi:1.23.2.1
--- src/distrib/sets/lists/debug/module.mi:1.23 Sat Dec 3 01:04:43 2022
+++ src/distrib/sets/lists/debug/module.mi Sat Jul 20 16:03:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: module.mi,v 1.23 2022/12/03 01:04:43 brad Exp $
+# $NetBSD: module.mi,v 1.23.2.1 2024/07/20 16:03:23 martin Exp $
./usr/libdata/debug/@MODULEDIR@ modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/accf_dataready modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/accf_dataready/accf_dataready.kmod.debug modules-base-kernel kmod,debug
@@ -244,8 +244,8 @@
./usr/libdata/debug/@MODULEDIR@/iic/iic.kmod.debug modules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/ip_ecnmodules-base-kernel kmod,debug
./usr/libdata/debug/@MODULEDIR@/ip_ecn/ip_ecn.kmod.debug modules-base-kernel kmod,debug
-./usr/libdata/debug/@MODULEDIR@/iplmodules-base-kernel kmod,debug
-./usr/libdata/debug/@MODULEDIR@/ipl/ipl.kmod.debug modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/iplmodules-base-kernel kmod,debug,ipfilter
+./usr/libdata/debug/@MODULEDIR@/ipl/ipl.kmod.debug modules-base-kernel kmod,debug,ipfilter
./usr/libdata/debug/@MODULEDIR@/iscsimodules-base-kernel kmod,iscsi,debug
./usr/libdata/debug/@MODULEDIR@/iscsi/iscsi.kmod.debug modules-base-kernel kmod,iscsi,debug
./usr/libdata/debug/@MODULEDIR@/kernfsmodules-base-kernel kmod,debug
Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.157 src/distrib/sets/lists/modules/mi:1.157.2.1
--- src/distrib/sets/lists/modules/mi:1.157 Sat Dec 3 01:04:43 2022
+++ src/distrib/sets/lists/modules/mi Sat Jul 20 16:03:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.157 2022/12/03 01:04:43 brad Exp $
+# $NetBSD: mi,v 1.157.2.1 2024/07/20 16:03:23 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -271,8 +271,8 @@
./@MODULEDIR@/iic/iic.kmod modules-base-kernel kmod
./@MODULEDIR@/ip_ecnmodules-base-kernel kmod
./@MODULEDIR@/ip_ecn/ip_ecn.kmod modules-base-kernel kmod
-./@MODULEDIR@/iplmodules-base-kernel kmod
-./@MODULEDIR@/ipl/ipl.kmod modules-base-kernel kmod
+./@MODULEDIR@/iplmodules-base-kernel kmod,ipfilter
+./@MODULEDIR@/ipl/ipl.kmod modules-base-kernel kmod,ipfilter
./@MODULEDIR@/iscsimodules-base-kernel kmod,iscsi
./@MODULEDIR@/iscsi/iscsi.kmod modules-base-kernel kmod,iscsi
./@MODULEDIR@/kernfsmodules-base-kernel kmod
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.274.2.3 src/sys/modules/Makefile:1.274.2.4
--- src/sys/modules/Makefile:1.274.2.3 Thu Apr 18 15:21:55 2024
+++ src/sys/modules/Makefile Sat Jul 20 16:03:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.274.2.3 2024/04/18 15:21:55 martin Exp $
+# $NetBSD: Makefile,v 1.274.2.4 2024/07/20 16:03:23 martin Exp $
.include
@@ -109,7 +109,9 @@ SUBDIR+= if_vlan
SUBDIR+= if_wg
SUBDIR+= iic
SUBDIR+= ip_ecn
+.if ${MKIPFILTER:Uno} != no
SUBDIR+= ipl
+.endif
SUBDIR+= kernfs
SUBDIR+= layerfs
SUBDIR+= lfs
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Sat Jul 20 16:03:23 UTC 2024 Modified Files: src/distrib/sets/lists/debug [netbsd-10]: module.mi src/distrib/sets/lists/modules [netbsd-10]: mi src/sys/modules [netbsd-10]: Makefile Log Message: Pull up following revision(s) (requested by rin in ticket #765): sys/modules/Makefile: revision 1.291 distrib/sets/lists/modules/mi: revision 1.160 distrib/sets/lists/debug/module.mi: revision 1.27 modules: Build `ipl` module only if MKIPFILTER is enabled To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.23.2.1 src/distrib/sets/lists/debug/module.mi cvs rdiff -u -r1.157 -r1.157.2.1 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.274.2.3 -r1.274.2.4 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sat Jul 20 15:59:35 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.5 Log Message: Tickets #1855 - #1858 To generate a diff of this commit: cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/doc/CHANGES-9.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.5 diff -u src/doc/CHANGES-9.5:1.1.2.9 src/doc/CHANGES-9.5:1.1.2.10 --- src/doc/CHANGES-9.5:1.1.2.9 Wed Jul 3 17:29:50 2024 +++ src/doc/CHANGES-9.5 Sat Jul 20 15:59:35 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.5,v 1.1.2.9 2024/07/03 17:29:50 martin Exp $ +# $NetBSD: CHANGES-9.5,v 1.1.2.10 2024/07/20 15:59:35 martin Exp $ A complete list of changes from the NetBSD 9.4 release to the NetBSD 9.5 release: @@ -116,3 +116,26 @@ usr.sbin/sysinst/msg.mi.en 1.52 autoconfigures. [nia, ticket #1853] +sys/arch/x86/include/specialreg.h 1.212 +sys/arch/x86/x86/identcpu.c 1.129,1.130 + + x86: PR 58370: VIA CPU probe fixes. + [andvar, ticket #1855] + +bin/sh/histedit.c1.68 + + sh(1): ignore non-numeric values for HISTSIZE. + [kre, ticket #1856] + +distrib/sets/lists/comp/mi 1.2463 +share/man/man9/Makefile1.471 +share/man/man9/imax.91.7,1.8 + + imax(9): document the renaming from max/min to uimax/uimin. + [rin, ticket #1857] + +sys/net/if_bridge.c1.192 + + bridge(4): add missing curlwp_bind() for pppoe. + [rin, ticket #1858] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sat Jul 20 15:59:35 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.5 Log Message: Tickets #1855 - #1858 To generate a diff of this commit: cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/doc/CHANGES-9.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/net
Module Name:src
Committed By: martin
Date: Sat Jul 20 15:55:23 UTC 2024
Modified Files:
src/sys/net [netbsd-9]: if_bridge.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #1858):
sys/net/if_bridge.c: revision 1.192
bridge: add missing curlwp_bind() for pppoe
>From knakahara@
To generate a diff of this commit:
cvs rdiff -u -r1.164.4.1 -r1.164.4.2 src/sys/net/if_bridge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.164.4.1 src/sys/net/if_bridge.c:1.164.4.2
--- src/sys/net/if_bridge.c:1.164.4.1 Thu Feb 27 18:34:12 2020
+++ src/sys/net/if_bridge.c Sat Jul 20 15:55:23 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridge.c,v 1.164.4.1 2020/02/27 18:34:12 martin Exp $ */
+/* $NetBSD: if_bridge.c,v 1.164.4.2 2024/07/20 15:55:23 martin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.164.4.1 2020/02/27 18:34:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.164.4.2 2024/07/20 15:55:23 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_bridge_ipf.h"
@@ -1486,7 +1486,7 @@ bridge_output(struct ifnet *ifp, struct
struct ifnet *dst_if;
struct bridge_softc *sc;
struct mbuf *n;
- int s;
+ int s, bound;
/*
* bridge_output() is called from ether_output(), furthermore
@@ -1600,6 +1600,11 @@ bridge_output(struct ifnet *ifp, struct
return 0;
}
+ /*
+ * When we use pppoe over bridge, bridge_output() can be called
+ * in a lwp context by pppoe_timeout_wk().
+ */
+ bound = curlwp_bind();
do {
/* XXX Should call bridge_broadcast, but there are locking
* issues which need resolving first. */
@@ -1695,6 +1700,8 @@ next:
m = n;
} while (m != NULL);
+ curlwp_bindx(bound);
+
return 0;
unicast_asis:
CVS commit: [netbsd-9] src/sys/net
Module Name:src Committed By: martin Date: Sat Jul 20 15:55:23 UTC 2024 Modified Files: src/sys/net [netbsd-9]: if_bridge.c Log Message: Pull up following revision(s) (requested by rin in ticket #1858): sys/net/if_bridge.c: revision 1.192 bridge: add missing curlwp_bind() for pppoe >From knakahara@ To generate a diff of this commit: cvs rdiff -u -r1.164.4.1 -r1.164.4.2 src/sys/net/if_bridge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/net
Module Name:src Committed By: martin Date: Sat Jul 20 15:54:10 UTC 2024 Modified Files: src/sys/net [netbsd-10]: if_bridge.c Log Message: Pull up following revision(s) (requested by rin in ticket #763): sys/net/if_bridge.c: revision 1.192 bridge: add missing curlwp_bind() for pppoe >From knakahara@ To generate a diff of this commit: cvs rdiff -u -r1.189 -r1.189.4.1 src/sys/net/if_bridge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/net
Module Name:src
Committed By: martin
Date: Sat Jul 20 15:54:10 UTC 2024
Modified Files:
src/sys/net [netbsd-10]: if_bridge.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #763):
sys/net/if_bridge.c: revision 1.192
bridge: add missing curlwp_bind() for pppoe
>From knakahara@
To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.189.4.1 src/sys/net/if_bridge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.189 src/sys/net/if_bridge.c:1.189.4.1
--- src/sys/net/if_bridge.c:1.189 Fri Jul 29 07:58:18 2022
+++ src/sys/net/if_bridge.c Sat Jul 20 15:54:10 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridge.c,v 1.189 2022/07/29 07:58:18 skrll Exp $ */
+/* $NetBSD: if_bridge.c,v 1.189.4.1 2024/07/20 15:54:10 martin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.189 2022/07/29 07:58:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.189.4.1 2024/07/20 15:54:10 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1548,7 +1548,7 @@ bridge_output(struct ifnet *ifp, struct
struct ifnet *dst_if;
struct bridge_softc *sc;
struct mbuf *n;
- int s;
+ int s, bound;
/*
* bridge_output() is called from ether_output(), furthermore
@@ -1658,6 +1658,11 @@ bridge_output(struct ifnet *ifp, struct
return 0;
}
+ /*
+ * When we use pppoe over bridge, bridge_output() can be called
+ * in a lwp context by pppoe_timeout_wk().
+ */
+ bound = curlwp_bind();
do {
/* XXX Should call bridge_broadcast, but there are locking
* issues which need resolving first. */
@@ -1754,6 +1759,8 @@ next:
m = n;
} while (m != NULL);
+ curlwp_bindx(bound);
+
return 0;
unicast_asis:
CVS commit: [netbsd-10] src
Module Name:src
Committed By: martin
Date: Sat Jul 20 15:47:51 UTC 2024
Modified Files:
src/distrib/sets/lists/comp [netbsd-10]: mi
src/share/man/man9 [netbsd-10]: Makefile imax.9
Log Message:
Pull up following revision(s) (requested by rin in ticket #762):
share/man/man9/imax.9: revision 1.7
share/man/man9/imax.9: revision 1.8
share/man/man9/Makefile: revision 1.471
distrib/sets/lists/comp/mi: revision 1.2463
imax(9): Belatedly catch up with min/max --> uimin/uimax renaming
done almost 6 years ago:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/lib/libkern/libkern.h#rev1.130
Thanks asahi at iij for pointing this out :)
imax.9: Additional fixes for previous...
man9: Provide all combinations of {,u}{i,l}{max,min}(9)
sets/lists: Add all combinations of {,u}{i,l}{max,min}(9)
To generate a diff of this commit:
cvs rdiff -u -r1.2425.2.4 -r1.2425.2.5 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.465.2.1 -r1.465.2.2 src/share/man/man9/Makefile
cvs rdiff -u -r1.6 -r1.6.56.1 src/share/man/man9/imax.9
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.2425.2.4 src/distrib/sets/lists/comp/mi:1.2425.2.5
--- src/distrib/sets/lists/comp/mi:1.2425.2.4 Sun Feb 25 15:47:58 2024
+++ src/distrib/sets/lists/comp/mi Sat Jul 20 15:47:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2425.2.4 2024/02/25 15:47:58 martin Exp $
+# $NetBSD: mi,v 1.2425.2.5 2024/07/20 15:47:50 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.compcomp-sys-root
@@ -12126,6 +12126,8 @@
./usr/share/man/cat9/le64enc.0 comp-sys-catman .cat
./usr/share/man/cat9/le64toh.0 comp-sys-catman .cat
./usr/share/man/cat9/linedisc.0 comp-sys-catman .cat
+./usr/share/man/cat9/lmax.0 comp-sys-catman .cat
+./usr/share/man/cat9/lmin.0 comp-sys-catman .cat
./usr/share/man/cat9/localcount.0 comp-sys-catman .cat
./usr/share/man/cat9/lock.0 comp-sys-catman .cat
./usr/share/man/cat9/locking.0 comp-sys-catman .cat
@@ -12819,7 +12821,11 @@
./usr/share/man/cat9/ufetch_long.0 comp-sys-catman .cat
./usr/share/man/cat9/ufetch_ptr.0 comp-sys-catman .cat
./usr/share/man/cat9/ufetch_short.0 comp-sys-catman .cat
+./usr/share/man/cat9/uimax.0 comp-sys-catman .cat
+./usr/share/man/cat9/uimin.0 comp-sys-catman .cat
./usr/share/man/cat9/uiomove.0 comp-sys-catman .cat
+./usr/share/man/cat9/ulmax.0 comp-sys-catman .cat
+./usr/share/man/cat9/ulmin.0 comp-sys-catman .cat
./usr/share/man/cat9/ungetnewvnode.0 comp-obsolete obsolete
./usr/share/man/cat9/untimeout.0 comp-sys-catman .cat
./usr/share/man/cat9/uprintf.0 comp-sys-catman .cat
@@ -20471,6 +20477,8 @@
./usr/share/man/html9/le64enc.html comp-sys-htmlman html
./usr/share/man/html9/le64toh.html comp-sys-htmlman html
./usr/share/man/html9/linedisc.html comp-sys-htmlman html
+./usr/share/man/html9/lmax.html comp-sys-htmlman html
+./usr/share/man/html9/lmin.html comp-sys-htmlman html
./usr/share/man/html9/localcount.html comp-sys-htmlman html
./usr/share/man/html9/lock.html comp-sys-htmlman html
./usr/share/man/html9/locking.html comp-sys-htmlman html
@@ -21137,7 +21145,11 @@
./usr/share/man/html9/ufetch_long.html comp-sys-htmlman html
./usr/share/man/html9/ufetch_ptr.html comp-sys-htmlman html
./usr/share/man/html9/ufetch_short.html comp-sys-htmlman html
+./usr/share/man/html9/uimax.html comp-sys-htmlman html
+./usr/share/man/html9/uimin.html comp-sys-htmlman html
./usr/share/man/html9/uiomove.html comp-sys-htmlman html
+./usr/share/man/html9/ulmax.html comp-sys-htmlman html
+./usr/share/man/html9/ulmin.html comp-sys-htmlman html
./usr/share/man/html9/ungetnewvnode.html comp-obsolete obsolete
./usr/share/man/html9/untimeout.html comp-sys-htmlman html
./usr/share/man/html9/uprintf.html comp-sys-htmlman html
@@ -28969,6 +28981,8 @@
./usr/share/man/man9/le64enc.9 comp-sys-man .man
./usr/share/man/man9/le64toh.9 comp-sys-man .man
./usr/share/man/man9/linedisc.9 comp-sys-man .man
+./usr/share/man/man9/lmax.9 comp-sys-man .man
+./usr/share/man/man9/lmin.9 comp-sys-man .man
./usr/share/man/man9/localcount.9 comp-sys-man .man
./usr/share/man/man9/lock.9 comp-sys-man .man
./usr/share/man/man9/locking.9 comp-sys-man .man
@@ -29662,7 +29676,11 @@
./usr/share/man/man9/ufetch_long.9 comp-sys-man .man
./usr/share/man/man9/ufetch_ptr.9 comp-sys-man .man
./usr/share/man/man9/ufetch_short.9 comp-sys-man .man
+./usr/share/man/man9/uimax.9 comp-sys-man .man
+./usr/share/man/man9/uimin.9 comp-sys-man .man
./usr/share/man/man9/uiomove.9 comp-sys-man .man
+./usr/share/man/man9/ulmax.9 comp-sys-man .man
+./usr/share/man/man9/ulmin.9 comp-sys-man .man
./usr/share/man/man9/ungetnewvnode.9 comp-obsolete obsolete
CVS commit: [netbsd-10] src
Module Name:src
Committed By: martin
Date: Sat Jul 20 15:47:51 UTC 2024
Modified Files:
src/distrib/sets/lists/comp [netbsd-10]: mi
src/share/man/man9 [netbsd-10]: Makefile imax.9
Log Message:
Pull up following revision(s) (requested by rin in ticket #762):
share/man/man9/imax.9: revision 1.7
share/man/man9/imax.9: revision 1.8
share/man/man9/Makefile: revision 1.471
distrib/sets/lists/comp/mi: revision 1.2463
imax(9): Belatedly catch up with min/max --> uimin/uimax renaming
done almost 6 years ago:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/lib/libkern/libkern.h#rev1.130
Thanks asahi at iij for pointing this out :)
imax.9: Additional fixes for previous...
man9: Provide all combinations of {,u}{i,l}{max,min}(9)
sets/lists: Add all combinations of {,u}{i,l}{max,min}(9)
To generate a diff of this commit:
cvs rdiff -u -r1.2425.2.4 -r1.2425.2.5 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.465.2.1 -r1.465.2.2 src/share/man/man9/Makefile
cvs rdiff -u -r1.6 -r1.6.56.1 src/share/man/man9/imax.9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-9] src/bin/sh
Module Name:src
Committed By: martin
Date: Sat Jul 20 15:43:23 UTC 2024
Modified Files:
src/bin/sh [netbsd-9]: histedit.c
Log Message:
Pull up following revision(s) (requested by kre in ticket #1856):
bin/sh/histedit.c: revision 1.68
Ignore non-numeric values for HISTSIZE
This is a temporary change (which can be pulled up to -9 and -10)
to avoid having
HISTSIZE=foo /bin/sh
cause sh to fail to start.
A better change, but one requiring far more code changes, so that
bad HISTSIZE is ignored, only when read from the environment, but
will be an error otherwise, will come later.
To generate a diff of this commit:
cvs rdiff -u -r1.55.2.1 -r1.55.2.2 src/bin/sh/histedit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/histedit.c
diff -u src/bin/sh/histedit.c:1.55.2.1 src/bin/sh/histedit.c:1.55.2.2
--- src/bin/sh/histedit.c:1.55.2.1 Mon Feb 21 17:58:11 2022
+++ src/bin/sh/histedit.c Sat Jul 20 15:43:23 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: histedit.c,v 1.55.2.1 2022/02/21 17:58:11 martin Exp $ */
+/* $NetBSD: histedit.c,v 1.55.2.2 2024/07/20 15:43:23 martin Exp $ */
/*-
* Copyright (c) 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)histedit.c 8.2 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: histedit.c,v 1.55.2.1 2022/02/21 17:58:11 martin Exp $");
+__RCSID("$NetBSD: histedit.c,v 1.55.2.2 2024/07/20 15:43:23 martin Exp $");
#endif
#endif /* not lint */
@@ -215,7 +215,7 @@ sethistsize(const char *hs)
HistEvent he;
if (hist != NULL) {
- if (hs == NULL || *hs == '\0' || *hs == '-' ||
+ if (hs == NULL || *hs == '\0' || !is_number(hs) ||
(histsize = number(hs)) < 0)
histsize = 100;
INTOFF;
CVS commit: [netbsd-9] src/bin/sh
Module Name:src Committed By: martin Date: Sat Jul 20 15:43:23 UTC 2024 Modified Files: src/bin/sh [netbsd-9]: histedit.c Log Message: Pull up following revision(s) (requested by kre in ticket #1856): bin/sh/histedit.c: revision 1.68 Ignore non-numeric values for HISTSIZE This is a temporary change (which can be pulled up to -9 and -10) to avoid having HISTSIZE=foo /bin/sh cause sh to fail to start. A better change, but one requiring far more code changes, so that bad HISTSIZE is ignored, only when read from the environment, but will be an error otherwise, will come later. To generate a diff of this commit: cvs rdiff -u -r1.55.2.1 -r1.55.2.2 src/bin/sh/histedit.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/bin/sh
Module Name:src Committed By: martin Date: Sat Jul 20 15:42:08 UTC 2024 Modified Files: src/bin/sh [netbsd-10]: histedit.c Log Message: Pull up following revision(s) (requested by kre in ticket #761): bin/sh/histedit.c: revision 1.68 Ignore non-numeric values for HISTSIZE This is a temporary change (which can be pulled up to -9 and -10) to avoid having HISTSIZE=foo /bin/sh cause sh to fail to start. A better change, but one requiring far more code changes, so that bad HISTSIZE is ignored, only when read from the environment, but will be an error otherwise, will come later. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.65.2.1 src/bin/sh/histedit.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/bin/sh
Module Name:src
Committed By: martin
Date: Sat Jul 20 15:42:08 UTC 2024
Modified Files:
src/bin/sh [netbsd-10]: histedit.c
Log Message:
Pull up following revision(s) (requested by kre in ticket #761):
bin/sh/histedit.c: revision 1.68
Ignore non-numeric values for HISTSIZE
This is a temporary change (which can be pulled up to -9 and -10)
to avoid having
HISTSIZE=foo /bin/sh
cause sh to fail to start.
A better change, but one requiring far more code changes, so that
bad HISTSIZE is ignored, only when read from the environment, but
will be an error otherwise, will come later.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.65.2.1 src/bin/sh/histedit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/histedit.c
diff -u src/bin/sh/histedit.c:1.65 src/bin/sh/histedit.c:1.65.2.1
--- src/bin/sh/histedit.c:1.65 Mon Aug 22 17:33:11 2022
+++ src/bin/sh/histedit.c Sat Jul 20 15:42:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: histedit.c,v 1.65 2022/08/22 17:33:11 kre Exp $ */
+/* $NetBSD: histedit.c,v 1.65.2.1 2024/07/20 15:42:08 martin Exp $ */
/*-
* Copyright (c) 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)histedit.c 8.2 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: histedit.c,v 1.65 2022/08/22 17:33:11 kre Exp $");
+__RCSID("$NetBSD: histedit.c,v 1.65.2.1 2024/07/20 15:42:08 martin Exp $");
#endif
#endif /* not lint */
@@ -247,7 +247,7 @@ sethistsize(const char *hs)
HistEvent he;
if (hist != NULL) {
- if (hs == NULL || *hs == '\0' || *hs == '-' ||
+ if (hs == NULL || *hs == '\0' || !is_number(hs) ||
(histsize = number(hs)) < 0)
histsize = 100;
INTOFF;
CVS commit: [netbsd-10] src/sbin/mount_procfs
Module Name:src Committed By: martin Date: Sat Jul 20 15:39:46 UTC 2024 Modified Files: src/sbin/mount_procfs [netbsd-10]: mount_procfs.8 Log Message: Pull up following revision(s) (requested by rin in ticket #760): sbin/mount_procfs/mount_procfs.8: revision 1.39 mount_procfs(8): Document the format of the region descriptor lines contained in the 'map' and 'maps' special files. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.38.8.1 src/sbin/mount_procfs/mount_procfs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount_procfs/mount_procfs.8 diff -u src/sbin/mount_procfs/mount_procfs.8:1.38 src/sbin/mount_procfs/mount_procfs.8:1.38.8.1 --- src/sbin/mount_procfs/mount_procfs.8:1.38 Wed Jan 8 12:04:57 2020 +++ src/sbin/mount_procfs/mount_procfs.8 Sat Jul 20 15:39:46 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: mount_procfs.8,v 1.38 2020/01/08 12:04:57 ad Exp $ +.\" $NetBSD: mount_procfs.8,v 1.38.8.1 2024/07/20 15:39:46 martin Exp $ .\" .\" Copyright (c) 1992, 1993 .\" The Regents of the University of California. All rights reserved. @@ -34,7 +34,7 @@ .\" @(#)mount_procfs.8 8.3 (Berkeley) 6/1/94 .\" .\" -.Dd January 8, 2020 +.Dd April 18, 2023 .Dt MOUNT_PROCFS 8 .Os .Sh NAME @@ -108,9 +108,103 @@ This can be used to gain access to the p or to start another copy of the process. .It Pa map A map of the process' virtual memory. +This file comprises lines describing the memory regions of the process, +where each line contains the following fields: +.Pp +.Bl -tag -compact -width max-protection +.It start-address +The starting address of the region (inclusive). +.It end-address +The ending address of the region (exclusive). +.It protection +The access permissions for the region, represented as +a three-character string using the characters +.Sq r , +.Sq w +and +.Sq x +to denote read, write, and execute permission respectively. +The lack of a permission is represented by a +.Sq - . +.It max-protection +The maximum access permissions for the region represented as +a three character string using the characters +.Sq r , +.Sq w +and +.Sq x +to denote read, write, and execute permission respectively. +The lack of a permission is represented by a +.Sq - . +.It copy-on-write +Whether the region is copy-on-write. +One of: +.Bl -tag -compact -width NCOW +.It COW +A region that is copy-on-write. +.It NCOW +A region that is not copy-on-write. +.El +.It needs-copy +Whether the region needs a copy. +One of: +.Bl -tag -compact -width NNC +.It NC +The region needs a copy. +.It NNC +The region does not need a copy. +.El +.It inheritance +The inheritance code for the region, as set by +.Xr minherit 2 . +.It wired-count +The wired count for the region. +The region can be paged out if its wired count is zero. +.It advice +The advice value set by a prior call to +.Xr madvise 2 +for the region. +.El .It Pa maps A map of the process' virtual memory in a form like the proc filesystem as implemented in Linux. +This file comprises lines describing the memory regions of +the process, where each line contains the following fields: +.Pp +.Bl -tag -compact -width start-address +.It start-address +The starting address of the region (inclusive). +.It end-address +The ending address of the region (exclusive). +.It protection +The access permissions for the region, represented as +a three-character string using the characters +.Sq r , +.Sq w +and +.Sq x +to denote read, write, and execute permission respectively. +The lack of a permission is represented by a +.Sq - . +.It copy-on-write +Whether the region is copy-on-write. +One of: +.Bl -tag -compact -width ".Sq p" +.It Sq p +The region is copy-on-write. +.It Sq s +The region is shared. +.El +.It offset +The offset into the file being mapped by the region. +.It device-id +The major and minor number of the device containing the file +being mapped by the region. +.It fileid +The inode for the file associated with the region. +.It path +The pathname to the file associated with the region. +.El .It Pa mem The complete virtual memory image of the process. Only those addresses which exist in the process can be accessed.
CVS commit: [netbsd-10] src/sbin/mount_procfs
Module Name:src Committed By: martin Date: Sat Jul 20 15:39:46 UTC 2024 Modified Files: src/sbin/mount_procfs [netbsd-10]: mount_procfs.8 Log Message: Pull up following revision(s) (requested by rin in ticket #760): sbin/mount_procfs/mount_procfs.8: revision 1.39 mount_procfs(8): Document the format of the region descriptor lines contained in the 'map' and 'maps' special files. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.38.8.1 src/sbin/mount_procfs/mount_procfs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/lib/libutil
Module Name:src Committed By: martin Date: Sat Jul 20 15:38:24 UTC 2024 Modified Files: src/lib/libutil [netbsd-10]: stat_flags.3 Log Message: Pull up following revision(s) (requested by rin in ticket #759): lib/libutil/stat_flags.3: revision 1.9 stat_flags(3): try to improve the descriptions List all alternative forms recognized by string_to_flags(3). Both "dump" and "nonodump" are the negative of "nodump". string_to_flags does not recognize "snap". Provide xrefs for flag descriptions where applicable. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.40.1 src/lib/libutil/stat_flags.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libutil/stat_flags.3 diff -u src/lib/libutil/stat_flags.3:1.8 src/lib/libutil/stat_flags.3:1.8.40.1 --- src/lib/libutil/stat_flags.3:1.8 Wed Sep 19 23:22:56 2012 +++ src/lib/libutil/stat_flags.3 Sat Jul 20 15:38:24 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: stat_flags.3,v 1.8 2012/09/19 23:22:56 wiz Exp $ +.\" $NetBSD: stat_flags.3,v 1.8.40.1 2024/07/20 15:38:24 martin Exp $ .\" .\" Copyright (c) 1996 The NetBSD Foundation, Inc. .\" 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 September 20, 2012 +.Dd May 31, 2023 .Dt STAT_FLAGS 3 .Os .Sh NAME @@ -49,36 +49,59 @@ and .Fn string_to_flags functions are used by programs such as +.Xr chflags 1 , .Xr ls 1 , -.Xr mtree 8 , .Xr makefs 8 , +.Xr mtree 8 , etc., to parse and/or print the -.Dv st_flags field in the +.Fa st_flags +field in the .Xr stat 2 structure. +. .Pp They recognize the following flags: -.Bl -column -offset indent "uappnd " "SF_IMMUTABLE" "xxx" -.It Sy String Ta Sy Flag Ta Sy Description -.It Va arch Ta Dv SF_ARCHIVED Ta file is archived -.It Va nodump Ta Dv UF_NODUMP Ta do not dump file -.It Va opaque Ta Dv UF_OPAQUE Ta directory is opaque in union filesystems -.It Va sappnd Ta Dv SF_APPEND Ta writes to the file may only append -.It Va schg Ta Dv SF_IMMUTABLE Ta file cannot be changed; it is immutable -.It Va snap Ta Dv SF_SNAPSHOT Ta file is a snapshot inode -.It Va uappnd Ta Dv UF_APPEND Ta writes to the file may only append -.It Va uchg Ta Dv UF_IMMUTABLE Ta file cannot be changed; it is immutable +. +.Bl -tag -width Cm -offset indent +. +.It Cm arch , Cm archived Pq Dv SF_ARCHIVED +file is archived +.Po legacy/compat flag for +.Xr mount_msdos 8 +filesystems +.Pc +. +.It Cm nodump Pq Dv UF_NODUMP +do not +.Xr dump 8 +file +. +.It Cm opaque Pq Dv UF_OPAQUE +directory is opaque in +.Xr mount_union 8 +filesystems +. +.It Cm sappnd , Cm sappend Pq Dv SF_APPEND +writes to the file may only append +.Pq flag can be changed by the superuser only +. +.It Cm schg , Cm schange , Cm simmutable Pq Dv SF_IMMUTABLE +file cannot be changed; it is immutable +.Pq flag can be changed by the superuser only +. +.It Cm snap Pq Dv SF_SNAPSHOT +file is an +.Xr fss 4 +snapshot inode +. +.It Cm uappnd , Cm uappend Pq Dv UF_APPEND +writes to the file may only append +. +.It Cm uchg , Cm uchange , Cm uimmutable Pq Dv UF_IMMUTABLE +file cannot be changed; it is immutable +. .El -.Pp -The -.Dv SF_APPEND -and -.Dv SF_IMMUTABLE -flags are for the superuser only, whereas -.Dv UF_APPEND -and -.Dv UF_IMMUTABLE -are for the user only. +. .Pp The .Fn flags_to_string @@ -94,6 +117,10 @@ and it is the responsibility of the call .Xr free 3 it. .Pp +Where the above list has several flag names for a flag, +the first of the listed names is returned. +. +.Pp The .Fn string_to_flags function takes a @@ -102,16 +129,35 @@ of space, comma, or tab separated flag n and places their bit value on the .Fa setp argument. -If the flag name is prefixed by: -.Dq no , +.Pp +If the flag name is prefixed by +.Ql no , then the bit value is placed on the .Fa clrp argument. +Both +.Cm nonodump +and +.Cm dump +are recognized as negative forms of the +.Cm nodump +flag name. +.Pp +Where the above list has several flag names for a flag, +all of them are recognized. +The +.Cm snap +flag name is +.Em not +recognized +.Pq as its flag cannot be changed anyway . +. .Sh RETURN VALUES .Fn flags_to_string returns the symbolic representation of flags, the default string, or .Dv NULL if allocation failed. +. .Pp .Fn string_to_flags returns @@ -120,7 +166,7 @@ on success and .Dv 1 if it fails to parse the string, setting .Fa stringp -to point to the first string that it failed to parse. +to point to the first name that it failed to parse. .Sh SEE ALSO .Xr chflags 2 , .Xr stat 2
CVS commit: [netbsd-10] src/lib/libutil
Module Name:src Committed By: martin Date: Sat Jul 20 15:38:24 UTC 2024 Modified Files: src/lib/libutil [netbsd-10]: stat_flags.3 Log Message: Pull up following revision(s) (requested by rin in ticket #759): lib/libutil/stat_flags.3: revision 1.9 stat_flags(3): try to improve the descriptions List all alternative forms recognized by string_to_flags(3). Both "dump" and "nonodump" are the negative of "nodump". string_to_flags does not recognize "snap". Provide xrefs for flag descriptions where applicable. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.40.1 src/lib/libutil/stat_flags.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/lib/libpthread
Module Name:src Committed By: martin Date: Sat Jul 20 15:36:52 UTC 2024 Modified Files: src/lib/libpthread [netbsd-10]: pthread_attr_getguardsize.3 pthread_attr_getstack.3 Log Message: Pull up following revision(s) (requested by rin in ticket #758): lib/libpthread/pthread_attr_getstack.3: revision 1.9 lib/libpthread/pthread_attr_getguardsize.3: revision 1.6 pthread: Document the setstack vs setguardsize bug. Suggest the safe, compatible workaround. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.14.1 src/lib/libpthread/pthread_attr_getguardsize.3 cvs rdiff -u -r1.8 -r1.8.14.1 src/lib/libpthread/pthread_attr_getstack.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libpthread/pthread_attr_getguardsize.3 diff -u src/lib/libpthread/pthread_attr_getguardsize.3:1.5 src/lib/libpthread/pthread_attr_getguardsize.3:1.5.14.1 --- src/lib/libpthread/pthread_attr_getguardsize.3:1.5 Sun Oct 22 16:37:24 2017 +++ src/lib/libpthread/pthread_attr_getguardsize.3 Sat Jul 20 15:36:52 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: pthread_attr_getguardsize.3,v 1.5 2017/10/22 16:37:24 abhinav Exp $ +.\" $NetBSD: pthread_attr_getguardsize.3,v 1.5.14.1 2024/07/20 15:36:52 martin Exp $ .\" .\" Copyright (c) 2010 Jukka Ruohonen .\" All rights reserved. @@ -123,3 +123,27 @@ There was insufficient memory. .Sh STANDARDS Both functions conform to .St -p1003.1-2008 . +.Sh BUGS +Older versions of +.Nx , +prior to 10.0, 9.4, and 8.3, incorrectly adjust the stack address by +the guard size in threads configured with +.Xr pthread_attr_setstack 3 , +instead of ignoring the guard size in that case as +.Tn POSIX +prescribes +.Po +see +.Lk https://gnats.NetBSD.org/57721 "PR lib/57721" +.Pc . +.Pp +Even if you didn't set a nonzero guard size with +.Fn pthread_attr_setguardsize , +the system will choose a nonzero default guard size. +.Pp +To work around this in applications that run on older and newer +versions of +.Nx , +as well as on other operating systems, you can safely set the guard +size to zero: +.Dl "pthread_attr_setguardsize(, 0);" Index: src/lib/libpthread/pthread_attr_getstack.3 diff -u src/lib/libpthread/pthread_attr_getstack.3:1.8 src/lib/libpthread/pthread_attr_getstack.3:1.8.14.1 --- src/lib/libpthread/pthread_attr_getstack.3:1.8 Mon Oct 23 01:03:23 2017 +++ src/lib/libpthread/pthread_attr_getstack.3 Sat Jul 20 15:36:52 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: pthread_attr_getstack.3,v 1.8 2017/10/23 01:03:23 wiz Exp $ +.\" $NetBSD: pthread_attr_getstack.3,v 1.8.14.1 2024/07/20 15:36:52 martin Exp $ .\" .\" Copyright (c) 2010 Jukka Ruohonen .\" All rights reserved. @@ -177,3 +177,27 @@ and were however removed from the specification in the .St -p1003.1-2008 revision. +.Sh BUGS +Older versions of +.Nx , +prior to 10.0, 9.4, and 8.3, incorrectly adjust the stack address by +the guard size in threads configured with +.Fn pthread_attr_setstack , +instead of ignoring the guard size in that case as +.Tn POSIX +prescribes +.Po +see +.Lk https://gnats.NetBSD.org/57721 "PR lib/57721" +.Pc . +.Pp +Even if you didn't set a nonzero guard size with +.Xr pthread_attr_setguardsize 3 , +the system will choose a nonzero default guard size. +.Pp +To work around this in applications that run on older and newer +versions of +.Nx , +as well as on other operating systems, you can safely set the guard +size to zero: +.Dl "pthread_attr_setguardsize(, 0);"
CVS commit: [netbsd-10] src/lib/libpthread
Module Name:src Committed By: martin Date: Sat Jul 20 15:36:52 UTC 2024 Modified Files: src/lib/libpthread [netbsd-10]: pthread_attr_getguardsize.3 pthread_attr_getstack.3 Log Message: Pull up following revision(s) (requested by rin in ticket #758): lib/libpthread/pthread_attr_getstack.3: revision 1.9 lib/libpthread/pthread_attr_getguardsize.3: revision 1.6 pthread: Document the setstack vs setguardsize bug. Suggest the safe, compatible workaround. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.14.1 src/lib/libpthread/pthread_attr_getguardsize.3 cvs rdiff -u -r1.8 -r1.8.14.1 src/lib/libpthread/pthread_attr_getstack.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/lib/libpthread
Module Name:src
Committed By: martin
Date: Sat Jul 20 15:35:01 UTC 2024
Modified Files:
src/lib/libpthread [netbsd-10]: pthread.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #757):
lib/libpthread/pthread.c: revision 1.182
Use snprintf_ss in pthread__assertfunc and update comment in
pthread__errorfunc. snprintf can use locks in some code paths and we
only care about the restricted subset here.
To generate a diff of this commit:
cvs rdiff -u -r1.181.2.2 -r1.181.2.3 src/lib/libpthread/pthread.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/pthread.c
diff -u src/lib/libpthread/pthread.c:1.181.2.2 src/lib/libpthread/pthread.c:1.181.2.3
--- src/lib/libpthread/pthread.c:1.181.2.2 Thu Jun 20 18:22:47 2024
+++ src/lib/libpthread/pthread.c Sat Jul 20 15:35:01 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread.c,v 1.181.2.2 2024/06/20 18:22:47 martin Exp $ */
+/* $NetBSD: pthread.c,v 1.181.2.3 2024/07/20 15:35:01 martin Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008, 2020
@@ -31,7 +31,7 @@
*/
#include
-__RCSID("$NetBSD: pthread.c,v 1.181.2.2 2024/06/20 18:22:47 martin Exp $");
+__RCSID("$NetBSD: pthread.c,v 1.181.2.3 2024/07/20 15:35:01 martin Exp $");
#define __EXPOSE_STACK 1
@@ -1076,10 +1076,10 @@ pthread__assertfunc(const char *file, in
int len;
/*
- * snprintf should not acquire any locks, or we could
+ * snprintf_ss should not acquire any locks, or we could
* end up deadlocked if the assert caller held locks.
*/
- len = snprintf(buf, 1024,
+ len = snprintf_ss(buf, 1024,
"assertion \"%s\" failed: file \"%s\", line %d%s%s%s\n",
expr, file, line,
function ? ", function \"" : "",
@@ -1109,7 +1109,7 @@ pthread__errorfunc(const char *file, int
va_end(ap);
/*
- * snprintf should not acquire any locks, or we could
+ * snprintf_ss should not acquire any locks, or we could
* end up deadlocked if the assert caller held locks.
*/
len = snprintf_ss(buf, sizeof(buf),
CVS commit: [netbsd-10] src/lib/libpthread
Module Name:src Committed By: martin Date: Sat Jul 20 15:35:01 UTC 2024 Modified Files: src/lib/libpthread [netbsd-10]: pthread.c Log Message: Pull up following revision(s) (requested by rin in ticket #757): lib/libpthread/pthread.c: revision 1.182 Use snprintf_ss in pthread__assertfunc and update comment in pthread__errorfunc. snprintf can use locks in some code paths and we only care about the restricted subset here. To generate a diff of this commit: cvs rdiff -u -r1.181.2.2 -r1.181.2.3 src/lib/libpthread/pthread.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/lib/libcurses
Module Name:src Committed By: martin Date: Sat Jul 20 15:33:04 UTC 2024 Modified Files: src/lib/libcurses [netbsd-10]: refresh.c Log Message: Pull up following revision(s) (requested by rin in ticket #756): lib/libcurses/refresh.c: revision 1.127 Don't set the clear_to_eol variable in doupdate to NULL, this was a leftover from previous code that makes no sense and makes worms(6) crash randomly. Thanks to kre@ for reporting this. To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.126.2.1 src/lib/libcurses/refresh.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/lib/libcurses
Module Name:src
Committed By: martin
Date: Sat Jul 20 15:33:04 UTC 2024
Modified Files:
src/lib/libcurses [netbsd-10]: refresh.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #756):
lib/libcurses/refresh.c: revision 1.127
Don't set the clear_to_eol variable in doupdate to NULL, this was a
leftover from previous code that makes no sense and makes worms(6)
crash randomly. Thanks to kre@ for reporting this.
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.126.2.1 src/lib/libcurses/refresh.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/refresh.c
diff -u src/lib/libcurses/refresh.c:1.126 src/lib/libcurses/refresh.c:1.126.2.1
--- src/lib/libcurses/refresh.c:1.126 Mon Dec 5 21:14:25 2022
+++ src/lib/libcurses/refresh.c Sat Jul 20 15:33:03 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: refresh.c,v 1.126 2022/12/05 21:14:25 blymn Exp $ */
+/* $NetBSD: refresh.c,v 1.126.2.1 2024/07/20 15:33:03 martin Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)refresh.c 8.7 (Berkeley) 8/13/94";
#else
-__RCSID("$NetBSD: refresh.c,v 1.126 2022/12/05 21:14:25 blymn Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.126.2.1 2024/07/20 15:33:03 martin Exp $");
#endif
#endif/* not lint */
@@ -1382,7 +1382,6 @@ makech(int wy)
}
return OK;
}
-ce = NULL;
}
#ifdef HAVE_WCHAR
CVS commit: [netbsd-10] src/lib/libc/sys
Module Name:src Committed By: martin Date: Sat Jul 20 15:31:37 UTC 2024 Modified Files: src/lib/libc/sys [netbsd-10]: stat.2 Log Message: Pull up following revision(s) (requested by rin in ticket #755): lib/libc/sys/stat.2: revision 1.60 document S_ISWHT, sort these macros To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.59.8.1 src/lib/libc/sys/stat.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/stat.2 diff -u src/lib/libc/sys/stat.2:1.59 src/lib/libc/sys/stat.2:1.59.8.1 --- src/lib/libc/sys/stat.2:1.59 Sun Sep 1 19:45:48 2019 +++ src/lib/libc/sys/stat.2 Sat Jul 20 15:31:36 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: stat.2,v 1.59 2019/09/01 19:45:48 sevan Exp $ +.\" $NetBSD: stat.2,v 1.59.8.1 2024/07/20 15:31:36 martin Exp $ .\" .\" Copyright (c) 1980, 1991, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)stat.2 8.4 (Berkeley) 5/1/95 .\" -.Dd September 1, 2019 +.Dd October 15, 2023 .Dt STAT 2 .Os .Sh NAME @@ -225,12 +225,14 @@ Test for a character special file. Test for a directory. .It Fn S_ISFIFO "m" Test for a pipe or FIFO special file. -.It Fn S_ISREG "m" -Test for a regular file. .It Fn S_ISLNK "m" Test for a symbolic link. +.It Fn S_ISREG "m" +Test for a regular file. .It Fn S_ISSOCK "m" Test for a socket. +.It Fn S_ISWHT "m" +Test for a whiteout file. .El .Pp The macros evaluate to a non-zero value if the test
CVS commit: [netbsd-10] src/lib/libc/sys
Module Name:src Committed By: martin Date: Sat Jul 20 15:31:37 UTC 2024 Modified Files: src/lib/libc/sys [netbsd-10]: stat.2 Log Message: Pull up following revision(s) (requested by rin in ticket #755): lib/libc/sys/stat.2: revision 1.60 document S_ISWHT, sort these macros To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.59.8.1 src/lib/libc/sys/stat.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/lib/libc/stdio
Module Name:src
Committed By: martin
Date: Sat Jul 20 15:28:14 UTC 2024
Modified Files:
src/lib/libc/stdio [netbsd-10]: fvwrite.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #754):
lib/libc/stdio/fvwrite.c: revision 1.31
>From enh at google dot com in tech-userlevel. Don't limit writes to
BUFSIZ, change the limit to INT_MAX; improves performance dramatically. From:
https://github.com/apple-oss-distributions/Libc/commit/c5a3293354e22262702a3add5b2dfc9bb0b93b85#diff-3b844a19cfb0aab1a23f7fbc457d3bce7453513730c489a72f66ff89d6557ff3
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.30.2.1 src/lib/libc/stdio/fvwrite.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdio/fvwrite.c
diff -u src/lib/libc/stdio/fvwrite.c:1.30 src/lib/libc/stdio/fvwrite.c:1.30.2.1
--- src/lib/libc/stdio/fvwrite.c:1.30 Thu Jul 22 17:08:15 2021
+++ src/lib/libc/stdio/fvwrite.c Sat Jul 20 15:28:14 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: fvwrite.c,v 1.30 2021/07/22 17:08:15 christos Exp $ */
+/* $NetBSD: fvwrite.c,v 1.30.2.1 2024/07/20 15:28:14 martin Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)fvwrite.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fvwrite.c,v 1.30 2021/07/22 17:08:15 christos Exp $");
+__RCSID("$NetBSD: fvwrite.c,v 1.30.2.1 2024/07/20 15:28:14 martin Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -99,11 +99,12 @@ __sfvwrite(FILE *fp, struct __suio *uio)
}
if (fp->_flags & __SNBF) {
/*
- * Unbuffered: write up to BUFSIZ bytes at a time.
+ * Unbuffered: write up to INT_MAX bytes at a time, to not
+ * truncate the value of len if it is greater than 2^31 bytes.
*/
do {
GETIOV(;);
- w = (*fp->_write)(fp->_cookie, p, MIN(len, BUFSIZ));
+ w = (*fp->_write)(fp->_cookie, p, MIN(len, INT_MAX));
if (w <= 0)
goto err;
p += w;
@@ -113,7 +114,8 @@ __sfvwrite(FILE *fp, struct __suio *uio)
/*
* Fully buffered: fill partially full buffer, if any,
* and then flush. If there is no partial buffer, write
- * one _bf._size byte chunk directly (without copying).
+ * entire payload directly (without copying) up to a multiple
+ * of the buffer size.
*
* String output is a special case: write as many bytes
* as fit, but pretend we wrote everything. This makes
@@ -159,7 +161,15 @@ __sfvwrite(FILE *fp, struct __suio *uio)
if (fflush(fp))
goto err;
} else if (len >= (size_t)(w = fp->_bf._size)) {
-/* write directly */
+/*
+ * write directly up to INT_MAX or greatest
+ * multiple of buffer size (whatever is
+ * smaller), keeping in the memory buffer the
+ * remaining part of payload that is smaller
+ * than buffer size.
+ */
+if (w != 0)
+ w = MIN(w * (len / w), INT_MAX);
w = (*fp->_write)(fp->_cookie, p, (size_t)w);
if (w <= 0)
goto err;
CVS commit: [netbsd-10] src/lib/libc/stdio
Module Name:src Committed By: martin Date: Sat Jul 20 15:28:14 UTC 2024 Modified Files: src/lib/libc/stdio [netbsd-10]: fvwrite.c Log Message: Pull up following revision(s) (requested by rin in ticket #754): lib/libc/stdio/fvwrite.c: revision 1.31 >From enh at google dot com in tech-userlevel. Don't limit writes to BUFSIZ, change the limit to INT_MAX; improves performance dramatically. From: https://github.com/apple-oss-distributions/Libc/commit/c5a3293354e22262702a3add5b2dfc9bb0b93b85#diff-3b844a19cfb0aab1a23f7fbc457d3bce7453513730c489a72f66ff89d6557ff3 To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.30.2.1 src/lib/libc/stdio/fvwrite.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/lib/libc/net
Module Name:src Committed By: martin Date: Sat Jul 20 15:25:50 UTC 2024 Modified Files: src/lib/libc/net [netbsd-10]: getaddrinfo.3 Log Message: Pull up following revision(s) (requested by rin in ticket #753): lib/libc/net/getaddrinfo.3: revision 1.61 Document that freeaddrinfo(NULL) dumps core. A source code comment already said this, but it's easier to find in a man page. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.60.6.1 src/lib/libc/net/getaddrinfo.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/net/getaddrinfo.3 diff -u src/lib/libc/net/getaddrinfo.3:1.60 src/lib/libc/net/getaddrinfo.3:1.60.6.1 --- src/lib/libc/net/getaddrinfo.3:1.60 Thu Jun 4 11:28:00 2020 +++ src/lib/libc/net/getaddrinfo.3 Sat Jul 20 15:25:50 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: getaddrinfo.3,v 1.60 2020/06/04 11:28:00 nia Exp $ +.\" $NetBSD: getaddrinfo.3,v 1.60.6.1 2024/07/20 15:25:50 martin Exp $ .\" $KAME: getaddrinfo.3,v 1.36 2005/01/05 03:23:05 itojun Exp $ .\" $OpenBSD: getaddrinfo.3,v 1.35 2004/12/21 03:40:31 jaredy Exp $ .\" @@ -17,7 +17,7 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.Dd June 4, 2020 +.Dd May 9, 2024 .Dt GETADDRINFO 3 .Os .Sh NAME @@ -494,3 +494,13 @@ function is defined by the draft specification and documented in .Dv "RFC 3493" , .Dq Basic Socket Interface Extensions for IPv6 . +.Sh NOTES +In the current implementation, +.Dl freeaddrinfo(NULL); +will cause a segmentation fault. +.Po Tn RFC +3493 does not specify what should happen, +.St -xns5.2 +says +.Dv NULL +is an invalid argument.)
CVS commit: [netbsd-10] src/lib/libc/net
Module Name:src Committed By: martin Date: Sat Jul 20 15:25:50 UTC 2024 Modified Files: src/lib/libc/net [netbsd-10]: getaddrinfo.3 Log Message: Pull up following revision(s) (requested by rin in ticket #753): lib/libc/net/getaddrinfo.3: revision 1.61 Document that freeaddrinfo(NULL) dumps core. A source code comment already said this, but it's easier to find in a man page. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.60.6.1 src/lib/libc/net/getaddrinfo.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/share/man/man4
Module Name:src Committed By: martin Date: Sat Jul 20 15:22:09 UTC 2024 Modified Files: src/share/man/man4 [netbsd-10]: options.4 Log Message: Pull up following revision(s) (requested by reinoud in ticket #752): share/man/man4/options.4: revision 1.531 Update `file-system UDF' description. Since it now has fsck_udf(4) and it has matured enough to remove the EXPERIMENTAL flag. To generate a diff of this commit: cvs rdiff -u -r1.523.2.1 -r1.523.2.2 src/share/man/man4/options.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/options.4 diff -u src/share/man/man4/options.4:1.523.2.1 src/share/man/man4/options.4:1.523.2.2 --- src/share/man/man4/options.4:1.523.2.1 Sat May 13 13:26:57 2023 +++ src/share/man/man4/options.4 Sat Jul 20 15:22:09 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: options.4,v 1.523.2.1 2023/05/13 13:26:57 martin Exp $ +.\" $NetBSD: options.4,v 1.523.2.2 2024/07/20 15:22:09 martin Exp $ .\" .\" Copyright (c) 1996 .\" Perry E. Metzger. All rights reserved. @@ -900,15 +900,15 @@ See .Xr mount_procfs 8 for details. .It Cd file-system UDF -.Bq Em EXPERIMENTAL -Includes code for the UDF file system commonly found on CD and DVD -media but also on USB sticks. -Currently supports read and write access up to UDF 2.01 and somewhat limited -write support for UDF 2.50. -It is marked experimental since there is no -.Xr fsck_udf 8 . +Includes code for the UDF file system commonly found on CD and DVD media but +also on USB sticks and harddiscs for interchange and backup. Supports read and +write access for all formats on discs and on rewritable and recordable +CD/DVD/BD media. It has a somewhat limited write support for UDF 2.50 as it +can't expand the metadata partion. See .Xr mount_udf 8 +and +.Xr fsck_udf 8 for details. .It Cd file-system UMAPFS Includes a loopback file system in which user and group IDs may be
CVS commit: [netbsd-10] src/share/man/man4
Module Name:src Committed By: martin Date: Sat Jul 20 15:22:09 UTC 2024 Modified Files: src/share/man/man4 [netbsd-10]: options.4 Log Message: Pull up following revision(s) (requested by reinoud in ticket #752): share/man/man4/options.4: revision 1.531 Update `file-system UDF' description. Since it now has fsck_udf(4) and it has matured enough to remove the EXPERIMENTAL flag. To generate a diff of this commit: cvs rdiff -u -r1.523.2.1 -r1.523.2.2 src/share/man/man4/options.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/lib/libc/gen
Module Name:src Committed By: martin Date: Sat Jul 20 15:19:39 UTC 2024 Modified Files: src/lib/libc/gen [netbsd-10]: usleep.3 Log Message: Pull up following revision(s) (requested by rin in ticket #751): lib/libc/gen/usleep.3: revision 1.22 usleep(3): Note the historical rake that was stepped upon. PR 58184 To generate a diff of this commit: cvs rdiff -u -r1.19.56.1 -r1.19.56.2 src/lib/libc/gen/usleep.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/usleep.3 diff -u src/lib/libc/gen/usleep.3:1.19.56.1 src/lib/libc/gen/usleep.3:1.19.56.2 --- src/lib/libc/gen/usleep.3:1.19.56.1 Sun Apr 28 13:23:20 2024 +++ src/lib/libc/gen/usleep.3 Sat Jul 20 15:19:39 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: usleep.3,v 1.19.56.1 2024/04/28 13:23:20 martin Exp $ +.\" $NetBSD: usleep.3,v 1.19.56.2 2024/07/20 15:19:39 martin Exp $ .\" .\" Copyright (c) 1986, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -99,3 +99,17 @@ The .Fn usleep function appeared in .Bx 4.3 . +.Sh CAVEATS +In +.St -p1003.1-2004 , +.Nm +was limited to values of +.Fa microseconds +less than one million. +Some implementations, including +.Nx +before 10.1, fail immediately with +.Er EINVAL +\(em and don't sleep at all \(em if +.Fa microseconds +is one million or greater.
CVS commit: [netbsd-10] src/lib/libc/gen
Module Name:src Committed By: martin Date: Sat Jul 20 15:19:39 UTC 2024 Modified Files: src/lib/libc/gen [netbsd-10]: usleep.3 Log Message: Pull up following revision(s) (requested by rin in ticket #751): lib/libc/gen/usleep.3: revision 1.22 usleep(3): Note the historical rake that was stepped upon. PR 58184 To generate a diff of this commit: cvs rdiff -u -r1.19.56.1 -r1.19.56.2 src/lib/libc/gen/usleep.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/lib/libc/gen
Module Name:src Committed By: martin Date: Sat Jul 20 15:05:52 UTC 2024 Modified Files: src/lib/libc/gen [netbsd-10]: err.3 Log Message: Pull up following revision(s) (requested by rin in ticket #750): lib/libc/gen/err.3: revision 1.24 Make the err(3) manual clearer to read. - Mention that the 'fmt' argument to these functions holds a printf(3)-like format specification. - Clarify that the err()/warn()/errc()/warnc() family of functions will append an additional error message to the output. - Add whitespace to separate paragraphs describing distinct concepts. - Move the sentence mentioning the final output newline to a less ambiguous location within the text. - Add a cross-reference to printf(3). To generate a diff of this commit: cvs rdiff -u -r1.22.16.1 -r1.22.16.2 src/lib/libc/gen/err.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/err.3 diff -u src/lib/libc/gen/err.3:1.22.16.1 src/lib/libc/gen/err.3:1.22.16.2 --- src/lib/libc/gen/err.3:1.22.16.1 Fri Jan 6 13:44:41 2023 +++ src/lib/libc/gen/err.3 Sat Jul 20 15:05:52 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: err.3,v 1.22.16.1 2023/01/06 13:44:41 martin Exp $ +.\" $NetBSD: err.3,v 1.22.16.2 2024/07/20 15:05:52 martin Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)err.3 8.1 (Berkeley) 6/9/93 .\" -.Dd January 5, 2023 +.Dd February 2, 2024 .Dt ERR 3 .Os .Sh NAME @@ -81,27 +81,30 @@ and .Fn warn family of functions display a formatted error message on the standard error output. -In all cases, the last component of the program name, a colon character, -and a space are output. +.Pp +In all cases these functions output the last component of the program name, +a colon character, and a space. If the .Fa fmt argument is not .Dv NULL , -the formatted error message is output. +it is used as a +.Xr printf 3 Ns +-like format specification for the error message. +.Pp In the case of the .Fn err , .Fn verr , .Fn warn , and .Fn vwarn -functions, the error message string affiliated with the current value of -the global variable +functions, an additional error message string affiliated with the current +value of the global variable .Va errno is output next, preceded by a colon character and a space if .Fa fmt is not .Dv NULL . -In all cases, the output is followed by a newline character. The .Fn errc , .Fn verrc , @@ -119,7 +122,9 @@ The .Fn warnx , and .Fn vwarnx -functions will not output this error message string. +functions will not output an additional error message string. +.Pp +In all cases, the output is terminated by a newline character. .Pp The .Fn err , @@ -168,6 +173,7 @@ if ((fd = open(block_device, O_RDONLY, 0 .Sh SEE ALSO .Xr exit 3 , .Xr getprogname 3 , +.Xr printf 3 , .Xr strerror 3 .Sh HISTORY The
CVS commit: [netbsd-10] src/lib/libc/gen
Module Name:src Committed By: martin Date: Sat Jul 20 15:05:52 UTC 2024 Modified Files: src/lib/libc/gen [netbsd-10]: err.3 Log Message: Pull up following revision(s) (requested by rin in ticket #750): lib/libc/gen/err.3: revision 1.24 Make the err(3) manual clearer to read. - Mention that the 'fmt' argument to these functions holds a printf(3)-like format specification. - Clarify that the err()/warn()/errc()/warnc() family of functions will append an additional error message to the output. - Add whitespace to separate paragraphs describing distinct concepts. - Move the sentence mentioning the final output newline to a less ambiguous location within the text. - Add a cross-reference to printf(3). To generate a diff of this commit: cvs rdiff -u -r1.22.16.1 -r1.22.16.2 src/lib/libc/gen/err.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/lib/libc/gdtoa
Module Name:src
Committed By: martin
Date: Sat Jul 20 15:03:07 UTC 2024
Modified Files:
src/lib/libc/gdtoa [netbsd-10]: strtod.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #749):
lib/libc/gdtoa/strtod.c: revision 1.19
remove the -O0 force for _int_strtod_l() and GCC 9, it's fixed in GCC 10
and 12.
this was triggering sh3 GCC 12 to fail compiles because of ssp.h's memcpy()
frontend having the always_inline attribute that didn't match -O0 or so.
tested with pkgsrc gcc9 to confirm it hangs there, but newer versions
are fine.
also known as PR#55668, which now has a real fix (gcc 10 :-).
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.6.1 src/lib/libc/gdtoa/strtod.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gdtoa/strtod.c
diff -u src/lib/libc/gdtoa/strtod.c:1.18 src/lib/libc/gdtoa/strtod.c:1.18.6.1
--- src/lib/libc/gdtoa/strtod.c:1.18 Thu May 6 16:15:33 2021
+++ src/lib/libc/gdtoa/strtod.c Sat Jul 20 15:03:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: strtod.c,v 1.18 2021/05/06 16:15:33 christos Exp $ */
+/* $NetBSD: strtod.c,v 1.18.6.1 2024/07/20 15:03:06 martin Exp $ */
/
@@ -90,9 +90,6 @@ sulp
}
#endif /*}*/
-#if __GNUC_PREREQ__(9, 3)
-__attribute__((__optimize__("O0")))
-#endif
static double
_int_strtod_l(CONST char *s00, char **se, locale_t loc)
{
CVS commit: [netbsd-10] src/lib/libc/gdtoa
Module Name:src Committed By: martin Date: Sat Jul 20 15:03:07 UTC 2024 Modified Files: src/lib/libc/gdtoa [netbsd-10]: strtod.c Log Message: Pull up following revision(s) (requested by rin in ticket #749): lib/libc/gdtoa/strtod.c: revision 1.19 remove the -O0 force for _int_strtod_l() and GCC 9, it's fixed in GCC 10 and 12. this was triggering sh3 GCC 12 to fail compiles because of ssp.h's memcpy() frontend having the always_inline attribute that didn't match -O0 or so. tested with pkgsrc gcc9 to confirm it hangs there, but newer versions are fine. also known as PR#55668, which now has a real fix (gcc 10 :-). To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.18.6.1 src/lib/libc/gdtoa/strtod.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/lib/libc/atomic
Module Name:src Committed By: martin Date: Sat Jul 20 15:00:36 UTC 2024 Modified Files: src/lib/libc/atomic [netbsd-10]: atomic_ops.3 Log Message: Pull up following revision(s) (requested by rin in ticket #748): lib/libc/atomic/atomic_ops.3: revision 1.9 Note that aarch64 implements CAS. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.12.1 src/lib/libc/atomic/atomic_ops.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/atomic/atomic_ops.3 diff -u src/lib/libc/atomic/atomic_ops.3:1.8 src/lib/libc/atomic/atomic_ops.3:1.8.12.1 --- src/lib/libc/atomic/atomic_ops.3:1.8 Sat Jun 16 08:11:32 2018 +++ src/lib/libc/atomic/atomic_ops.3 Sat Jul 20 15:00:36 2024 @@ -1,10 +1,10 @@ -.\" $NetBSD: atomic_ops.3,v 1.8 2018/06/16 08:11:32 dholland Exp $ +.\" $NetBSD: atomic_ops.3,v 1.8.12.1 2024/07/20 15:00:36 martin Exp $ .\" -.\" Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. +.\" Copyright (c) 2007, 2008, 2020, 2023 The NetBSD Foundation, Inc. .\" All rights reserved. .\" .\" This code is derived from software contributed to The NetBSD Foundation -.\" by Jason R. Thorpe. +.\" by Jason R. Thorpe, and by Andrew Doran. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -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 February 7, 2018 +.Dd September 6, 2023 .Dt ATOMIC_OPS 3 .Os .Sh NAME @@ -68,7 +68,7 @@ spinlock. The chosen method is not ordinarily distinguishable by or visible to users of the interface. The following architectures can be assumed to provide CAS in hardware: -alpha, amd64, i386, powerpc, powerpc64, sparc64. +aarch64, alpha, amd64, i386, powerpc, powerpc64, sparc64. .Ss Scope and Restrictions If hardware CAS is available, the atomic operations are globally atomic: operations within a memory region shared between processes are
CVS commit: [netbsd-10] src/lib/libc/atomic
Module Name:src Committed By: martin Date: Sat Jul 20 15:00:36 UTC 2024 Modified Files: src/lib/libc/atomic [netbsd-10]: atomic_ops.3 Log Message: Pull up following revision(s) (requested by rin in ticket #748): lib/libc/atomic/atomic_ops.3: revision 1.9 Note that aarch64 implements CAS. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.12.1 src/lib/libc/atomic/atomic_ops.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/external/bsd/libproc/dist
Module Name:src
Committed By: martin
Date: Sat Jul 20 14:59:02 UTC 2024
Modified Files:
src/external/bsd/libproc/dist [netbsd-10]: proc_sym.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #747):
external/bsd/libproc/dist/proc_sym.c: revision 1.5
external/bsd/libproc/dist/proc_sym.c: revision 1.6
libproc: sanitize process symbols so binary doesn't end up in dtrace profiling
>From RVP on current-users
libproc: proc_sym.c: Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.16.1 src/external/bsd/libproc/dist/proc_sym.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/libproc/dist/proc_sym.c
diff -u src/external/bsd/libproc/dist/proc_sym.c:1.4 src/external/bsd/libproc/dist/proc_sym.c:1.4.16.1
--- src/external/bsd/libproc/dist/proc_sym.c:1.4 Thu Jun 15 23:44:58 2017
+++ src/external/bsd/libproc/dist/proc_sym.c Sat Jul 20 14:59:02 2024
@@ -32,7 +32,7 @@
#ifdef __FBSDID
__FBSDID("$FreeBSD: head/lib/libproc/proc_sym.c 279946 2015-03-13 04:26:48Z stas $");
#else
-__RCSID("$NetBSD: proc_sym.c,v 1.4 2017/06/15 23:44:58 kamil Exp $");
+__RCSID("$NetBSD: proc_sym.c,v 1.4.16.1 2024/07/20 14:59:02 martin Exp $");
#endif
#include
@@ -141,6 +141,10 @@ proc_objname(struct proc_handle *p, uint
size_t i;
rd_loadobj_t *rdl;
+ if (p->nobjs == 0)
+ if (proc_rdagent(p) == NULL)
+ return (NULL);
+
for (i = 0; i < p->nobjs; i++) {
rdl = >rdobjs[i];
if (addr >= rdl->rdl_saddr && addr < rdl->rdl_eaddr) {
CVS commit: [netbsd-10] src/external/bsd/libproc/dist
Module Name:src Committed By: martin Date: Sat Jul 20 14:59:02 UTC 2024 Modified Files: src/external/bsd/libproc/dist [netbsd-10]: proc_sym.c Log Message: Pull up following revision(s) (requested by rin in ticket #747): external/bsd/libproc/dist/proc_sym.c: revision 1.5 external/bsd/libproc/dist/proc_sym.c: revision 1.6 libproc: sanitize process symbols so binary doesn't end up in dtrace profiling >From RVP on current-users libproc: proc_sym.c: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.16.1 src/external/bsd/libproc/dist/proc_sym.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/etc
Module Name:src Committed By: martin Date: Sat Jul 20 14:57:08 UTC 2024 Modified Files: src/etc [netbsd-10]: services Log Message: Pull up following revision(s) (requested by rin in ticket #746): etc/services: revision 1.105 etc/services: revision 1.106 Resolve the port 2049 conflict by commenting out the entries for "shilp". Now "netstat" will produce sensible output for NFS connections again. PR/57759: Hauke Fath: Restore local additions, lost in revision 1.104 To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.104.2.1 src/etc/services Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/services diff -u src/etc/services:1.104 src/etc/services:1.104.2.1 --- src/etc/services:1.104 Mon Nov 28 02:48:33 2022 +++ src/etc/services Sat Jul 20 14:57:07 2024 @@ -1,4 +1,4 @@ -# $NetBSD: services,v 1.104 2022/11/28 02:48:33 jschauma Exp $ +# $NetBSD: services,v 1.104.2.1 2024/07/20 14:57:07 martin Exp $ # See also: services(5), https://www.iana.org/assignments/service-names-port-numbers/ # # Service Name and Transport Protocol Port Number Registry @@ -4659,8 +4659,8 @@ dls2047/tcp dls2047/udp dls-monitor2048/tcp dls-monitor2048/udp -shilp 2049/tcp# <== NOTE Conflict on 2049 ! -shilp 2049/udp# <== NOTE Conflict on 2049 ! +#shilp 2049/tcp# <== NOTE Conflict on 2049 ! +#shilp 2049/udp# <== NOTE Conflict on 2049 ! nfs2049/tcp# Network File System - Sun[Brent_Callaghan] [Brent_Callaghan]Defined TXT keys: path= # Microsystems nfs2049/udp# Network File System - Sun[Brent_Callaghan] [Brent_Callaghan]Defined TXT keys: path= @@ -24818,4 +24818,98 @@ inspider 49150/tcp# InSpid # configured experiments; they MUST NOT be shipped as defaults in # implementations. See RFC 3692 for details. # + +# Local NetBSD additions [aliases or missing stuff] +sink 9/tcp null +sink 9/udp null +users 11/tcp +quote 17/tcp +quote 17/udp +ttytst 19/tcp source +ttytst 19/udp source +mail 25/tcp +mail 25/udp +timserver 37/tcp +timserver 37/udp +resource 39/tcp +resource 39/udp +netrjs 77/tcp +netrjs 77/udp +krb5 88/tcp +krb5 88/udp +hostnames 101/tcp +hostnames 101/udp +tsap 102/tcp +tsap 102/udp +cso-ns 105/tcp +cso-ns 105/udp +poppass 106/tcp poppassd +postoffice 109/tcp +rpcbind 111/tcp +rpcbind 111/udp +authentications 113/tcp +readnews 119/tcp untp +imap2 143/tcp imap4 +imap2 143/udp imap4 +z3950 210/tcp wais +z3950 210/udp wais +krcmd 544/tcp +ekshell 545/tcp +whod 513/udp +cmd 514/tcp +spooler 515/tcp +spooler 515/udp +route 520/udp routed +timeserver 525/tcp +timeserver 525/udp +newdate 526/tcp +newdate 526/udp +rpc 530/tcp +rpc 530/udp +chat 531/tcp +chat 531/udp +uucpd 540/tcp +uucpd 540/udp +rdist 541/tcp rdistd +rfs_server 556/tcp rfs # Brunhoff remote filesystem +smtps 465/tcp # smtp protocol over TLS/SSL +smtps 465/udp # smtp protocol over TLS/SSL +kdc 750/tcp kerberos4 +kdc 750/udp kerberos4 +kerberos-master 751/udp # Kerberos admin server udp +kerberos-master 751/tcp # Kerberos admin server tcp +hprop 754/tcp # Heimdal KDC database propagation +krbupdate 760/tcp kreg # BSD Kerberos registration +kpwd 761/tcp # old BSD Kerberos `passwd' +supfilesrv 871/tcp # SUP server +swat 901/tcp # Samba Web Administration Tool +kpop 1109/tcp # Kerberos POP server +supfiledbg 1127/tcp # SUP
CVS commit: [netbsd-10] src/etc
Module Name:src Committed By: martin Date: Sat Jul 20 14:57:08 UTC 2024 Modified Files: src/etc [netbsd-10]: services Log Message: Pull up following revision(s) (requested by rin in ticket #746): etc/services: revision 1.105 etc/services: revision 1.106 Resolve the port 2049 conflict by commenting out the entries for "shilp". Now "netstat" will produce sensible output for NFS connections again. PR/57759: Hauke Fath: Restore local additions, lost in revision 1.104 To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.104.2.1 src/etc/services Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/common/lib/libc/arch/arm/string
Module Name:src Committed By: martin Date: Sat Jul 20 14:52:04 UTC 2024 Modified Files: src/common/lib/libc/arch/arm/string [netbsd-10]: memcpy_arm.S memcpy_neon.S memcpy_xscale.S memmove.S memset.S memset_naive.S strlen_neon.S Log Message: Pull up following revision(s) (requested by rin in ticket #745): common/lib/libc/arch/arm/string/memcpy_arm.S: revision 1.6 common/lib/libc/arch/arm/string/memcpy_arm.S: revision 1.7 common/lib/libc/arch/arm/string/memcpy_xscale.S: revision 1.6 common/lib/libc/arch/arm/string/memcpy_neon.S: revision 1.2 common/lib/libc/arch/arm/string/memset_naive.S: revision 1.2 common/lib/libc/arch/arm/string/memmove.S: revision 1.11 common/lib/libc/arch/arm/string/strlen_neon.S: revision 1.4 common/lib/libc/arch/arm/string/memset.S: revision 1.9 Use unsigned comparisons for pointers and size_t values. Fix two signed comparisons that were missed in the last patch. Found be rillig@ To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.40.1 \ src/common/lib/libc/arch/arm/string/memcpy_arm.S \ src/common/lib/libc/arch/arm/string/memcpy_xscale.S cvs rdiff -u -r1.1 -r1.1.52.1 \ src/common/lib/libc/arch/arm/string/memcpy_neon.S \ src/common/lib/libc/arch/arm/string/memset_naive.S cvs rdiff -u -r1.10 -r1.10.26.1 src/common/lib/libc/arch/arm/string/memmove.S cvs rdiff -u -r1.8 -r1.8.30.1 src/common/lib/libc/arch/arm/string/memset.S cvs rdiff -u -r1.3 -r1.3.52.1 \ src/common/lib/libc/arch/arm/string/strlen_neon.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/common/lib/libc/arch/arm/string
Module Name:src
Committed By: martin
Date: Sat Jul 20 14:52:04 UTC 2024
Modified Files:
src/common/lib/libc/arch/arm/string [netbsd-10]: memcpy_arm.S
memcpy_neon.S memcpy_xscale.S memmove.S memset.S memset_naive.S
strlen_neon.S
Log Message:
Pull up following revision(s) (requested by rin in ticket #745):
common/lib/libc/arch/arm/string/memcpy_arm.S: revision 1.6
common/lib/libc/arch/arm/string/memcpy_arm.S: revision 1.7
common/lib/libc/arch/arm/string/memcpy_xscale.S: revision 1.6
common/lib/libc/arch/arm/string/memcpy_neon.S: revision 1.2
common/lib/libc/arch/arm/string/memset_naive.S: revision 1.2
common/lib/libc/arch/arm/string/memmove.S: revision 1.11
common/lib/libc/arch/arm/string/strlen_neon.S: revision 1.4
common/lib/libc/arch/arm/string/memset.S: revision 1.9
Use unsigned comparisons for pointers and size_t values.
Fix two signed comparisons that were missed in the last patch.
Found be rillig@
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.40.1 \
src/common/lib/libc/arch/arm/string/memcpy_arm.S \
src/common/lib/libc/arch/arm/string/memcpy_xscale.S
cvs rdiff -u -r1.1 -r1.1.52.1 \
src/common/lib/libc/arch/arm/string/memcpy_neon.S \
src/common/lib/libc/arch/arm/string/memset_naive.S
cvs rdiff -u -r1.10 -r1.10.26.1 src/common/lib/libc/arch/arm/string/memmove.S
cvs rdiff -u -r1.8 -r1.8.30.1 src/common/lib/libc/arch/arm/string/memset.S
cvs rdiff -u -r1.3 -r1.3.52.1 \
src/common/lib/libc/arch/arm/string/strlen_neon.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/string/memcpy_arm.S
diff -u src/common/lib/libc/arch/arm/string/memcpy_arm.S:1.5 src/common/lib/libc/arch/arm/string/memcpy_arm.S:1.5.40.1
--- src/common/lib/libc/arch/arm/string/memcpy_arm.S:1.5 Mon Dec 2 21:21:33 2013
+++ src/common/lib/libc/arch/arm/string/memcpy_arm.S Sat Jul 20 14:52:04 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: memcpy_arm.S,v 1.5 2013/12/02 21:21:33 joerg Exp $ */
+/* $NetBSD: memcpy_arm.S,v 1.5.40.1 2024/07/20 14:52:04 martin Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@ ENTRY(memcpy)
push {r0, lr} /* memcpy() returns dest addr */
subs r2, r2, #4
- blt .Lmemcpy_l4 /* less than 4 bytes */
+ blo .Lmemcpy_l4 /* less than 4 bytes */
ands r12, r0, #3
bne .Lmemcpy_destul /* oh unaligned destination addr */
ands r12, r1, #3
@@ -75,9 +75,9 @@ ENTRY(memcpy)
.Lmemcpy_t8:
/* We have aligned source and destination */
subs r2, r2, #8
- blt .Lmemcpy_l12 /* less than 12 bytes (4 from above) */
+ blo .Lmemcpy_l12 /* less than 12 bytes (4 from above) */
subs r2, r2, #0x14
- blt .Lmemcpy_l32 /* less than 32 bytes (12 from above) */
+ blo .Lmemcpy_l32 /* less than 32 bytes (12 from above) */
push {r4} /* borrow r4 */
/* blat 32 bytes at a time */
@@ -88,12 +88,12 @@ ENTRY(memcpy)
ldmia r1!, {r3, r4, r12, lr}
stmia r0!, {r3, r4, r12, lr}
subs r2, r2, #0x20
- bge .Lmemcpy_loop32
+ bhs .Lmemcpy_loop32
cmn r2, #0x10
- ldmiage r1!, {r3, r4, r12, lr} /* blat a remaining 16 bytes */
- stmiage r0!, {r3, r4, r12, lr}
- subge r2, r2, #0x10
+ ldmiahs r1!, {r3, r4, r12, lr} /* blat a remaining 16 bytes */
+ stmiahs r0!, {r3, r4, r12, lr}
+ subhs r2, r2, #0x10
pop {r4} /* return r4 */
.Lmemcpy_l32:
@@ -101,21 +101,21 @@ ENTRY(memcpy)
/* blat 12 bytes at a time */
.Lmemcpy_loop12:
- ldmiage r1!, {r3, r12, lr}
- stmiage r0!, {r3, r12, lr}
- subsge r2, r2, #0x0c
- bge .Lmemcpy_loop12
+ ldmiahs r1!, {r3, r12, lr}
+ stmiahs r0!, {r3, r12, lr}
+ subshs r2, r2, #0x0c
+ bhs .Lmemcpy_loop12
.Lmemcpy_l12:
adds r2, r2, #8
- blt .Lmemcpy_l4
+ blo .Lmemcpy_l4
subs r2, r2, #4
- ldrlt r3, [r1], #4
- strlt r3, [r0], #4
- ldmiage r1!, {r3, r12}
- stmiage r0!, {r3, r12}
- subge r2, r2, #4
+ ldrlo r3, [r1], #4
+ strlo r3, [r0], #4
+ ldmiahs r1!, {r3, r12}
+ stmiahs r0!, {r3, r12}
+ subhs r2, r2, #4
.Lmemcpy_l4:
/* less than 4 bytes to go */
@@ -129,10 +129,10 @@ ENTRY(memcpy)
cmp r2, #2
ldrb r3, [r1], #1
strb r3, [r0], #1
- ldrbge r3, [r1], #1
- strbge r3, [r0], #1
- ldrbgt r3, [r1], #1
- strbgt r3, [r0], #1
+ ldrbhs r3, [r1], #1
+ strbhs r3, [r0], #1
+ ldrbhi r3, [r1], #1
+ strbhi r3, [r0], #1
pop {r0, pc}
/* erg - unaligned destination */
@@ -143,12 +143,12 @@ ENTRY(memcpy)
/* align destination with byte copies */
ldrb r3, [r1], #1
strb r3, [r0], #1
- ldrbge r3, [r1], #1
- strbge r3, [r0], #1
- ldrbgt r3, [r1], #1
- strbgt r3, [r0], #1
+ ldrbhs r3, [r1], #1
+ strbhs r3, [r0], #1
+ ldrbhi r3, [r1], #1
+ strbhi r3, [r0], #1
subs r2, r2, r12
- blt .Lmemcpy_l4 /* less the 4 bytes */
+ blo .Lmemcpy_l4 /* less the 4 bytes */
ands r12, r1, #3
beq .Lmemcpy_t8 /* we have an aligned source */
@@ -159,10 +159,10 @@ ENTRY(memcpy)
bic r1, r1, #3
ldr lr, [r1], #4
cmp r12, #2
- bgt
CVS commit: [netbsd-10] src/common/lib/libc/arch/aarch64/string
Module Name:src
Committed By: martin
Date: Sat Jul 20 14:49:32 UTC 2024
Modified Files:
src/common/lib/libc/arch/aarch64/string [netbsd-10]: bcopy.S
Log Message:
Pull up following revision(s) (requested by rin in ticket #744):
common/lib/libc/arch/aarch64/string/bcopy.S: revision 1.3
port-arm/57388: Minor bug fix in bcopy.S
Use correct register to check alignment of destination in backwards copy.
Patch from Antoni Pokusinski. Thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.8.1 src/common/lib/libc/arch/aarch64/string/bcopy.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/aarch64/string/bcopy.S
diff -u src/common/lib/libc/arch/aarch64/string/bcopy.S:1.2 src/common/lib/libc/arch/aarch64/string/bcopy.S:1.2.8.1
--- src/common/lib/libc/arch/aarch64/string/bcopy.S:1.2 Sat Apr 11 05:12:52 2020
+++ src/common/lib/libc/arch/aarch64/string/bcopy.S Sat Jul 20 14:49:32 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bcopy.S,v 1.2 2020/04/11 05:12:52 ryo Exp $ */
+/* $NetBSD: bcopy.S,v 1.2.8.1 2024/07/20 14:49:32 martin Exp $ */
/*
* Copyright (c) 2018 Ryo Shimizu
@@ -29,7 +29,7 @@
#include
#if defined(LIBC_SCCS)
-RCSID("$NetBSD: bcopy.S,v 1.2 2020/04/11 05:12:52 ryo Exp $")
+RCSID("$NetBSD: bcopy.S,v 1.2.8.1 2024/07/20 14:49:32 martin Exp $")
#endif
#if defined(MEMCOPY)
@@ -306,7 +306,7 @@ backward_tiny:
ret
9:
/* length is small(<32), and src or dst may be unaligned */
- eor TMP_X, SRC0, DST0
+ eor TMP_X, SRC0, DST
ands TMP_X, TMP_X, #7
bne notaligned_backward_small
CVS commit: [netbsd-10] src/common/lib/libc/arch/aarch64/string
Module Name:src Committed By: martin Date: Sat Jul 20 14:49:32 UTC 2024 Modified Files: src/common/lib/libc/arch/aarch64/string [netbsd-10]: bcopy.S Log Message: Pull up following revision(s) (requested by rin in ticket #744): common/lib/libc/arch/aarch64/string/bcopy.S: revision 1.3 port-arm/57388: Minor bug fix in bcopy.S Use correct register to check alignment of destination in backwards copy. Patch from Antoni Pokusinski. Thanks. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.8.1 src/common/lib/libc/arch/aarch64/string/bcopy.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/bin/ls
Module Name:src Committed By: martin Date: Sat Jul 20 14:46:10 UTC 2024 Modified Files: src/bin/ls [netbsd-10]: ls.c Log Message: Pull up following revision(s) (requested by rin in ticket #743): bin/ls/ls.c: revision 1.78 PR/57892: Roberto Branco: Print full pathname in error messages To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.77.6.1 src/bin/ls/ls.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/bin/ls
Module Name:src
Committed By: martin
Date: Sat Jul 20 14:46:10 UTC 2024
Modified Files:
src/bin/ls [netbsd-10]: ls.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #743):
bin/ls/ls.c: revision 1.78
PR/57892: Roberto Branco: Print full pathname in error messages
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.77.6.1 src/bin/ls/ls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ls/ls.c
diff -u src/bin/ls/ls.c:1.77 src/bin/ls/ls.c:1.77.6.1
--- src/bin/ls/ls.c:1.77 Tue Jul 7 14:29:06 2020
+++ src/bin/ls/ls.c Sat Jul 20 14:46:10 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ls.c,v 1.77 2020/07/07 14:29:06 christos Exp $ */
+/* $NetBSD: ls.c,v 1.77.6.1 2024/07/20 14:46:10 martin Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)ls.c 8.7 (Berkeley) 8/5/94";
#else
-__RCSID("$NetBSD: ls.c,v 1.77 2020/07/07 14:29:06 christos Exp $");
+__RCSID("$NetBSD: ls.c,v 1.77.6.1 2024/07/20 14:46:10 martin Exp $");
#endif
#endif /* not lint */
@@ -445,7 +445,7 @@ traverse(int argc, char *argv[], int opt
break;
case FTS_DNR:
case FTS_ERR:
- warnx("%s: %s", p->fts_name, strerror(p->fts_errno));
+ warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
rval = EXIT_FAILURE;
break;
case FTS_D:
CVS commit: [netbsd-10] src/bin/cp
Module Name:src
Committed By: martin
Date: Sat Jul 20 14:41:11 UTC 2024
Modified Files:
src/bin/cp [netbsd-10]: utils.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #742):
bin/cp/utils.c: revision 1.50
PR/57857: Ricardo Branco: Always copy regular files, even if they appear to
be zero-sized.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.49.6.1 src/bin/cp/utils.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/cp/utils.c
diff -u src/bin/cp/utils.c:1.49 src/bin/cp/utils.c:1.49.6.1
--- src/bin/cp/utils.c:1.49 Sun May 17 23:34:11 2020
+++ src/bin/cp/utils.c Sat Jul 20 14:41:10 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: utils.c,v 1.49 2020/05/17 23:34:11 christos Exp $ */
+/* $NetBSD: utils.c,v 1.49.6.1 2024/07/20 14:41:10 martin Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)utils.c 8.3 (Berkeley) 4/1/94";
#else
-__RCSID("$NetBSD: utils.c,v 1.49 2020/05/17 23:34:11 christos Exp $");
+__RCSID("$NetBSD: utils.c,v 1.49.6.1 2024/07/20 14:41:10 martin Exp $");
#endif
#endif /* not lint */
@@ -179,10 +179,10 @@ copy_file(FTSENT *entp, int dne)
rval = 0;
/*
- * There's no reason to do anything other than close the file
- * now if it's regular and empty, so let's not bother.
+ * We always copy regular files, even if they appear to be 0-sized
+ * because kernfs and procfs don't return file sizes.
*/
- bool need_copy = !S_ISREG(fs->st_mode) || fs->st_size > 0;
+ bool need_copy = S_ISREG(fs->st_mode) || fs->st_size > 0;
struct finfo fi;
CVS commit: [netbsd-10] src/bin/cp
Module Name:src Committed By: martin Date: Sat Jul 20 14:41:11 UTC 2024 Modified Files: src/bin/cp [netbsd-10]: utils.c Log Message: Pull up following revision(s) (requested by rin in ticket #742): bin/cp/utils.c: revision 1.50 PR/57857: Ricardo Branco: Always copy regular files, even if they appear to be zero-sized. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.49.6.1 src/bin/cp/utils.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/kern
Module Name:src
Committed By: martin
Date: Sat Jul 20 14:37:05 UTC 2024
Modified Files:
src/sys/kern [netbsd-10]: uipc_socket.c
Log Message:
Pull up following revision(s) (requested by jdolecek in ticket #741):
sys/kern/uipc_socket.c: revision 1.309
make kqfilter() behave the same for PIPE_SOCKETPAIR pipe as it does
for standard one - refuse EVFILT_WRITE if the reader is already disconnected
fixes test failure for kernel/kqueue/write/t_pipe.c on PIPE_SOCKETPAIR kernel
PR kern/55690
To generate a diff of this commit:
cvs rdiff -u -r1.302.4.1 -r1.302.4.2 src/sys/kern/uipc_socket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.302.4.1 src/sys/kern/uipc_socket.c:1.302.4.2
--- src/sys/kern/uipc_socket.c:1.302.4.1 Sun Feb 4 11:20:15 2024
+++ src/sys/kern/uipc_socket.c Sat Jul 20 14:37:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.302.4.1 2024/02/04 11:20:15 martin Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.302.4.2 2024/07/20 14:37:05 martin Exp $ */
/*
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.302.4.1 2024/02/04 11:20:15 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.302.4.2 2024/07/20 14:37:05 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -81,6 +81,7 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_socket.
#include "opt_somaxkva.h"
#include "opt_multiprocessor.h" /* XXX */
#include "opt_sctp.h"
+#include "opt_pipe.h"
#endif
#include
@@ -2394,6 +2395,16 @@ soo_kqfilter(struct file *fp, struct kno
case EVFILT_WRITE:
kn->kn_fop = _filtops;
sb = >so_snd;
+
+#ifdef PIPE_SOCKETPAIR
+ if (so->so_state & SS_ISAPIPE) {
+ /* Other end of pipe has been closed. */
+ if (so->so_state & SS_ISDISCONNECTED) {
+sounlock(so);
+return EBADF;
+ }
+ }
+#endif
break;
case EVFILT_EMPTY:
kn->kn_fop = _filtops;
CVS commit: [netbsd-10] src/sys/kern
Module Name:src Committed By: martin Date: Sat Jul 20 14:37:05 UTC 2024 Modified Files: src/sys/kern [netbsd-10]: uipc_socket.c Log Message: Pull up following revision(s) (requested by jdolecek in ticket #741): sys/kern/uipc_socket.c: revision 1.309 make kqfilter() behave the same for PIPE_SOCKETPAIR pipe as it does for standard one - refuse EVFILT_WRITE if the reader is already disconnected fixes test failure for kernel/kqueue/write/t_pipe.c on PIPE_SOCKETPAIR kernel PR kern/55690 To generate a diff of this commit: cvs rdiff -u -r1.302.4.1 -r1.302.4.2 src/sys/kern/uipc_socket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys
Module Name:src
Committed By: martin
Date: Sat Jul 20 14:34:24 UTC 2024
Modified Files:
src/sys/netinet6 [netbsd-10]: ip6_output.c
src/sys/netipsec [netbsd-10]: ipsec.c ipsec_input.c ipsec_output.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #740):
sys/netipsec/ipsec_input.c: revision 1.79
sys/netipsec/ipsec_output.c: revision 1.86
sys/netipsec/ipsec.c: revision 1.178
sys/netinet6/ip6_output.c: revision 1.232
ipsec: remove unnecessary splsoftnet
Because the code of IPsec itself is already MP-safe.
To generate a diff of this commit:
cvs rdiff -u -r1.231.2.2 -r1.231.2.3 src/sys/netinet6/ip6_output.c
cvs rdiff -u -r1.177 -r1.177.2.1 src/sys/netipsec/ipsec.c
cvs rdiff -u -r1.78 -r1.78.4.1 src/sys/netipsec/ipsec_input.c
cvs rdiff -u -r1.85 -r1.85.4.1 src/sys/netipsec/ipsec_output.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/netinet6/ip6_output.c
diff -u src/sys/netinet6/ip6_output.c:1.231.2.2 src/sys/netinet6/ip6_output.c:1.231.2.3
--- src/sys/netinet6/ip6_output.c:1.231.2.2 Fri Aug 4 14:28:01 2023
+++ src/sys/netinet6/ip6_output.c Sat Jul 20 14:34:24 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_output.c,v 1.231.2.2 2023/08/04 14:28:01 martin Exp $ */
+/* $NetBSD: ip6_output.c,v 1.231.2.3 2024/07/20 14:34:24 martin Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.231.2.2 2023/08/04 14:28:01 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.231.2.3 2024/07/20 14:34:24 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -490,9 +490,7 @@ ip6_output(
#ifdef IPSEC
if (needipsec) {
- int s = splsoftnet();
error = ipsec6_process_packet(m, sp->req, flags);
- splx(s);
/*
* Preserve KAME behaviour: ENOENT can be returned
Index: src/sys/netipsec/ipsec.c
diff -u src/sys/netipsec/ipsec.c:1.177 src/sys/netipsec/ipsec.c:1.177.2.1
--- src/sys/netipsec/ipsec.c:1.177 Thu Dec 8 08:07:07 2022
+++ src/sys/netipsec/ipsec.c Sat Jul 20 14:34:24 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.177 2022/12/08 08:07:07 knakahara Exp $ */
+/* $NetBSD: ipsec.c,v 1.177.2.1 2024/07/20 14:34:24 martin Exp $ */
/* $FreeBSD: ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */
/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.177 2022/12/08 08:07:07 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.177.2.1 2024/07/20 14:34:24 martin Exp $");
/*
* IPsec controller part.
@@ -619,7 +619,7 @@ ipsec4_output(struct mbuf *m, struct inp
{
struct secpolicy *sp = NULL;
u_long _mtu = 0;
- int error, s;
+ int error;
/*
* Check the security policy (SP) for the packet and, if required,
@@ -632,9 +632,7 @@ ipsec4_output(struct mbuf *m, struct inp
if (ipsec_outdone(m)) {
return 0;
}
- s = splsoftnet();
if (inp && ipsec_pcb_skip_ipsec(inp->inp_sp, IPSEC_DIR_OUTBOUND)) {
- splx(s);
return 0;
}
sp = ipsec_checkpolicy(m, IPSEC_DIR_OUTBOUND, flags, , inp);
@@ -647,7 +645,6 @@ ipsec4_output(struct mbuf *m, struct inp
* sp == NULL, error != 0discard packet, report error
*/
if (sp == NULL) {
- splx(s);
if (error) {
/*
* Hack: -EINVAL is used to signal that a packet
@@ -684,7 +681,6 @@ ipsec4_output(struct mbuf *m, struct inp
*mtu = _mtu;
*natt_frag = true;
KEY_SP_UNREF();
- splx(s);
return 0;
}
@@ -698,7 +694,6 @@ ipsec4_output(struct mbuf *m, struct inp
if (error == ENOENT)
error = 0;
KEY_SP_UNREF();
- splx(s);
*done = true;
return error;
}
@@ -707,11 +702,9 @@ int
ipsec_ip_input_checkpolicy(struct mbuf *m, bool forward)
{
struct secpolicy *sp;
- int error, s;
+ int error;
- s = splsoftnet();
error = ipsec_in_reject(m, NULL);
- splx(s);
if (error) {
return EINVAL;
}
@@ -724,14 +717,12 @@ ipsec_ip_input_checkpolicy(struct mbuf *
* Peek at the outbound SP for this packet to determine if
* it is a Fast Forward candidate.
*/
- s = splsoftnet();
sp = ipsec_checkpolicy(m, IPSEC_DIR_OUTBOUND, IP_FORWARDING,
, NULL);
if (sp != NULL) {
m->m_flags &= ~M_CANFASTFWD;
KEY_SP_UNREF();
}
- splx(s);
return 0;
}
@@ -1801,20 +1792,16 @@ ipsec6_check_policy(struct mbuf *m, stru
int *needipsecp, int *errorp)
{
struct secpolicy *sp = NULL;
- int s;
int error = 0;
int needipsec = 0;
if (ipsec_outdone(m)) {
goto skippolicycheck;
}
- s = splsoftnet();
if (inp && ipsec_pcb_skip_ipsec(inp->inp_sp, IPSEC_DIR_OUTBOUND)) {
- splx(s);
goto skippolicycheck;
}
sp = ipsec_checkpolicy(m, IPSEC_DIR_OUTBOUND, flags, , inp);
- splx(s);
/*
* There are four return cases:
Index: src/sys/netipsec/ipsec_input.c
diff -u src/sys/netipsec/ipsec_input.c:1.78
CVS commit: [netbsd-10] src/sys
Module Name:src Committed By: martin Date: Sat Jul 20 14:34:24 UTC 2024 Modified Files: src/sys/netinet6 [netbsd-10]: ip6_output.c src/sys/netipsec [netbsd-10]: ipsec.c ipsec_input.c ipsec_output.c Log Message: Pull up following revision(s) (requested by rin in ticket #740): sys/netipsec/ipsec_input.c: revision 1.79 sys/netipsec/ipsec_output.c: revision 1.86 sys/netipsec/ipsec.c: revision 1.178 sys/netinet6/ip6_output.c: revision 1.232 ipsec: remove unnecessary splsoftnet Because the code of IPsec itself is already MP-safe. To generate a diff of this commit: cvs rdiff -u -r1.231.2.2 -r1.231.2.3 src/sys/netinet6/ip6_output.c cvs rdiff -u -r1.177 -r1.177.2.1 src/sys/netipsec/ipsec.c cvs rdiff -u -r1.78 -r1.78.4.1 src/sys/netipsec/ipsec_input.c cvs rdiff -u -r1.85 -r1.85.4.1 src/sys/netipsec/ipsec_output.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys
Module Name:src
Committed By: martin
Date: Sat Jul 20 14:26:01 UTC 2024
Modified Files:
src/sys/conf [netbsd-10]: copts.mk
src/sys/net [netbsd-10]: zlib.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #739):
sys/net/zlib.c: revision 1.39
sys/conf/copts.mk: revision 1.12 (patch)
net/zlib.c: Add apparent /* FALLTHROUGH */'s to appease compilers
Ideas from t-kusaba at iij, thanks!
sys/conf/copts.mk: Drop fallthrough hack for zlib.c
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/conf/copts.mk
cvs rdiff -u -r1.38 -r1.38.4.1 src/sys/net/zlib.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/conf/copts.mk
diff -u src/sys/conf/copts.mk:1.7 src/sys/conf/copts.mk:1.7.4.1
--- src/sys/conf/copts.mk:1.7 Sat Aug 27 20:42:16 2022
+++ src/sys/conf/copts.mk Sat Jul 20 14:26:01 2024
@@ -1,4 +1,4 @@
-# $NetBSD: copts.mk,v 1.7 2022/08/27 20:42:16 rillig Exp $
+# $NetBSD: copts.mk,v 1.7.4.1 2024/07/20 14:26:01 martin Exp $
# MI per-file compiler options required.
@@ -9,7 +9,6 @@
_SYS_CONF_COPTS_MK_=1
.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.zlib.c+= -Wno-error=implicit-fallthrough
COPTS.pf.c+= -Wno-error=implicit-fallthrough
COPTS.radeon_cs.c+= -Wno-error=implicit-fallthrough
COPTS.via_dmablit.c+= -Wno-error=implicit-fallthrough
Index: src/sys/net/zlib.c
diff -u src/sys/net/zlib.c:1.38 src/sys/net/zlib.c:1.38.4.1
--- src/sys/net/zlib.c:1.38 Tue Apr 12 20:51:42 2022
+++ src/sys/net/zlib.c Sat Jul 20 14:26:01 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: zlib.c,v 1.38 2022/04/12 20:51:42 andvar Exp $ */
+/* $NetBSD: zlib.c,v 1.38.4.1 2024/07/20 14:26:01 martin Exp $ */
/*
* This file is derived from various .h and .c files from the zlib-1.0.4
* distribution by Jean-loup Gailly and Mark Adler, with some additions
@@ -11,7 +11,7 @@
* - added inflateIncomp and deflateOutputPending
* - allow strm->next_out to be NULL, meaning discard the output
*
- * $Id: zlib.c,v 1.38 2022/04/12 20:51:42 andvar Exp $
+ * $Id: zlib.c,v 1.38.4.1 2024/07/20 14:26:01 martin Exp $
*/
/*
@@ -22,7 +22,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: zlib.c,v 1.38 2022/04/12 20:51:42 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zlib.c,v 1.38.4.1 2024/07/20 14:26:01 martin Exp $");
#define NO_DUMMY_DECL
#define NO_ZCFUNCS
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: zlib.c,v 1.3
subject to change. Applications should only use zlib.h.
*/
-/* @(#) $Id: zlib.c,v 1.38 2022/04/12 20:51:42 andvar Exp $ */
+/* @(#) $Id: zlib.c,v 1.38.4.1 2024/07/20 14:26:01 martin Exp $ */
#ifndef _Z_UTIL_H
#define _Z_UTIL_H
@@ -294,7 +294,7 @@ void zcfree(voidpf opaque, voidpf ptr)
subject to change. Applications should only use zlib.h.
*/
-/* @(#) $Id: zlib.c,v 1.38 2022/04/12 20:51:42 andvar Exp $ */
+/* @(#) $Id: zlib.c,v 1.38.4.1 2024/07/20 14:26:01 martin Exp $ */
#ifndef _DEFLATE_H
#define _DEFLATE_H
@@ -656,7 +656,7 @@ void _tr_stored_type_only(deflate_state
*
*/
-/* @(#) $Id: zlib.c,v 1.38 2022/04/12 20:51:42 andvar Exp $ */
+/* @(#) $Id: zlib.c,v 1.38.4.1 2024/07/20 14:26:01 martin Exp $ */
/* #include "deflate.h" */
@@ -1999,7 +1999,7 @@ local block_state deflate_slow(deflate_s
* Addison-Wesley, 1983. ISBN 0-201-06672-6.
*/
-/* @(#) $Id: zlib.c,v 1.38 2022/04/12 20:51:42 andvar Exp $ */
+/* @(#) $Id: zlib.c,v 1.38.4.1 2024/07/20 14:26:01 martin Exp $ */
/* #define GEN_TREES_H */
@@ -3529,6 +3529,7 @@ int ZEXPORT inflate(z_streamp z, int f)
break;
}
z->state->mode = FLAG;
+ /* FALLTHROUGH */
case FLAG:
NEEDBYTE
b = NEXTBYTE;
@@ -3546,18 +3547,22 @@ int ZEXPORT inflate(z_streamp z, int f)
break;
}
z->state->mode = DICT4;
+ /* FALLTHROUGH */
case DICT4:
NEEDBYTE
z->state->sub.check.need = (uLong)NEXTBYTE << 24;
z->state->mode = DICT3;
+ /* FALLTHROUGH */
case DICT3:
NEEDBYTE
z->state->sub.check.need += (uLong)NEXTBYTE << 16;
z->state->mode = DICT2;
+ /* FALLTHROUGH */
case DICT2:
NEEDBYTE
z->state->sub.check.need += (uLong)NEXTBYTE << 8;
z->state->mode = DICT1;
+ /* FALLTHROUGH */
case DICT1:
NEEDBYTE
z->state->sub.check.need += (uLong)NEXTBYTE;
@@ -3591,18 +3596,22 @@ int ZEXPORT inflate(z_streamp z, int f)
break;
}
z->state->mode = CHECK4;
+ /* FALLTHROUGH */
case CHECK4:
NEEDBYTE
z->state->sub.check.need = (uLong)NEXTBYTE << 24;
z->state->mode = CHECK3;
+ /* FALLTHROUGH */
case CHECK3:
NEEDBYTE
z->state->sub.check.need += (uLong)NEXTBYTE << 16;
z->state->mode = CHECK2;
+ /* FALLTHROUGH */
case CHECK2:
NEEDBYTE
z->state->sub.check.need += (uLong)NEXTBYTE << 8;
CVS commit: [netbsd-10] src/sys
Module Name:src Committed By: martin Date: Sat Jul 20 14:26:01 UTC 2024 Modified Files: src/sys/conf [netbsd-10]: copts.mk src/sys/net [netbsd-10]: zlib.c Log Message: Pull up following revision(s) (requested by rin in ticket #739): sys/net/zlib.c: revision 1.39 sys/conf/copts.mk: revision 1.12 (patch) net/zlib.c: Add apparent /* FALLTHROUGH */'s to appease compilers Ideas from t-kusaba at iij, thanks! sys/conf/copts.mk: Drop fallthrough hack for zlib.c To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/conf/copts.mk cvs rdiff -u -r1.38 -r1.38.4.1 src/sys/net/zlib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/x86
Module Name:src Committed By: martin Date: Sat Jul 20 14:20:57 UTC 2024 Modified Files: src/sys/arch/x86/include [netbsd-9]: specialreg.h src/sys/arch/x86/x86 [netbsd-9]: identcpu.c Log Message: Pull up following revision(s) (requested by andvar in ticket #1855): sys/arch/x86/x86/identcpu.c: revision 1.129 sys/arch/x86/include/specialreg.h: revision 1.212 sys/arch/x86/x86/identcpu.c: revision 1.130 Disable the VIA Alternate Instructions according the VIA documentation: * C7 and above do not support ALTINST, do not check or attempt to disable them. * For VIA C3 Nehemiah check extended feature flags for support and status, do no attempt to disable when AIS is not supported or enabled. * For pre-Nehemiah models explicitly disable, if they are in the range of documented models, flags aren't present to check the status on these models. Note: for pre-Nehemiah may be other functional side effects depdending on the version and stepping. Explicit disabling of ALTINST was introduced with rev. 1.84 following the discovery of some VIA CPUs having these instructions enabled by default leading to the potential backdoor (aka rosenbrindge). Unfortunately, implementation used a wrong check (ACE supported flag), which can be true for the later models, still supporting padlock features. Setting ALTINST bit on those may have unexpected side effects like VIA C7 CPUID instruction for temperature sensor not reporting correct value or `cpuctl identify' not reporting certain CPU features. Similar side effects can be observed even for Nehemiah models not supporting AIS instructions. This change should limit possibility of such issues to only the pre-Nehemiah models, not covered at all in the previous implementation. Feature Control Register (FCR) macros were unified under one group and consistent naming while implementing the change. Few comments updated as well. patch reviewed by Riastradh@ (thank you) PR kern/58370 Move determination of the largest VIA CPU extended function value to the intended place where the checks are performed. Currently the value can be overridden while checking for the padlock features, and failing the check for max function value as a result. To generate a diff of this commit: cvs rdiff -u -r1.150.2.15 -r1.150.2.16 src/sys/arch/x86/include/specialreg.h cvs rdiff -u -r1.93.2.5 -r1.93.2.6 src/sys/arch/x86/x86/identcpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/x86
Module Name:src Committed By: martin Date: Sat Jul 20 14:20:57 UTC 2024 Modified Files: src/sys/arch/x86/include [netbsd-9]: specialreg.h src/sys/arch/x86/x86 [netbsd-9]: identcpu.c Log Message: Pull up following revision(s) (requested by andvar in ticket #1855): sys/arch/x86/x86/identcpu.c: revision 1.129 sys/arch/x86/include/specialreg.h: revision 1.212 sys/arch/x86/x86/identcpu.c: revision 1.130 Disable the VIA Alternate Instructions according the VIA documentation: * C7 and above do not support ALTINST, do not check or attempt to disable them. * For VIA C3 Nehemiah check extended feature flags for support and status, do no attempt to disable when AIS is not supported or enabled. * For pre-Nehemiah models explicitly disable, if they are in the range of documented models, flags aren't present to check the status on these models. Note: for pre-Nehemiah may be other functional side effects depdending on the version and stepping. Explicit disabling of ALTINST was introduced with rev. 1.84 following the discovery of some VIA CPUs having these instructions enabled by default leading to the potential backdoor (aka rosenbrindge). Unfortunately, implementation used a wrong check (ACE supported flag), which can be true for the later models, still supporting padlock features. Setting ALTINST bit on those may have unexpected side effects like VIA C7 CPUID instruction for temperature sensor not reporting correct value or `cpuctl identify' not reporting certain CPU features. Similar side effects can be observed even for Nehemiah models not supporting AIS instructions. This change should limit possibility of such issues to only the pre-Nehemiah models, not covered at all in the previous implementation. Feature Control Register (FCR) macros were unified under one group and consistent naming while implementing the change. Few comments updated as well. patch reviewed by Riastradh@ (thank you) PR kern/58370 Move determination of the largest VIA CPU extended function value to the intended place where the checks are performed. Currently the value can be overridden while checking for the padlock features, and failing the check for max function value as a result. To generate a diff of this commit: cvs rdiff -u -r1.150.2.15 -r1.150.2.16 src/sys/arch/x86/include/specialreg.h cvs rdiff -u -r1.93.2.5 -r1.93.2.6 src/sys/arch/x86/x86/identcpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.150.2.15 src/sys/arch/x86/include/specialreg.h:1.150.2.16 --- src/sys/arch/x86/include/specialreg.h:1.150.2.15 Sat Jul 29 09:48:51 2023 +++ src/sys/arch/x86/include/specialreg.h Sat Jul 20 14:20:57 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.150.2.15 2023/07/29 09:48:51 martin Exp $ */ +/* $NetBSD: specialreg.h,v 1.150.2.16 2024/07/20 14:20:57 martin Exp $ */ /* * Copyright (c) 2014-2020 The NetBSD Foundation, Inc. @@ -1099,8 +1099,12 @@ /* * Centaur Extended Feature flags. - * CPUID FnC000_0001 + * CPUID FnC000_0001 (VIA "Nehemiah" or later) */ +#define CPUID_VIA_HAS_AIS __BIT(0) /* Alternate Instruction Set supported */ + /* (VIA "Nehemiah" only) */ +#define CPUID_VIA_DO_AIS __BIT(1) /* Alternate Instruction Set enabled */ + /* (VIA "Nehemiah" only) */ #define CPUID_VIA_HAS_RNG __BIT(2) /* Random number generator */ #define CPUID_VIA_DO_RNG __BIT(3) #define CPUID_VIA_HAS_ACE __BIT(6) /* AES Encryption */ @@ -1288,7 +1292,7 @@ #define MSR_X2APIC_SELF_IPI 0x03f /* SELF IPI (W) */ /* - * VIA "Nehemiah" MSRs + * VIA "Nehemiah" or later MSRs */ #define MSR_VIA_RNG 0x110b #define MSR_VIA_RNG_ENABLE 0x0040 @@ -1296,15 +1300,10 @@ #define MSR_VIA_RNG_NOISE_A 0x #define MSR_VIA_RNG_NOISE_B 0x0100 #define MSR_VIA_RNG_2NOISE 0x0300 -#define MSR_VIA_ACE 0x1107 -#define VIA_ACE_ALTINST 0x0001 -#define VIA_ACE_ECX8 0x0002 -#define VIA_ACE_ENABLE 0x1000 - -/* - * VIA "Eden" MSRs - */ -#define MSR_VIA_FCR MSR_VIA_ACE +#define MSR_VIA_FCR 0x1107 /* Feature Control Register */ +#define VIA_FCR_ACE_ENABLE 0x1000 /* Enable PadLock (ex. RNG) */ +#define VIA_FCR_CX8_REPORT 0x0002 /* Enable CX8 CPUID reporting */ +#define VIA_FCR_ALTINST_ENABLE 0x0001 /* Enable ALTINST (C3 only) */ /* * AMD K6/K7 MSRs. Index: src/sys/arch/x86/x86/identcpu.c diff -u src/sys/arch/x86/x86/identcpu.c:1.93.2.5 src/sys/arch/x86/x86/identcpu.c:1.93.2.6 --- src/sys/arch/x86/x86/identcpu.c:1.93.2.5 Fri Dec 24 12:58:14 2021 +++ src/sys/arch/x86/x86/identcpu.c Sat Jul 20 14:20:57 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: identcpu.c,v 1.93.2.5 2021/12/24 12:58:14 martin Exp $ */ +/* $NetBSD: identcpu.c,v 1.93.2.6 2024/07/20 14:20:57 martin Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@
CVS commit: [netbsd-10] src/sys/arch/x86
Module Name:src Committed By: martin Date: Sat Jul 20 14:19:31 UTC 2024 Modified Files: src/sys/arch/x86/include [netbsd-10]: specialreg.h src/sys/arch/x86/x86 [netbsd-10]: identcpu.c Log Message: Pull up following revision(s) (requested by andvar in ticket #738): sys/arch/x86/x86/identcpu.c: revision 1.129 sys/arch/x86/include/specialreg.h: revision 1.212 sys/arch/x86/x86/identcpu.c: revision 1.130 Disable the VIA Alternate Instructions according the VIA documentation: * C7 and above do not support ALTINST, do not check or attempt to disable them. * For VIA C3 Nehemiah check extended feature flags for support and status, do no attempt to disable when AIS is not supported or enabled. * For pre-Nehemiah models explicitly disable, if they are in the range of documented models, flags aren't present to check the status on these models. Note: for pre-Nehemiah may be other functional side effects depdending on the version and stepping. Explicit disabling of ALTINST was introduced with rev. 1.84 following the discovery of some VIA CPUs having these instructions enabled by default leading to the potential backdoor (aka rosenbrindge). Unfortunately, implementation used a wrong check (ACE supported flag), which can be true for the later models, still supporting padlock features. Setting ALTINST bit on those may have unexpected side effects like VIA C7 CPUID instruction for temperature sensor not reporting correct value or `cpuctl identify' not reporting certain CPU features. Similar side effects can be observed even for Nehemiah models not supporting AIS instructions. This change should limit possibility of such issues to only the pre-Nehemiah models, not covered at all in the previous implementation. Feature Control Register (FCR) macros were unified under one group and consistent naming while implementing the change. Few comments updated as well. patch reviewed by Riastradh@ (thank you) PR kern/58370 Move determination of the largest VIA CPU extended function value to the intended place where the checks are performed. Currently the value can be overridden while checking for the padlock features, and failing the check for max function value as a result. To generate a diff of this commit: cvs rdiff -u -r1.198.2.4 -r1.198.2.5 src/sys/arch/x86/include/specialreg.h cvs rdiff -u -r1.123 -r1.123.4.1 src/sys/arch/x86/x86/identcpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/x86
Module Name:src Committed By: martin Date: Sat Jul 20 14:19:31 UTC 2024 Modified Files: src/sys/arch/x86/include [netbsd-10]: specialreg.h src/sys/arch/x86/x86 [netbsd-10]: identcpu.c Log Message: Pull up following revision(s) (requested by andvar in ticket #738): sys/arch/x86/x86/identcpu.c: revision 1.129 sys/arch/x86/include/specialreg.h: revision 1.212 sys/arch/x86/x86/identcpu.c: revision 1.130 Disable the VIA Alternate Instructions according the VIA documentation: * C7 and above do not support ALTINST, do not check or attempt to disable them. * For VIA C3 Nehemiah check extended feature flags for support and status, do no attempt to disable when AIS is not supported or enabled. * For pre-Nehemiah models explicitly disable, if they are in the range of documented models, flags aren't present to check the status on these models. Note: for pre-Nehemiah may be other functional side effects depdending on the version and stepping. Explicit disabling of ALTINST was introduced with rev. 1.84 following the discovery of some VIA CPUs having these instructions enabled by default leading to the potential backdoor (aka rosenbrindge). Unfortunately, implementation used a wrong check (ACE supported flag), which can be true for the later models, still supporting padlock features. Setting ALTINST bit on those may have unexpected side effects like VIA C7 CPUID instruction for temperature sensor not reporting correct value or `cpuctl identify' not reporting certain CPU features. Similar side effects can be observed even for Nehemiah models not supporting AIS instructions. This change should limit possibility of such issues to only the pre-Nehemiah models, not covered at all in the previous implementation. Feature Control Register (FCR) macros were unified under one group and consistent naming while implementing the change. Few comments updated as well. patch reviewed by Riastradh@ (thank you) PR kern/58370 Move determination of the largest VIA CPU extended function value to the intended place where the checks are performed. Currently the value can be overridden while checking for the padlock features, and failing the check for max function value as a result. To generate a diff of this commit: cvs rdiff -u -r1.198.2.4 -r1.198.2.5 src/sys/arch/x86/include/specialreg.h cvs rdiff -u -r1.123 -r1.123.4.1 src/sys/arch/x86/x86/identcpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.198.2.4 src/sys/arch/x86/include/specialreg.h:1.198.2.5 --- src/sys/arch/x86/include/specialreg.h:1.198.2.4 Sat Jul 29 09:44:34 2023 +++ src/sys/arch/x86/include/specialreg.h Sat Jul 20 14:19:31 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.198.2.4 2023/07/29 09:44:34 martin Exp $ */ +/* $NetBSD: specialreg.h,v 1.198.2.5 2024/07/20 14:19:31 martin Exp $ */ /* * Copyright (c) 2014-2020 The NetBSD Foundation, Inc. @@ -1099,8 +1099,12 @@ /* * Centaur Extended Feature flags. - * CPUID FnC000_0001 + * CPUID FnC000_0001 (VIA "Nehemiah" or later) */ +#define CPUID_VIA_HAS_AIS __BIT(0) /* Alternate Instruction Set supported */ + /* (VIA "Nehemiah" only) */ +#define CPUID_VIA_DO_AIS __BIT(1) /* Alternate Instruction Set enabled */ + /* (VIA "Nehemiah" only) */ #define CPUID_VIA_HAS_RNG __BIT(2) /* Random number generator */ #define CPUID_VIA_DO_RNG __BIT(3) #define CPUID_VIA_HAS_ACE __BIT(6) /* AES Encryption */ @@ -1288,7 +1292,7 @@ #define MSR_X2APIC_SELF_IPI 0x03f /* SELF IPI (W) */ /* - * VIA "Nehemiah" MSRs + * VIA "Nehemiah" or later MSRs */ #define MSR_VIA_RNG 0x110b #define MSR_VIA_RNG_ENABLE 0x0040 @@ -1296,15 +1300,10 @@ #define MSR_VIA_RNG_NOISE_A 0x #define MSR_VIA_RNG_NOISE_B 0x0100 #define MSR_VIA_RNG_2NOISE 0x0300 -#define MSR_VIA_ACE 0x1107 -#define VIA_ACE_ALTINST 0x0001 -#define VIA_ACE_ECX8 0x0002 -#define VIA_ACE_ENABLE 0x1000 - -/* - * VIA "Eden" MSRs - */ -#define MSR_VIA_FCR MSR_VIA_ACE +#define MSR_VIA_FCR 0x1107 /* Feature Control Register */ +#define VIA_FCR_ACE_ENABLE 0x1000 /* Enable PadLock (ex. RNG) */ +#define VIA_FCR_CX8_REPORT 0x0002 /* Enable CX8 CPUID reporting */ +#define VIA_FCR_ALTINST_ENABLE 0x0001 /* Enable ALTINST (C3 only) */ /* * AMD K6/K7 MSRs. Index: src/sys/arch/x86/x86/identcpu.c diff -u src/sys/arch/x86/x86/identcpu.c:1.123 src/sys/arch/x86/x86/identcpu.c:1.123.4.1 --- src/sys/arch/x86/x86/identcpu.c:1.123 Thu Oct 7 13:04:18 2021 +++ src/sys/arch/x86/x86/identcpu.c Sat Jul 20 14:19:31 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: identcpu.c,v 1.123 2021/10/07 13:04:18 msaitoh Exp $ */ +/* $NetBSD: identcpu.c,v 1.123.4.1 2024/07/20 14:19:31 martin Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@
CVS commit: src/distrib/sets/lists/xdebug
Module Name:src Committed By: martin Date: Thu Jul 4 12:35:47 UTC 2024 Modified Files: src/distrib/sets/lists/xdebug: md.evbarm Log Message: adjust to libdrm update To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/xdebug/md.evbarm 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/xdebug/md.evbarm diff -u src/distrib/sets/lists/xdebug/md.evbarm:1.37 src/distrib/sets/lists/xdebug/md.evbarm:1.38 --- src/distrib/sets/lists/xdebug/md.evbarm:1.37 Fri Jan 26 13:06:36 2024 +++ src/distrib/sets/lists/xdebug/md.evbarm Thu Jul 4 12:35:47 2024 @@ -1,4 +1,4 @@ -# $NetBSD: md.evbarm,v 1.37 2024/01/26 13:06:36 tsutsui Exp $ +# $NetBSD: md.evbarm,v 1.38 2024/07/04 12:35:47 martin Exp $ ./usr/X11R7/lib/libdrm_amdgpu_g.a xdebug-libdrm_amdgpu-debuglib xorg,debuglib,compatx11file ./usr/X11R7/lib/libdrm_nouveau_g.a xdebug-libdrm_nouveau-debuglib xorg,debuglib,compatx11file ./usr/X11R7/lib/libvdpau_g.axdebug-libvdpau-debuglib xorg,debuglib,compatx11file @@ -19,8 +19,10 @@ ./usr/X11R7/lib/modules/libxf8_16bpp_g.a xdebug-obsolete xorg,obsolete ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug xdebug-xorg-server-debug xorg,debug ./usr/libdata/debug/usr/X11R7/bin/gtf.debug xdebug-xorg-server-debug xorg,debug -./usr/libdata/debug/usr/X11R7/lib/libdrm_amdgpu.so.1.2.debug xdebug-libdrm_amdgpu-debug xorg,debug,compatx11file -./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.3.1.debug xdebug-libdrm_nouveau-debug xorg,debug,compatx11file +./usr/libdata/debug/usr/X11R7/lib/libdrm_amdgpu.so.1.2.debug xdebug-obsolete xorg,obsolete,compatx11file +./usr/libdata/debug/usr/X11R7/lib/libdrm_amdgpu.so.1.3.debug xdebug-libdrm_amdgpu-debug xorg,debug,compatx11file +./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.3.1.debug xdebug-obsolete xorg,obsolete,compatx11file +./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.3.2.debug xdebug-libdrm_nouveau-debug xorg,debug,compatx11file ./usr/libdata/debug/usr/X11R7/lib/libvdpau.so.1.0.debug xdebug-libvdpau-debug xorg,debug,compatx11file ./usr/libdata/debug/usr/X11R7/lib/modules/dri/mesa_dri_drivers.so.0.debug xdebug-dri-debug xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug xdebug-xf86-video-nouveau-debug xorg,debug
CVS commit: src/distrib/sets/lists/xdebug
Module Name:src Committed By: martin Date: Thu Jul 4 12:35:47 UTC 2024 Modified Files: src/distrib/sets/lists/xdebug: md.evbarm Log Message: adjust to libdrm update To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/xdebug/md.evbarm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Wed Jul 3 19:16:46 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Tickets #730 - #736 To generate a diff of this commit: cvs rdiff -u -r1.1.2.16 -r1.1.2.17 src/doc/CHANGES-10.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-10.1 diff -u src/doc/CHANGES-10.1:1.1.2.16 src/doc/CHANGES-10.1:1.1.2.17 --- src/doc/CHANGES-10.1:1.1.2.16 Mon Jul 1 19:58:14 2024 +++ src/doc/CHANGES-10.1 Wed Jul 3 19:16:46 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.1,v 1.1.2.16 2024/07/01 19:58:14 martin Exp $ +# $NetBSD: CHANGES-10.1,v 1.1.2.17 2024/07/03 19:16:46 martin Exp $ A complete list of changes from the NetBSD 10.0 release on 2024-03-28 until the 10.1 release: @@ -610,3 +610,154 @@ crypto/external/bsd/openssh/dist/version context. Fixes CVE-2024-6387. [riastradh, ticket #737] +sys/dev/pci/pcidevs1.1507 +sys/dev/pci/pcidevs.h(regen) +sys/dev/pci/pcidevs_data.h (regen) + + PR 58358: add Brainboxes as manufacturer and some of their devices. + [nia, ticket #730] + +usr.sbin/sysinst/msg.mi.de 1.49,1.50 +usr.sbin/sysinst/msg.mi.en 1.52 + + sysinst(8): note that leaving the network "media type" empty + autoconfigures. + [nia, ticket #731] + +sys/arch/powerpc/oea/altivec.c 1.35 + + powerpc: PR 58283; don not try to restore altivec registers + in vec_restore_from_mcontext() if no altivec is supported. + [tsutsui, ticket #732] + +distrib/cdrom/Makefile1.54-1.57 +distrib/cdrom/boothfs.uue 1.2 +distrib/cdrom/macppc_installboot/Makefile 1.12-1.14 +distrib/cdrom/macppc_installboot/cd9660.c 1.5,1.6 +distrib/cdrom/macppc_installboot/cd9660.c delete +distrib/cdrom/macppc_installboot/installboot.c 1.6,1.7 +distrib/cdrom/macppc_installboot/installboot.h 1.5 +distrib/cdrom/macppc_mkboothfs/mkboothfs.c 1.4 +distrib/macppc/Makefile1.18 +etc/Makefile 1.471,1.472 +etc/etc.mac68k/Makefile.inc 1.25,1.26 +etc/etc.macppc/Makefile.inc 1.13 +external/gpl2/mkhybrid/README.md 1.1 +external/gpl2/mkhybrid/bin/Makefile 1.1-1.3 +external/gpl2/mkhybrid/dist/COPYING 1.1 +external/gpl2/mkhybrid/dist/ChangeLog 1.1 +external/gpl2/mkhybrid/dist/ChangeLog.mkhybrid 1.1 +external/gpl2/mkhybrid/dist/Makefile.in 1.1,1.2 +external/gpl2/mkhybrid/dist/README 1.1 +external/gpl2/mkhybrid/dist/README.eltorito 1.1 +external/gpl2/mkhybrid/dist/README.hfs_boot 1.1 +external/gpl2/mkhybrid/dist/README.hfs_magic 1.1 +external/gpl2/mkhybrid/dist/README.mkhybrid 1.1 +external/gpl2/mkhybrid/dist/README.mkisofs 1.1 +external/gpl2/mkhybrid/dist/README.session 1.1 +external/gpl2/mkhybrid/dist/README.win32 1.1 +external/gpl2/mkhybrid/dist/TODO 1.1 +external/gpl2/mkhybrid/dist/acconfig.h 1.1 +external/gpl2/mkhybrid/dist/apple.c 1.1-1.4 +external/gpl2/mkhybrid/dist/apple.h 1.1,1.2 +external/gpl2/mkhybrid/dist/apple_proto.h 1.1,1.2 +external/gpl2/mkhybrid/dist/config.h 1.1,1.2 +external/gpl2/mkhybrid/dist/config.h.in 1.1-1.3 +external/gpl2/mkhybrid/dist/configure 1.1-1.3 +external/gpl2/mkhybrid/dist/configure.in 1.1-1.3 +external/gpl2/mkhybrid/dist/defaults.h 1.1-1.3 +external/gpl2/mkhybrid/dist/desktop.c 1.1,1.2 +external/gpl2/mkhybrid/dist/eltorito.c 1.1 +external/gpl2/mkhybrid/dist/getopt.c 1.1-1.3 +external/gpl2/mkhybrid/dist/getopt.h 1.1,1.2 +external/gpl2/mkhybrid/dist/getopt1.c 1.1-1.3 +external/gpl2/mkhybrid/dist/hash.c 1.1,1.2 +external/gpl2/mkhybrid/dist/include/fctldefs.h 1.1 +external/gpl2/mkhybrid/dist/include/mconfig.h 1.1,1.2 +external/gpl2/mkhybrid/dist/include/prototyp.h 1.1 +external/gpl2/mkhybrid/dist/include/statdefs.h 1.1 +external/gpl2/mkhybrid/dist/install-sh 1.1 +external/gpl2/mkhybrid/dist/iso9660.h 1.1 +external/gpl2/mkhybrid/dist/joliet.c 1.1 +external/gpl2/mkhybrid/dist/libfile/LEGAL.NOTICE 1.1 +external/gpl2/mkhybrid/dist/libfile/README 1.1 +external/gpl2/mkhybrid/dist/libfile/apprentice.c 1.1,1.2 +external/gpl2/mkhybrid/dist/libfile/file.h 1.1-1.3 +external/gpl2/mkhybrid/dist/libfile/lfile.c 1.1,1.2 +external/gpl2/mkhybrid/dist/libfile/patchlevel.h 1.1 +external/gpl2/mkhybrid/dist/libfile/proto.h 1.1 +external/gpl2/mkhybrid/dist/libfile/softmagic.c 1.1,1.2 +external/gpl2/mkhybrid/dist/libhfs_iso/Makefile 1.1 +external/gpl2/mkhybrid/dist/libhfs_iso/README 1.1 +external/gpl2/mkhybrid/dist/libhfs_iso/block.c 1.1 +external/gpl2/mkhybrid/dist/libhfs_iso/block.h 1.1 +external/gpl2/mkhybrid/dist/libhfs_iso/btree.c 1.1 +external/gpl2/mkhybrid/dist/libhfs_iso/btree.h 1.1 +external/gpl2/mkhybrid/dist/libhfs_iso/data.c 1.1 +external/gpl2/mkhybrid/dist/libhfs_iso/data.h 1.1 +external/gpl2/mkhybrid/dist/libhfs_iso/file.c 1.1 +external/gpl2/mkhybrid/dist/libhfs_iso/file.h 1.1 +external/gpl2/mkhybrid/dist/libhfs_iso/hfs.c 1.1 +external/gpl2/mkhybrid/dist/libhfs_iso/hfs.h 1.1,1.2 +external/gpl2/mkhybrid/dist/libhfs_iso/hybrid.h 1.1 +external/gpl2/mkhybrid/dist/libhfs_iso/internal.h 1.1
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Wed Jul 3 19:16:46 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Tickets #730 - #736 To generate a diff of this commit: cvs rdiff -u -r1.1.2.16 -r1.1.2.17 src/doc/CHANGES-10.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/altq
Module Name:src
Committed By: martin
Date: Wed Jul 3 19:15:08 UTC 2024
Modified Files:
src/sys/altq [netbsd-10]: altq_rmclass.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #736):
sys/altq/altq_rmclass.c: revision 1.31
altq, cbq: take care of borrowed classes on sleeping
rmc_under_limit() determines if we can send a packet by checking
that a target class (or borrowing classes) is ready to send a
packet. cl->undertime_ indicates a time that the class can send
packets after the time. So if cl->undertime_ has passed
(i.e., now >=3D cl->undertime_), we can send packets through the class.
The treatment is important when a required delay period is shorten
than the minimum delay on the system (a tick), because in that case
the delay handler is too late to wake up to send a packet in time.
If there are traffic, rmc_under_limit() can save such a case.
Unfortunately, the old code didn't take care of bandwidth borrowing
on sleeping. So bandwidth borrowing didn't work well with high
bandwidths that require short delay actions.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.10.1 src/sys/altq/altq_rmclass.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/altq/altq_rmclass.c
diff -u src/sys/altq/altq_rmclass.c:1.29 src/sys/altq/altq_rmclass.c:1.29.10.1
--- src/sys/altq/altq_rmclass.c:1.29 Wed Jul 21 07:34:44 2021
+++ src/sys/altq/altq_rmclass.c Wed Jul 3 19:15:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_rmclass.c,v 1.29 2021/07/21 07:34:44 ozaki-r Exp $ */
+/* $NetBSD: altq_rmclass.c,v 1.29.10.1 2024/07/03 19:15:07 martin Exp $ */
/* $KAME: altq_rmclass.c,v 1.19 2005/04/13 03:44:25 suz Exp $ */
/*
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: altq_rmclass.c,v 1.29 2021/07/21 07:34:44 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_rmclass.c,v 1.29.10.1 2024/07/03 19:15:07 martin Exp $");
/* #ident "@(#)rm_class.c 1.48 97/12/05 SMI" */
@@ -879,6 +879,7 @@ rmc_under_limit(struct rm_class *cl, str
rm_class_t *p = cl;
rm_class_t *top;
struct rm_ifdat *ifd = cl->ifdat_;
+ int sleeping = cl->sleeping_;
ifd->borrowed_[ifd->qi_] = NULL;
/*
@@ -888,20 +889,23 @@ rmc_under_limit(struct rm_class *cl, str
if (cl->parent_ == NULL)
return (1);
- if (cl->sleeping_) {
- if (TS_LT(now, >undertime_))
- return (0);
-
- CALLOUT_STOP(>callout_);
- cl->sleeping_ = 0;
- cl->undertime_.tv_sec = 0;
+ if (!TS_LT(now, >undertime_)) {
+ /* Fast path: the given class is allowed to send packets */
+ if (sleeping) {
+ CALLOUT_STOP(>callout_);
+ cl->sleeping_ = 0;
+ cl->undertime_.tv_sec = 0;
+ }
return (1);
}
top = NULL;
- while (cl->undertime_.tv_sec && TS_LT(now, >undertime_)) {
+ do {
if (((cl = cl->borrow_) == NULL) ||
(cl->depth_ > ifd->cutoff_)) {
+ /* No need to call the delay action */
+ if (sleeping)
+return (0);
#ifdef ADJUST_CUTOFF
if (cl != NULL)
/* cutoff is taking effect, just
@@ -931,7 +935,7 @@ rmc_under_limit(struct rm_class *cl, str
return (0);
}
top = cl;
- }
+ } while (cl->undertime_.tv_sec && TS_LT(now, >undertime_));
if (cl != p)
ifd->borrowed_[ifd->qi_] = cl;
CVS commit: [netbsd-10] src/sys/altq
Module Name:src Committed By: martin Date: Wed Jul 3 19:15:08 UTC 2024 Modified Files: src/sys/altq [netbsd-10]: altq_rmclass.c Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #736): sys/altq/altq_rmclass.c: revision 1.31 altq, cbq: take care of borrowed classes on sleeping rmc_under_limit() determines if we can send a packet by checking that a target class (or borrowing classes) is ready to send a packet. cl->undertime_ indicates a time that the class can send packets after the time. So if cl->undertime_ has passed (i.e., now >=3D cl->undertime_), we can send packets through the class. The treatment is important when a required delay period is shorten than the minimum delay on the system (a tick), because in that case the delay handler is too late to wake up to send a packet in time. If there are traffic, rmc_under_limit() can save such a case. Unfortunately, the old code didn't take care of bandwidth borrowing on sleeping. So bandwidth borrowing didn't work well with high bandwidths that require short delay actions. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.29.10.1 src/sys/altq/altq_rmclass.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys
Module Name:src
Committed By: martin
Date: Wed Jul 3 19:13:20 UTC 2024
Modified Files:
src/sys/arch/aarch64/include [netbsd-10]: vmparam.h
src/sys/arch/arm/pci [netbsd-10]: pci_msi_machdep.c
src/sys/dev/acpi [netbsd-10]: acpi_resource.c
src/sys/dev/pci [netbsd-10]: pci_resource.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #735):
sys/dev/pci/pci_resource.c: revision 1.5
sys/arch/arm/pci/pci_msi_machdep.c: revision 1.10
sys/arch/aarch64/include/vmparam.h: revision 1.21
sys/dev/acpi/acpi_resource.c: revision 1.43
pci_resource: Make unexpected bus numbers in bridges non-fatal.
Firmware bugs happen. Log a warning and continue instead of panicing.
acpi: Ignore producer/consumer bit for fixed memory resources.
The requirement to honour the producer/consumer bit in fixed memory
resource descriptors was dropped at some point in a revision to the ACPI
2.0 specification because too many firmware implementations got it wrong.
aarch64: Bump VM_PHYSSEG_MAX to match DRAM_BANKS / FDT_MEMORY_RANGES.
On aarch64 there is a single free list, so VM_PHYSSEG_MAX needs to be
the same as FDT_MEMORY_RANGES (which needs to be the same as DRAM_BANKS).
Future cleanup should be done to fold these into a single define.
arm: pci: Fix ITS ID lookup for MSIs.
pci_get_frameid expects a BDF requestor ID as input, not a Device ID.
Fixes MSI/MSI-X support on Ampere Altra systems.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.4.1 src/sys/arch/aarch64/include/vmparam.h
cvs rdiff -u -r1.9 -r1.9.24.1 src/sys/arch/arm/pci/pci_msi_machdep.c
cvs rdiff -u -r1.42 -r1.42.6.1 src/sys/dev/acpi/acpi_resource.c
cvs rdiff -u -r1.3.2.1 -r1.3.2.2 src/sys/dev/pci/pci_resource.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/aarch64/include/vmparam.h
diff -u src/sys/arch/aarch64/include/vmparam.h:1.19 src/sys/arch/aarch64/include/vmparam.h:1.19.4.1
--- src/sys/arch/aarch64/include/vmparam.h:1.19 Sat Apr 2 11:16:06 2022
+++ src/sys/arch/aarch64/include/vmparam.h Wed Jul 3 19:13:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.19 2022/04/02 11:16:06 skrll Exp $ */
+/* $NetBSD: vmparam.h,v 1.19.4.1 2024/07/03 19:13:20 martin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -179,7 +179,7 @@
#define AARCH64_KVA_TO_PA(va) ((paddr_t) ((va) & ~AARCH64_DIRECTMAP_MASK))
/* */
-#define VM_PHYSSEG_MAX 64 /* XXX */
+#define VM_PHYSSEG_MAX 256 /* XXX */
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
#define VM_NFREELIST 1
Index: src/sys/arch/arm/pci/pci_msi_machdep.c
diff -u src/sys/arch/arm/pci/pci_msi_machdep.c:1.9 src/sys/arch/arm/pci/pci_msi_machdep.c:1.9.24.1
--- src/sys/arch/arm/pci/pci_msi_machdep.c:1.9 Thu Feb 13 06:28:25 2020
+++ src/sys/arch/arm/pci/pci_msi_machdep.c Wed Jul 3 19:13:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_msi_machdep.c,v 1.9 2020/02/13 06:28:25 skrll Exp $ */
+/* $NetBSD: pci_msi_machdep.c,v 1.9.24.1 2024/07/03 19:13:20 martin Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_msi_machdep.c,v 1.9 2020/02/13 06:28:25 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_msi_machdep.c,v 1.9.24.1 2024/07/03 19:13:20 martin Exp $");
#include
#include
@@ -63,14 +63,13 @@ static struct arm_pci_msi *
arm_pci_msi_lookup(const struct pci_attach_args *pa)
{
struct arm_pci_msi *msip;
- uint32_t devid, frameid;
+ uint32_t rid, frameid;
int b, d, f;
pci_decompose_tag(pa->pa_pc, pa->pa_tag, , , );
- devid = (b << 8) | (d << 3) | f;
- devid = pci_get_devid(pa->pa_pc, devid);
- frameid = pci_get_frameid(pa->pa_pc, devid);
+ rid = (b << 8) | (d << 3) | f;
+ frameid = pci_get_frameid(pa->pa_pc, rid);
SIMPLEQ_FOREACH(msip, _pci_msi_list, msi_link)
if (frameid == msip->msi_id)
Index: src/sys/dev/acpi/acpi_resource.c
diff -u src/sys/dev/acpi/acpi_resource.c:1.42 src/sys/dev/acpi/acpi_resource.c:1.42.6.1
--- src/sys/dev/acpi/acpi_resource.c:1.42 Sat Aug 7 18:39:40 2021
+++ src/sys/dev/acpi/acpi_resource.c Wed Jul 3 19:13:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_resource.c,v 1.42 2021/08/07 18:39:40 jmcneill Exp $ */
+/* $NetBSD: acpi_resource.c,v 1.42.6.1 2024/07/03 19:13:20 martin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.42 2021/08/07 18:39:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.42.6.1 2024/07/03 19:13:20 martin Exp $");
#include
#include
@@ -247,9 +247,7 @@ acpi_resource_parse_callback(ACPI_RESOUR
case ACPI_RESOURCE_TYPE_ADDRESS32:
/* XXX Only fixed size supported for now */
- if (res->Data.Address32.Address.AddressLength == 0 ||
- (!arg->include_producer &&
- res->Data.Address32.ProducerConsumer !=
CVS commit: [netbsd-10] src/share/man/man4
Module Name:src Committed By: martin Date: Wed Jul 3 19:09:10 UTC 2024 Modified Files: src/share/man/man4 [netbsd-10]: ddb.4 Log Message: Pull up following revision(s) (requested by rin in ticket #734): share/man/man4/ddb.4: revision 1.204 ddb(4): vax: Clarify how to enter into DDB from console See gencnrint() and kdbrint(). // At last, I can activate DDB on SIMH ;) To generate a diff of this commit: cvs rdiff -u -r1.202.2.1 -r1.202.2.2 src/share/man/man4/ddb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ddb.4 diff -u src/share/man/man4/ddb.4:1.202.2.1 src/share/man/man4/ddb.4:1.202.2.2 --- src/share/man/man4/ddb.4:1.202.2.1 Wed Aug 9 17:42:03 2023 +++ src/share/man/man4/ddb.4 Wed Jul 3 19:09:10 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: ddb.4,v 1.202.2.1 2023/08/09 17:42:03 martin Exp $ +.\" $NetBSD: ddb.4,v 1.202.2.2 2024/07/03 19:09:10 martin Exp $ .\" .\" Copyright (c) 1997 - 2019 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -56,7 +56,7 @@ .\" any improvements or extensions that they make and grant Carnegie Mellon .\" the rights to redistribute these changes. .\" -.Dd April 28, 2022 +.Dd June 29, 2024 .Dt DDB 4 .Os .Sh NAME @@ -170,7 +170,7 @@ Abort switch on CPU card. .It "" on serial console. .It vax ---D on serial console. + followed by -D on serial console. .It x68k Interrupt switch on the body. .It xen dom0
CVS commit: [netbsd-10] src/share/man/man4
Module Name:src Committed By: martin Date: Wed Jul 3 19:09:10 UTC 2024 Modified Files: src/share/man/man4 [netbsd-10]: ddb.4 Log Message: Pull up following revision(s) (requested by rin in ticket #734): share/man/man4/ddb.4: revision 1.204 ddb(4): vax: Clarify how to enter into DDB from console See gencnrint() and kdbrint(). // At last, I can activate DDB on SIMH ;) To generate a diff of this commit: cvs rdiff -u -r1.202.2.1 -r1.202.2.2 src/share/man/man4/ddb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Wed Jul 3 18:38:55 UTC 2024 Modified Files: src/distrib/cdrom [netbsd-10]: Makefile boothfs.uue src/distrib/cdrom/macppc_installboot [netbsd-10]: Makefile installboot.c installboot.h src/distrib/cdrom/macppc_mkboothfs [netbsd-10]: mkboothfs.c src/distrib/macppc [netbsd-10]: Makefile src/etc [netbsd-10]: Makefile src/etc/etc.mac68k [netbsd-10]: Makefile.inc src/etc/etc.macppc [netbsd-10]: Makefile.inc src/share/mk [netbsd-10]: bsd.own.mk src/tools [netbsd-10]: Makefile Added Files: src/external/gpl2/mkhybrid [netbsd-10]: README.md src/external/gpl2/mkhybrid/bin [netbsd-10]: Makefile src/external/gpl2/mkhybrid/dist [netbsd-10]: COPYING ChangeLog ChangeLog.mkhybrid Makefile.in README README.eltorito README.hfs_boot README.hfs_magic README.mkhybrid README.mkisofs README.session README.win32 TODO acconfig.h apple.c apple.h apple_proto.h config.h config.h.in configure configure.in defaults.h desktop.c eltorito.c getopt.c getopt.h getopt1.c hash.c install-sh iso9660.h joliet.c mac_label.c mac_label.h mac_label_proto.h mactypes.h magic mapping match.c match.h mkhybrid.8 mkisofs.8 mkisofs.c mkisofs.h mkisofs.spec multi.c name.c rock.c tree.c volume.c volume.h write.c write.h src/external/gpl2/mkhybrid/dist/include [netbsd-10]: fctldefs.h mconfig.h prototyp.h statdefs.h src/external/gpl2/mkhybrid/dist/libfile [netbsd-10]: LEGAL.NOTICE README apprentice.c file.h lfile.c patchlevel.h proto.h softmagic.c src/external/gpl2/mkhybrid/dist/libhfs_iso [netbsd-10]: Makefile README block.c block.h btree.c btree.h data.c data.h file.c file.h hfs.c hfs.h hybrid.h internal.h low.c low.h lvolume.c node.c node.h record.c record.h volume.h src/tools/macppc_installboot [netbsd-10]: Makefile src/tools/mkhybrid [netbsd-10]: Makefile Removed Files: src/distrib/cdrom/macppc_installboot [netbsd-10]: cd9660.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #733): external/gpl2/mkhybrid/dist/mkisofs.h: revision 1.6 distrib/cdrom/Makefile: revision 1.55 distrib/cdrom/macppc_installboot/Makefile: revision 1.12 external/gpl2/mkhybrid/dist/getopt.c: revision 1.2 external/gpl2/mkhybrid/dist/libfile/LEGAL.NOTICE: revision 1.1 external/gpl2/mkhybrid/dist/write.c: revision 1.1 distrib/cdrom/Makefile: revision 1.56 distrib/cdrom/macppc_installboot/Makefile: revision 1.13 distrib/cdrom/macppc_installboot/installboot.c: revision 1.6 external/gpl2/mkhybrid/dist/getopt.c: revision 1.3 external/gpl2/mkhybrid/dist/write.c: revision 1.2 external/gpl2/mkhybrid/dist/libhfs_iso/data.h: revision 1.1 distrib/cdrom/Makefile: revision 1.57 distrib/cdrom/macppc_installboot/Makefile: revision 1.14 distrib/cdrom/macppc_installboot/installboot.c: revision 1.7 tools/Makefile: revision 1.221 tools/Makefile: revision 1.222 external/gpl2/mkhybrid/dist/libhfs_iso/file.h: revision 1.1 external/gpl2/mkhybrid/dist/libhfs_iso/README: revision 1.1 distrib/macppc/Makefile: revision 1.18 external/gpl2/mkhybrid/dist/TODO: revision 1.1 external/gpl2/mkhybrid/dist/libhfs_iso/block.h: revision 1.1 external/gpl2/mkhybrid/dist/libhfs_iso/record.c: revision 1.1 external/gpl2/mkhybrid/dist/libhfs_iso/hfs.c: revision 1.1 external/gpl2/mkhybrid/dist/match.c: revision 1.1 external/gpl2/mkhybrid/dist/libfile/softmagic.c: revision 1.1 external/gpl2/mkhybrid/dist/match.c: revision 1.2 external/gpl2/mkhybrid/dist/libfile/softmagic.c: revision 1.2 external/gpl2/mkhybrid/dist/volume.c: revision 1.1 external/gpl2/mkhybrid/dist/volume.c: revision 1.2 external/gpl2/mkhybrid/dist/libhfs_iso/internal.h: revision 1.1 external/gpl2/mkhybrid/dist/getopt1.c: revision 1.1 external/gpl2/mkhybrid/dist/getopt1.c: revision 1.2 external/gpl2/mkhybrid/dist/getopt1.c: revision 1.3 external/gpl2/mkhybrid/dist/README.mkisofs: revision 1.1 external/gpl2/mkhybrid/dist/libhfs_iso/hybrid.h: revision 1.1 tools/mkhybrid/Makefile: revision 1.1 external/gpl2/mkhybrid/dist/README.hfs_magic: revision 1.1 external/gpl2/mkhybrid/dist/apple.h: revision 1.1 external/gpl2/mkhybrid/dist/include/prototyp.h: revision 1.1 external/gpl2/mkhybrid/dist/libhfs_iso/volume.h: revision 1.1 external/gpl2/mkhybrid/dist/apple.h: revision 1.2 external/gpl2/mkhybrid/dist/mkisofs.c: revision 1.1 external/gpl2/mkhybrid/dist/desktop.c: revision 1.1 external/gpl2/mkhybrid/dist/mkisofs.c:
CVS commit: [netbsd-10] src/sys/arch/powerpc/oea
Module Name:src Committed By: martin Date: Wed Jul 3 18:12:35 UTC 2024 Modified Files: src/sys/arch/powerpc/oea [netbsd-10]: altivec.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #732): sys/arch/powerpc/oea/altivec.c: revision 1.35 don't do anything in vec_restore_from_mcontext() if no altivec. fixes a crash seen on netbsd-10 in PR#58283. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.34.4.1 src/sys/arch/powerpc/oea/altivec.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/powerpc/oea/altivec.c diff -u src/sys/arch/powerpc/oea/altivec.c:1.34 src/sys/arch/powerpc/oea/altivec.c:1.34.4.1 --- src/sys/arch/powerpc/oea/altivec.c:1.34 Sat Oct 30 19:44:56 2021 +++ src/sys/arch/powerpc/oea/altivec.c Wed Jul 3 18:12:35 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: altivec.c,v 1.34 2021/10/30 19:44:56 thorpej Exp $ */ +/* $NetBSD: altivec.c,v 1.34.4.1 2024/07/03 18:12:35 martin Exp $ */ /* * Copyright (C) 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: altivec.c,v 1.34 2021/10/30 19:44:56 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: altivec.c,v 1.34.4.1 2024/07/03 18:12:35 martin Exp $"); #include #include @@ -163,6 +163,10 @@ vec_restore_from_mcontext(struct lwp *l, KASSERT(l == curlwp); + /* Nothing to do here. */ + if (!vec_used_p(l)) + return; + /* we don't need to save the state, just drop it */ pcu_discard(_ops, l, true);
CVS commit: [netbsd-10] src/sys/arch/powerpc/oea
Module Name:src Committed By: martin Date: Wed Jul 3 18:12:35 UTC 2024 Modified Files: src/sys/arch/powerpc/oea [netbsd-10]: altivec.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #732): sys/arch/powerpc/oea/altivec.c: revision 1.35 don't do anything in vec_restore_from_mcontext() if no altivec. fixes a crash seen on netbsd-10 in PR#58283. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.34.4.1 src/sys/arch/powerpc/oea/altivec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Jul 3 17:29:50 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.5 Log Message: Tickets #1852 and #1853 To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/doc/CHANGES-9.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.5 diff -u src/doc/CHANGES-9.5:1.1.2.8 src/doc/CHANGES-9.5:1.1.2.9 --- src/doc/CHANGES-9.5:1.1.2.8 Mon Jul 1 20:05:04 2024 +++ src/doc/CHANGES-9.5 Wed Jul 3 17:29:50 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.5,v 1.1.2.8 2024/07/01 20:05:04 martin Exp $ +# $NetBSD: CHANGES-9.5,v 1.1.2.9 2024/07/03 17:29:50 martin Exp $ A complete list of changes from the NetBSD 9.4 release to the NetBSD 9.5 release: @@ -102,3 +102,17 @@ crypto/external/bsd/openssh/dist/version context. Fixes CVE-2024-6387. [riastradh, ticket #1854] +sys/dev/pci/pcidevs1.1507 +sys/dev/pci/pcidevs.h(regen) +sys/dev/pci/pcidevs_data.h (regen) + + PR 58358: add Brainboxes as manufacturer and some of their devices. + [nia, ticket #1852] + +usr.sbin/sysinst/msg.mi.de 1.49,1.50 +usr.sbin/sysinst/msg.mi.en 1.52 + + sysinst(8): Note that leaving the network "media type" empty + autoconfigures. + [nia, ticket #1853] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Jul 3 17:29:50 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.5 Log Message: Tickets #1852 and #1853 To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/doc/CHANGES-9.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Wed Jul 3 17:28:34 UTC 2024
Modified Files:
src/usr.sbin/sysinst [netbsd-9]: msg.mi.de msg.mi.en
Log Message:
Pull up following revision(s) (requested by nia in ticket #1853):
usr.sbin/sysinst/msg.mi.de: revision 1.49
usr.sbin/sysinst/msg.mi.de: revision 1.50
usr.sbin/sysinst/msg.mi.en: revision 1.52
sysinst(8): Note that leaving the network "media type" empty autoconfigures
sysinst: fix umlaut in German translation
To generate a diff of this commit:
cvs rdiff -u -r1.13.2.10 -r1.13.2.11 src/usr.sbin/sysinst/msg.mi.de
cvs rdiff -u -r1.19.2.11 -r1.19.2.12 src/usr.sbin/sysinst/msg.mi.en
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/sysinst/msg.mi.de
diff -u src/usr.sbin/sysinst/msg.mi.de:1.13.2.10 src/usr.sbin/sysinst/msg.mi.de:1.13.2.11
--- src/usr.sbin/sysinst/msg.mi.de:1.13.2.10 Thu Jan 20 11:45:28 2022
+++ src/usr.sbin/sysinst/msg.mi.de Wed Jul 3 17:28:34 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.13.2.10 2022/01/20 11:45:28 martin Exp $ */
+/* $NetBSD: msg.mi.de,v 1.13.2.11 2024/07/03 17:28:34 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -637,7 +637,7 @@ message net_defroute
{IPv4-Gateway}
message net_media
-{Art der Netzwerkverbindung}
+{Art der Netzwerkverbindung (für Automatik leer lassen)}
message net_ssid
{WLAN-SSID?}
Index: src/usr.sbin/sysinst/msg.mi.en
diff -u src/usr.sbin/sysinst/msg.mi.en:1.19.2.11 src/usr.sbin/sysinst/msg.mi.en:1.19.2.12
--- src/usr.sbin/sysinst/msg.mi.en:1.19.2.11 Thu Jan 20 11:45:28 2022
+++ src/usr.sbin/sysinst/msg.mi.en Wed Jul 3 17:28:34 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.19.2.11 2022/01/20 11:45:28 martin Exp $ */
+/* $NetBSD: msg.mi.en,v 1.19.2.12 2024/07/03 17:28:34 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -614,7 +614,7 @@ message net_defroute
{IPv4 gateway}
message net_media
-{Network media type}
+{Network media type (empty to autoconfigure)}
message net_ssid
{Wi-Fi SSID?}
CVS commit: [netbsd-9] src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Wed Jul 3 17:28:34 UTC 2024 Modified Files: src/usr.sbin/sysinst [netbsd-9]: msg.mi.de msg.mi.en Log Message: Pull up following revision(s) (requested by nia in ticket #1853): usr.sbin/sysinst/msg.mi.de: revision 1.49 usr.sbin/sysinst/msg.mi.de: revision 1.50 usr.sbin/sysinst/msg.mi.en: revision 1.52 sysinst(8): Note that leaving the network "media type" empty autoconfigures sysinst: fix umlaut in German translation To generate a diff of this commit: cvs rdiff -u -r1.13.2.10 -r1.13.2.11 src/usr.sbin/sysinst/msg.mi.de cvs rdiff -u -r1.19.2.11 -r1.19.2.12 src/usr.sbin/sysinst/msg.mi.en Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Wed Jul 3 17:27:11 UTC 2024 Modified Files: src/usr.sbin/sysinst [netbsd-10]: msg.mi.de msg.mi.en Log Message: Pull up following revision(s) (requested by nia in ticket #731): usr.sbin/sysinst/msg.mi.de: revision 1.49 usr.sbin/sysinst/msg.mi.de: revision 1.50 usr.sbin/sysinst/msg.mi.en: revision 1.52 sysinst(8): Note that leaving the network "media type" empty autoconfigures sysinst: fix umlaut in German translation To generate a diff of this commit: cvs rdiff -u -r1.43.2.2 -r1.43.2.3 src/usr.sbin/sysinst/msg.mi.de cvs rdiff -u -r1.46.2.1 -r1.46.2.2 src/usr.sbin/sysinst/msg.mi.en Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Wed Jul 3 17:27:11 UTC 2024
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: msg.mi.de msg.mi.en
Log Message:
Pull up following revision(s) (requested by nia in ticket #731):
usr.sbin/sysinst/msg.mi.de: revision 1.49
usr.sbin/sysinst/msg.mi.de: revision 1.50
usr.sbin/sysinst/msg.mi.en: revision 1.52
sysinst(8): Note that leaving the network "media type" empty autoconfigures
sysinst: fix umlaut in German translation
To generate a diff of this commit:
cvs rdiff -u -r1.43.2.2 -r1.43.2.3 src/usr.sbin/sysinst/msg.mi.de
cvs rdiff -u -r1.46.2.1 -r1.46.2.2 src/usr.sbin/sysinst/msg.mi.en
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/sysinst/msg.mi.de
diff -u src/usr.sbin/sysinst/msg.mi.de:1.43.2.2 src/usr.sbin/sysinst/msg.mi.de:1.43.2.3
--- src/usr.sbin/sysinst/msg.mi.de:1.43.2.2 Thu Nov 2 14:12:03 2023
+++ src/usr.sbin/sysinst/msg.mi.de Wed Jul 3 17:27:11 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.43.2.2 2023/11/02 14:12:03 sborrill Exp $ */
+/* $NetBSD: msg.mi.de,v 1.43.2.3 2024/07/03 17:27:11 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -643,7 +643,7 @@ message net_defroute
{IPv4-Gateway}
message net_media
-{Art der Netzwerkverbindung}
+{Art der Netzwerkverbindung (für Automatik leer lassen)}
message net_ssid
{WLAN-SSID?}
Index: src/usr.sbin/sysinst/msg.mi.en
diff -u src/usr.sbin/sysinst/msg.mi.en:1.46.2.1 src/usr.sbin/sysinst/msg.mi.en:1.46.2.2
--- src/usr.sbin/sysinst/msg.mi.en:1.46.2.1 Thu Nov 2 14:08:17 2023
+++ src/usr.sbin/sysinst/msg.mi.en Wed Jul 3 17:27:11 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.46.2.1 2023/11/02 14:08:17 sborrill Exp $ */
+/* $NetBSD: msg.mi.en,v 1.46.2.2 2024/07/03 17:27:11 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -618,7 +618,7 @@ message net_defroute
{IPv4 gateway}
message net_media
-{Network media type}
+{Network media type (empty to autoconfigure)}
message net_ssid
{Wi-Fi SSID?}
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Jul 3 17:23:19 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #1852 (Brainboxes devices) To generate a diff of this commit: cvs rdiff -u -r1.1371.2.22 -r1.1371.2.23 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.22 -r1.1370.2.23 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Jul 3 17:23:19 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #1852 (Brainboxes devices) To generate a diff of this commit: cvs rdiff -u -r1.1371.2.22 -r1.1371.2.23 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.22 -r1.1370.2.23 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Jul 3 17:21:26 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up following revision(s) (requested by nia in ticket #1852): sys/dev/pci/pcidevs: revision 1.1507 Add Brainboxes and devices >From Cameron Williams in PR 58358. To generate a diff of this commit: cvs rdiff -u -r1.1383.2.22 -r1.1383.2.23 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Jul 3 17:21:26 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up following revision(s) (requested by nia in ticket #1852): sys/dev/pci/pcidevs: revision 1.1507 Add Brainboxes and devices >From Cameron Williams in PR 58358. To generate a diff of this commit: cvs rdiff -u -r1.1383.2.22 -r1.1383.2.23 src/sys/dev/pci/pcidevs 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/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1383.2.22 src/sys/dev/pci/pcidevs:1.1383.2.23 --- src/sys/dev/pci/pcidevs:1.1383.2.22 Sat Feb 3 11:24:19 2024 +++ src/sys/dev/pci/pcidevs Wed Jul 3 17:21:26 2024 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1383.2.22 2024/02/03 11:24:19 martin Exp $ +$NetBSD: pcidevs,v 1.1383.2.23 2024/07/03 17:21:26 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -545,6 +545,7 @@ vendor FORTEMEDIA 0x1319 Forte Media vendor SIIG 0x131f Siig vendor MICROMEMORY 0x1332 Micro Memory vendor DOMEX 0x134a Domex +vendor BRAINBOXES 0x135a Brainboxes Ltd vendor QUATECH 0x135c Quatech vendor LMC 0x1376 LAN Media vendor NETGEAR 0x1385 Netgear @@ -2505,6 +2506,59 @@ product BIT3 PCIVME2706 0x0300 PCI-VME product BLUESTEEL 5501 0x 5501 product BLUESTEEL 5601 0x5601 5601 +/* Brainboxes products */ +product BRAINBOXES UC268 0x0841 Brainboxes UC-268 +product BRAINBOXES UC257 0x0861 Brainboxes UC-257 +product BRAINBOXES UC257R3 0x0862 Brainboxes UC-257 +product BRAINBOXES UC257R4 0x0863 Brainboxes UC-257 +product BRAINBOXES UC279 0x0881 Brainboxes UC-279 +product BRAINBOXES UC313 0x08a1 Brainboxes UC-313 +product BRAINBOXES UC313R3 0x08a2 Brainboxes UC-313 +product BRAINBOXES UC313R4 0x08a3 Brainboxes UC-313 +product BRAINBOXES UC310 0x08c1 Brainboxes UC-310 +product BRAINBOXES UC302 0x08e1 Brainboxes UC-302 +product BRAINBOXES UC302R3 0x08e2 Brainboxes UC-302 +product BRAINBOXES UC302R4 0x08e3 Brainboxes UC-302 +product BRAINBOXES UC431 0x0901 Brainboxes UC-431 +product BRAINBOXES UC420 0x0921 Brainboxes UC-420 +product BRAINBOXES UC475 0x0981 Brainboxes UC-475 +product BRAINBOXES UC475R3 0x0982 Brainboxes UC-475 +product BRAINBOXES UC607 0x09a1 Brainboxes UC-607 +product BRAINBOXES UC607R3 0x09a2 Brainboxes UC-607 +product BRAINBOXES UC607R4 0x09a3 Brainboxes UC-607 +product BRAINBOXES UC324 0x0a61 Brainboxes UC-324 +product BRAINBOXES UC357 0x0a81 Brainboxes UC-357 +product BRAINBOXES UC357R3 0x0a82 Brainboxes UC-357 +product BRAINBOXES UC357R4 0x0a83 Brainboxes UC-357 +product BRAINBOXES UC246 0x0aa1 Brainboxes UC-246 +product BRAINBOXES UC246R3 0x0aa2 Brainboxes UC-246 +product BRAINBOXES UP189 0x0ac1 Brainboxes UP-189 +product BRAINBOXES UP189R3 0x0ac2 Brainboxes UP-189 +product BRAINBOXES UP189R4 0x0ac3 Brainboxes UP-189 +product BRAINBOXES UC346 0x0b01 Brainboxes UC-346 +product BRAINBOXES UC346R3 0x0b02 Brainboxes UC-346 +product BRAINBOXES UP200 0x0b21 Brainboxes UP-200 +product BRAINBOXES UP200R3 0x0b22 Brainboxes UP-200 +product BRAINBOXES UP200R4 0x0b23 Brainboxes UP-200 +product BRAINBOXES UC101 0x0ba1 Brainboxes UC-101 +product BRAINBOXES UC203 0x0bc1 Brainboxes UC-203 +product BRAINBOXES UC203R3 0x0bc2 Brainboxes UC-203 +product BRAINBOXES UP869 0x0c01 Brainboxes UP-869 +product BRAINBOXES UP869R3 0x0c02 Brainboxes UP-869 +product BRAINBOXES UP869R4 0x0c03 Brainboxes UP-869 +product BRAINBOXES UP880 0x0c21 Brainboxes UP-880 +product BRAINBOXES UP880R3 0x0c22 Brainboxes UP-880 +product BRAINBOXES UP880R4 0x0c23 Brainboxes UP-880 +product BRAINBOXES UC368 0x0c41 Brainboxes UC-368 +product BRAINBOXES UC253 0x0ca1 Brainboxes UC-253 +product BRAINBOXES UC260 0x0d21 Brainboxes UC-260 +product BRAINBOXES UC836 0x0d41 Brainboxes UC-836 +product BRAINBOXES IS100 0x0d60 Intashield IS-100 +product BRAINBOXES IS200 0x0d80 Intashield IS-200 +product BRAINBOXES IS300 0x0da0 Intashield IS-300 +product BRAINBOXES IS400 0x0dc0 Intashield IS-400 +product BRAINBOXES UC414 0x0e61 Brainboxes UC-414 + /* Broadcom products */ product BROADCOM BCM5752 0x1600 BCM5752 NetXtreme 1000baseT Ethernet product BROADCOM BCM5752M 0x1601 BCM5752M NetXtreme 1000baseT Ethernet
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Jul 3 17:20:06 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-10]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #730 (Brainboxes devices) To generate a diff of this commit: cvs rdiff -u -r1.1452.2.12 -r1.1452.2.13 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1451.2.12 -r1.1451.2.13 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Jul 3 17:20:06 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-10]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #730 (Brainboxes devices) To generate a diff of this commit: cvs rdiff -u -r1.1452.2.12 -r1.1452.2.13 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1451.2.12 -r1.1451.2.13 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
