Re: CVS commit: src/usr.sbin/acpitools/acpidump
On 2021/09/15 8:30, Jason Thorpe wrote: On Sep 14, 2021, at 1:34 PM, Roland Illig wrote: When lint runs on the code, it defines the preprocessor macro 'lint' to be 1. Due to that, this name cannot be used as a regular identifier. Perhaps all of the "#ifdef lint" conditions should become "#ifdef __lint__"? Agreed. lint should not pollute public namespace. Thanks, rin
Re: CVS commit: src/sys
Hi,
For alpha, I've observed similar failure with rev 1.104; savecore fails and
panic occurs in pagedaemon after that.
Thanks,
rin
# /etc/rc.d/savecore onestart
Checking for core dump...
savecore: (null): kvm_nlist: bad namelist
savecore: (null): _dumpdev not in namelist
# dd if=/dev/zero of=/dev/null bs=2g
[ 727.7471213] CPU 0: fatal kernel trap:
^
[ 727.7946544] CPU 0trap entry = 0x2 (memory management fault)
[ 727.8653781] CPU 0a0 = 0x73
[ 727.9101025] CPU 0a1 = 0x1
[ 727.9537858] CPU 0a2 = 0x0
[ 727.9974700] CPU 0pc = 0xfca68898
[ 728.0567529] CPU 0ra = 0xfc00010b9598
[ 728.1160375] CPU 0pv = 0xfca68864
[ 728.1753220] CPU 0curlwp = 0xfc007f58e5c0
[ 728.2346053] CPU 0pid = 0, comm = system
[ 728.2907705] panic: trap
[ 728.3198911] cpu0: Begin traceback...
[ 728.3625359] alpha trace requires known PC =eject=
[ 728.4187019] cpu0: End traceback...
Stopped in pid 0.111 (system) atnetbsd:cpu_Debugger+0x4:ret
zero,(ra)
db{0}> bt
cpu_Debugger() at netbsd:cpu_Debugger+0x4
db_panic() at netbsd:db_panic+0xc8
vpanic() at netbsd:vpanic+0x108
panic() at netbsd:panic+0x58
trap() at netbsd:trap+0xb00
XentMM() at netbsd:XentMM+0x20
--- memory management fault (from ipl 0) ---
rw_tryenter() at netbsd:rw_tryenter+0x34
uvmpd_trylockowner() at netbsd:uvmpd_trylockowner+0x68
uvmpdpol_balancequeue() at netbsd:uvmpdpol_balancequeue+0x1b4
uvm_pageout() at netbsd:uvm_pageout+0x714
--- kernel thread backstop ---
db{0}>
On 2021/09/15 22:12, Rin Okuyama wrote:
On 2021/09/15 21:55, Taylor R Campbell wrote:
Date: Wed, 15 Sep 2021 19:58:20 +0900
From: Rin Okuyama
login: [ 95.5000696] panic: kernel diagnostic assertion "slock != NULL" failed: file
"../../../../uvm/uvm_pdaemon.c", line 398 pg 0x8c66bd88 uobj 0x8fa7e400, NULL lock
[...]
It seems that I can avoid this panic if
- revert kern_ksyms.c to rev 1.98 (*), *or*
- set savecore=NO in rc.conf.
(*) I've not tested revs 1.99--1.103.
Can you please take a look into?
Interesting. I'm not sure what's going on here. The uvm panic looks
like a compounded symptom rather than the original problem.
Can you try booting with savecore=NO and see if `cat /dev/ksyms' or
`nm /dev/ksyms' works?
Can you also try rev. 1.103 and see if that makes a difference, just
to narrow it down? (No point in trying the other revisions. Unlikely
that 1.103 will work if 1.104 doesn't, but will help to confidently
narrow it down.)
'nm /dev/ksyms' works fine for 1.104. Also, panic does not occur after that,
as far as I can see.
For 1.103, savecore does not work and panic occurs during multiuser boot with
savecore=YES in the same manner as for 1.104. On the other hand,
'nm /dev/ksyms' works fine.
For 1.102 (== 1.98), whereas savecore works, nm complains as:
# nm /dev/ksyms
nm: warning: /dev/ksyms has a corrupt section with a size (18) larger than the
file size
nm: warning: /dev/ksyms has a corrupt section with a size (4a560) larger than
the file size
nm: warning: /dev/ksyms has a corrupt section with a size (46de5) larger than
the file size
nm: warning: /dev/ksyms has a corrupt section with a size (40) larger than the
file size
8c38fec8 t C.7
8c3e5b08 t CSWTCH.118
...
Thanks,
rin
CVS commit: src/external/bsd/compiler_rt/lib/clang/lib/netbsd
Module Name:src Committed By: christos Date: Fri Sep 17 02:18:05 UTC 2021 Modified Files: src/external/bsd/compiler_rt/lib/clang/lib/netbsd: common.mk src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m32: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m32: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m32: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m32: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/dd-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/dyndd-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer_no_main-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-dynamic-m32: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-dynamic-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m32: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-dynamic-m32: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-dynamic-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m32: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m32: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-basic-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-fdr-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64: Makefile Log Message: - get the version dynamically - move more common stuff into common.mk To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m32/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m64/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m32/Makefile cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m32/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m64/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m32/Makefile cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/dd-m64/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/dyndd-m64/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer-m64/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer_no_main-m64/Makefile cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile cvs rdiff -u -r1.2 -r1.3 \
CVS commit: src/external/bsd/compiler_rt/lib/clang/lib/netbsd
Module Name:src Committed By: christos Date: Fri Sep 17 02:18:05 UTC 2021 Modified Files: src/external/bsd/compiler_rt/lib/clang/lib/netbsd: common.mk src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m32: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m32: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m32: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m32: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/dd-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/dyndd-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer_no_main-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-dynamic-m32: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-dynamic-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m32: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-dynamic-m32: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-dynamic-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m32: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m32: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-basic-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-fdr-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-m64: Makefile src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64: Makefile Log Message: - get the version dynamically - move more common stuff into common.mk To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m32/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-dynamic-m64/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m32/Makefile cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m32/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-preinit-m64/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m32/Makefile cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/dd-m64/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/dyndd-m64/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer-m64/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/fuzzer_no_main-m64/Makefile cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/safestack-m32/Makefile cvs rdiff -u -r1.2 -r1.3 \
CVS commit: src/lib
Module Name:src
Committed By: christos
Date: Fri Sep 17 02:12:17 UTC 2021
Modified Files:
src/lib: checkver
Log Message:
Robustness fix: handle libraries that contain . in their basename.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/checkver
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/checkver
diff -u src/lib/checkver:1.16 src/lib/checkver:1.17
--- src/lib/checkver:1.16 Sat Feb 16 21:36:21 2013
+++ src/lib/checkver Thu Sep 16 22:12:16 2021
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: checkver,v 1.16 2013/02/17 02:36:21 christos Exp $
+# $NetBSD: checkver,v 1.17 2021/09/17 02:12:16 christos Exp $
#
# Copyright (c) 1998 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -96,11 +96,17 @@ usedir=0
usefile=0
usesets=0
CWD=$(pwd)
+: ${AWK:=awk}
fixone() {
- local instmajor=$(basename $1 | awk 'BEGIN { FS="." } { print $3 }')
- local instminor=$(basename $1 | awk 'BEGIN { FS="." } { print $4 }')
- local instteeny=$(basename $1 | awk 'BEGIN { FS="." } { print $5 + 0 }')
+ eval $(${AWK} -v 'LIB=$1' '
+BEGIN {
+ gsub(".*\.so\.", "", LIB);
+ split(LIB, VER, ".");
+ printf("local instmajor=%d\n", V[1] + 0);
+ printf("local instminor=%d\n", V[2] + 0);
+ printf("local instteeny=%d\n", V[3] + 0);
+}')
local ms="The following libraries have versions greater than the source"
# If they're greater than the source, complain.
CVS commit: src/lib
Module Name:src Committed By: christos Date: Fri Sep 17 02:12:17 UTC 2021 Modified Files: src/lib: checkver Log Message: Robustness fix: handle libraries that contain . in their basename. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/lib/checkver Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: christos Date: Thu Sep 16 23:32:50 UTC 2021 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: md.amd64 md.i386 mi src/etc/mtree: NetBSD.dist.base src/external/bsd/compiler_rt/lib/clang/lib/netbsd: common.mk src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64: Makefile Log Message: Move the sanitizer libraries from 9.0.0 -> 13.0.0 to match our current clang version. To generate a diff of this commit: cvs rdiff -u -r1.1281 -r1.1282 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.287 -r1.288 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.203 -r1.204 src/distrib/sets/lists/comp/md.i386 cvs rdiff -u -r1.2391 -r1.2392 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.237 -r1.238 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/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/base/mi diff -u src/distrib/sets/lists/base/mi:1.1281 src/distrib/sets/lists/base/mi:1.1282 --- src/distrib/sets/lists/base/mi:1.1281 Mon Aug 16 02:56:28 2021 +++ src/distrib/sets/lists/base/mi Thu Sep 16 19:32:49 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1281 2021/08/16 06:56:28 mrg Exp $ +# $NetBSD: mi,v 1.1282 2021/09/16 23:32:49 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1336,14 +1336,20 @@ ./usr/lib/clang/7.0.0/lib base-obsolete obsolete ./usr/lib/clang/7.0.0/lib/netbsd base-obsolete obsolete ./usr/lib/clang/7.0.0/share base-obsolete obsolete -./usr/lib/clang/9.0.0base-sys-usr -./usr/lib/clang/9.0.0/include base-sys-usr -./usr/lib/clang/9.0.0/include/sanitizer base-sys-usr -./usr/lib/clang/9.0.0/include/xray base-sys-usr -./usr/lib/clang/9.0.0/lib base-sys-usr -./usr/lib/clang/9.0.0/lib/netbsd base-sys-usr -./usr/lib/clang/9.0.0/share base-sys-usr -./usr/lib/dtracebase-sys-usr dtrace +./usr/lib/clang/9.0.0base-obsolete obsolete +./usr/lib/clang/9.0.0/include base-obsolete obsolete +./usr/lib/clang/9.0.0/include/sanitizer base-obsolete obsolete +./usr/lib/clang/9.0.0/include/xray base-obsolete obsolete +./usr/lib/clang/9.0.0/lib base-obsolete obsolete +./usr/lib/clang/9.0.0/lib/netbsd base-obsolete obsolete +./usr/lib/clang/9.0.0/share base-obsolete obsolete +./usr/lib/clang/13.0.0base-sys-usr +./usr/lib/clang/13.0.0/include base-sys-usr +./usr/lib/clang/13.0.0/include/sanitizer base-sys-usr +./usr/lib/clang/13.0.0/include/xray base-sys-usr +./usr/lib/clang/13.0.0/lib base-sys-usr +./usr/lib/clang/13.0.0/lib/netbsd base-sys-usr +./usr/lib/clang/13.0.0/share base-sys-usr ./usr/lib/dtrace/errno.d base-sys-usr dtrace ./usr/lib/dtrace/psinfo.d base-sys-usr dtrace ./usr/lib/dtrace/signal.d base-sys-usr dtrace Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.287 src/distrib/sets/lists/comp/md.amd64:1.288 --- src/distrib/sets/lists/comp/md.amd64:1.287 Sat May 29 21:56:45 2021 +++ src/distrib/sets/lists/comp/md.amd64 Thu Sep 16 19:32:49 2021 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.287 2021/05/30 01:56:45 joerg Exp $ +# $NetBSD: md.amd64,v 1.288 2021/09/16 23:32:49 christos Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include ./usr/include/amd64/aout_machdep.h comp-c-include @@ -1315,61 +1315,116 @@ ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-fdr-x86_64.a comp-obsolete obsolete ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-profiling-x86_64.a comp-obsolete obsolete ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.xray-x86_64.a comp-obsolete obsolete -./usr/lib/clang/9.0.0/lib/netbsd/libclang_rt.asan-i386.a comp-cxx-lib compat,llvm -./usr/lib/clang/9.0.0/lib/netbsd/libclang_rt.asan-i386.so comp-cxx-lib compat,llvm -./usr/lib/clang/9.0.0/lib/netbsd/libclang_rt.asan-i386.so.0 comp-cxx-lib compat,llvm -./usr/lib/clang/9.0.0/lib/netbsd/libclang_rt.asan-i386.so.0.0 comp-cxx-lib compat,llvm -./usr/lib/clang/9.0.0/lib/netbsd/libclang_rt.asan-preinit-i386.a comp-cxx-lib compat,llvm -./usr/lib/clang/9.0.0/lib/netbsd/libclang_rt.asan-preinit-x86_64.a comp-cxx-lib llvm -./usr/lib/clang/9.0.0/lib/netbsd/libclang_rt.asan-x86_64.a comp-cxx-lib llvm -./usr/lib/clang/9.0.0/lib/netbsd/libclang_rt.asan-x86_64.a.syms comp-cxx-lib llvm -./usr/lib/clang/9.0.0/lib/netbsd/libclang_rt.asan-x86_64.so comp-cxx-lib llvm -./usr/lib/clang/9.0.0/lib/netbsd/libclang_rt.asan-x86_64.so.0 comp-cxx-lib llvm -./usr/lib/clang/9.0.0/lib/netbsd/libclang_rt.asan-x86_64.so.0.0 comp-cxx-lib llvm -./usr/lib/clang/9.0.0/lib/netbsd/libclang_rt.asan_cxx-i386.a comp-cxx-lib compat,llvm
CVS commit: src
Module Name:src Committed By: christos Date: Thu Sep 16 23:32:50 UTC 2021 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: md.amd64 md.i386 mi src/etc/mtree: NetBSD.dist.base src/external/bsd/compiler_rt/lib/clang/lib/netbsd: common.mk src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64: Makefile Log Message: Move the sanitizer libraries from 9.0.0 -> 13.0.0 to match our current clang version. To generate a diff of this commit: cvs rdiff -u -r1.1281 -r1.1282 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.287 -r1.288 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.203 -r1.204 src/distrib/sets/lists/comp/md.i386 cvs rdiff -u -r1.2391 -r1.2392 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.237 -r1.238 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src
Committed By: christos
Date: Thu Sep 16 22:47:29 UTC 2021
Modified Files:
src/sys/sys: sysctl.h
Log Message:
fix pasto
To generate a diff of this commit:
cvs rdiff -u -r1.235 -r1.236 src/sys/sys/sysctl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/sysctl.h
diff -u src/sys/sys/sysctl.h:1.235 src/sys/sys/sysctl.h:1.236
--- src/sys/sys/sysctl.h:1.235 Tue Sep 14 13:10:46 2021
+++ src/sys/sys/sysctl.h Thu Sep 16 18:47:29 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctl.h,v 1.235 2021/09/14 17:10:46 christos Exp $ */
+/* $NetBSD: sysctl.h,v 1.236 2021/09/16 22:47:29 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -567,7 +567,7 @@ struct kinfo_proc2 {
"\17EXEC" \
"\20OWEUPC" \
"\22NOCLDWAIT" \
- "\22P32" \
+ "\23P32" \
"\24CLDSIGIGN" \
"\26SYSTRACE" \
"\27CHTRACED" \
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Thu Sep 16 22:47:29 UTC 2021 Modified Files: src/sys/sys: sysctl.h Log Message: fix pasto To generate a diff of this commit: cvs rdiff -u -r1.235 -r1.236 src/sys/sys/sysctl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: andvar Date: Thu Sep 16 22:19:12 UTC 2021 Modified Files: src/lib/libp2k: p2k.3 src/lib/libresolv: dst_api.c src/lib/librumpclient: rumpclient.c src/lib/libukfs: ukfs.3 src/sys/arch/arm/omap: omap_edma.c src/sys/arch/arm/ti: ti_edma.c src/sys/arch/shark/shark: i8042.c src/sys/dev: smbios.c src/sys/dev/ic: aic79xx.c aic7xxx.c src/sys/dev/usb: umass.c src/sys/fs/nilfs: nilfs_vfsops.c src/sys/fs/udf: udf_subr.c udf_vfsops.c src/sys/kern: kern_physio.c src/sys/net: bpf.c src/sys/stand/efiboot: smbios.c src/tests/dev/md: h_mdserv.c src/tests/fs/puffs: t_fuzz.c src/tests/fs/puffs/h_dtfs: dtfs_subr.c src/tests/lib/librumphijack: h_client.c src/tests/sbin/fsck_ffs: t_enable_quotas.sh src/usr.sbin/syslogd: tls.c Log Message: fix typos in word "successful". To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libp2k/p2k.3 cvs rdiff -u -r1.3 -r1.4 src/lib/libresolv/dst_api.c cvs rdiff -u -r1.68 -r1.69 src/lib/librumpclient/rumpclient.c cvs rdiff -u -r1.16 -r1.17 src/lib/libukfs/ukfs.3 cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/omap/omap_edma.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ti/ti_edma.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/shark/shark/i8042.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/smbios.c cvs rdiff -u -r1.57 -r1.58 src/sys/dev/ic/aic79xx.c cvs rdiff -u -r1.143 -r1.144 src/sys/dev/ic/aic7xxx.c cvs rdiff -u -r1.185 -r1.186 src/sys/dev/usb/umass.c cvs rdiff -u -r1.26 -r1.27 src/sys/fs/nilfs/nilfs_vfsops.c cvs rdiff -u -r1.157 -r1.158 src/sys/fs/udf/udf_subr.c cvs rdiff -u -r1.81 -r1.82 src/sys/fs/udf/udf_vfsops.c cvs rdiff -u -r1.98 -r1.99 src/sys/kern/kern_physio.c cvs rdiff -u -r1.241 -r1.242 src/sys/net/bpf.c cvs rdiff -u -r1.3 -r1.4 src/sys/stand/efiboot/smbios.c cvs rdiff -u -r1.4 -r1.5 src/tests/dev/md/h_mdserv.c cvs rdiff -u -r1.6 -r1.7 src/tests/fs/puffs/t_fuzz.c cvs rdiff -u -r1.4 -r1.5 src/tests/fs/puffs/h_dtfs/dtfs_subr.c cvs rdiff -u -r1.9 -r1.10 src/tests/lib/librumphijack/h_client.c cvs rdiff -u -r1.2 -r1.3 src/tests/sbin/fsck_ffs/t_enable_quotas.sh cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/syslogd/tls.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: andvar
Date: Thu Sep 16 22:19:12 UTC 2021
Modified Files:
src/lib/libp2k: p2k.3
src/lib/libresolv: dst_api.c
src/lib/librumpclient: rumpclient.c
src/lib/libukfs: ukfs.3
src/sys/arch/arm/omap: omap_edma.c
src/sys/arch/arm/ti: ti_edma.c
src/sys/arch/shark/shark: i8042.c
src/sys/dev: smbios.c
src/sys/dev/ic: aic79xx.c aic7xxx.c
src/sys/dev/usb: umass.c
src/sys/fs/nilfs: nilfs_vfsops.c
src/sys/fs/udf: udf_subr.c udf_vfsops.c
src/sys/kern: kern_physio.c
src/sys/net: bpf.c
src/sys/stand/efiboot: smbios.c
src/tests/dev/md: h_mdserv.c
src/tests/fs/puffs: t_fuzz.c
src/tests/fs/puffs/h_dtfs: dtfs_subr.c
src/tests/lib/librumphijack: h_client.c
src/tests/sbin/fsck_ffs: t_enable_quotas.sh
src/usr.sbin/syslogd: tls.c
Log Message:
fix typos in word "successful".
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libp2k/p2k.3
cvs rdiff -u -r1.3 -r1.4 src/lib/libresolv/dst_api.c
cvs rdiff -u -r1.68 -r1.69 src/lib/librumpclient/rumpclient.c
cvs rdiff -u -r1.16 -r1.17 src/lib/libukfs/ukfs.3
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/omap/omap_edma.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ti/ti_edma.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/shark/shark/i8042.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/smbios.c
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/ic/aic79xx.c
cvs rdiff -u -r1.143 -r1.144 src/sys/dev/ic/aic7xxx.c
cvs rdiff -u -r1.185 -r1.186 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.26 -r1.27 src/sys/fs/nilfs/nilfs_vfsops.c
cvs rdiff -u -r1.157 -r1.158 src/sys/fs/udf/udf_subr.c
cvs rdiff -u -r1.81 -r1.82 src/sys/fs/udf/udf_vfsops.c
cvs rdiff -u -r1.98 -r1.99 src/sys/kern/kern_physio.c
cvs rdiff -u -r1.241 -r1.242 src/sys/net/bpf.c
cvs rdiff -u -r1.3 -r1.4 src/sys/stand/efiboot/smbios.c
cvs rdiff -u -r1.4 -r1.5 src/tests/dev/md/h_mdserv.c
cvs rdiff -u -r1.6 -r1.7 src/tests/fs/puffs/t_fuzz.c
cvs rdiff -u -r1.4 -r1.5 src/tests/fs/puffs/h_dtfs/dtfs_subr.c
cvs rdiff -u -r1.9 -r1.10 src/tests/lib/librumphijack/h_client.c
cvs rdiff -u -r1.2 -r1.3 src/tests/sbin/fsck_ffs/t_enable_quotas.sh
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/syslogd/tls.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/libp2k/p2k.3
diff -u src/lib/libp2k/p2k.3:1.10 src/lib/libp2k/p2k.3:1.11
--- src/lib/libp2k/p2k.3:1.10 Fri Jan 7 16:02:32 2011
+++ src/lib/libp2k/p2k.3 Thu Sep 16 22:19:10 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: p2k.3,v 1.10 2011/01/07 16:02:32 pooka Exp $
+.\" $NetBSD: p2k.3,v 1.11 2021/09/16 22:19:10 andvar Exp $
.\"
.\" Copyright (c) 2008 Antti Kantee. All rights reserved.
.\"
@@ -70,7 +70,7 @@ It can therefore be used to mount and ru
a userspace daemon.
.Pp
Calling the library interface function mounts the file system and,
-if succesful, starts handling requests.
+if successful, starts handling requests.
The parameters are handled by
.Fn ukfs_mount
(see
Index: src/lib/libresolv/dst_api.c
diff -u src/lib/libresolv/dst_api.c:1.3 src/lib/libresolv/dst_api.c:1.4
--- src/lib/libresolv/dst_api.c:1.3 Fri Nov 16 02:16:38 2012
+++ src/lib/libresolv/dst_api.c Thu Sep 16 22:19:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dst_api.c,v 1.3 2012/11/16 02:16:38 christos Exp $ */
+/* $NetBSD: dst_api.c,v 1.4 2021/09/16 22:19:10 andvar Exp $ */
/*
* Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc.
@@ -40,7 +40,7 @@
#if 0
static const char rcsid[] = "Header: /proj/cvs/prod/libbind/dst/dst_api.c,v 1.17 2007/09/24 17:18:25 each Exp ";
#else
-__RCSID("$NetBSD: dst_api.c,v 1.3 2012/11/16 02:16:38 christos Exp $");
+__RCSID("$NetBSD: dst_api.c,v 1.4 2021/09/16 22:19:10 andvar Exp $");
#endif
@@ -240,7 +240,7 @@ dst_compare_keys(const DST_KEY *key1, co
* The location to which the signature will be written.
* sig_len Length of the signature field in bytes.
* Return
- * 0 Successfull INIT or Update operation
+ * 0 Successful INIT or Update operation
* 0 success FINAL (sign) operation
* 0 failure
*/
Index: src/lib/librumpclient/rumpclient.c
diff -u src/lib/librumpclient/rumpclient.c:1.68 src/lib/librumpclient/rumpclient.c:1.69
--- src/lib/librumpclient/rumpclient.c:1.68 Sat Sep 11 14:23:04 2021
+++ src/lib/librumpclient/rumpclient.c Thu Sep 16 22:19:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpclient.c,v 1.68 2021/09/11 14:23:04 christos Exp $ */
+/* $NetBSD: rumpclient.c,v 1.69 2021/09/16 22:19:10 andvar Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -50,7 +50,7 @@
#define USE_SIGNALFD
#endif
-__RCSID("$NetBSD: rumpclient.c,v 1.68 2021/09/11 14:23:04 christos Exp $");
+__RCSID("$NetBSD: rumpclient.c,v 1.69 2021/09/16 22:19:10 andvar Exp $");
#include
#include
@@ -200,7 +200,7 @@ send_with_recon(struct spclient *spc,
CVS commit: src
Module Name:src
Committed By: andvar
Date: Thu Sep 16 21:29:42 UTC 2021
Modified Files:
src/common/lib/libc/gen: rb.c
src/lib/libc/gdtoa/test: README
src/libexec/identd: identd.c
src/sys/arch/arm/imx: imx23_ssp.c
src/sys/arch/i386/pci: pci_intr_fixup.c
src/sys/dev/microcode/aic7xxx: aic79xx.seq
src/sys/dev/pci: amdpm_smbusreg.h if_ena.c
src/sys/kern: kern_module.c
src/sys/rump/librump/rumpkern: vm.c
src/sys/ufs/chfs: ebh_media.h
src/tests/fs/vfs: t_vnops.c
src/usr.bin/rump_dhcpclient: rump.dhcpclient.1
src/usr.sbin/puffs/mount_psshfs: node.c
Log Message:
fix typos in word "successfully", mainly s/succesfully/successfully/.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/common/lib/libc/gen/rb.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/lib/libc/gdtoa/test/README
cvs rdiff -u -r1.36 -r1.37 src/libexec/identd/identd.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/imx/imx23_ssp.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/i386/pci/pci_intr_fixup.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/microcode/aic7xxx/aic79xx.seq
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/amdpm_smbusreg.h
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/if_ena.c
cvs rdiff -u -r1.152 -r1.153 src/sys/kern/kern_module.c
cvs rdiff -u -r1.191 -r1.192 src/sys/rump/librump/rumpkern/vm.c
cvs rdiff -u -r1.1 -r1.2 src/sys/ufs/chfs/ebh_media.h
cvs rdiff -u -r1.60 -r1.61 src/tests/fs/vfs/t_vnops.c
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/rump_dhcpclient/rump.dhcpclient.1
cvs rdiff -u -r1.65 -r1.66 src/usr.sbin/puffs/mount_psshfs/node.c
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/gen/rb.c
diff -u src/common/lib/libc/gen/rb.c:1.15 src/common/lib/libc/gen/rb.c:1.16
--- src/common/lib/libc/gen/rb.c:1.15 Thu May 9 10:56:24 2019
+++ src/common/lib/libc/gen/rb.c Thu Sep 16 21:29:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rb.c,v 1.15 2019/05/09 10:56:24 skrll Exp $ */
+/* $NetBSD: rb.c,v 1.16 2021/09/16 21:29:41 andvar Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -45,10 +45,10 @@
#define KASSERT(s) do { } while (/*CONSTCOND*/ 0)
#define __rbt_unused __unused
#endif
-__RCSID("$NetBSD: rb.c,v 1.15 2019/05/09 10:56:24 skrll Exp $");
+__RCSID("$NetBSD: rb.c,v 1.16 2021/09/16 21:29:41 andvar Exp $");
#else
#include
-__KERNEL_RCSID(0, "$NetBSD: rb.c,v 1.15 2019/05/09 10:56:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rb.c,v 1.16 2021/09/16 21:29:41 andvar Exp $");
#ifndef DIAGNOSTIC
#define __rbt_unused __unused
#else
@@ -313,7 +313,7 @@ rb_tree_insert_node(struct rb_tree *rbt,
KASSERT(rb_tree_check_node(rbt, self, NULL, true));
}
- /* Succesfully inserted, return our node pointer. */
+ /* Successfully inserted, return our node pointer. */
return object;
}
Index: src/lib/libc/gdtoa/test/README
diff -u src/lib/libc/gdtoa/test/README:1.1.1.1 src/lib/libc/gdtoa/test/README:1.2
--- src/lib/libc/gdtoa/test/README:1.1.1.1 Sat Mar 19 16:26:42 2011
+++ src/lib/libc/gdtoa/test/README Thu Sep 16 21:29:41 2021
@@ -69,7 +69,7 @@ You can also or alternatively compile ge
-DUSE_MY_LOCALE (when ../gdtoa.a is compiled with -DUSE_LOCALE)
to test multi-byte decimal points.
-If in the parent directory, you have sucessfully invoked "make Printf"
+If in the parent directory, you have successfully invoked "make Printf"
to add a "printf" (called Printf and accessed via ../stdio1.h), then
here you can use "make pf_test" and (if you have both a 64-bit long
double and a 113-bit "quad" double type) "make pf_testLq" for a brief
Index: src/libexec/identd/identd.c
diff -u src/libexec/identd/identd.c:1.36 src/libexec/identd/identd.c:1.37
--- src/libexec/identd/identd.c:1.36 Sat Dec 10 22:08:13 2016
+++ src/libexec/identd/identd.c Thu Sep 16 21:29:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: identd.c,v 1.36 2016/12/10 22:08:13 christos Exp $ */
+/* $NetBSD: identd.c,v 1.37 2021/09/16 21:29:41 andvar Exp $ */
/*
* identd.c - TCP/IP Ident protocol server.
@@ -8,7 +8,7 @@
*/
#include
-__RCSID("$NetBSD: identd.c,v 1.36 2016/12/10 22:08:13 christos Exp $");
+__RCSID("$NetBSD: identd.c,v 1.37 2021/09/16 21:29:41 andvar Exp $");
#include
#include
@@ -441,7 +441,7 @@ idhandle(int fd, const char *charset, co
forward(fd, (struct sockaddr *)_addr,
nat_lport, fport, lport)) {
maybe_syslog(LOG_INFO,
-"Succesfully forwarded the request to %s",
+"Successfully forwarded the request to %s",
gethost((struct sockaddr *)_addr));
return 0;
}
@@ -796,7 +796,7 @@ sysctl_proxy_getuid(struct sockaddr_stor
return rc;
}
-/* Forward ident queries. Returns 1 when succesful, or zero if not. */
+/* Forward ident queries. Returns 1 when successful, or zero if not. */
static int
forward(int fd, struct sockaddr *nat_addr, int nat_lport, int fport, int lport)
{
Index:
CVS commit: src
Module Name:src Committed By: andvar Date: Thu Sep 16 21:29:42 UTC 2021 Modified Files: src/common/lib/libc/gen: rb.c src/lib/libc/gdtoa/test: README src/libexec/identd: identd.c src/sys/arch/arm/imx: imx23_ssp.c src/sys/arch/i386/pci: pci_intr_fixup.c src/sys/dev/microcode/aic7xxx: aic79xx.seq src/sys/dev/pci: amdpm_smbusreg.h if_ena.c src/sys/kern: kern_module.c src/sys/rump/librump/rumpkern: vm.c src/sys/ufs/chfs: ebh_media.h src/tests/fs/vfs: t_vnops.c src/usr.bin/rump_dhcpclient: rump.dhcpclient.1 src/usr.sbin/puffs/mount_psshfs: node.c Log Message: fix typos in word "successfully", mainly s/succesfully/successfully/. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/common/lib/libc/gen/rb.c cvs rdiff -u -r1.1.1.1 -r1.2 src/lib/libc/gdtoa/test/README cvs rdiff -u -r1.36 -r1.37 src/libexec/identd/identd.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/imx/imx23_ssp.c cvs rdiff -u -r1.51 -r1.52 src/sys/arch/i386/pci/pci_intr_fixup.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/microcode/aic7xxx/aic79xx.seq cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/amdpm_smbusreg.h cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/if_ena.c cvs rdiff -u -r1.152 -r1.153 src/sys/kern/kern_module.c cvs rdiff -u -r1.191 -r1.192 src/sys/rump/librump/rumpkern/vm.c cvs rdiff -u -r1.1 -r1.2 src/sys/ufs/chfs/ebh_media.h cvs rdiff -u -r1.60 -r1.61 src/tests/fs/vfs/t_vnops.c cvs rdiff -u -r1.3 -r1.4 src/usr.bin/rump_dhcpclient/rump.dhcpclient.1 cvs rdiff -u -r1.65 -r1.66 src/usr.sbin/puffs/mount_psshfs/node.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: andvar
Date: Thu Sep 16 20:17:48 UTC 2021
Modified Files:
src/lib/libc/resolv: res_debug.c
src/sys/arch/acorn32/acorn32: rpc_machdep.c
src/sys/arch/acorn32/eb7500atx: eb7500atx_machdep.c
src/sys/arch/acorn32/podulebus: sbicreg.h
src/sys/arch/alpha/pci: pci_machdep.c
src/sys/arch/amiga/dev: sbicreg.h
src/sys/arch/atari/atari: le_bus.c
src/sys/arch/evbarm/stand: Makefile
src/sys/arch/i386/stand/lib/netif: 3c509.h
src/sys/arch/mips/rmi: rmixl_obio_el_space.c
src/sys/arch/mvme68k/dev: sbicreg.h
src/sys/arch/xen/include: i82489var.h
src/sys/dev/pci: if_bge.c
src/sys/net: if.c
src/sys/nfs: nfs_serv.c
src/sys/sys: flashio.h
Log Message:
fix various typos, mainly in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/resolv/res_debug.c
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/acorn32/acorn32/rpc_machdep.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/acorn32/podulebus/sbicreg.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/alpha/pci/pci_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amiga/dev/sbicreg.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/atari/atari/le_bus.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/stand/Makefile
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/i386/stand/lib/netif/3c509.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/rmi/rmixl_obio_el_space.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mvme68k/dev/sbicreg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/xen/include/i82489var.h
cvs rdiff -u -r1.348 -r1.349 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.487 -r1.488 src/sys/net/if.c
cvs rdiff -u -r1.181 -r1.182 src/sys/nfs/nfs_serv.c
cvs rdiff -u -r1.4 -r1.5 src/sys/sys/flashio.h
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/resolv/res_debug.c
diff -u src/lib/libc/resolv/res_debug.c:1.15 src/lib/libc/resolv/res_debug.c:1.16
--- src/lib/libc/resolv/res_debug.c:1.15 Thu Dec 13 08:45:29 2018
+++ src/lib/libc/resolv/res_debug.c Thu Sep 16 20:17:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: res_debug.c,v 1.15 2018/12/13 08:45:29 maya Exp $ */
+/* $NetBSD: res_debug.c,v 1.16 2021/09/16 20:17:46 andvar Exp $ */
/*
* Portions Copyright (C) 2004, 2005, 2008, 2009 Internet Systems Consortium, Inc. ("ISC")
@@ -97,7 +97,7 @@
static const char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] = "Id: res_debug.c,v 1.19 2009/02/26 11:20:20 tbox Exp";
#else
-__RCSID("$NetBSD: res_debug.c,v 1.15 2018/12/13 08:45:29 maya Exp $");
+__RCSID("$NetBSD: res_debug.c,v 1.16 2021/09/16 20:17:46 andvar Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -509,7 +509,7 @@ const struct res_sym __p_type_syms[] = {
{ns_t_naptr, "NAPTR", "naptr"},
{ns_t_kx, "KX", "key exchange"},
{ns_t_cert, "CERT", "certificate"},
- {ns_t_a6, "A", "IPv6 address (experminental)"},
+ {ns_t_a6, "A", "IPv6 address (experimental)"},
{ns_t_dname, "DNAME", "non-terminal redirection"},
{ns_t_opt, "OPT", "opt"},
{ns_t_apl, "apl", "apl"},
@@ -680,7 +680,7 @@ p_option(u_long option) {
case RES_DEBUG: return "debug";
case RES_AAONLY: return "aaonly(unimpl)";
case RES_USEVC: return "usevc";
- case RES_PRIMARY: return "primry(unimpl)";
+ case RES_PRIMARY: return "primary(unimpl)";
case RES_IGNTC: return "igntc";
case RES_RECURSE: return "recurs";
case RES_DEFNAMES: return "defnam";
Index: src/sys/arch/acorn32/acorn32/rpc_machdep.c
diff -u src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.99 src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.100
--- src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.99 Tue Aug 17 22:00:26 2021
+++ src/sys/arch/acorn32/acorn32/rpc_machdep.c Thu Sep 16 20:17:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_machdep.c,v 1.99 2021/08/17 22:00:26 andvar Exp $ */
+/* $NetBSD: rpc_machdep.c,v 1.100 2021/09/16 20:17:46 andvar Exp $ */
/*
* Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -54,7 +54,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.99 2021/08/17 22:00:26 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.100 2021/09/16 20:17:46 andvar Exp $");
#include
#include
@@ -405,7 +405,7 @@ initarm(void *cookie)
*/
set_cpufuncs();
- /* canonicalise the boot configuration structure to alow versioning */
+ /* canonicalise the boot configuration structure to allow versioning */
canonicalise_bootconfig(, raw_bootconf);
booted_kernel = bootconfig.kernelname;
Index: src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
diff -u src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.35 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.36
--- src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.35 Tue Aug 17 22:00:26 2021
+++ src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c Thu Sep 16 20:17:46 2021
CVS commit: src
Module Name:src Committed By: andvar Date: Thu Sep 16 20:17:48 UTC 2021 Modified Files: src/lib/libc/resolv: res_debug.c src/sys/arch/acorn32/acorn32: rpc_machdep.c src/sys/arch/acorn32/eb7500atx: eb7500atx_machdep.c src/sys/arch/acorn32/podulebus: sbicreg.h src/sys/arch/alpha/pci: pci_machdep.c src/sys/arch/amiga/dev: sbicreg.h src/sys/arch/atari/atari: le_bus.c src/sys/arch/evbarm/stand: Makefile src/sys/arch/i386/stand/lib/netif: 3c509.h src/sys/arch/mips/rmi: rmixl_obio_el_space.c src/sys/arch/mvme68k/dev: sbicreg.h src/sys/arch/xen/include: i82489var.h src/sys/dev/pci: if_bge.c src/sys/net: if.c src/sys/nfs: nfs_serv.c src/sys/sys: flashio.h Log Message: fix various typos, mainly in comments. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/lib/libc/resolv/res_debug.c cvs rdiff -u -r1.99 -r1.100 src/sys/arch/acorn32/acorn32/rpc_machdep.c cvs rdiff -u -r1.35 -r1.36 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/acorn32/podulebus/sbicreg.h cvs rdiff -u -r1.32 -r1.33 src/sys/arch/alpha/pci/pci_machdep.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amiga/dev/sbicreg.h cvs rdiff -u -r1.21 -r1.22 src/sys/arch/atari/atari/le_bus.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/stand/Makefile cvs rdiff -u -r1.6 -r1.7 src/sys/arch/i386/stand/lib/netif/3c509.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/rmi/rmixl_obio_el_space.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mvme68k/dev/sbicreg.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/xen/include/i82489var.h cvs rdiff -u -r1.348 -r1.349 src/sys/dev/pci/if_bge.c cvs rdiff -u -r1.487 -r1.488 src/sys/net/if.c cvs rdiff -u -r1.181 -r1.182 src/sys/nfs/nfs_serv.c cvs rdiff -u -r1.4 -r1.5 src/sys/sys/flashio.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/ksh
Module Name:src
Committed By: christos
Date: Thu Sep 16 19:44:01 UTC 2021
Modified Files:
src/bin/ksh: c_test.c shf.c tree.c vi.c
Log Message:
It is either teaching gcc about aaah or adding FALLTHROUGH.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/bin/ksh/c_test.c src/bin/ksh/tree.c
cvs rdiff -u -r1.13 -r1.14 src/bin/ksh/shf.c
cvs rdiff -u -r1.20 -r1.21 src/bin/ksh/vi.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/ksh/c_test.c
diff -u src/bin/ksh/c_test.c:1.9 src/bin/ksh/c_test.c:1.10
--- src/bin/ksh/c_test.c:1.9 Fri Jun 30 00:41:19 2017
+++ src/bin/ksh/c_test.c Thu Sep 16 15:44:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: c_test.c,v 1.9 2017/06/30 04:41:19 kamil Exp $ */
+/* $NetBSD: c_test.c,v 1.10 2021/09/16 19:44:01 christos Exp $ */
/*
* test(1); version 7-like -- author Erik Baalbergen
@@ -11,7 +11,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: c_test.c,v 1.9 2017/06/30 04:41:19 kamil Exp $");
+__RCSID("$NetBSD: c_test.c,v 1.10 2021/09/16 19:44:01 christos Exp $");
#endif
#include
@@ -393,6 +393,7 @@ test_eval(te, op, opnd1, opnd2, do_eval)
return v1 < v2;
}
}
+ abort();
case TO_FILNT: /* -nt */
{
int s2;
Index: src/bin/ksh/tree.c
diff -u src/bin/ksh/tree.c:1.9 src/bin/ksh/tree.c:1.10
--- src/bin/ksh/tree.c:1.9 Tue May 8 12:37:59 2018
+++ src/bin/ksh/tree.c Thu Sep 16 15:44:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.c,v 1.9 2018/05/08 16:37:59 kamil Exp $ */
+/* $NetBSD: tree.c,v 1.10 2021/09/16 19:44:01 christos Exp $ */
/*
* command tree climbing
@@ -6,7 +6,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: tree.c,v 1.9 2018/05/08 16:37:59 kamil Exp $");
+__RCSID("$NetBSD: tree.c,v 1.10 2021/09/16 19:44:01 christos Exp $");
#endif
@@ -106,8 +106,8 @@ ptree(t, indent, shf)
#ifdef KSH
case TSELECT:
fptreef(shf, indent, "select %s ", t->str);
- /* fall through */
#endif /* KSH */
+ /*FALLTHROUGH*/
case TFOR:
if (t->type == TFOR)
fptreef(shf, indent, "for %s ", t->str);
Index: src/bin/ksh/shf.c
diff -u src/bin/ksh/shf.c:1.13 src/bin/ksh/shf.c:1.14
--- src/bin/ksh/shf.c:1.13 Thu Jun 29 23:56:12 2017
+++ src/bin/ksh/shf.c Thu Sep 16 15:44:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: shf.c,v 1.13 2017/06/30 03:56:12 kamil Exp $ */
+/* $NetBSD: shf.c,v 1.14 2021/09/16 19:44:01 christos Exp $ */
/*
* Shell file I/O routines
@@ -6,7 +6,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: shf.c,v 1.13 2017/06/30 03:56:12 kamil Exp $");
+__RCSID("$NetBSD: shf.c,v 1.14 2021/09/16 19:44:01 christos Exp $");
#endif
#include
@@ -984,6 +984,7 @@ shf_vfprintf(shf, fmt, args)
if (sizeof(char *) > sizeof(int))
flags |= FL_LONG; /* hope it fits.. */
/* aaahhh... */
+ /*FALLTHROUGH*/
case 'd':
case 'i':
case 'o':
@@ -1000,7 +1001,7 @@ shf_vfprintf(shf, fmt, args)
else
tmp = 0;
/* aaa. */
-
+/*FALLTHROUGH*/
case 'u':
do {
*--s = lnum % 10 + '0';
Index: src/bin/ksh/vi.c
diff -u src/bin/ksh/vi.c:1.20 src/bin/ksh/vi.c:1.21
--- src/bin/ksh/vi.c:1.20 Tue May 8 12:37:59 2018
+++ src/bin/ksh/vi.c Thu Sep 16 15:44:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vi.c,v 1.20 2018/05/08 16:37:59 kamil Exp $ */
+/* $NetBSD: vi.c,v 1.21 2021/09/16 19:44:01 christos Exp $ */
/*
* vi command editing
@@ -9,7 +9,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: vi.c,v 1.20 2018/05/08 16:37:59 kamil Exp $");
+__RCSID("$NetBSD: vi.c,v 1.21 2021/09/16 19:44:01 christos Exp $");
#endif
#include "config.h"
@@ -793,6 +793,7 @@ vi_cmd(argcnt, cmd)
case 'Y':
cmd = "y$";
/* ahh... */
+ /*FALLTHROUGH*/
case 'c':
case 'd':
case 'y':
@@ -1004,6 +1005,7 @@ vi_cmd(argcnt, cmd)
if (hnum == hlast)
hnum = -1;
/* ahhh */
+ /*FALLTHROUGH*/
case '/':
c3 = 1;
srchlen = 0;
@@ -1131,6 +1133,7 @@ vi_cmd(argcnt, cmd)
case Ctrl('['): /* some annoying at ksh's */
if (!Flag(FVIESCCOMPLETE))
return -1;
+ /*FALLTHROUGH*/
case '\\': /* at ksh */
case Ctrl('f'): /* Nonstandard vi/ksh */
complete_word(1, argcnt);
@@ -1194,7 +1197,7 @@ domove(argcnt, cmd, sub)
fsavecmd = *cmd;
fsavech = cmd[1];
/* drop through */
-
+ /*FALLTHROUGH*/
case ',':
case ';':
if (fsavecmd == ' ')
CVS commit: src/bin/ksh
Module Name:src Committed By: christos Date: Thu Sep 16 19:44:01 UTC 2021 Modified Files: src/bin/ksh: c_test.c shf.c tree.c vi.c Log Message: It is either teaching gcc about aaah or adding FALLTHROUGH. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/bin/ksh/c_test.c src/bin/ksh/tree.c cvs rdiff -u -r1.13 -r1.14 src/bin/ksh/shf.c cvs rdiff -u -r1.20 -r1.21 src/bin/ksh/vi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/ksh
Module Name:src
Committed By: christos
Date: Thu Sep 16 19:43:33 UTC 2021
Modified Files:
src/bin/ksh: c_ksh.c
Log Message:
support -Z
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/bin/ksh/c_ksh.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/ksh/c_ksh.c
diff -u src/bin/ksh/c_ksh.c:1.29 src/bin/ksh/c_ksh.c:1.30
--- src/bin/ksh/c_ksh.c:1.29 Sun Jun 3 08:18:29 2018
+++ src/bin/ksh/c_ksh.c Thu Sep 16 15:43:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: c_ksh.c,v 1.29 2018/06/03 12:18:29 kamil Exp $ */
+/* $NetBSD: c_ksh.c,v 1.30 2021/09/16 19:43:33 christos Exp $ */
/*
* built-in Korn commands: c_*
@@ -6,7 +6,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: c_ksh.c,v 1.29 2018/06/03 12:18:29 kamil Exp $");
+__RCSID("$NetBSD: c_ksh.c,v 1.30 2021/09/16 19:43:33 christos Exp $");
#endif
#include
@@ -1072,9 +1072,10 @@ c_jobs(wp)
int optc;
int flag = 0;
int nflag = 0;
+ int Zflag = 0;
int rv = 0;
- while ((optc = ksh_getopt(wp, _opt, "lpnz")) != EOF)
+ while ((optc = ksh_getopt(wp, _opt, "lpnzZ")) != EOF)
switch (optc) {
case 'l':
flag = 1;
@@ -1088,10 +1089,21 @@ c_jobs(wp)
case 'z': /* debugging: print zombies */
nflag = -1;
break;
+ case 'Z':
+ Zflag = 1;
+ break;
case '?':
return 1;
}
wp += builtin_opt.optind;
+ if (Zflag) {
+ if (*wp && **wp) {
+ setproctitle("%s", *wp);
+ } else {
+ setproctitle(NULL);
+ }
+ return 0;
+ }
if (!*wp) {
if (j_jobs((char *) 0, flag, nflag))
rv = 1;
CVS commit: src/bin/ksh
Module Name:src Committed By: christos Date: Thu Sep 16 19:43:33 UTC 2021 Modified Files: src/bin/ksh: c_ksh.c Log Message: support -Z To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/bin/ksh/c_ksh.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/csh
Module Name:src Committed By: christos Date: Thu Sep 16 19:34:21 UTC 2021 Modified Files: src/bin/csh: proc.c Log Message: provide a way to reset setproctitle. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/bin/csh/proc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/csh
Module Name:src
Committed By: christos
Date: Thu Sep 16 19:34:21 UTC 2021
Modified Files:
src/bin/csh: proc.c
Log Message:
provide a way to reset setproctitle.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/bin/csh/proc.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/csh/proc.c
diff -u src/bin/csh/proc.c:1.41 src/bin/csh/proc.c:1.42
--- src/bin/csh/proc.c:1.41 Sat Sep 11 16:55:03 2021
+++ src/bin/csh/proc.c Thu Sep 16 15:34:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.c,v 1.41 2021/09/11 20:55:03 christos Exp $ */
+/* $NetBSD: proc.c,v 1.42 2021/09/16 19:34:21 christos Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)proc.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: proc.c,v 1.41 2021/09/11 20:55:03 christos Exp $");
+__RCSID("$NetBSD: proc.c,v 1.42 2021/09/16 19:34:21 christos Exp $");
#endif
#endif /* not lint */
@@ -845,8 +845,12 @@ dojobs(Char **v, struct command *t)
if (v[1]) {
if (eq(*v, STRml)) {
flag |= FANCY | JOBDIR;
- } else if (eq(*v, STRmZ) && v[1]) {
- setproctitle("%s", short2str(v[1]));
+ } else if (eq(*v, STRmZ)) {
+ if (v[1] && v[1][0]) {
+ setproctitle("%s", short2str(v[1]));
+ } else {
+ setproctitle(NULL);
+ }
return;
} else {
stderror(ERR_JOBS);
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Thu Sep 16 09:55:28 UTC 2021
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixgbe.h ixv.c
Log Message:
Fix a bug that an mbuf chain which has more than 63488bytes MAY fail on TX.
- Currently, The TX buffer dmamap's max number of segments is set to 32.
MCLBYTES(== 2048) * 32 = 65536 and it's enough for IP_MAXPACKET(65535).
If an mbuf chain has more than 32 mbufs, we call m_defrag() to make
it lower than equal to 32, but it might not work. The reason is that
our m_defrag() don't modify the first mbuf entry of the chain. e.g.:
if an mbuf chain contains 63600bytes data and the first mbuf has 100bytes
in the m_data, the new chain has 100+2048+2048+...+12 and the total number
of the chain is not 32 but 33. It result in 43 TCP packets will drop.
- One of the way to fix this problem is to change m_defrag() which add a
new mbuf cluster to the first mbuf. It's need discussion.
- Another solution is to change the max number of the TX DMA segment.
It should be at least 33 to avoid the m_defrag()'s current limitation.
The document (82599-X550 DS 7.2.1.1 "Transmit Storage in system Memory")
says that a packet can be fragmented into 40 - WTHRESH - 2 (for 82598,
the document say nothing and some people and code says it's unlimited).
Currently WTHRESH is set to 8. 40 - 8 - 2 = 30. !?!?!? {Net,Free,Open}BSD
and Linux use 32. Is that safe? Anyway, we change WTHRESH from 8 to 5
to fit it. The added comment in ixgbe.h is based on DragonFly's
though they don't use WTHRESH.
- Yet another solution is to use the Tx Head Pointer Write Back function
instead of WTHRESH based write back (see 82599-X550 DS 7.2.3.5.2
"Tx Head Pointer Write Back" or 82598 "Transmit Completions Head Write Back"
). DragonFly, illumos and DPDK use it.
- Yet yet another solution is to add tso_maxsize entry to struct ifnet
and use it in the TCP stack.
To generate a diff of this commit:
cvs rdiff -u -r1.291 -r1.292 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.80 -r1.81 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.167 -r1.168 src/sys/dev/pci/ixgbe/ixv.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/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.291 src/sys/dev/pci/ixgbe/ixgbe.c:1.292
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.291 Thu Sep 16 07:08:26 2021
+++ src/sys/dev/pci/ixgbe/ixgbe.c Thu Sep 16 09:55:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.291 2021/09/16 07:08:26 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.292 2021/09/16 09:55:28 msaitoh Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.291 2021/09/16 07:08:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.292 2021/09/16 09:55:28 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -927,11 +927,12 @@ ixgbe_attach(device_t parent, device_t d
hw->allow_unsupported_sfp = allow_unsupported_sfp;
/* Pick up the 82599 settings */
- if (hw->mac.type != ixgbe_mac_82598EB) {
+ if (hw->mac.type != ixgbe_mac_82598EB)
hw->phy.smart_speed = ixgbe_smart_speed;
- adapter->num_segs = IXGBE_82599_SCATTER;
- } else
- adapter->num_segs = IXGBE_82598_SCATTER;
+
+ /* Set the right number of segments */
+ KASSERT(IXGBE_82599_SCATTER_MAX >= IXGBE_SCATTER_DEFAULT);
+ adapter->num_segs = IXGBE_SCATTER_DEFAULT;
/* Ensure SW/FW semaphore is free */
ixgbe_init_swfw_semaphore(hw);
@@ -4102,7 +4103,7 @@ ixgbe_init_locked(struct adapter *adapte
txdctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(txr->me));
txdctl |= IXGBE_TXDCTL_ENABLE;
/* Set WTHRESH to 8, burst writeback */
- txdctl |= (8 << IXGBE_TXDCTL_WTHRESH_SHIFT);
+ txdctl |= IXGBE_TX_WTHRESH << IXGBE_TXDCTL_WTHRESH_SHIFT;
/*
* When the internal queue falls below PTHRESH (32),
* start prefetching as long as there are at least
Index: src/sys/dev/pci/ixgbe/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.80 src/sys/dev/pci/ixgbe/ixgbe.h:1.81
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.80 Fri Sep 3 08:57:58 2021
+++ src/sys/dev/pci/ixgbe/ixgbe.h Thu Sep 16 09:55:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.h,v 1.80 2021/09/03 08:57:58 msaitoh Exp $ */
+/* $NetBSD: ixgbe.h,v 1.81 2021/09/16 09:55:28 msaitoh Exp $ */
/**
SPDX-License-Identifier: BSD-3-Clause
@@ -185,6 +185,23 @@
*/
#define IXGBE_RX_COPY_LEN_MAX (MHLEN - ETHER_ALIGN)
+/*
+ * Default TX WTHRESH value.
+ * Currently, we don't use the Tx Head Pointer Write Back function.
+ */
+#define IXGBE_TX_WTHRESH 5
+
+/*
+ * The max number of descriptors that one packet can use is 40 - WTHRESH - 2.
+ * Though 82598 does not have this limit, we don't want long TX chain.
+ * 33 should be large enough even for 64K TSO
+ * (32 * 2K mbuf
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Thu Sep 16 09:55:28 UTC 2021
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixgbe.h ixv.c
Log Message:
Fix a bug that an mbuf chain which has more than 63488bytes MAY fail on TX.
- Currently, The TX buffer dmamap's max number of segments is set to 32.
MCLBYTES(== 2048) * 32 = 65536 and it's enough for IP_MAXPACKET(65535).
If an mbuf chain has more than 32 mbufs, we call m_defrag() to make
it lower than equal to 32, but it might not work. The reason is that
our m_defrag() don't modify the first mbuf entry of the chain. e.g.:
if an mbuf chain contains 63600bytes data and the first mbuf has 100bytes
in the m_data, the new chain has 100+2048+2048+...+12 and the total number
of the chain is not 32 but 33. It result in 43 TCP packets will drop.
- One of the way to fix this problem is to change m_defrag() which add a
new mbuf cluster to the first mbuf. It's need discussion.
- Another solution is to change the max number of the TX DMA segment.
It should be at least 33 to avoid the m_defrag()'s current limitation.
The document (82599-X550 DS 7.2.1.1 "Transmit Storage in system Memory")
says that a packet can be fragmented into 40 - WTHRESH - 2 (for 82598,
the document say nothing and some people and code says it's unlimited).
Currently WTHRESH is set to 8. 40 - 8 - 2 = 30. !?!?!? {Net,Free,Open}BSD
and Linux use 32. Is that safe? Anyway, we change WTHRESH from 8 to 5
to fit it. The added comment in ixgbe.h is based on DragonFly's
though they don't use WTHRESH.
- Yet another solution is to use the Tx Head Pointer Write Back function
instead of WTHRESH based write back (see 82599-X550 DS 7.2.3.5.2
"Tx Head Pointer Write Back" or 82598 "Transmit Completions Head Write Back"
). DragonFly, illumos and DPDK use it.
- Yet yet another solution is to add tso_maxsize entry to struct ifnet
and use it in the TCP stack.
To generate a diff of this commit:
cvs rdiff -u -r1.291 -r1.292 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.80 -r1.81 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.167 -r1.168 src/sys/dev/pci/ixgbe/ixv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src Committed By: leot Date: Thu Sep 16 08:33:24 UTC 2021 Modified Files: src/share/misc: acronyms Log Message: Add DW To generate a diff of this commit: cvs rdiff -u -r1.311 -r1.312 src/share/misc/acronyms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src
Committed By: leot
Date: Thu Sep 16 08:33:24 UTC 2021
Modified Files:
src/share/misc: acronyms
Log Message:
Add DW
To generate a diff of this commit:
cvs rdiff -u -r1.311 -r1.312 src/share/misc/acronyms
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.311 src/share/misc/acronyms:1.312
--- src/share/misc/acronyms:1.311 Sun Sep 5 17:29:27 2021
+++ src/share/misc/acronyms Thu Sep 16 08:33:24 2021
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.311 2021/09/05 17:29:27 alnsn Exp $
+$NetBSD: acronyms,v 1.312 2021/09/16 08:33:24 leot Exp $
10Q thank you
10X thanks
1337 elite ("leet")
@@ -137,6 +137,7 @@ DS Dual Screen
DSTM don't shoot the messenger
DTRT do the right thing
DTWT do the wrong thing
+DW don't worry
DWIM do what I mean
DYAC damn you autocorrect
DYK do you know?
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Thu Sep 16 07:08:26 UTC 2021 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c ixv.c Log Message: Use IXGBE_TXDCTL_WTHRESH_SHIFT macro. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.290 -r1.291 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.166 -r1.167 src/sys/dev/pci/ixgbe/ixv.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/pci/ixgbe/ixgbe.c diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.290 src/sys/dev/pci/ixgbe/ixgbe.c:1.291 --- src/sys/dev/pci/ixgbe/ixgbe.c:1.290 Thu Aug 26 09:03:47 2021 +++ src/sys/dev/pci/ixgbe/ixgbe.c Thu Sep 16 07:08:26 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe.c,v 1.290 2021/08/26 09:03:47 msaitoh Exp $ */ +/* $NetBSD: ixgbe.c,v 1.291 2021/09/16 07:08:26 msaitoh Exp $ */ /** @@ -64,7 +64,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.290 2021/08/26 09:03:47 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.291 2021/09/16 07:08:26 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -4102,7 +4102,7 @@ ixgbe_init_locked(struct adapter *adapte txdctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(txr->me)); txdctl |= IXGBE_TXDCTL_ENABLE; /* Set WTHRESH to 8, burst writeback */ - txdctl |= (8 << 16); + txdctl |= (8 << IXGBE_TXDCTL_WTHRESH_SHIFT); /* * When the internal queue falls below PTHRESH (32), * start prefetching as long as there are at least Index: src/sys/dev/pci/ixgbe/ixv.c diff -u src/sys/dev/pci/ixgbe/ixv.c:1.166 src/sys/dev/pci/ixgbe/ixv.c:1.167 --- src/sys/dev/pci/ixgbe/ixv.c:1.166 Thu Aug 26 09:03:47 2021 +++ src/sys/dev/pci/ixgbe/ixv.c Thu Sep 16 07:08:26 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ixv.c,v 1.166 2021/08/26 09:03:47 msaitoh Exp $ */ +/* $NetBSD: ixv.c,v 1.167 2021/09/16 07:08:26 msaitoh Exp $ */ /** @@ -35,7 +35,7 @@ /*$FreeBSD: head/sys/dev/ixgbe/if_ixv.c 331224 2018-03-19 20:55:05Z erj $*/ #include -__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.166 2021/08/26 09:03:47 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.167 2021/09/16 07:08:26 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1716,7 +1716,7 @@ ixv_initialize_transmit_units(struct ada /* Set WTHRESH to 8, burst writeback */ txdctl = IXGBE_READ_REG(hw, IXGBE_VFTXDCTL(j)); - txdctl |= (8 << 16); + txdctl |= (8 << IXGBE_TXDCTL_WTHRESH_SHIFT); IXGBE_WRITE_REG(hw, IXGBE_VFTXDCTL(j), txdctl); /* Set the HW Tx Head and Tail indices */
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Thu Sep 16 07:08:26 UTC 2021 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c ixv.c Log Message: Use IXGBE_TXDCTL_WTHRESH_SHIFT macro. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.290 -r1.291 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.166 -r1.167 src/sys/dev/pci/ixgbe/ixv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
