CVS commit: src/tests/net/ipsec
Module Name:src
Committed By: rin
Date: Tue Aug 22 05:40:50 UTC 2023
Modified Files:
src/tests/net/ipsec: t_ipsec_gif.sh t_ipsec_l2tp.sh
Log Message:
t_ipsec_{gif,l2tp}: Adjust for tcpdump 4.99.4
It does not longer output redundant `` (ipip-proto-4)'':
https://github.com/the-tcpdump-group/tcpdump/commit/cba9b77a98e9dde764abde71a899ee8937ca56e8
Now, these tests become passing again.
Thanks mlelstv@ for finding out upstream commit.
OK ozaki-r@
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/net/ipsec/t_ipsec_gif.sh \
src/tests/net/ipsec/t_ipsec_l2tp.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/ipsec/t_ipsec_gif.sh
diff -u src/tests/net/ipsec/t_ipsec_gif.sh:1.9 src/tests/net/ipsec/t_ipsec_gif.sh:1.10
--- src/tests/net/ipsec/t_ipsec_gif.sh:1.9 Mon Feb 17 08:46:10 2020
+++ src/tests/net/ipsec/t_ipsec_gif.sh Tue Aug 22 05:40:50 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipsec_gif.sh,v 1.9 2020/02/17 08:46:10 ozaki-r Exp $
+# $NetBSD: t_ipsec_gif.sh,v 1.10 2023/08/22 05:40:50 rin Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -49,11 +49,7 @@ make_gif_pktstr()
proto_cap=ESP
else
proto_cap=AH
- if [ $ipproto = ipv4 ]; then
- inner_str="$src_inner > $dst_inner:.+\(ipip-proto-4\)"
- else
- inner_str="$src_inner > $dst_inner"
- fi
+ inner_str="$src_inner > $dst_inner"
fi
echo "$src > $dst: $proto_cap.+$inner_str"
@@ -144,11 +140,9 @@ test_ipsec4_gif()
extract_new_packets $BUS_TUNNEL > $outfile
str="$ip_gwlo_tun > $ip_gwre_tun:"
str="$str $ip_local > $ip_remote: ICMP echo request,"
- str="$str .+ \(ipip-proto-4\)"
atf_check -s exit:0 -o match:"$str" cat $outfile
str="$ip_gwre_tun > $ip_gwlo_tun:"
str="$str $ip_remote > $ip_local: ICMP echo reply,"
- str="$str .+ \(ipip-proto-4\)"
atf_check -s exit:0 -o match:"$str" cat $outfile
if [ $mode = tunnel ]; then
Index: src/tests/net/ipsec/t_ipsec_l2tp.sh
diff -u src/tests/net/ipsec/t_ipsec_l2tp.sh:1.9 src/tests/net/ipsec/t_ipsec_l2tp.sh:1.10
--- src/tests/net/ipsec/t_ipsec_l2tp.sh:1.9 Mon Feb 17 08:46:10 2020
+++ src/tests/net/ipsec/t_ipsec_l2tp.sh Tue Aug 22 05:40:50 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipsec_l2tp.sh,v 1.9 2020/02/17 08:46:10 ozaki-r Exp $
+# $NetBSD: t_ipsec_l2tp.sh,v 1.10 2023/08/22 05:40:50 rin Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -49,11 +49,7 @@ make_l2tp_pktstr()
else
proto_cap=AH
if [ $ipproto = ipv4 ]; then
- if [ $mode = tunnel ]; then
-proto_str="ip-proto-115 102 \(ipip-proto-4\)"
- else
-proto_str="ip-proto-115 102"
- fi
+ proto_str="ip-proto-115 102"
else
proto_str="ip-proto-115"
fi
CVS commit: src/tests/net/ipsec
Module Name:src
Committed By: rin
Date: Tue Aug 22 05:40:50 UTC 2023
Modified Files:
src/tests/net/ipsec: t_ipsec_gif.sh t_ipsec_l2tp.sh
Log Message:
t_ipsec_{gif,l2tp}: Adjust for tcpdump 4.99.4
It does not longer output redundant `` (ipip-proto-4)'':
https://github.com/the-tcpdump-group/tcpdump/commit/cba9b77a98e9dde764abde71a899ee8937ca56e8
Now, these tests become passing again.
Thanks mlelstv@ for finding out upstream commit.
OK ozaki-r@
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/net/ipsec/t_ipsec_gif.sh \
src/tests/net/ipsec/t_ipsec_l2tp.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: christos Date: Mon Aug 21 22:37:17 UTC 2023 Modified Files: src/distrib/sets/lists/debug: md.amd64 Log Message: add inotify tests, sort To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 src/distrib/sets/lists/debug/md.amd64 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/md.amd64 diff -u src/distrib/sets/lists/debug/md.amd64:1.121 src/distrib/sets/lists/debug/md.amd64:1.122 --- src/distrib/sets/lists/debug/md.amd64:1.121 Mon Aug 21 05:54:07 2023 +++ src/distrib/sets/lists/debug/md.amd64 Mon Aug 21 18:37:17 2023 @@ -1,5 +1,4 @@ -# $NetBSD: md.amd64,v 1.121 2023/08/21 09:54:07 martin Exp $ -./usr/libdata/debug/usr/bin/gdbserver.debug base-util-debug gdb,debug +# $NetBSD: md.amd64,v 1.122 2023/08/21 22:37:17 christos Exp $ ./usr/lib/i386/12.202++_g.a comp-c-debuglib debuglib,compat,12.202xx ./usr/lib/i386/libi386_g.a comp-c-debuglib debuglib,compat ./usr/lib/i386/libiberty_g.a comp-obsolete obsolete @@ -7,6 +6,7 @@ ./usr/lib/libx86_64_g.acomp-c-debuglib debuglib ./usr/libdata/debug/libexec/ld.elf_so-i386.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug +./usr/libdata/debug/usr/bin/gdbserver.debug base-util-debug gdb,debug ./usr/libdata/debug/usr/bin/pmc.debug comp-obsolete obsolete ./usr/libdata/debug/usr/lib/i386/libi386.so.2.0.debug comp-compat-shlib compat,pic,debug ./usr/libdata/debug/usr/lib/i386/libpam.so.4.1.debug comp-compat-shlib compat,pic,debug,pam @@ -17,6 +17,10 @@ ./usr/libdata/debug/usr/lib/libx86_64.so.0.0.debug comp-sys-shlib pic,debug ./usr/libdata/debug/usr/libexec/ld.elf_so-i386 comp-obsolete obsolete ./usr/libdata/debug/usr/libexec/ld.elf_so-i386.debug comp-sys-debug debug,compat +./usr/libdata/debug/usr/tests/compat/linux/h_inotify_directory.debug tests-sys-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/compat/linux/h_inotify_init.debug tests-sys-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/compat/linux/h_inotify_single_file.debug tests-sys-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/compat/linux/h_inotify_watch_change.debug tests-sys-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait3.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait4.debug tests-obsolete obsolete
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: christos Date: Mon Aug 21 22:37:17 UTC 2023 Modified Files: src/distrib/sets/lists/debug: md.amd64 Log Message: add inotify tests, sort To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 src/distrib/sets/lists/debug/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/compat/linux
Yes, I committed it (I had the change in my tree).
Best,
christos
> On Aug 21, 2023, at 3:40 PM, Ryo ONODERA wrote:
>
> Hi,
>
> "Christos Zoulas" writes:
>
>> Module Name: src
>> Committed By:christos
>> Date:Sun Aug 20 18:08:57 UTC 2023
>>
>> Modified Files:
>> src/sys/compat/linux: files.linux
>>
>> Log Message:
>> add inotify (forgot to commit this)
>>
>>
>> To generate a diff of this commit:
>> cvs rdiff -u -r1.22 -r1.23 src/sys/compat/linux/files.linux
>>
>> Please note that diffs are not public domain; they are subject to the
>> copyright notices on the relevant files.
>
> The compat_linux kernel module is also required to have inotify.
> The following patch fixes my error from 'modload compat_linux'.
>
> # modload compat_linux
> [ 14619.3999280] kobj_checksyms, 1013: [compat_linux]: linker error: symbol
> `linux_sys_inotify_add_watch' not found
> [ 14619.3999280] kobj_checksyms, 1013: [compat_linux]: linker error: symbol
> `linux_sys_inotify_init1' not found
> [ 14619.3999280] kobj_checksyms, 1013: [compat_linux]: linker error: symbol
> `linux_sys_inotify_rm_watch' not found
> [ 14619.3999280] kobj_checksyms, 1013: [compat_linux]: linker error: symbol
> `linux_inotify_init' not found
> [ 14619.3999280] kobj_checksyms, 1013: [compat_linux]: linker error: symbol
> `linux_sys_inotify_init' not found
> [ 14619.3999280] kobj_checksyms, 1013: [compat_linux]: linker error: symbol
> `linux_inotify_fini' not found
> [ 14619.3999280] WARNING: module error: unable to affix module
> `compat_linux', error 8
>
> Patch:
> Index: sys/modules/compat_linux/Makefile
> ===
> RCS file: /cvsroot/src/sys/modules/compat_linux/Makefile,v
> retrieving revision 1.6
> diff -u -r1.6 Makefile
> --- sys/modules/compat_linux/Makefile 9 Oct 2021 07:01:35 - 1.6
> +++ sys/modules/compat_linux/Makefile 21 Aug 2023 19:37:08 -
> @@ -9,7 +9,8 @@
>
> .PATH:${S}/compat/linux/common
> SRCS= linux_blkio.c linux_cdrom.c linux_errno.c linux_exec.c
> -SRCS+= linux_fdio.c linux_file.c linux_hdio.c linux_ioctl.c
> +SRCS+= linux_fdio.c linux_file.c linux_hdio.c linux_inotify.c
> +SRCS+= linux_ioctl.c
> SRCS+=linux_ipc.c linux_misc.c linux_mtio.c linux_sched.c
> SRCS+=linux_sg.c linux_signal.c linux_signo.c linux_socket.c
> SRCS+=linux_sysctl.c linux_termios.c linux_time.c linux_mod.c
>
> Thank you.
>
> --
> Ryo ONODERA // r...@tetera.org
> PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB FD1B F404 27FA C7D1 15F3
signature.asc
Description: Message signed with OpenPGP
CVS commit: src/sys/modules/compat_linux
Module Name:src
Committed By: christos
Date: Mon Aug 21 19:43:22 UTC 2023
Modified Files:
src/sys/modules/compat_linux: Makefile
Log Message:
Add inotify (thanks Ryo)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/compat_linux/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/compat_linux/Makefile
diff -u src/sys/modules/compat_linux/Makefile:1.6 src/sys/modules/compat_linux/Makefile:1.7
--- src/sys/modules/compat_linux/Makefile:1.6 Sat Oct 9 03:01:35 2021
+++ src/sys/modules/compat_linux/Makefile Mon Aug 21 15:43:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/10/09 07:01:35 ryo Exp $
+# $NetBSD: Makefile,v 1.7 2023/08/21 19:43:22 christos Exp $
.include "../Makefile.inc"
.include "../Makefile.assym"
@@ -13,6 +13,7 @@ SRCS+= linux_fdio.c linux_file.c linux_h
SRCS+= linux_ipc.c linux_misc.c linux_mtio.c linux_sched.c
SRCS+= linux_sg.c linux_signal.c linux_signo.c linux_socket.c
SRCS+= linux_sysctl.c linux_termios.c linux_time.c linux_mod.c
+SRCS+= linux_inotify.c
.if ${MACHINE_CPU} == "aarch64"
CPPFLAGS+= -DEXEC_ELF64
CVS commit: src/sys/modules/compat_linux
Module Name:src Committed By: christos Date: Mon Aug 21 19:43:22 UTC 2023 Modified Files: src/sys/modules/compat_linux: Makefile Log Message: Add inotify (thanks Ryo) To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/modules/compat_linux/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/compat/linux
Hi,
"Christos Zoulas" writes:
> Module Name: src
> Committed By: christos
> Date: Sun Aug 20 18:08:57 UTC 2023
>
> Modified Files:
> src/sys/compat/linux: files.linux
>
> Log Message:
> add inotify (forgot to commit this)
>
>
> To generate a diff of this commit:
> cvs rdiff -u -r1.22 -r1.23 src/sys/compat/linux/files.linux
>
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
The compat_linux kernel module is also required to have inotify.
The following patch fixes my error from 'modload compat_linux'.
# modload compat_linux
[ 14619.3999280] kobj_checksyms, 1013: [compat_linux]: linker error: symbol
`linux_sys_inotify_add_watch' not found
[ 14619.3999280] kobj_checksyms, 1013: [compat_linux]: linker error: symbol
`linux_sys_inotify_init1' not found
[ 14619.3999280] kobj_checksyms, 1013: [compat_linux]: linker error: symbol
`linux_sys_inotify_rm_watch' not found
[ 14619.3999280] kobj_checksyms, 1013: [compat_linux]: linker error: symbol
`linux_inotify_init' not found
[ 14619.3999280] kobj_checksyms, 1013: [compat_linux]: linker error: symbol
`linux_sys_inotify_init' not found
[ 14619.3999280] kobj_checksyms, 1013: [compat_linux]: linker error: symbol
`linux_inotify_fini' not found
[ 14619.3999280] WARNING: module error: unable to affix module `compat_linux',
error 8
Patch:
Index: sys/modules/compat_linux/Makefile
===
RCS file: /cvsroot/src/sys/modules/compat_linux/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- sys/modules/compat_linux/Makefile 9 Oct 2021 07:01:35 - 1.6
+++ sys/modules/compat_linux/Makefile 21 Aug 2023 19:37:08 -
@@ -9,7 +9,8 @@
.PATH: ${S}/compat/linux/common
SRCS= linux_blkio.c linux_cdrom.c linux_errno.c linux_exec.c
-SRCS+= linux_fdio.c linux_file.c linux_hdio.c linux_ioctl.c
+SRCS+= linux_fdio.c linux_file.c linux_hdio.c linux_inotify.c
+SRCS+= linux_ioctl.c
SRCS+= linux_ipc.c linux_misc.c linux_mtio.c linux_sched.c
SRCS+= linux_sg.c linux_signal.c linux_signo.c linux_socket.c
SRCS+= linux_sysctl.c linux_termios.c linux_time.c linux_mod.c
Thank you.
--
Ryo ONODERA // r...@tetera.org
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB FD1B F404 27FA C7D1 15F3
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto
Module Name:src
Committed By: palle
Date: Mon Aug 21 18:46:57 UTC 2023
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: gen
Log Message:
PR57519: Fix awk script script (escape opening curly) so building with non-gnu
versions of awk is possible (e.g. Solaris 11.4)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/lib/libcrypto/gen
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/gen
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/gen:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/gen:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/gen:1.3 Thu Jun 8 21:24:00 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/gen Mon Aug 21 18:46:57 2023
@@ -11,7 +11,7 @@ awk '
/use OpenSSL/ {
next;
}
-/^{-/ {
+/^\{-/ {
next;
}
/^-}/ {
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto
Module Name:src Committed By: palle Date: Mon Aug 21 18:46:57 UTC 2023 Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto: gen Log Message: PR57519: Fix awk script script (escape opening curly) so building with non-gnu versions of awk is possible (e.g. Solaris 11.4) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/lib/libcrypto/gen Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Aug 21 12:41:29 UTC 2023 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1887 To generate a diff of this commit: cvs rdiff -u -r1.1.2.191 -r1.1.2.192 src/doc/CHANGES-8.3 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-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.191 src/doc/CHANGES-8.3:1.1.2.192 --- src/doc/CHANGES-8.3:1.1.2.191 Wed Aug 9 16:17:44 2023 +++ src/doc/CHANGES-8.3 Mon Aug 21 12:41:29 2023 @@ -1,4 +1,4 @@ - $NetBSD: CHANGES-8.3,v 1.1.2.191 2023/08/09 16:17:44 martin Exp $ + $NetBSD: CHANGES-8.3,v 1.1.2.192 2023/08/21 12:41:29 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -3809,3 +3809,15 @@ tests/libexec/ld.elf_so/t_hash.c 1.1 ld.elf_so: Fix sysv elf hash. [riastradh, ticket #1886] +sys/dev/pci/pcidevs1.1483-1.1492 +sys/dev/pci/pcidevs.hregen +sys/dev/pci/pcidevs_data.h regen + + - Add AMD 19h/7xh Root Complex. + - Add ASMedia ASM106x. + - Add Intel Snow Ridge, Xeon D-2100 devices. + - Add Intel I226 devices. + - Add the VIA VX800 chipset devices and S3 chrome 500 series GPU. + - Fix description of Intel 0x37d0. + [msaitoh, ticket #1887] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Aug 21 12:41:29 UTC 2023 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1887 To generate a diff of this commit: cvs rdiff -u -r1.1.2.191 -r1.1.2.192 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Aug 21 12:39:45 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-8]: pcidevs.h pcidevs_data.h Log Message: regen (for ticket #1887) To generate a diff of this commit: cvs rdiff -u -r1.1281.2.26 -r1.1281.2.27 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1280.2.26 -r1.1280.2.27 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-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Aug 21 12:39:45 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-8]: pcidevs.h pcidevs_data.h Log Message: regen (for ticket #1887) To generate a diff of this commit: cvs rdiff -u -r1.1281.2.26 -r1.1281.2.27 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1280.2.26 -r1.1280.2.27 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-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Aug 21 12:37:34 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-8]: pcidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1887): sys/dev/pci/pcidevs: revision 1.1483-1.1492 Add AMD 19h/7xh Root Complex. pcidevs: add ASMedia ASM106x Add Intel Snow Ridge devices. Fix some descriptions of Intel Snow Ridge. Add Intel I226 devices. Add device ids of the VX800 chipset and s3 chrome 500 series GPU. Descriptions mainly aligned with VX800/820 Series System Programming Manual. fix duplicate definition. Add some Intel Xeon D-2100 devices. Fix description of Intel 0x37d0. Simplify descriptions of Snow Ridge internal Ethernet devices. Rename PCI to PCIE for naming consistency. To generate a diff of this commit: cvs rdiff -u -r1.1289.2.26 -r1.1289.2.27 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.1289.2.26 src/sys/dev/pci/pcidevs:1.1289.2.27 --- src/sys/dev/pci/pcidevs:1.1289.2.26 Sat Jul 29 10:42:39 2023 +++ src/sys/dev/pci/pcidevs Mon Aug 21 12:37:34 2023 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1289.2.26 2023/07/29 10:42:39 martin Exp $ +$NetBSD: pcidevs,v 1.1289.2.27 2023/08/21 12:37:34 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1100,6 +1100,7 @@ product AMD F19_6X_DF_4 0x14e4 19h/6xh product AMD F19_6X_DF_5 0x14e5 19h/6xh Data Fabric 5 product AMD F19_6X_DF_6 0x14e6 19h/6xh Data Fabric 6 product AMD F19_6X_DF_7 0x14e7 19h/6xh Data Fabric 7 +product AMD F19_7X_RC 0x14e8 19h/7xh Root Complex product AMD F17_AX_XHCI_0 0x1503 17h/Axh USB 3.1 xHCI product AMD F17_AX_XHCI_1 0x1504 17h/Axh USB 3.1 xHCI product AMD F17_AX_USB_BIOM 0x1505 17h/Axh Secure USB BIOmetric @@ -1509,6 +1510,7 @@ product ASMEDIA ASM1061_01 0x0601 ASM106 product ASMEDIA ASM1061_02 0x0602 ASM1061 AHCI SATA III Controller product ASMEDIA ASM1061_11 0x0611 ASM1061 AHCI SATA III Controller product ASMEDIA ASM1061_12 0x0612 ASM1061 AHCI SATA III Controller +product ASMEDIA ASM106X 0x0625 ASM106x AHCI SATA III Controller product ASMEDIA ASM1042 0x1042 ASM1042 USB 3.0 Host Controller product ASMEDIA ASM1083 0x1080 ASM1083/1085 PCIe-PCI Bridge product ASMEDIA ASM1042A 0x1142 ASM1042A USB 3.0 Host Controller @@ -3873,6 +3875,13 @@ product INTEL WIFI_LINK_7265_2 0x095b Du product INTEL X1000_LB 0x095e Quark X1000 Legacy Bridge product INTEL 80960RM 0x0962 i960 RM PCI-PCI product INTEL 80960RN 0x0964 i960 RN PCI-PCI +product INTEL SNR_IEH 0x0998 Snow Ridge IEH +product INTEL SNR_M2IIO_VTD 0x09a2 Snow Ridge Mesh2IIO MMAP/VT-d +product INTEL SNR_M2IIO_RAS 0x09a3 Snow Ridge Mesh2IIO RAS +product INTEL SNR_M2IIO_PMU 0x09a4 Snow Ridge Mesh2IIO PMU/PMON +product INTEL SNR_M2IIO_DFX 0x09a5 Snow Ridge Mesh2IIO DFx +product INTEL SNR_PECI_OOB_MSM 0x09a6 Snow Ridge PECI OOB-MSM +product INTEL SNR_PECI_OOB_MSM_PMU 0x09a7 Snow Ridge PECI OOB-MSM PMU product INTEL CORE4G_D_ULT_GT1 0x0a02 HD Graphics product INTEL CORE4G_M_HOST_DRAM 0x0a04 Core 4G (mobile) Host Bridge, DRAM product INTEL CORE4G_M_ULT_GT1 0x0a06 HD Graphics (GT1) @@ -3893,6 +3902,7 @@ product INTEL CORE4G_R_ULT_GT3_2 0x0a2e product INTEL DC_P3520_SSD 0x0a53 SSD DC P3520 product INTEL DC_P4500_SSD 0x0a54 SSD DC P4500 product INTEL DC_P4600_SSD 0x0a55 SSD DC P4600 +product INTEL SNR_DMA 0x0b00 Snow Ridge DMA product INTEL HASWELL_HOST_DRAM 0x0c00 Haswell Host Bridge, DRAM product INTEL HASWELL_PCIE16 0x0c01 Haswell PCI-E x16 Controller product INTEL HASWELL_PCIE8 0x0c05 Haswell PCI-E x8 Controller @@ -4234,6 +4244,9 @@ product INTEL 82441FX 0x1237 82441FX (P product INTEL 82380AB 0x123c 82380AB (MISA) Mobile PCI-ISA Bridge product INTEL 82380FB 0x124b 82380FB (MPCI2) Mobile PCI-PCI Bridge product INTEL 82439HX 0x1250 82439HX (TXC) System Controller +product INTEL I226_LM 0x125b I226-LM Ethernet +product INTEL I226_V 0x125c I226-V Ethernet +product INTEL I226_IT 0x125d I226-IT Ethernet product INTEL C3K_X553_10G 0x1306 C3000 X553 10G Ethernet product INTEL C3K_X553_1G 0x1307 C3000 X553 1G Ethernet product INTEL 82870P2_PPB 0x1460 82870P2 P64H2 PCI-PCI Bridge @@ -4374,6 +4387,43 @@ product INTEL CORE5G_M_GT2_1 0x1616 HD G product INTEL CORE5G_M_GT2_2 0x161e HD Graphics 5300 product INTEL CORE5G_M_GT3_15W 0x1626 HD Graphics 6000 product INTEL CORE5G_M_GT3_28W 0x162b Iris Graphics 6100 +product INTEL SNR_E882_C_BP 0x1890 E882-C for backplane +product INTEL SNR_E882_C_QSFP 0x1891 E882-C for QSFP +product INTEL SNR_E882_C_SFP 0x1892 E882-C for SFP +product INTEL SNR_E882_C_10GT 0x1893 E882-C/X557-AT 10GBASE-T +product INTEL SNR_E882_C_1G 0x1894 E882-C 1G +product INTEL SNR_E882_X 0x1895 E882-X (for BMSM) +product INTEL SNR_E882_L_BP 0x1897 E882-L for backplane +product INTEL SNR_E882_L_SFP 0x1898 E882-L for SFP +product INTEL
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Aug 21 12:37:04 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: regen (for ticket #1719) To generate a diff of this commit: cvs rdiff -u -r1.1371.2.17 -r1.1371.2.18 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.17 -r1.1370.2.18 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: Mon Aug 21 12:37:04 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: regen (for ticket #1719) To generate a diff of this commit: cvs rdiff -u -r1.1371.2.17 -r1.1371.2.18 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.17 -r1.1370.2.18 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-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Aug 21 12:37:34 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-8]: pcidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1887): sys/dev/pci/pcidevs: revision 1.1483-1.1492 Add AMD 19h/7xh Root Complex. pcidevs: add ASMedia ASM106x Add Intel Snow Ridge devices. Fix some descriptions of Intel Snow Ridge. Add Intel I226 devices. Add device ids of the VX800 chipset and s3 chrome 500 series GPU. Descriptions mainly aligned with VX800/820 Series System Programming Manual. fix duplicate definition. Add some Intel Xeon D-2100 devices. Fix description of Intel 0x37d0. Simplify descriptions of Snow Ridge internal Ethernet devices. Rename PCI to PCIE for naming consistency. To generate a diff of this commit: cvs rdiff -u -r1.1289.2.26 -r1.1289.2.27 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/doc
Module Name:src Committed By: martin Date: Mon Aug 21 12:34:48 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1716 - #1719 To generate a diff of this commit: cvs rdiff -u -r1.1.2.92 -r1.1.2.93 src/doc/CHANGES-9.4 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.4 diff -u src/doc/CHANGES-9.4:1.1.2.92 src/doc/CHANGES-9.4:1.1.2.93 --- src/doc/CHANGES-9.4:1.1.2.92 Tue Aug 15 10:08:35 2023 +++ src/doc/CHANGES-9.4 Mon Aug 21 12:34:48 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.92 2023/08/15 10:08:35 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.93 2023/08/21 12:34:48 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -2028,3 +2028,33 @@ external/apache2/mDNSResponder/usr.sbin/ mdnsd(8): switch to use arc4random(3) for randomness [gutteridge, ticket #1715] +sys/dev/vnd.c 1.289 + + vnd(4): PR 57421: fix deadlock in low-memory scenario by allowing + the pagedaemon to allocate for I/O to flush dirty buffers to free + memory. + [riastradh, ticket #1716] + +sbin/dump/optr.c1.44 + + dump(8): PR 56249: silently ignore /etc/fstab entries with + NAME= entries that cannot be resolved. + [manu, ticket #1717] + +sys/net/npf/npf_tableset.c 1.41 + + npf(9): fix crashes in table queries, PR 57136 and 57181. + [riastradh, ticket #1718] + +sys/dev/pci/pcidevs1.1483-1.1492 +sys/dev/pci/pcidevs.hregen +sys/dev/pci/pcidevs_data.h regen + + - Add AMD 19h/7xh Root Complex. + - Add ASMedia ASM106x. + - Add Intel Snow Ridge, Xeon D-2100 devices. + - Add Intel I226 devices. + - Add the VIA VX800 chipset devices and S3 chrome 500 series GPU. + - Fix description of Intel 0x37d0. + [msaitoh, ticket #1719] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Aug 21 12:34:48 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1716 - #1719 To generate a diff of this commit: cvs rdiff -u -r1.1.2.92 -r1.1.2.93 src/doc/CHANGES-9.4 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: Mon Aug 21 12:32:26 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1719): sys/dev/pci/pcidevs: revision 1.1483-1.1492 Add AMD 19h/7xh Root Complex. pcidevs: add ASMedia ASM106x Add Intel Snow Ridge devices. Fix some descriptions of Intel Snow Ridge. Add Intel I226 devices. Add device ids of the VX800 chipset and s3 chrome 500 series GPU. Descriptions mainly aligned with VX800/820 Series System Programming Manual. fix duplicate definition. Add some Intel Xeon D-2100 devices. Fix description of Intel 0x37d0. Simplify descriptions of Snow Ridge internal Ethernet devices. Rename PCI to PCIE for naming consistency. To generate a diff of this commit: cvs rdiff -u -r1.1383.2.17 -r1.1383.2.18 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.17 src/sys/dev/pci/pcidevs:1.1383.2.18 --- src/sys/dev/pci/pcidevs:1.1383.2.17 Sat Jul 29 10:30:37 2023 +++ src/sys/dev/pci/pcidevs Mon Aug 21 12:32:25 2023 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1383.2.17 2023/07/29 10:30:37 martin Exp $ +$NetBSD: pcidevs,v 1.1383.2.18 2023/08/21 12:32:25 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1100,6 +1100,7 @@ product AMD F19_6X_DF_4 0x14e4 19h/6xh product AMD F19_6X_DF_5 0x14e5 19h/6xh Data Fabric 5 product AMD F19_6X_DF_6 0x14e6 19h/6xh Data Fabric 6 product AMD F19_6X_DF_7 0x14e7 19h/6xh Data Fabric 7 +product AMD F19_7X_RC 0x14e8 19h/7xh Root Complex product AMD F17_AX_XHCI_0 0x1503 17h/Axh USB 3.1 xHCI product AMD F17_AX_XHCI_1 0x1504 17h/Axh USB 3.1 xHCI product AMD F17_AX_USB_BIOM 0x1505 17h/Axh Secure USB BIOmetric @@ -1509,6 +1510,7 @@ product ASMEDIA ASM1061_01 0x0601 ASM106 product ASMEDIA ASM1061_02 0x0602 ASM1061 AHCI SATA III Controller product ASMEDIA ASM1061_11 0x0611 ASM1061 AHCI SATA III Controller product ASMEDIA ASM1061_12 0x0612 ASM1061 AHCI SATA III Controller +product ASMEDIA ASM106X 0x0625 ASM106x AHCI SATA III Controller product ASMEDIA ASM1042 0x1042 ASM1042 USB 3.0 Host Controller product ASMEDIA ASM1083 0x1080 ASM1083/1085 PCIe-PCI Bridge product ASMEDIA ASM1042A 0x1142 ASM1042A USB 3.0 Host Controller @@ -3875,6 +3877,13 @@ product INTEL WIFI_LINK_7265_2 0x095b Du product INTEL X1000_LB 0x095e Quark X1000 Legacy Bridge product INTEL 80960RM 0x0962 i960 RM PCI-PCI product INTEL 80960RN 0x0964 i960 RN PCI-PCI +product INTEL SNR_IEH 0x0998 Snow Ridge IEH +product INTEL SNR_M2IIO_VTD 0x09a2 Snow Ridge Mesh2IIO MMAP/VT-d +product INTEL SNR_M2IIO_RAS 0x09a3 Snow Ridge Mesh2IIO RAS +product INTEL SNR_M2IIO_PMU 0x09a4 Snow Ridge Mesh2IIO PMU/PMON +product INTEL SNR_M2IIO_DFX 0x09a5 Snow Ridge Mesh2IIO DFx +product INTEL SNR_PECI_OOB_MSM 0x09a6 Snow Ridge PECI OOB-MSM +product INTEL SNR_PECI_OOB_MSM_PMU 0x09a7 Snow Ridge PECI OOB-MSM PMU product INTEL CORE4G_D_ULT_GT1 0x0a02 HD Graphics product INTEL CORE4G_M_HOST_DRAM 0x0a04 Core 4G (mobile) Host Bridge, DRAM product INTEL CORE4G_M_ULT_GT1 0x0a06 HD Graphics (GT1) @@ -3895,6 +3904,7 @@ product INTEL CORE4G_R_ULT_GT3_2 0x0a2e product INTEL DC_P3520_SSD 0x0a53 SSD DC P3520 product INTEL DC_P4500_SSD 0x0a54 SSD DC P4500 product INTEL DC_P4600_SSD 0x0a55 SSD DC P4600 +product INTEL SNR_DMA 0x0b00 Snow Ridge DMA product INTEL HASWELL_HOST_DRAM 0x0c00 Haswell Host Bridge, DRAM product INTEL HASWELL_PCIE16 0x0c01 Haswell PCI-E x16 Controller product INTEL HASWELL_PCIE8 0x0c05 Haswell PCI-E x8 Controller @@ -4236,6 +4246,9 @@ product INTEL 82441FX 0x1237 82441FX (P product INTEL 82380AB 0x123c 82380AB (MISA) Mobile PCI-ISA Bridge product INTEL 82380FB 0x124b 82380FB (MPCI2) Mobile PCI-PCI Bridge product INTEL 82439HX 0x1250 82439HX (TXC) System Controller +product INTEL I226_LM 0x125b I226-LM Ethernet +product INTEL I226_V 0x125c I226-V Ethernet +product INTEL I226_IT 0x125d I226-IT Ethernet product INTEL C3K_X553_10G 0x1306 C3000 X553 10G Ethernet product INTEL C3K_X553_1G 0x1307 C3000 X553 1G Ethernet product INTEL 82870P2_PPB 0x1460 82870P2 P64H2 PCI-PCI Bridge @@ -4376,6 +4389,43 @@ product INTEL CORE5G_M_GT2_1 0x1616 HD G product INTEL CORE5G_M_GT2_2 0x161e HD Graphics 5300 product INTEL CORE5G_M_GT3_15W 0x1626 HD Graphics 6000 product INTEL CORE5G_M_GT3_28W 0x162b Iris Graphics 6100 +product INTEL SNR_E882_C_BP 0x1890 E882-C for backplane +product INTEL SNR_E882_C_QSFP 0x1891 E882-C for QSFP +product INTEL SNR_E882_C_SFP 0x1892 E882-C for SFP +product INTEL SNR_E882_C_10GT 0x1893 E882-C/X557-AT 10GBASE-T +product INTEL SNR_E882_C_1G 0x1894 E882-C 1G +product INTEL SNR_E882_X 0x1895 E882-X (for BMSM) +product INTEL SNR_E882_L_BP 0x1897 E882-L for backplane +product INTEL SNR_E882_L_SFP 0x1898 E882-L for SFP +product INTEL
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Aug 21 12:32:26 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1719): sys/dev/pci/pcidevs: revision 1.1483-1.1492 Add AMD 19h/7xh Root Complex. pcidevs: add ASMedia ASM106x Add Intel Snow Ridge devices. Fix some descriptions of Intel Snow Ridge. Add Intel I226 devices. Add device ids of the VX800 chipset and s3 chrome 500 series GPU. Descriptions mainly aligned with VX800/820 Series System Programming Manual. fix duplicate definition. Add some Intel Xeon D-2100 devices. Fix description of Intel 0x37d0. Simplify descriptions of Snow Ridge internal Ethernet devices. Rename PCI to PCIE for naming consistency. To generate a diff of this commit: cvs rdiff -u -r1.1383.2.17 -r1.1383.2.18 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-10] src/doc
Module Name:src Committed By: martin Date: Mon Aug 21 12:30:47 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #331 - #333 To generate a diff of this commit: cvs rdiff -u -r1.1.2.110 -r1.1.2.111 src/doc/CHANGES-10.0 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: Mon Aug 21 12:30:47 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #331 - #333 To generate a diff of this commit: cvs rdiff -u -r1.1.2.110 -r1.1.2.111 src/doc/CHANGES-10.0 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.0 diff -u src/doc/CHANGES-10.0:1.1.2.110 src/doc/CHANGES-10.0:1.1.2.111 --- src/doc/CHANGES-10.0:1.1.2.110 Fri Aug 18 12:52:31 2023 +++ src/doc/CHANGES-10.0 Mon Aug 21 12:30:46 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.110 2023/08/18 12:52:31 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.111 2023/08/21 12:30:46 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -11194,3 +11194,27 @@ sys/dev/vnd.c 1.289 memory. [riastradh, ticket #330] +usr.sbin/sysinst/arch/luna68k/md.c 1.11 +usr.sbin/sysinst/arch/luna68k/md.h 1.7 + + PR 55058: force the boot partition to sd0d, so our root partitions + becomes sd0a again. + [tsutsui, ticket #331] + +sys/net/npf/npf_tableset.c 1.41 + + npf(9): fix crashes in table queries, PR 57136 and 57181. + [riastradh, ticket #332] + +sys/dev/pci/pcidevs1.1483-1.1492 +sys/dev/pci/pcidevs.hregen +sys/dev/pci/pcidevs_data.h regen + + - Add AMD 19h/7xh Root Complex. + - Add ASMedia ASM106x. + - Add Intel Snow Ridge, Xeon D-2100 devices. + - Add Intel I226 devices. + - Add the VIA VX800 chipset devices and S3 chrome 500 series GPU. + - Fix description of Intel 0x37d0. + [msaitoh, ticket #333] +
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Aug 21 12:27:19 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-10]: pcidevs.h pcidevs_data.h Log Message: regen (for ticket #333) To generate a diff of this commit: cvs rdiff -u -r1.1452.2.5 -r1.1452.2.6 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1451.2.5 -r1.1451.2.6 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-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Aug 21 12:27:19 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-10]: pcidevs.h pcidevs_data.h Log Message: regen (for ticket #333) To generate a diff of this commit: cvs rdiff -u -r1.1452.2.5 -r1.1452.2.6 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1451.2.5 -r1.1451.2.6 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: Mon Aug 21 12:26:12 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-10]: pcidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #333): sys/dev/pci/pcidevs: revision 1.1483-1.1492 Add AMD 19h/7xh Root Complex. pcidevs: add ASMedia ASM106x Add Intel Snow Ridge devices. Fix some descriptions of Intel Snow Ridge. Add Intel I226 devices. Add device ids of the VX800 chipset and s3 chrome 500 series GPU. Descriptions mainly aligned with VX800/820 Series System Programming Manual. fix duplicate definition. Add some Intel Xeon D-2100 devices. Fix description of Intel 0x37d0. Simplify descriptions of Snow Ridge internal Ethernet devices. Rename PCI to PCIE for naming consistency. To generate a diff of this commit: cvs rdiff -u -r1.1471.2.4 -r1.1471.2.5 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-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Aug 21 12:26:12 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-10]: pcidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #333): sys/dev/pci/pcidevs: revision 1.1483-1.1492 Add AMD 19h/7xh Root Complex. pcidevs: add ASMedia ASM106x Add Intel Snow Ridge devices. Fix some descriptions of Intel Snow Ridge. Add Intel I226 devices. Add device ids of the VX800 chipset and s3 chrome 500 series GPU. Descriptions mainly aligned with VX800/820 Series System Programming Manual. fix duplicate definition. Add some Intel Xeon D-2100 devices. Fix description of Intel 0x37d0. Simplify descriptions of Snow Ridge internal Ethernet devices. Rename PCI to PCIE for naming consistency. To generate a diff of this commit: cvs rdiff -u -r1.1471.2.4 -r1.1471.2.5 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.1471.2.4 src/sys/dev/pci/pcidevs:1.1471.2.5 --- src/sys/dev/pci/pcidevs:1.1471.2.4 Sat Jul 29 10:26:20 2023 +++ src/sys/dev/pci/pcidevs Mon Aug 21 12:26:12 2023 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1471.2.4 2023/07/29 10:26:20 martin Exp $ +$NetBSD: pcidevs,v 1.1471.2.5 2023/08/21 12:26:12 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1100,6 +1100,7 @@ product AMD F19_6X_DF_4 0x14e4 19h/6xh product AMD F19_6X_DF_5 0x14e5 19h/6xh Data Fabric 5 product AMD F19_6X_DF_6 0x14e6 19h/6xh Data Fabric 6 product AMD F19_6X_DF_7 0x14e7 19h/6xh Data Fabric 7 +product AMD F19_7X_RC 0x14e8 19h/7xh Root Complex product AMD F17_AX_XHCI_0 0x1503 17h/Axh USB 3.1 xHCI product AMD F17_AX_XHCI_1 0x1504 17h/Axh USB 3.1 xHCI product AMD F17_AX_USB_BIOM 0x1505 17h/Axh Secure USB BIOmetric @@ -1509,6 +1510,7 @@ product ASMEDIA ASM1061_01 0x0601 ASM106 product ASMEDIA ASM1061_02 0x0602 ASM1061 AHCI SATA III Controller product ASMEDIA ASM1061_11 0x0611 ASM1061 AHCI SATA III Controller product ASMEDIA ASM1061_12 0x0612 ASM1061 AHCI SATA III Controller +product ASMEDIA ASM106X 0x0625 ASM106x AHCI SATA III Controller product ASMEDIA ASM1042 0x1042 ASM1042 USB 3.0 Host Controller product ASMEDIA ASM1083 0x1080 ASM1083/1085 PCIe-PCI Bridge product ASMEDIA ASM1042A 0x1142 ASM1042A USB 3.0 Host Controller @@ -3875,6 +3877,13 @@ product INTEL WIFI_LINK_7265_2 0x095b Du product INTEL X1000_LB 0x095e Quark X1000 Legacy Bridge product INTEL 80960RM 0x0962 i960 RM PCI-PCI product INTEL 80960RN 0x0964 i960 RN PCI-PCI +product INTEL SNR_IEH 0x0998 Snow Ridge IEH +product INTEL SNR_M2IIO_VTD 0x09a2 Snow Ridge Mesh2IIO MMAP/VT-d +product INTEL SNR_M2IIO_RAS 0x09a3 Snow Ridge Mesh2IIO RAS +product INTEL SNR_M2IIO_PMU 0x09a4 Snow Ridge Mesh2IIO PMU/PMON +product INTEL SNR_M2IIO_DFX 0x09a5 Snow Ridge Mesh2IIO DFx +product INTEL SNR_PECI_OOB_MSM 0x09a6 Snow Ridge PECI OOB-MSM +product INTEL SNR_PECI_OOB_MSM_PMU 0x09a7 Snow Ridge PECI OOB-MSM PMU product INTEL CORE4G_D_ULT_GT1 0x0a02 HD Graphics product INTEL CORE4G_M_HOST_DRAM 0x0a04 Core 4G (mobile) Host Bridge, DRAM product INTEL CORE4G_M_ULT_GT1 0x0a06 HD Graphics (GT1) @@ -3895,6 +3904,7 @@ product INTEL CORE4G_R_ULT_GT3_2 0x0a2e product INTEL DC_P3520_SSD 0x0a53 SSD DC P3520 product INTEL DC_P4500_SSD 0x0a54 SSD DC P4500 product INTEL DC_P4600_SSD 0x0a55 SSD DC P4600 +product INTEL SNR_DMA 0x0b00 Snow Ridge DMA product INTEL HASWELL_HOST_DRAM 0x0c00 Haswell Host Bridge, DRAM product INTEL HASWELL_PCIE16 0x0c01 Haswell PCI-E x16 Controller product INTEL HASWELL_PCIE8 0x0c05 Haswell PCI-E x8 Controller @@ -4236,6 +4246,9 @@ product INTEL 82441FX 0x1237 82441FX (P product INTEL 82380AB 0x123c 82380AB (MISA) Mobile PCI-ISA Bridge product INTEL 82380FB 0x124b 82380FB (MPCI2) Mobile PCI-PCI Bridge product INTEL 82439HX 0x1250 82439HX (TXC) System Controller +product INTEL I226_LM 0x125b I226-LM Ethernet +product INTEL I226_V 0x125c I226-V Ethernet +product INTEL I226_IT 0x125d I226-IT Ethernet product INTEL C3K_X553_10G 0x1306 C3000 X553 10G Ethernet product INTEL C3K_X553_1G 0x1307 C3000 X553 1G Ethernet product INTEL 82870P2_PPB 0x1460 82870P2 P64H2 PCI-PCI Bridge @@ -4376,6 +4389,43 @@ product INTEL CORE5G_M_GT2_1 0x1616 HD G product INTEL CORE5G_M_GT2_2 0x161e HD Graphics 5300 product INTEL CORE5G_M_GT3_15W 0x1626 HD Graphics 6000 product INTEL CORE5G_M_GT3_28W 0x162b Iris Graphics 6100 +product INTEL SNR_E882_C_BP 0x1890 E882-C for backplane +product INTEL SNR_E882_C_QSFP 0x1891 E882-C for QSFP +product INTEL SNR_E882_C_SFP 0x1892 E882-C for SFP +product INTEL SNR_E882_C_10GT 0x1893 E882-C/X557-AT 10GBASE-T +product INTEL SNR_E882_C_1G 0x1894 E882-C 1G +product INTEL SNR_E882_X 0x1895 E882-X (for BMSM) +product INTEL SNR_E882_L_BP 0x1897 E882-L for backplane +product INTEL SNR_E882_L_SFP 0x1898 E882-L for SFP +product INTEL SNR_E882_L_10GT
CVS commit: [netbsd-9] src/sys/net/npf
Module Name:src Committed By: martin Date: Mon Aug 21 12:20:07 UTC 2023 Modified Files: src/sys/net/npf [netbsd-9]: npf_tableset.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1718): sys/net/npf/npf_tableset.c: revision 1.41 npf(9): Drop table lock around copyout. It is forbidden to hold a spin lock around copyout, and t_lock is a spin lock. We need t_lock in order to iterate over the list of entries. However, during copyout itself, we only need to ensure that the object we're copying out isn't freed by npf_table_remove or npf_table_gc. Fortunately, the only caller of npf_table_list, npf_table_remove, and npf_table_gc is npfctl_table, and it serializes all of them by the npf config lock. So we can safely drop t_lock across copyout. PR kern/57136 PR kern/57181 To generate a diff of this commit: cvs rdiff -u -r1.33.2.2 -r1.33.2.3 src/sys/net/npf/npf_tableset.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/net/npf
Module Name:src
Committed By: martin
Date: Mon Aug 21 12:20:07 UTC 2023
Modified Files:
src/sys/net/npf [netbsd-9]: npf_tableset.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1718):
sys/net/npf/npf_tableset.c: revision 1.41
npf(9): Drop table lock around copyout.
It is forbidden to hold a spin lock around copyout, and t_lock is a
spin lock.
We need t_lock in order to iterate over the list of entries.
However, during copyout itself, we only need to ensure that the
object we're copying out isn't freed by npf_table_remove or
npf_table_gc.
Fortunately, the only caller of npf_table_list, npf_table_remove, and
npf_table_gc is npfctl_table, and it serializes all of them by the
npf config lock. So we can safely drop t_lock across copyout.
PR kern/57136
PR kern/57181
To generate a diff of this commit:
cvs rdiff -u -r1.33.2.2 -r1.33.2.3 src/sys/net/npf/npf_tableset.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf_tableset.c
diff -u src/sys/net/npf/npf_tableset.c:1.33.2.2 src/sys/net/npf/npf_tableset.c:1.33.2.3
--- src/sys/net/npf/npf_tableset.c:1.33.2.2 Sat Jun 20 15:46:47 2020
+++ src/sys/net/npf/npf_tableset.c Mon Aug 21 12:20:07 2023
@@ -46,7 +46,7 @@
#ifdef _KERNEL
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_tableset.c,v 1.33.2.2 2020/06/20 15:46:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_tableset.c,v 1.33.2.3 2023/08/21 12:20:07 martin Exp $");
#include
#include
@@ -758,15 +758,17 @@ table_ent_copyout(const npf_addr_t *addr
}
static int
-table_generic_list(const npf_table_t *t, void *ubuf, size_t len)
+table_generic_list(npf_table_t *t, void *ubuf, size_t len)
{
npf_tblent_t *ent;
size_t off = 0;
int error = 0;
LIST_FOREACH(ent, >t_list, te_listent) {
+ mutex_exit(>t_lock);
error = table_ent_copyout(>te_addr,
ent->te_alen, ent->te_preflen, ubuf, len, );
+ mutex_enter(>t_lock);
if (error)
break;
}
CVS commit: [netbsd-10] src/sys/net/npf
Module Name:src
Committed By: martin
Date: Mon Aug 21 12:18:17 UTC 2023
Modified Files:
src/sys/net/npf [netbsd-10]: npf_tableset.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #332):
sys/net/npf/npf_tableset.c: revision 1.41
npf(9): Drop table lock around copyout.
It is forbidden to hold a spin lock around copyout, and t_lock is a
spin lock.
We need t_lock in order to iterate over the list of entries.
However, during copyout itself, we only need to ensure that the
object we're copying out isn't freed by npf_table_remove or
npf_table_gc.
Fortunately, the only caller of npf_table_list, npf_table_remove, and
npf_table_gc is npfctl_table, and it serializes all of them by the
npf config lock. So we can safely drop t_lock across copyout.
PR kern/57136
PR kern/57181
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.38.4.1 src/sys/net/npf/npf_tableset.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf_tableset.c
diff -u src/sys/net/npf/npf_tableset.c:1.38 src/sys/net/npf/npf_tableset.c:1.38.4.1
--- src/sys/net/npf/npf_tableset.c:1.38 Sat Apr 9 23:38:33 2022
+++ src/sys/net/npf/npf_tableset.c Mon Aug 21 12:18:17 2023
@@ -46,7 +46,7 @@
#ifdef _KERNEL
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_tableset.c,v 1.38 2022/04/09 23:38:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_tableset.c,v 1.38.4.1 2023/08/21 12:18:17 martin Exp $");
#include
#include
@@ -762,15 +762,17 @@ table_ent_copyout(const npf_addr_t *addr
}
static int
-table_generic_list(const npf_table_t *t, void *ubuf, size_t len)
+table_generic_list(npf_table_t *t, void *ubuf, size_t len)
{
npf_tblent_t *ent;
size_t off = 0;
int error = 0;
LIST_FOREACH(ent, >t_list, te_listent) {
+ mutex_exit(>t_lock);
error = table_ent_copyout(>te_addr,
ent->te_alen, ent->te_preflen, ubuf, len, );
+ mutex_enter(>t_lock);
if (error)
break;
}
CVS commit: [netbsd-10] src/sys/net/npf
Module Name:src Committed By: martin Date: Mon Aug 21 12:18:17 UTC 2023 Modified Files: src/sys/net/npf [netbsd-10]: npf_tableset.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #332): sys/net/npf/npf_tableset.c: revision 1.41 npf(9): Drop table lock around copyout. It is forbidden to hold a spin lock around copyout, and t_lock is a spin lock. We need t_lock in order to iterate over the list of entries. However, during copyout itself, we only need to ensure that the object we're copying out isn't freed by npf_table_remove or npf_table_gc. Fortunately, the only caller of npf_table_list, npf_table_remove, and npf_table_gc is npfctl_table, and it serializes all of them by the npf config lock. So we can safely drop t_lock across copyout. PR kern/57136 PR kern/57181 To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.38.4.1 src/sys/net/npf/npf_tableset.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/sbin/dump
Module Name:src
Committed By: martin
Date: Mon Aug 21 12:14:23 UTC 2023
Modified Files:
src/sbin/dump [netbsd-9]: optr.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #1717):
sbin/dump/optr.c: revision 1.44
Silently ignore fstab entries with NAME= entries that cannot be resolved.
Fixes PR 56249.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.43.2.1 src/sbin/dump/optr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/dump/optr.c
diff -u src/sbin/dump/optr.c:1.43 src/sbin/dump/optr.c:1.43.2.1
--- src/sbin/dump/optr.c:1.43 Fri Mar 1 16:42:11 2019
+++ src/sbin/dump/optr.c Mon Aug 21 12:14:23 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: optr.c,v 1.43 2019/03/01 16:42:11 christos Exp $ */
+/* $NetBSD: optr.c,v 1.43.2.1 2023/08/21 12:14:23 martin Exp $ */
/*-
* Copyright (c) 1980, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)optr.c 8.2 (Berkeley) 1/6/94";
#else
-__RCSID("$NetBSD: optr.c,v 1.43 2019/03/01 16:42:11 christos Exp $");
+__RCSID("$NetBSD: optr.c,v 1.43.2.1 2023/08/21 12:14:23 martin Exp $");
#endif
#endif /* not lint */
@@ -344,9 +344,10 @@ allocfsent(const struct fstab *fs)
new->fs_file = xstrdup(fs->fs_file);
new->fs_type = xstrdup(fs->fs_type);
new->fs_spec = xmalloc(FILENAME_MAX);
- if (getfsspecname(new->fs_spec, FILENAME_MAX, fs->fs_spec) == NULL)
- quite(errno, "can't resolve mount point %s (%s)",
- fs->fs_spec, new->fs_spec);
+ if (getfsspecname(new->fs_spec, FILENAME_MAX, fs->fs_spec) == NULL) {
+ free(new);
+ return NULL;
+ }
new->fs_passno = fs->fs_passno;
new->fs_freq = fs->fs_freq;
return new;
@@ -384,6 +385,9 @@ getfstab(void)
continue;
#endif
fs = allocfsent(fs);
+ if (fs == NULL)
+ continue;
+
pf = (struct pfstab *)xmalloc(sizeof (*pf));
pf->pf_fstab = fs;
SLIST_INSERT_HEAD(, pf, pf_list);
CVS commit: [netbsd-9] src/sbin/dump
Module Name:src Committed By: martin Date: Mon Aug 21 12:14:23 UTC 2023 Modified Files: src/sbin/dump [netbsd-9]: optr.c Log Message: Pull up following revision(s) (requested by manu in ticket #1717): sbin/dump/optr.c: revision 1.44 Silently ignore fstab entries with NAME= entries that cannot be resolved. Fixes PR 56249. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.43.2.1 src/sbin/dump/optr.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/usr.sbin/sysinst/arch/luna68k
Module Name:src
Committed By: martin
Date: Mon Aug 21 11:05:54 UTC 2023
Modified Files:
src/usr.sbin/sysinst/arch/luna68k [netbsd-10]: md.c md.h
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #331):
usr.sbin/sysinst/arch/luna68k/md.c: revision 1.11
usr.sbin/sysinst/arch/luna68k/md.h: revision 1.7
PR 55058: force the boot partition to sd0d, so our root partitions becomes
sd0a again.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 src/usr.sbin/sysinst/arch/luna68k/md.c
cvs rdiff -u -r1.6 -r1.6.2.1 src/usr.sbin/sysinst/arch/luna68k/md.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/arch/luna68k/md.c
diff -u src/usr.sbin/sysinst/arch/luna68k/md.c:1.10 src/usr.sbin/sysinst/arch/luna68k/md.c:1.10.2.1
--- src/usr.sbin/sysinst/arch/luna68k/md.c:1.10 Sat Jan 29 16:01:19 2022
+++ src/usr.sbin/sysinst/arch/luna68k/md.c Mon Aug 21 11:05:54 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.10 2022/01/29 16:01:19 martin Exp $ */
+/* $NetBSD: md.c,v 1.10.2.1 2023/08/21 11:05:54 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -117,6 +117,23 @@ md_make_bsd_partitions(struct install_pa
return make_bsd_partitions(install);
}
+static part_id
+find_boot_part(struct install_partition_desc *install)
+{
+ for (size_t i = 0; i < install->num; i++) {
+ if (install->infos[i].fs_type != PART_BOOT_TYPE)
+ continue;
+ if (install->infos[i].fs_version != PART_BOOT_SUBT)
+ continue;
+ if (install->infos[i].size < (PART_BOOT/512))
+ continue;
+ if (install->infos[i].cur_start > 0)
+ continue;
+ return i;
+ }
+ return NO_PART;
+}
+
/*
* any additional partition validation
*/
@@ -128,14 +145,12 @@ md_check_partitions(struct install_parti
* Make sure that a boot partition (old 4.3BSD UFS) is prepared
* properly for our native bootloader.
*/
- if (install->num < 1 || install->infos[0].fs_type != PART_BOOT_TYPE ||
- install->infos[0].fs_version != PART_BOOT_SUBT ||
- !(install->infos[0].instflags & PUIINST_NEWFS)) {
- msg_display(MSG_nobootpartdisklabel);
- process_menu(MENU_ok, NULL);
- return false;
- }
- return true;
+ if (find_boot_part(install) != NO_PART)
+ return true;
+
+ msg_display(MSG_nobootpartdisklabel);
+ process_menu(MENU_ok, NULL);
+ return false;
}
/*
@@ -187,16 +202,19 @@ int
md_post_newfs(struct install_partition_desc *install)
{
char rdisk[STRSIZE], disk[STRSIZE];
+ part_id boot_part = find_boot_part(install);
- if (install->num < 1)
+ if (boot_part == NO_PART)
return 1;
- if (!install->infos[0].parts->pscheme->get_part_device(
- install->infos[0].parts, install->infos[0].cur_part_id,
+ if (!install->infos[boot_part].parts->pscheme->get_part_device(
+ install->infos[boot_part].parts,
+ install->infos[boot_part].cur_part_id,
rdisk, sizeof rdisk, NULL, raw_dev_name, true, true))
return 1;
- if (!install->infos[0].parts->pscheme->get_part_device(
- install->infos[0].parts, install->infos[0].cur_part_id,
+ if (!install->infos[boot_part].parts->pscheme->get_part_device(
+ install->infos[boot_part].parts,
+ install->infos[boot_part].cur_part_id,
disk, sizeof disk, NULL, plain_name, true, true))
return 1;
@@ -240,12 +258,14 @@ md_update(struct install_partition_desc
struct stat sb;
bool hasboot = false;
char disk[STRSIZE];
+ part_id boot_part = find_boot_part(install);
- if (install->num < 1)
+ if (boot_part == NO_PART)
return 0;
- if (!install->infos[0].parts->pscheme->get_part_device(
- install->infos[0].parts, install->infos[0].cur_part_id,
+ if (!install->infos[boot_part].parts->pscheme->get_part_device(
+ install->infos[boot_part].parts,
+ install->infos[boot_part].cur_part_id,
disk, sizeof disk, NULL, plain_name, true, true))
return 0;
@@ -288,4 +308,3 @@ md_gpt_post_write(struct disk_partitions
return true;
}
#endif
-
Index: src/usr.sbin/sysinst/arch/luna68k/md.h
diff -u src/usr.sbin/sysinst/arch/luna68k/md.h:1.6 src/usr.sbin/sysinst/arch/luna68k/md.h:1.6.2.1
--- src/usr.sbin/sysinst/arch/luna68k/md.h:1.6 Fri Jun 17 16:09:47 2022
+++ src/usr.sbin/sysinst/arch/luna68k/md.h Mon Aug 21 11:05:54 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.6 2022/06/17 16:09:47 tsutsui Exp $ */
+/* $NetBSD: md.h,v 1.6.2.1 2023/08/21 11:05:54 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -64,3 +64,15 @@
* the hand-edited disklabel will NOT be written by MI code.
*/
#define DISKLABEL_CMD "disklabel -w -r"
+
+/*
+ * Our boot partition is FFSv1, so it will be reported as PT_root
+ * and might take up disklabel slot 0 (partition 'a'), which we would
+ * like to avoid and make it use 'd' instead.
+ * Only allow PT_root partitions for slots before RAW_PART if they
+ * start past the boot partition size.
+ */
+#define
CVS commit: [netbsd-10] src/usr.sbin/sysinst/arch/luna68k
Module Name:src Committed By: martin Date: Mon Aug 21 11:05:54 UTC 2023 Modified Files: src/usr.sbin/sysinst/arch/luna68k [netbsd-10]: md.c md.h Log Message: Pull up following revision(s) (requested by tsutsui in ticket #331): usr.sbin/sysinst/arch/luna68k/md.c: revision 1.11 usr.sbin/sysinst/arch/luna68k/md.h: revision 1.7 PR 55058: force the boot partition to sd0d, so our root partitions becomes sd0a again. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.2.1 src/usr.sbin/sysinst/arch/luna68k/md.c cvs rdiff -u -r1.6 -r1.6.2.1 src/usr.sbin/sysinst/arch/luna68k/md.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
Module Name:src
Committed By: martin
Date: Mon Aug 21 10:57:07 UTC 2023
Modified Files:
src/sys/dev [netbsd-9]: vnd.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1716):
sys/dev/vnd.c: revision 1.289
Neither limit the number of requests for the page daemon.
Otherwise you may deadlock when the backend needs to allocate
memory and the page daemon needs to flush dirty vnd buffers.
See PR 57421 for details.
To generate a diff of this commit:
cvs rdiff -u -r1.272.4.1 -r1.272.4.2 src/sys/dev/vnd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/vnd.c
diff -u src/sys/dev/vnd.c:1.272.4.1 src/sys/dev/vnd.c:1.272.4.2
--- src/sys/dev/vnd.c:1.272.4.1 Wed Mar 15 18:43:28 2023
+++ src/sys/dev/vnd.c Mon Aug 21 10:57:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.272.4.1 2023/03/15 18:43:28 martin Exp $ */
+/* $NetBSD: vnd.c,v 1.272.4.2 2023/08/21 10:57:07 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.272.4.1 2023/03/15 18:43:28 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.272.4.2 2023/08/21 10:57:07 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -122,6 +122,8 @@ __KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.27
#include
#include
+#include
+
#include
#include
@@ -558,7 +560,7 @@ vndstrategy(struct buf *bp)
* thread to add requests, as a wedge on vnd queues
* requests with biodone() -> dkstart() -> vndstrategy().
*/
- if (curlwp != vnd->sc_kthread) {
+ if (curlwp != vnd->sc_kthread && curlwp != uvm.pagedaemon_lwp) {
while (vnd->sc_pending >= VND_MAXPENDING(vnd))
tsleep(>sc_pending, PRIBIO, "vndpc", 0);
}
CVS commit: [netbsd-9] src/sys/dev
Module Name:src Committed By: martin Date: Mon Aug 21 10:57:07 UTC 2023 Modified Files: src/sys/dev [netbsd-9]: vnd.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1716): sys/dev/vnd.c: revision 1.289 Neither limit the number of requests for the page daemon. Otherwise you may deadlock when the backend needs to allocate memory and the page daemon needs to flush dirty vnd buffers. See PR 57421 for details. To generate a diff of this commit: cvs rdiff -u -r1.272.4.1 -r1.272.4.2 src/sys/dev/vnd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: nia Date: Mon Aug 21 10:10:40 UTC 2023 Modified Files: src/doc: CHANGES Log Message: doc: ch-ch-changes To generate a diff of this commit: cvs rdiff -u -r1.2994 -r1.2995 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2994 src/doc/CHANGES:1.2995 --- src/doc/CHANGES:1.2994 Fri Aug 18 19:02:04 2023 +++ src/doc/CHANGES Mon Aug 21 10:10:39 2023 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2994 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2995 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -193,10 +193,38 @@ Changes from NetBSD 10.0 to NetBSD 11.0: x86: Add serial console support to efiboot via raw I/O port access. [rin 20230724] x86: Turn off Zenbleed chicken bit on Zen2 CPUs. [mrg 20230725] + evbmips: Allow ramdisk to handle GPT wedges. [gutteridge 20230725] + xbd(4): Properly handle 4k sector size backends. [bouyer 20230725] OpenSSH: Import 9.3. [christos 20230726] + iostat(8): Add -X option, limited alternative statistics. + This is like the "-D" option, except it skips the xfers/s, and + reports MB/s instead of KB/s. Allows for ~50% more devices to + be displayed per line by default. [mrg 20230728] + compat_linux(8): Add epoll system calls implemented around kqueue(2), + contributed by Theodore Preduta as part of GSoC 2023. + [christos 20230728] + compat_linux(8): Add/fix statx, readahead, close_range. From GSoC 2023 + by Theodore Preduta. [christos 20230729] + libc: Add wmempcpy(3). [christos 20230731] + libc: Add companion mempcpy(3) to wmempcpy(3). + [christos 20230801] + u3g(4): Add support for D-Link DWM-222 4G LTS USB adapter. + [manu 20230804] + amd64: Build legacy VIA DRM UMS driver module by default, + this allows basic acceleration on VIA integrated graphics + with modload(8) viadrmums. [andvar 20230809] + all: Fix many small bugs found by GCC 12. [mrg 20230810] gdb(1): Updated to 13.2. [christos 20230811] libfido2: Import 1.13.0 [christos 20230811] + vis(3): Fixed many implementation issues, expand tests. + [riastradh 20230812] libpcap: Import 1.10.4. [christos 20230817] tcpdump(8): Import 4.99.4. [christos 20230817] file(1): Upgraded to 5.45. [christos 20230818] - + make(1): Show more detail in "invalid line" error messages. + [rillig 20230819] + compat_linux(8): Add support for Linux waitid syscall. + Contributed by Theodore Preduta. [christos 20230818] + compat_linux(8): Add support for Linux inotify syscalls, + implemented around kqueue(2). Contributed by + Theodore Preduta. [christos 20230819]
CVS commit: src/doc
Module Name:src Committed By: nia Date: Mon Aug 21 10:10:40 UTC 2023 Modified Files: src/doc: CHANGES Log Message: doc: ch-ch-changes To generate a diff of this commit: cvs rdiff -u -r1.2994 -r1.2995 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: martin Date: Mon Aug 21 09:54:07 UTC 2023 Modified Files: src/distrib/sets/lists/debug: md.amd64 Log Message: Remove the compat linux (linux binaries) helpers *.debug files - they are not installed (and probably would be useless if they were) To generate a diff of this commit: cvs rdiff -u -r1.120 -r1.121 src/distrib/sets/lists/debug/md.amd64 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/md.amd64 diff -u src/distrib/sets/lists/debug/md.amd64:1.120 src/distrib/sets/lists/debug/md.amd64:1.121 --- src/distrib/sets/lists/debug/md.amd64:1.120 Sun Aug 20 12:27:02 2023 +++ src/distrib/sets/lists/debug/md.amd64 Mon Aug 21 09:54:07 2023 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.120 2023/08/20 12:27:02 riastradh Exp $ +# $NetBSD: md.amd64,v 1.121 2023/08/21 09:54:07 martin Exp $ ./usr/libdata/debug/usr/bin/gdbserver.debug base-util-debug gdb,debug ./usr/lib/i386/12.202++_g.a comp-c-debuglib debuglib,compat,12.202xx ./usr/lib/i386/libi386_g.a comp-c-debuglib debuglib,compat @@ -17,10 +17,6 @@ ./usr/libdata/debug/usr/lib/libx86_64.so.0.0.debug comp-sys-shlib pic,debug ./usr/libdata/debug/usr/libexec/ld.elf_so-i386 comp-obsolete obsolete ./usr/libdata/debug/usr/libexec/ld.elf_so-i386.debug comp-sys-debug debug,compat -./usr/libdata/debug/usr/tests/compat/linux/h_inotify_init.debug tests-sys-debug debug,atf,compattestfile -./usr/libdata/debug/usr/tests/compat/linux/h_inotify_directory.debug tests-sys-debug debug,atf,compattestfile -./usr/libdata/debug/usr/tests/compat/linux/h_inotify_single_file.debug tests-sys-debug debug,atf,compattestfile -./usr/libdata/debug/usr/tests/compat/linux/h_inotify_watch_change.debug tests-sys-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait3.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait4.debug tests-obsolete obsolete
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: martin Date: Mon Aug 21 09:54:07 UTC 2023 Modified Files: src/distrib/sets/lists/debug: md.amd64 Log Message: Remove the compat linux (linux binaries) helpers *.debug files - they are not installed (and probably would be useless if they were) To generate a diff of this commit: cvs rdiff -u -r1.120 -r1.121 src/distrib/sets/lists/debug/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
