CVS commit: src/lib/libc/arch
Module Name:src
Committed By: rin
Date: Thu Sep 14 03:58:50 UTC 2023
Modified Files:
src/lib/libc/arch/or1k/gen: Makefile.inc
src/lib/libc/arch/powerpc64/gen: Makefile.inc
src/lib/libc/arch/riscv/gen: Makefile.inc
Log Message:
libc/arch: Fix copy-paste; or1k, powerpc64, riscv are not powerpc ;)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/or1k/gen/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/powerpc64/gen/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/riscv/gen/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/or1k/gen/Makefile.inc
diff -u src/lib/libc/arch/or1k/gen/Makefile.inc:1.1 src/lib/libc/arch/or1k/gen/Makefile.inc:1.2
--- src/lib/libc/arch/or1k/gen/Makefile.inc:1.1 Wed Sep 3 19:34:25 2014
+++ src/lib/libc/arch/or1k/gen/Makefile.inc Thu Sep 14 03:58:50 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2014/09/03 19:34:25 matt Exp $
+# $NetBSD: Makefile.inc,v 1.2 2023/09/14 03:58:50 rin Exp $
SRCS+= __setjmp14.S __sigsetjmp14.S _setjmp.S
SRCS+= bswap16.c bswap32.c bswap64.c
@@ -23,7 +23,7 @@ SRCS+= fpgetsticky.c fpsetsticky.c
CPPFLAGS._lwp.c += -D_LIBC_SOURCE
-LSRCS.powerpc.gen=Lint_swapcontext.c
-LSRCS+= ${LSRCS.powerpc.gen}
-DPSRCS+= ${LSRCS.powerpc.gen}
-CLEANFILES+= ${LSRCS.powerpc.gen}
+LSRCS.or1k.gen= Lint_swapcontext.c
+LSRCS+= ${LSRCS.or1k.gen}
+DPSRCS+= ${LSRCS.or1k.gen}
+CLEANFILES+= ${LSRCS.or1k.gen}
Index: src/lib/libc/arch/powerpc64/gen/Makefile.inc
diff -u src/lib/libc/arch/powerpc64/gen/Makefile.inc:1.4 src/lib/libc/arch/powerpc64/gen/Makefile.inc:1.5
--- src/lib/libc/arch/powerpc64/gen/Makefile.inc:1.4 Sun Dec 6 07:12:17 2009
+++ src/lib/libc/arch/powerpc64/gen/Makefile.inc Thu Sep 14 03:58:50 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2009/12/06 07:12:17 uebayasi Exp $
+# $NetBSD: Makefile.inc,v 1.5 2023/09/14 03:58:50 rin Exp $
SRCS+= __setjmp14.S __sigsetjmp14.S _setjmp.S
SRCS+= bswap16.c bswap32.c bswap64.c
@@ -21,7 +21,7 @@ SRCS+= fpgetround.c fpsetround.c fpgetma
SRCS+= fpgetsticky.c fpsetsticky.c
.endif
-LSRCS.powerpc.gen=Lint_swapcontext.c
-LSRCS+= ${LSRCS.powerpc.gen}
-DPSRCS+= ${LSRCS.powerpc.gen}
-CLEANFILES+= ${LSRCS.powerpc.gen}
+LSRCS.powerpc64.gen= Lint_swapcontext.c
+LSRCS+= ${LSRCS.powerpc64.gen}
+DPSRCS+= ${LSRCS.powerpc64.gen}
+CLEANFILES+= ${LSRCS.powerpc64.gen}
Index: src/lib/libc/arch/riscv/gen/Makefile.inc
diff -u src/lib/libc/arch/riscv/gen/Makefile.inc:1.2 src/lib/libc/arch/riscv/gen/Makefile.inc:1.3
--- src/lib/libc/arch/riscv/gen/Makefile.inc:1.2 Sat Apr 13 17:54:13 2019
+++ src/lib/libc/arch/riscv/gen/Makefile.inc Thu Sep 14 03:58:50 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2019/04/13 17:54:13 maya Exp $
+# $NetBSD: Makefile.inc,v 1.3 2023/09/14 03:58:50 rin Exp $
SRCS+= __setjmp14.S __sigsetjmp14.S _setjmp.S
SRCS+= bswap16.c bswap32.c bswap64.c
@@ -23,7 +23,7 @@ SRCS+= fpgetsticky.c fpsetsticky.c
CPPFLAGS._lwp.c += -D_LIBC_SOURCE
-LSRCS.powerpc.gen=Lint_swapcontext.c
-LSRCS+= ${LSRCS.powerpc.gen}
-DPSRCS+= ${LSRCS.powerpc.gen}
-CLEANFILES+= ${LSRCS.powerpc.gen}
+LSRCS.riscv.gen=Lint_swapcontext.c
+LSRCS+= ${LSRCS.riscv.gen}
+DPSRCS+= ${LSRCS.riscv.gen}
+CLEANFILES+= ${LSRCS.riscv.gen}
CVS commit: src/lib/libc/arch
Module Name:src Committed By: rin Date: Thu Sep 14 03:58:50 UTC 2023 Modified Files: src/lib/libc/arch/or1k/gen: Makefile.inc src/lib/libc/arch/powerpc64/gen: Makefile.inc src/lib/libc/arch/riscv/gen: Makefile.inc Log Message: libc/arch: Fix copy-paste; or1k, powerpc64, riscv are not powerpc ;) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/or1k/gen/Makefile.inc cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/powerpc64/gen/Makefile.inc cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/riscv/gen/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc.old/dist/libstdc++-v3/config/locale/dragonfly
Module Name:src Committed By: rin Date: Thu Sep 14 03:52:24 UTC 2023 Modified Files: src/external/gpl3/gcc.old/dist/libstdc++-v3/config/locale/dragonfly: c_locale.h Log Message: gcc.old: c++locale.h: Drop unnecessary include This has no longer been required since rev 1.6 (of gcc one): http://cvsweb.netbsd.org/bsdweb.cgi/src/external/gpl3/gcc/dist/libstdc++-v3/config/locale/dragonfly/c_locale.h#rev1.6 where __convert_from_v() migrated to .cc file, and direct call for vsnprintf_l(3) from this header file was removed. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gcc.old/dist/libstdc++-v3/config/locale/dragonfly/c_locale.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc.old/dist/libstdc++-v3/config/locale/dragonfly/c_locale.h diff -u src/external/gpl3/gcc.old/dist/libstdc++-v3/config/locale/dragonfly/c_locale.h:1.6 src/external/gpl3/gcc.old/dist/libstdc++-v3/config/locale/dragonfly/c_locale.h:1.7 --- src/external/gpl3/gcc.old/dist/libstdc++-v3/config/locale/dragonfly/c_locale.h:1.6 Mon Feb 20 02:11:45 2023 +++ src/external/gpl3/gcc.old/dist/libstdc++-v3/config/locale/dragonfly/c_locale.h Thu Sep 14 03:52:24 2023 @@ -44,8 +44,6 @@ #include #ifndef __NetBSD__ #include -#else -#include #endif #define _GLIBCXX_NUM_CATEGORIES 0
CVS commit: src/external/gpl3/gcc.old/dist/libstdc++-v3/config/locale/dragonfly
Module Name:src Committed By: rin Date: Thu Sep 14 03:52:24 UTC 2023 Modified Files: src/external/gpl3/gcc.old/dist/libstdc++-v3/config/locale/dragonfly: c_locale.h Log Message: gcc.old: c++locale.h: Drop unnecessary include This has no longer been required since rev 1.6 (of gcc one): http://cvsweb.netbsd.org/bsdweb.cgi/src/external/gpl3/gcc/dist/libstdc++-v3/config/locale/dragonfly/c_locale.h#rev1.6 where __convert_from_v() migrated to .cc file, and direct call for vsnprintf_l(3) from this header file was removed. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gcc.old/dist/libstdc++-v3/config/locale/dragonfly/c_locale.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/libstdc++-v3/config/locale/dragonfly
Module Name:src Committed By: rin Date: Thu Sep 14 03:50:58 UTC 2023 Modified Files: src/external/gpl3/gcc/dist/libstdc++-v3/config/locale/dragonfly: c_locale.h Log Message: gcc: c_locale.h (c++locale.h): Drop unnecessary include This has no longer been required since rev 1.6: http://cvsweb.netbsd.org/bsdweb.cgi/src/external/gpl3/gcc/dist/libstdc++-v3/config/locale/dragonfly/c_locale.h#rev1.6 where __convert_from_v() migrated to .cc file, and direct call for vsnprintf_l(3) from this header file was removed. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gcc/dist/libstdc++-v3/config/locale/dragonfly/c_locale.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/libstdc++-v3/config/locale/dragonfly/c_locale.h diff -u src/external/gpl3/gcc/dist/libstdc++-v3/config/locale/dragonfly/c_locale.h:1.7 src/external/gpl3/gcc/dist/libstdc++-v3/config/locale/dragonfly/c_locale.h:1.8 --- src/external/gpl3/gcc/dist/libstdc++-v3/config/locale/dragonfly/c_locale.h:1.7 Sun Jul 30 05:51:43 2023 +++ src/external/gpl3/gcc/dist/libstdc++-v3/config/locale/dragonfly/c_locale.h Thu Sep 14 03:50:58 2023 @@ -44,8 +44,6 @@ #include #ifndef __NetBSD__ #include -#else -#include #endif #define _GLIBCXX_NUM_CATEGORIES 0
CVS commit: src/external/gpl3/gcc/dist/libstdc++-v3/config/locale/dragonfly
Module Name:src Committed By: rin Date: Thu Sep 14 03:50:58 UTC 2023 Modified Files: src/external/gpl3/gcc/dist/libstdc++-v3/config/locale/dragonfly: c_locale.h Log Message: gcc: c_locale.h (c++locale.h): Drop unnecessary include This has no longer been required since rev 1.6: http://cvsweb.netbsd.org/bsdweb.cgi/src/external/gpl3/gcc/dist/libstdc++-v3/config/locale/dragonfly/c_locale.h#rev1.6 where __convert_from_v() migrated to .cc file, and direct call for vsnprintf_l(3) from this header file was removed. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gcc/dist/libstdc++-v3/config/locale/dragonfly/c_locale.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: rin Date: Thu Sep 14 03:37:01 UTC 2023 Modified Files: src/sys/arch/mips/include: asm.h Log Message: mips: Add initial support to gprof(1) for n64 userland Use gp relative call for _mcount(). Stop using macro name MCOUNT as well for clarity. It has nothing to do with one provided by . Now, gprof(1) works just fine for C programs. On the other hand, some C++ profiling tests of ATF fail as partially observed for n32. More C++ profile tests become broken for GCC12 in comparison to GCC10. Something needs to be adjusted for us, or GCC, or both. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/sys/arch/mips/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: rin Date: Thu Sep 14 03:37:01 UTC 2023 Modified Files: src/sys/arch/mips/include: asm.h Log Message: mips: Add initial support to gprof(1) for n64 userland Use gp relative call for _mcount(). Stop using macro name MCOUNT as well for clarity. It has nothing to do with one provided by . Now, gprof(1) works just fine for C programs. On the other hand, some C++ profiling tests of ATF fail as partially observed for n32. More C++ profile tests become broken for GCC12 in comparison to GCC10. Something needs to be adjusted for us, or GCC, or both. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/sys/arch/mips/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/include/asm.h diff -u src/sys/arch/mips/include/asm.h:1.74 src/sys/arch/mips/include/asm.h:1.75 --- src/sys/arch/mips/include/asm.h:1.74 Thu Feb 23 14:56:00 2023 +++ src/sys/arch/mips/include/asm.h Thu Sep 14 03:37:01 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.74 2023/02/23 14:56:00 riastradh Exp $ */ +/* $NetBSD: asm.h,v 1.75 2023/09/14 03:37:01 rin Exp $ */ /* * Copyright (c) 1992, 1993 @@ -71,6 +71,9 @@ #define __SHIFTIN(__x, __mask) ((__x) * __LOWEST_SET_BIT(__mask)) #endif /* __ASSEMBLER__ */ +#ifndef GPROF +#define _MIPS_ASM_MCOUNT(x) +#else /* * Define -pg profile entry code. * Must always be noreorder, must never use a macro instruction. @@ -81,7 +84,7 @@ * stack and the final addiu to t9 must always equal the size of this * _MIPS_ASM_MCOUNT. */ -#define _MIPS_ASM_MCOUNT \ +#define _MIPS_ASM_MCOUNT(x) \ .set push; \ .set noreorder; \ .set noat; \ @@ -104,7 +107,8 @@ * call _mcount(). For the no abicalls case, skip the reloc dance. */ #ifdef __mips_abicalls -#define _MIPS_ASM_MCOUNT \ +#if defined(__mips_n32) /* n32 */ +#define _MIPS_ASM_MCOUNT(x) \ .set push; \ .set noreorder; \ .set noat; \ @@ -118,8 +122,28 @@ lw t9,8(sp); \ addiu sp,16; \ .set pop; +#else/* n64 */ +#define _MIPS_ASM_MCOUNT(x) \ + .set push; \ + .set noreorder; \ + .set noat; \ + dsubu sp,16; \ + sd gp,0(sp); \ + sd t9,8(sp); \ + move AT,ra; \ + lui gp,%hi(%neg(%gp_rel(x))); \ + daddiu gp,%lo(%neg(%gp_rel(x))); \ + daddu gp,gp,t9; \ + ld t9,%call16(_mcount)(gp); \ + jalr t9; \ + nop; \ + ld gp,0(sp); \ + ld t9,8(sp); \ + daddiu sp,16; \ + .set pop; +#endif #else /* !__mips_abicalls */ -#define _MIPS_ASM_MCOUNT \ +#define _MIPS_ASM_MCOUNT(x) \ .set push; \ .set noreorder; \ .set noat; \ @@ -129,12 +153,7 @@ .set pop; #endif /* !__mips_abicalls */ #endif /* n32/n64 */ - -#ifdef GPROF -#define MCOUNT _MIPS_ASM_MCOUNT -#else -#define MCOUNT -#endif +#endif /* GPROF */ #ifdef USE_AENT #define AENT(x)\ @@ -187,7 +206,7 @@ _C_LABEL(x): ;\ */ #define STATIC_LEAF(x) \ STATIC_LEAF_NOPROFILE(x); \ - MCOUNT + _MIPS_ASM_MCOUNT(x) /* * LEAF @@ -198,7 +217,7 @@ _C_LABEL(x): ;\ */ #define LEAF(x)\ LEAF_NOPROFILE(x); \ - MCOUNT + _MIPS_ASM_MCOUNT(x) /* * STATIC_XLEAF @@ -241,7 +260,7 @@ _C_LABEL(x): ; \ */ #define NESTED(x, fsize, retpc) \ NESTED_NOPROFILE(x, fsize, retpc); \ - MCOUNT + _MIPS_ASM_MCOUNT(x) /* * STATIC_NESTED @@ -249,7 +268,7 @@ _C_LABEL(x): ; \ */ #define STATIC_NESTED(x, fsize, retpc) \ STATIC_NESTED_NOPROFILE(x, fsize, retpc); \ - MCOUNT + _MIPS_ASM_MCOUNT(x) /* * XNESTED
CVS commit: src/sys/arch/riscv/include
Module Name:src
Committed By: rin
Date: Thu Sep 14 03:25:31 UTC 2023
Modified Files:
src/sys/arch/riscv/include: ptrace.h
Log Message:
riscv: ptrace: Add PTRACE_ILLEGAL_ASM for ATF
All related tests successfully pass.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/include/ptrace.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/riscv/include/ptrace.h
diff -u src/sys/arch/riscv/include/ptrace.h:1.4 src/sys/arch/riscv/include/ptrace.h:1.5
--- src/sys/arch/riscv/include/ptrace.h:1.4 Thu Aug 24 05:40:08 2023
+++ src/sys/arch/riscv/include/ptrace.h Thu Sep 14 03:25:31 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ptrace.h,v 1.4 2023/08/24 05:40:08 rin Exp $ */
+/* $NetBSD: ptrace.h,v 1.5 2023/09/14 03:25:31 rin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -54,6 +54,8 @@
#define PTRACE_REG_SP(r) (r)->r_reg[1]
#define PTRACE_REG_INTRV(r) (r)->r_reg[9]
+#define PTRACE_ILLEGAL_ASM __asm __volatile("c.unimp" ::: "memory")
+
#define PTRACE_BREAKPOINT ((const uint8_t[]) { 0x02, 0x90 })
#define PTRACE_BREAKPOINT_ASM __asm __volatile("c.ebreak" ::: "memory")
#define PTRACE_BREAKPOINT_SIZE 2
CVS commit: src/sys/arch/riscv/include
Module Name:src Committed By: rin Date: Thu Sep 14 03:25:31 UTC 2023 Modified Files: src/sys/arch/riscv/include: ptrace.h Log Message: riscv: ptrace: Add PTRACE_ILLEGAL_ASM for ATF All related tests successfully pass. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/include/ptrace.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/mips
Module Name:src
Committed By: rin
Date: Thu Sep 14 03:24:07 UTC 2023
Modified Files:
src/sys/arch/mips/mips: trap.c
Log Message:
mips/trap: Fix reversed ksi_code for SIGTRAP cases
It should be TRAP_TRACE and TRAP_BRKPT for software single stepping
and ``real'' break insn, respectively.
To generate a diff of this commit:
cvs rdiff -u -r1.262 -r1.263 src/sys/arch/mips/mips/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/trap.c
diff -u src/sys/arch/mips/mips/trap.c:1.262 src/sys/arch/mips/mips/trap.c:1.263
--- src/sys/arch/mips/mips/trap.c:1.262 Sun Mar 13 17:50:55 2022
+++ src/sys/arch/mips/mips/trap.c Thu Sep 14 03:24:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.262 2022/03/13 17:50:55 andvar Exp $ */
+/* $NetBSD: trap.c,v 1.263 2023/09/14 03:24:07 rin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.262 2022/03/13 17:50:55 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.263 2023/09/14 03:24:07 rin Exp $");
#include "opt_cputype.h" /* which mips CPU levels do we support? */
#include "opt_ddb.h"
@@ -604,7 +604,7 @@ trap(uint32_t status, uint32_t cause, va
ksi.ksi_trap = type & ~T_USER;
ksi.ksi_signo = SIGTRAP;
ksi.ksi_addr = (void *)va;
- ksi.ksi_code = TRAP_TRACE;
+ ksi.ksi_code = TRAP_BRKPT;
if ((insn.JType.op == OP_SPECIAL) &&
(insn.RType.func == OP_BREAK)) {
@@ -662,7 +662,7 @@ trap(uint32_t status, uint32_t cause, va
ksi.ksi_trap = type & ~T_USER;
ksi.ksi_signo = SIGTRAP;
ksi.ksi_addr = (void *)va;
- ksi.ksi_code = TRAP_BRKPT;
+ ksi.ksi_code = TRAP_TRACE;
break; /* SIGNAL */
}
case T_DSP+T_USER:
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: rin Date: Thu Sep 14 03:24:07 UTC 2023 Modified Files: src/sys/arch/mips/mips: trap.c Log Message: mips/trap: Fix reversed ksi_code for SIGTRAP cases It should be TRAP_TRACE and TRAP_BRKPT for software single stepping and ``real'' break insn, respectively. To generate a diff of this commit: cvs rdiff -u -r1.262 -r1.263 src/sys/arch/mips/mips/trap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libpthread
Module Name:src
Committed By: rin
Date: Thu Sep 14 03:17:02 UTC 2023
Modified Files:
src/lib/libpthread: Makefile
Log Message:
libpthread/Makefile: trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/lib/libpthread/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/Makefile
diff -u src/lib/libpthread/Makefile:1.97 src/lib/libpthread/Makefile:1.98
--- src/lib/libpthread/Makefile:1.97 Fri Jul 14 23:28:01 2023
+++ src/lib/libpthread/Makefile Thu Sep 14 03:17:02 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2023/07/14 23:28:01 lukem Exp $
+# $NetBSD: Makefile,v 1.98 2023/09/14 03:17:02 rin Exp $
#
NOSANITIZER= # defined
@@ -17,7 +17,7 @@ ARCHSUBDIR= ${PTHREAD_MACHINE_ARCH}
ARCHSUBDIR= ${PTHREAD_MACHINE_CPU}
.elif exists(${.CURDIR}/arch/${MACHINE_ARCH})
ARCHSUBDIR= ${MACHINE_ARCH}
-.elif exists(${.CURDIR}/arch/${MACHINE_CPU})
+.elif exists(${.CURDIR}/arch/${MACHINE_CPU})
ARCHSUBDIR= ${MACHINE_CPU}
.else
.BEGIN:
@@ -53,7 +53,7 @@ PTHREAD_MAKELWP?= pthread_makelwp_netbsd
# gets a reference to a symbol in that file. Otherwise, Unix's stupid static
# library semantics will end up discarding potentially important objects.
#
-SRCS= pthread.c
+SRCS= pthread.c
SRCS+= pthread_attr.c
SRCS+= pthread_barrier.c
# used by rumprun-posix to work around symbol collisions
@@ -62,7 +62,7 @@ SRCS+= pthread_cancelstub.c
.endif
SRCS+= pthread_cond.c
SRCS+= pthread_getcpuclockid.c
-SRCS+= pthread_lock.c
+SRCS+= pthread_lock.c
SRCS+= ${PTHREAD_MAKELWP}
SRCS+= pthread_misc.c
SRCS+= pthread_mutex.c
@@ -195,7 +195,7 @@ MLINKS+= pthread_mutex.3 pthread_mutex_t
MLINKS+= pthread_mutex.3 pthread_mutex_unlock.3
MLINKS+= pthread_mutex.3 pthread_mutex_timedlock.3
MLINKS+= pthread_mutex.3 pthread_mutex_getprioceiling.3
-MLINKS+= pthread_mutex.3 pthread_mutex_setprioceiling.3
+MLINKS+= pthread_mutex.3 pthread_mutex_setprioceiling.3
MLINKS+= pthread_mutexattr.3 pthread_mutexattr_init.3
MLINKS+= pthread_mutexattr.3 pthread_mutexattr_destroy.3
@@ -206,7 +206,7 @@ MLINKS+= pthread_mutexattr.3 pthread_mut
MLINKS+= pthread_mutexattr.3 pthread_mutexattr_getprotocol.3
MLINKS+= pthread_mutexattr.3 pthread_mutexattr_setprotocol.3
MLINKS+= pthread_mutexattr.3 pthread_mutexattr_getprioceiling.3
-MLINKS+= pthread_mutexattr.3 pthread_mutexattr_setprioceiling.3
+MLINKS+= pthread_mutexattr.3 pthread_mutexattr_setprioceiling.3
MLINKS+= pthread_rwlock.3 pthread_rwlock_init.3
MLINKS+= pthread_rwlock.3 pthread_rwlock_destroy.3
CVS commit: src/lib/libpthread
Module Name:src Committed By: rin Date: Thu Sep 14 03:17:02 UTC 2023 Modified Files: src/lib/libpthread: Makefile Log Message: libpthread/Makefile: trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 src/lib/libpthread/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/lib/libsa
Module Name:src
Committed By: rin
Date: Thu Sep 14 03:08:31 UTC 2023
Modified Files:
src/sys/lib/libsa: netif.c
Log Message:
netif_open: Fail with ENXIO instead of panic if no netif available
Avoid undesirable freeze for efiboot/x86 when interfaces are really
unavailable, or fail to be configured by buggy UEFI firmware.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/lib/libsa/netif.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/lib/libsa/netif.c
diff -u src/sys/lib/libsa/netif.c:1.26 src/sys/lib/libsa/netif.c:1.27
--- src/sys/lib/libsa/netif.c:1.26 Sun Mar 31 20:08:45 2019
+++ src/sys/lib/libsa/netif.c Thu Sep 14 03:08:31 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: netif.c,v 1.26 2019/03/31 20:08:45 christos Exp $ */
+/* $NetBSD: netif.c,v 1.27 2023/09/14 03:08:31 rin Exp $ */
/*
* Copyright (c) 1993 Adam Glass
@@ -292,8 +292,10 @@ fnd:
(void)memset(s, 0, sizeof(*s));
netif_init();
nif = netif_select(machdep_hint);
- if (!nif)
- panic("netboot: no interfaces left untried");
+ if (!nif) {
+ errno = ENXIO;
+ return -1;
+ }
if (netif_probe(nif, machdep_hint)) {
printf("%s: couldn't probe %s%d\n", __func__,
nif->nif_driver->netif_bname, nif->nif_unit);
CVS commit: src/sys/lib/libsa
Module Name:src Committed By: rin Date: Thu Sep 14 03:08:31 UTC 2023 Modified Files: src/sys/lib/libsa: netif.c Log Message: netif_open: Fail with ENXIO instead of panic if no netif available Avoid undesirable freeze for efiboot/x86 when interfaces are really unavailable, or fail to be configured by buggy UEFI firmware. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/lib/libsa/netif.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/stand/efiboot
Module Name:src Committed By: rin Date: Thu Sep 14 03:05:15 UTC 2023 Modified Files: src/sys/arch/i386/stand/efiboot: eficons.c Log Message: efiboot/x86: eficons.c: Explicitly include params.h for howmany() NFC for -current and netbsd-10, but necessary for netbsd-[89] to pull up raw IO serial port support (PR port-amd64/57523). To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/i386/stand/efiboot/eficons.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/stand/efiboot
Module Name:src Committed By: rin Date: Thu Sep 14 03:05:15 UTC 2023 Modified Files: src/sys/arch/i386/stand/efiboot: eficons.c Log Message: efiboot/x86: eficons.c: Explicitly include params.h for howmany() NFC for -current and netbsd-10, but necessary for netbsd-[89] to pull up raw IO serial port support (PR port-amd64/57523). To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/i386/stand/efiboot/eficons.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/stand/efiboot/eficons.c diff -u src/sys/arch/i386/stand/efiboot/eficons.c:1.13 src/sys/arch/i386/stand/efiboot/eficons.c:1.14 --- src/sys/arch/i386/stand/efiboot/eficons.c:1.13 Mon Jul 24 01:56:59 2023 +++ src/sys/arch/i386/stand/efiboot/eficons.c Thu Sep 14 03:05:15 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: eficons.c,v 1.13 2023/07/24 01:56:59 rin Exp $ */ +/* $NetBSD: eficons.c,v 1.14 2023/09/14 03:05:15 rin Exp $ */ /*- * Copyright (c) 2016 Kimihiro Nonaka @@ -26,6 +26,7 @@ * SUCH DAMAGE. */ +#include #include #include
CVS commit: src/usr.bin/xlint
Module Name:src
Committed By: rillig
Date: Wed Sep 13 20:31:58 UTC 2023
Modified Files:
src/usr.bin/xlint/common: lint.h
src/usr.bin/xlint/lint1: ckctype.c debug.c emit1.c lint1.h op.h oper.c
ops.def tree.c
Log Message:
lint: prevent invalid memory access when checking an expression
In check_expr_misc, the left and right operands of an expression were
accessed even in the case of CON (constant), STRING (string literal) and
NAME (identifier), which led to invalid values in pointer variables.
These invalid values were not used though, but technically they invoked
undefined behavior.
Precede each access to the operands with a check that the expression
indeed has operands, except in those cases where the operand is known to
have operands by only looking at the code of the current function.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/usr.bin/xlint/common/lint.h
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/xlint/lint1/ckctype.c
cvs rdiff -u -r1.61 -r1.62 src/usr.bin/xlint/lint1/debug.c
cvs rdiff -u -r1.76 -r1.77 src/usr.bin/xlint/lint1/emit1.c
cvs rdiff -u -r1.200 -r1.201 src/usr.bin/xlint/lint1/lint1.h
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/xlint/lint1/op.h
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/xlint/lint1/oper.c
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/xlint/lint1/ops.def
cvs rdiff -u -r1.580 -r1.581 src/usr.bin/xlint/lint1/tree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/common/lint.h
diff -u src/usr.bin/xlint/common/lint.h:1.43 src/usr.bin/xlint/common/lint.h:1.44
--- src/usr.bin/xlint/common/lint.h:1.43 Sat Aug 12 18:05:51 2023
+++ src/usr.bin/xlint/common/lint.h Wed Sep 13 20:31:58 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lint.h,v 1.43 2023/08/12 18:05:51 rillig Exp $ */
+/* $NetBSD: lint.h,v 1.44 2023/09/13 20:31:58 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -134,6 +134,8 @@ type_properties(tspec_t t) {
#define is_complex(t) (type_properties(t)->tt_is_complex)
#define is_scalar(t) (type_properties(t)->tt_is_scalar)
+#define has_operands(tn) (modtab[(tn)->tn_op].m_has_operands)
+
typedef enum {
NODECL, /* not declared until now */
Index: src/usr.bin/xlint/lint1/ckctype.c
diff -u src/usr.bin/xlint/lint1/ckctype.c:1.6 src/usr.bin/xlint/lint1/ckctype.c:1.7
--- src/usr.bin/xlint/lint1/ckctype.c:1.6 Wed Aug 2 18:51:25 2023
+++ src/usr.bin/xlint/lint1/ckctype.c Wed Sep 13 20:31:58 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ckctype.c,v 1.6 2023/08/02 18:51:25 rillig Exp $ */
+/* $NetBSD: ckctype.c,v 1.7 2023/09/13 20:31:58 rillig Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: ckctype.c,v 1.6 2023/08/02 18:51:25 rillig Exp $");
+__RCSID("$NetBSD: ckctype.c,v 1.7 2023/09/13 20:31:58 rillig Exp $");
#endif
#include
@@ -126,7 +126,7 @@ check_ctype_function_call(const tnode_t
if (func->tn_op == NAME &&
is_ctype_function(func->tn_sym->s_name) &&
args != NULL &&
- args->tn_left != NULL &&
+ tn_ck_left(args) != NULL &&
args->tn_right == NULL)
check_ctype_arg(func->tn_sym->s_name, args->tn_left);
}
Index: src/usr.bin/xlint/lint1/debug.c
diff -u src/usr.bin/xlint/lint1/debug.c:1.61 src/usr.bin/xlint/lint1/debug.c:1.62
--- src/usr.bin/xlint/lint1/debug.c:1.61 Wed Aug 2 21:58:11 2023
+++ src/usr.bin/xlint/lint1/debug.c Wed Sep 13 20:31:58 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: debug.c,v 1.61 2023/08/02 21:58:11 rillig Exp $ */
+/* $NetBSD: debug.c,v 1.62 2023/09/13 20:31:58 rillig Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: debug.c,v 1.61 2023/08/02 21:58:11 rillig Exp $");
+__RCSID("$NetBSD: debug.c,v 1.62 2023/09/13 20:31:58 rillig Exp $");
#endif
#include
@@ -253,6 +253,7 @@ debug_node(const tnode_t *tn) // NOLINT(
debug_printf("\n");
debug_indent_inc();
+ lint_assert(has_operands(tn));
lint_assert(tn->tn_left != NULL);
debug_node(tn->tn_left);
if (op != INCBEF && op != INCAFT
Index: src/usr.bin/xlint/lint1/emit1.c
diff -u src/usr.bin/xlint/lint1/emit1.c:1.76 src/usr.bin/xlint/lint1/emit1.c:1.77
--- src/usr.bin/xlint/lint1/emit1.c:1.76 Sat Aug 12 21:32:16 2023
+++ src/usr.bin/xlint/lint1/emit1.c Wed Sep 13 20:31:58 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: emit1.c,v 1.76 2023/08/12 21:32:16 rillig Exp $ */
+/* $NetBSD: emit1.c,v 1.77 2023/09/13 20:31:58 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: emit1.c,v 1.76 2023/08/12 21:32:16 rillig Exp $");
+__RCSID("$NetBSD: emit1.c,v 1.77 2023/09/13 20:31:58 rillig Exp $");
#endif
#include "lint1.h"
@@ -338,8 +338,8 @@ outcall(const tnode_t *tn, bool retval_u
* the function
*/
narg = 0;
- args = tn->tn_right;
- for (arg =
CVS commit: src/usr.bin/xlint
Module Name:src Committed By: rillig Date: Wed Sep 13 20:31:58 UTC 2023 Modified Files: src/usr.bin/xlint/common: lint.h src/usr.bin/xlint/lint1: ckctype.c debug.c emit1.c lint1.h op.h oper.c ops.def tree.c Log Message: lint: prevent invalid memory access when checking an expression In check_expr_misc, the left and right operands of an expression were accessed even in the case of CON (constant), STRING (string literal) and NAME (identifier), which led to invalid values in pointer variables. These invalid values were not used though, but technically they invoked undefined behavior. Precede each access to the operands with a check that the expression indeed has operands, except in those cases where the operand is known to have operands by only looking at the code of the current function. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/usr.bin/xlint/common/lint.h cvs rdiff -u -r1.6 -r1.7 src/usr.bin/xlint/lint1/ckctype.c cvs rdiff -u -r1.61 -r1.62 src/usr.bin/xlint/lint1/debug.c cvs rdiff -u -r1.76 -r1.77 src/usr.bin/xlint/lint1/emit1.c cvs rdiff -u -r1.200 -r1.201 src/usr.bin/xlint/lint1/lint1.h cvs rdiff -u -r1.21 -r1.22 src/usr.bin/xlint/lint1/op.h cvs rdiff -u -r1.11 -r1.12 src/usr.bin/xlint/lint1/oper.c cvs rdiff -u -r1.30 -r1.31 src/usr.bin/xlint/lint1/ops.def cvs rdiff -u -r1.580 -r1.581 src/usr.bin/xlint/lint1/tree.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src
Committed By: andvar
Date: Wed Sep 13 19:45:37 UTC 2023
Modified Files:
src/sys/arch/iyonix/iyonix: iyonix_machdep.c
Log Message:
fix printf format specifier for physmem.
fixes VERBOSE_INIT_ARM enabled build for iyonix.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/iyonix/iyonix/iyonix_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/iyonix/iyonix/iyonix_machdep.c
diff -u src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.32 src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.33
--- src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.32 Thu Apr 20 08:28:06 2023
+++ src/sys/arch/iyonix/iyonix/iyonix_machdep.c Wed Sep 13 19:45:37 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: iyonix_machdep.c,v 1.32 2023/04/20 08:28:06 skrll Exp $ */
+/* $NetBSD: iyonix_machdep.c,v 1.33 2023/09/13 19:45:37 andvar Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.32 2023/04/20 08:28:06 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.33 2023/09/13 19:45:37 andvar Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -492,7 +492,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
/* Tell the user about the memory */
- printf("physmemory: %d pages at 0x%08lx -> 0x%08lx\n", physmem,
+ printf("physmemory: %ld pages at 0x%08lx -> 0x%08lx\n", physmem,
physical_start, physical_end - 1);
#endif
CVS commit: src/sys/arch/iyonix/iyonix
Module Name:src Committed By: andvar Date: Wed Sep 13 19:45:37 UTC 2023 Modified Files: src/sys/arch/iyonix/iyonix: iyonix_machdep.c Log Message: fix printf format specifier for physmem. fixes VERBOSE_INIT_ARM enabled build for iyonix. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/iyonix/iyonix/iyonix_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hpcsh/dev/hd64461
Module Name:src
Committed By: andvar
Date: Wed Sep 13 17:08:15 UTC 2023
Modified Files:
src/sys/arch/hpcsh/dev/hd64461: hd64461uart.c
Log Message:
change hd64461uart_init_regs third argument from NULL to 0x0,
since compiler complains about making integer from pointer without cast.
fully fixes KGDB enabled build for hpcsh.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/hpcsh/dev/hd64461/hd64461uart.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcsh/dev/hd64461/hd64461uart.c
diff -u src/sys/arch/hpcsh/dev/hd64461/hd64461uart.c:1.30 src/sys/arch/hpcsh/dev/hd64461/hd64461uart.c:1.31
--- src/sys/arch/hpcsh/dev/hd64461/hd64461uart.c:1.30 Tue Dec 11 06:34:00 2018
+++ src/sys/arch/hpcsh/dev/hd64461/hd64461uart.c Wed Sep 13 17:08:14 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64461uart.c,v 1.30 2018/12/11 06:34:00 thorpej Exp $ */
+/* $NetBSD: hd64461uart.c,v 1.31 2023/09/13 17:08:14 andvar Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hd64461uart.c,v 1.30 2018/12/11 06:34:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64461uart.c,v 1.31 2023/09/13 17:08:14 andvar Exp $");
#include "opt_kgdb.h"
@@ -141,7 +141,7 @@ hd64461uart_kgdb_init(void)
hd64461uart_init();
- hd64461uart_init_regs(, hd64461uart_chip.io_tag, NULL, 0x0);
+ hd64461uart_init_regs(, hd64461uart_chip.io_tag, 0x0, 0x0);
if (com_kgdb_attach1(,
kgdb_rate, COM_FREQ, COM_TYPE_NORMAL, CONMODE) != 0) {
printf("%s: KGDB console open failed.\n", __func__);
CVS commit: src/sys/arch/hpcsh/dev/hd64461
Module Name:src Committed By: andvar Date: Wed Sep 13 17:08:15 UTC 2023 Modified Files: src/sys/arch/hpcsh/dev/hd64461: hd64461uart.c Log Message: change hd64461uart_init_regs third argument from NULL to 0x0, since compiler complains about making integer from pointer without cast. fully fixes KGDB enabled build for hpcsh. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/hpcsh/dev/hd64461/hd64461uart.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src
Committed By: bouyer
Date: Wed Sep 13 15:58:13 UTC 2023
Modified Files:
src/sys/netinet: sctp_output.c
Log Message:
handle EHOSTDOWN the same way as EHOSTUNREACH in sctp_med_chunk_output().
Compile-tested only (I don't have a sctp setup); proposed in
http://mail-index.netbsd.org/tech-net/2023/09/11/msg008611.html
LGTM from Greg Troxel and Robert Swindells
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/netinet/sctp_output.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/sctp_output.c
diff -u src/sys/netinet/sctp_output.c:1.33 src/sys/netinet/sctp_output.c:1.34
--- src/sys/netinet/sctp_output.c:1.33 Fri Nov 4 09:01:53 2022
+++ src/sys/netinet/sctp_output.c Wed Sep 13 15:58:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sctp_output.c,v 1.33 2022/11/04 09:01:53 ozaki-r Exp $ */
+/* $NetBSD: sctp_output.c,v 1.34 2023/09/13 15:58:13 bouyer Exp $ */
/* $KAME: sctp_output.c,v 1.48 2005/06/16 18:29:24 jinmei Exp $ */
/*
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.33 2022/11/04 09:01:53 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.34 2023/09/13 15:58:13 bouyer Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -5643,7 +5643,8 @@ sctp_med_chunk_output(struct sctp_inpcb
}
hbflag = 0;
}
- if (error == EHOSTUNREACH) {
+ if (error == EHOSTUNREACH ||
+ error == EHOSTDOWN) {
/*
* Destination went
* unreachable during
@@ -5921,7 +5922,8 @@ sctp_med_chunk_output(struct sctp_inpcb
}
hbflag = 0;
}
-if (error == EHOSTUNREACH) {
+if (error == EHOSTUNREACH ||
+error == EHOSTDOWN) {
/*
* Destination went unreachable during
* this send
CVS commit: src/sys/netinet
Module Name:src Committed By: bouyer Date: Wed Sep 13 15:58:13 UTC 2023 Modified Files: src/sys/netinet: sctp_output.c Log Message: handle EHOSTDOWN the same way as EHOSTUNREACH in sctp_med_chunk_output(). Compile-tested only (I don't have a sctp setup); proposed in http://mail-index.netbsd.org/tech-net/2023/09/11/msg008611.html LGTM from Greg Troxel and Robert Swindells To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/netinet/sctp_output.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src
Committed By: bouyer
Date: Wed Sep 13 15:54:28 UTC 2023
Modified Files:
src/sys/netinet: tcp_output.c
Log Message:
Handle EHOSTDOWN the same way as EHOSTUNREACH and ENETDOWN for established
connections. Avoid premature end of tcp connection with "Host is down" error
in case of transient link-layer failure.
Discussed and patch proposed in
http://mail-index.netbsd.org/tech-net/2023/09/11/msg008610.html
and followups.
To generate a diff of this commit:
cvs rdiff -u -r1.218 -r1.219 src/sys/netinet/tcp_output.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/tcp_output.c
diff -u src/sys/netinet/tcp_output.c:1.218 src/sys/netinet/tcp_output.c:1.219
--- src/sys/netinet/tcp_output.c:1.218 Fri Nov 4 09:01:53 2022
+++ src/sys/netinet/tcp_output.c Wed Sep 13 15:54:28 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_output.c,v 1.218 2022/11/04 09:01:53 ozaki-r Exp $ */
+/* $NetBSD: tcp_output.c,v 1.219 2023/09/13 15:54:28 bouyer Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -135,7 +135,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.218 2022/11/04 09:01:53 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.219 2023/09/13 15:54:28 bouyer Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1612,8 +1612,8 @@ out:
TCP_STATINC(TCP_STAT_SELFQUENCH);
tcp_quench(tp->t_inpcb);
error = 0;
- } else if ((error == EHOSTUNREACH || error == ENETDOWN) &&
- TCPS_HAVERCVDSYN(tp->t_state)) {
+ } else if ((error == EHOSTUNREACH || error == ENETDOWN ||
+ error == EHOSTDOWN) && TCPS_HAVERCVDSYN(tp->t_state)) {
tp->t_softerror = error;
error = 0;
}
CVS commit: src/sys/netinet
Module Name:src Committed By: bouyer Date: Wed Sep 13 15:54:28 UTC 2023 Modified Files: src/sys/netinet: tcp_output.c Log Message: Handle EHOSTDOWN the same way as EHOSTUNREACH and ENETDOWN for established connections. Avoid premature end of tcp connection with "Host is down" error in case of transient link-layer failure. Discussed and patch proposed in http://mail-index.netbsd.org/tech-net/2023/09/11/msg008610.html and followups. To generate a diff of this commit: cvs rdiff -u -r1.218 -r1.219 src/sys/netinet/tcp_output.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: jschauma Date: Wed Sep 13 14:12:21 UTC 2023 Modified Files: src/share/misc: acronyms.comp Log Message: +CRQC Cryptanalytically Relevant Quantum Computer To generate a diff of this commit: cvs rdiff -u -r1.363 -r1.364 src/share/misc/acronyms.comp 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.comp diff -u src/share/misc/acronyms.comp:1.363 src/share/misc/acronyms.comp:1.364 --- src/share/misc/acronyms.comp:1.363 Mon Sep 11 15:07:52 2023 +++ src/share/misc/acronyms.comp Wed Sep 13 14:12:21 2023 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.363 2023/09/11 15:07:52 jschauma Exp $ +$NetBSD: acronyms.comp,v 1.364 2023/09/13 14:12:21 jschauma Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -315,6 +315,7 @@ CR carriage return CRC cyclic redundancy check CRDT conflict-free replicated data type CRL carrier recovery loop +CRQC cryptanalytically relevant quantum computer CRLF carriage return line feed CSPM cloud security posture management CSU C start up
CVS commit: src/share/misc
Module Name:src Committed By: jschauma Date: Wed Sep 13 14:12:21 UTC 2023 Modified Files: src/share/misc: acronyms.comp Log Message: +CRQC Cryptanalytically Relevant Quantum Computer To generate a diff of this commit: cvs rdiff -u -r1.363 -r1.364 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Wed Sep 13 09:58:38 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #371 - #374 To generate a diff of this commit: cvs rdiff -u -r1.1.2.122 -r1.1.2.123 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: Wed Sep 13 09:58:38 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #371 - #374 To generate a diff of this commit: cvs rdiff -u -r1.1.2.122 -r1.1.2.123 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.122 src/doc/CHANGES-10.0:1.1.2.123 --- src/doc/CHANGES-10.0:1.1.2.122 Mon Sep 11 14:58:56 2023 +++ src/doc/CHANGES-10.0 Wed Sep 13 09:58:37 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.122 2023/09/11 14:58:56 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.123 2023/09/13 09:58:37 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -11912,3 +11912,27 @@ tests/lib/libc/hash/t_hmac.c 1.3 libc: disable md4 hmac tests. [riastradh, ticket #370] +sys/arch/arm/dts/sun8i-h3-orangepi-one.dts delete +sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts 1.5 + + arm: fix FDT build for OrangePi one. + [bouyer, ticket #371] + +external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c 1.11 +external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c 1.19 + + mdnsd(8): fix memory leak in an error path and minor + language fixes in a comment. + [gutteridge, ticket #372] + +sys/net/bpf.h 1.82 + + bpf: Fix SIZEOF_BPF_HDR (for LP64 userland) on mips64 + [rin, ticket #373] + +doc/CHANGES.prev1.173 +(applied to doc/CHANGES) + + Unicode updates were pulled up. + [wiz, ticket #374] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Wed Sep 13 09:56:17 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES Log Message: Pull up following revision(s) (requested by wiz in ticket #374): doc/CHANGES.prev: revision 1.173 (applied to doc/CHANGES) Unicode updates were pulled up To generate a diff of this commit: cvs rdiff -u -r1.2940.2.3 -r1.2940.2.4 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.2940.2.3 src/doc/CHANGES:1.2940.2.4 --- src/doc/CHANGES:1.2940.2.3 Fri Aug 11 16:22:05 2023 +++ src/doc/CHANGES Wed Sep 13 09:56:17 2023 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2940.2.3 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2940.2.4 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -761,6 +761,9 @@ Changes from NetBSD 9.0 to NetBSD 10.0: i386: Enable options DISKLABEL_EI in GENERIC kernel. [tsutsui 20221211] tzcode: Updated to 2022g. [christos 20221211] wbsio(4),lm(4): Add Nuvoton NCT6797D support. [msaitoh 20221215] + libc: Update Unicode tables to Unicode 13.0.0. [wiz 20221220] + libc: Update Unicode tables to Unicode 14.0.0. [wiz 20221220] + libc: Update Unicode tables to Unicode 15.0.0. [wiz 20221221] m68k: Fix out of bounds invalidate and writeback bug in bus_dmamap_sync(9) that could cause panic by POOL_REDZONE assertion on mac68k with sn(4) driver. [tsutsui 20230105]
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Wed Sep 13 09:56:17 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES Log Message: Pull up following revision(s) (requested by wiz in ticket #374): doc/CHANGES.prev: revision 1.173 (applied to doc/CHANGES) Unicode updates were pulled up To generate a diff of this commit: cvs rdiff -u -r1.2940.2.3 -r1.2940.2.4 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/net
Module Name:src
Committed By: martin
Date: Wed Sep 13 09:50:51 UTC 2023
Modified Files:
src/sys/net [netbsd-10]: bpf.h
Log Message:
Pull up following revision(s) (requested by rin in ticket #373):
sys/net/bpf.h: revision 1.82
bpf: Fix SIZEOF_BPF_HDR (for LP64 userland) on mips64
It cannot fit within 18 bytes, of course ;)
As we had never provided working bpf(4) implementation for LP64
userland on mips, just use natural structure size here.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.78.4.1 src/sys/net/bpf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/bpf.h
diff -u src/sys/net/bpf.h:1.78 src/sys/net/bpf.h:1.78.4.1
--- src/sys/net/bpf.h:1.78 Mon Jun 20 08:20:09 2022
+++ src/sys/net/bpf.h Wed Sep 13 09:50:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.h,v 1.78 2022/06/20 08:20:09 yamaguchi Exp $ */
+/* $NetBSD: bpf.h,v 1.78.4.1 2023/09/13 09:50:50 martin Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -204,7 +204,10 @@ struct bpf_hdr32 {
* XXX fail-safe: on new machines, we just use the 'safe' sizeof.
*/
#ifdef _KERNEL
-#if defined(__arm32__) || defined(__i386__) || defined(__m68k__) || \
+#if defined(__mips64)
+#define SIZEOF_BPF_HDR sizeof(struct bpf_hdr)
+#define SIZEOF_BPF_HDR32 18
+#elif defined(__arm32__) || defined(__i386__) || defined(__m68k__) || \
defined(__mips__) || defined(__ns32k__) || defined(__vax__) || \
defined(__sh__) || (defined(__sparc__) && !defined(__sparc64__))
#define SIZEOF_BPF_HDR 18
CVS commit: [netbsd-10] src/sys/net
Module Name:src Committed By: martin Date: Wed Sep 13 09:50:51 UTC 2023 Modified Files: src/sys/net [netbsd-10]: bpf.h Log Message: Pull up following revision(s) (requested by rin in ticket #373): sys/net/bpf.h: revision 1.82 bpf: Fix SIZEOF_BPF_HDR (for LP64 userland) on mips64 It cannot fit within 18 bytes, of course ;) As we had never provided working bpf(4) implementation for LP64 userland on mips, just use natural structure size here. To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.78.4.1 src/sys/net/bpf.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/doc
Module Name:src Committed By: martin Date: Wed Sep 13 09:49:14 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1731 To generate a diff of this commit: cvs rdiff -u -r1.1.2.100 -r1.1.2.101 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/doc
Module Name:src Committed By: martin Date: Wed Sep 13 09:49:14 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1731 To generate a diff of this commit: cvs rdiff -u -r1.1.2.100 -r1.1.2.101 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.100 src/doc/CHANGES-9.4:1.1.2.101 --- src/doc/CHANGES-9.4:1.1.2.100 Mon Sep 11 14:45:05 2023 +++ src/doc/CHANGES-9.4 Wed Sep 13 09:49:14 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.100 2023/09/11 14:45:05 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.101 2023/09/13 09:49:14 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -2121,3 +2121,10 @@ build.sh 1.374 build.sh: add support for git worktree. [khorben, ticket #1730] +external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c 1.11 +external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c 1.19 + + mdnsd(8): fix memory leak in an error path and minor + language fixes in a comment. + [gutteridge, ticket #1731] +
CVS commit: [netbsd-9] src/external/apache2/mDNSResponder/dist
Module Name:src
Committed By: martin
Date: Wed Sep 13 09:48:11 UTC 2023
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSCore [netbsd-9]:
DNSCommon.c
src/external/apache2/mDNSResponder/dist/mDNSPosix [netbsd-9]:
mDNSPosix.c
Log Message:
Pull up following revision(s) (requested by gutteridge in ticket #1731):
external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c: revision 1.19
external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c: revision 1.11
mDNSPosix.c: free very large struct on error path
DNSCommon.c: fix punctuation in a comment
This has very little value in itself; it's intended to make a material
change to this file to facilitate rebuilds. Otherwise, people running
update builds on branches will run into mismatches and build failures
after our switch to use arc4random(3). (That is, this change is
intended to be pulled up.)
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.4.1 \
src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c
cvs rdiff -u -r1.16.2.1 -r1.16.2.2 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.9 src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.9.4.1
--- src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.9 Wed Apr 11 18:33:48 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c Wed Sep 13 09:48:11 2023
@@ -3754,7 +3754,7 @@ mDNSexport mStatus mDNSSendDNSMessage(mD
m->UnicastPacketsSent++;
#endif // APPLE_OSX_mDNSResponder
-// Zero-length message data is okay (e.g. for a DNS Update ack, where all we need is an ID and an error code
+// Zero-length message data is okay (e.g. for a DNS Update ack, where all we need is an ID and an error code)
if (end < msg->data || end - msg->data > AbsoluteMaxDNSMessageData)
{
LogMsg("mDNSSendDNSMessage: invalid message %p %p %d", msg->data, end, end - msg->data);
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.16.2.1 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.16.2.2
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.16.2.1 Sun Jul 26 10:44:28 2020
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Wed Sep 13 09:48:11 2023
@@ -1266,6 +1266,8 @@ mDNSlocal mStatus WatchForInterfaceChang
err = OpenIfNotifySocket(>NotifySD);
if (err == 0)
err = mDNSPosixAddFDToEventLoop(pChgRec->NotifySD, InterfaceChangeCallback, pChgRec);
+if (err)
+mDNSPlatformMemFree(pChgRec);
return err;
}
CVS commit: [netbsd-9] src/external/apache2/mDNSResponder/dist
Module Name:src Committed By: martin Date: Wed Sep 13 09:48:11 UTC 2023 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSCore [netbsd-9]: DNSCommon.c src/external/apache2/mDNSResponder/dist/mDNSPosix [netbsd-9]: mDNSPosix.c Log Message: Pull up following revision(s) (requested by gutteridge in ticket #1731): external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c: revision 1.19 external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c: revision 1.11 mDNSPosix.c: free very large struct on error path DNSCommon.c: fix punctuation in a comment This has very little value in itself; it's intended to make a material change to this file to facilitate rebuilds. Otherwise, people running update builds on branches will run into mismatches and build failures after our switch to use arc4random(3). (That is, this change is intended to be pulled up.) To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.4.1 \ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c cvs rdiff -u -r1.16.2.1 -r1.16.2.2 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.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/external/apache2/mDNSResponder/dist
Module Name:src
Committed By: martin
Date: Wed Sep 13 09:46:49 UTC 2023
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSCore [netbsd-10]:
DNSCommon.c
src/external/apache2/mDNSResponder/dist/mDNSPosix [netbsd-10]:
mDNSPosix.c
Log Message:
Pull up following revision(s) (requested by gutteridge in ticket #372):
external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c: revision 1.19
external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c: revision 1.11
mDNSPosix.c: free very large struct on error path
DNSCommon.c: fix punctuation in a comment
This has very little value in itself; it's intended to make a material
change to this file to facilitate rebuilds. Otherwise, people running
update builds on branches will run into mismatches and build failures
after our switch to use arc4random(3). (That is, this change is
intended to be pulled up.)
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.12.1 \
src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c
cvs rdiff -u -r1.17 -r1.17.6.1 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.9 src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.9.12.1
--- src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c:1.9 Wed Apr 11 18:33:48 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c Wed Sep 13 09:46:49 2023
@@ -3754,7 +3754,7 @@ mDNSexport mStatus mDNSSendDNSMessage(mD
m->UnicastPacketsSent++;
#endif // APPLE_OSX_mDNSResponder
-// Zero-length message data is okay (e.g. for a DNS Update ack, where all we need is an ID and an error code
+// Zero-length message data is okay (e.g. for a DNS Update ack, where all we need is an ID and an error code)
if (end < msg->data || end - msg->data > AbsoluteMaxDNSMessageData)
{
LogMsg("mDNSSendDNSMessage: invalid message %p %p %d", msg->data, end, end - msg->data);
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.17 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.17.6.1
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.17 Tue Jul 21 14:04:07 2020
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Wed Sep 13 09:46:49 2023
@@ -1266,6 +1266,8 @@ mDNSlocal mStatus WatchForInterfaceChang
err = OpenIfNotifySocket(>NotifySD);
if (err == 0)
err = mDNSPosixAddFDToEventLoop(pChgRec->NotifySD, InterfaceChangeCallback, pChgRec);
+if (err)
+mDNSPlatformMemFree(pChgRec);
return err;
}
CVS commit: [netbsd-10] src/external/apache2/mDNSResponder/dist
Module Name:src Committed By: martin Date: Wed Sep 13 09:46:49 UTC 2023 Modified Files: src/external/apache2/mDNSResponder/dist/mDNSCore [netbsd-10]: DNSCommon.c src/external/apache2/mDNSResponder/dist/mDNSPosix [netbsd-10]: mDNSPosix.c Log Message: Pull up following revision(s) (requested by gutteridge in ticket #372): external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c: revision 1.19 external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c: revision 1.11 mDNSPosix.c: free very large struct on error path DNSCommon.c: fix punctuation in a comment This has very little value in itself; it's intended to make a material change to this file to facilitate rebuilds. Otherwise, people running update builds on branches will run into mismatches and build failures after our switch to use arc4random(3). (That is, this change is intended to be pulled up.) To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.12.1 \ src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c cvs rdiff -u -r1.17 -r1.17.6.1 \ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/arm/dts
Module Name:src
Committed By: martin
Date: Wed Sep 13 09:42:51 UTC 2023
Modified Files:
src/sys/arch/arm/dts [netbsd-10]: sun8i-h3-orangepi-plus2e.dts
Removed Files:
src/sys/arch/arm/dts [netbsd-10]: sun8i-h3-orangepi-one.dts
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #371):
sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts: revision 1.5
sys/arch/arm/dts/sun8i-h3-orangepi-one.dts: file removal
Remove now-unneeded and brocken (probably since dts-5.15 import)
sun8i-h3-orangepi-one.dts, and let the build use the one from sys/external.
Problem reported and fix tested by Dave Tyson as reported on port-arm@
While there remove #include "sun8i-h3.dtsi" from sun8i-h3-orangepi-plus2e.dts,
this file has been removed with the dts-5.15 import.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r0 src/sys/arch/arm/dts/sun8i-h3-orangepi-one.dts
cvs rdiff -u -r1.4 -r1.4.28.1 \
src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts
diff -u src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts:1.4 src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts:1.4.28.1
--- src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts:1.4 Tue May 21 22:31:39 2019
+++ src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts Wed Sep 13 09:42:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sun8i-h3-orangepi-plus2e.dts,v 1.4 2019/05/21 22:31:39 jmcneill Exp $ */
+/* $NetBSD: sun8i-h3-orangepi-plus2e.dts,v 1.4.28.1 2023/09/13 09:42:50 martin Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -27,7 +27,6 @@
*/
#include "../../../external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts"
-#include "sun8i-h3.dtsi"
/ {
cpus {
CVS commit: [netbsd-10] src/sys/arch/arm/dts
Module Name:src Committed By: martin Date: Wed Sep 13 09:42:51 UTC 2023 Modified Files: src/sys/arch/arm/dts [netbsd-10]: sun8i-h3-orangepi-plus2e.dts Removed Files: src/sys/arch/arm/dts [netbsd-10]: sun8i-h3-orangepi-one.dts Log Message: Pull up following revision(s) (requested by bouyer in ticket #371): sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts: revision 1.5 sys/arch/arm/dts/sun8i-h3-orangepi-one.dts: file removal Remove now-unneeded and brocken (probably since dts-5.15 import) sun8i-h3-orangepi-one.dts, and let the build use the one from sys/external. Problem reported and fix tested by Dave Tyson as reported on port-arm@ While there remove #include "sun8i-h3.dtsi" from sun8i-h3-orangepi-plus2e.dts, this file has been removed with the dts-5.15 import. To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/sys/arch/arm/dts/sun8i-h3-orangepi-one.dts cvs rdiff -u -r1.4 -r1.4.28.1 \ src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts 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: wiz Date: Wed Sep 13 09:27:53 UTC 2023 Modified Files: src/doc: CHANGES CHANGES.prev Log Message: Unicode updates were pulled up To generate a diff of this commit: cvs rdiff -u -r1.2999 -r1.3000 src/doc/CHANGES cvs rdiff -u -r1.172 -r1.173 src/doc/CHANGES.prev 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.2999 src/doc/CHANGES:1.3000 --- src/doc/CHANGES:1.2999 Sat Sep 9 18:30:00 2023 +++ src/doc/CHANGES Wed Sep 13 09:27:53 2023 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2999 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3000 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -26,10 +26,7 @@ Changes from NetBSD 10.0 to NetBSD 11.0: amdsmn(4): added trivial power management support [reinoud 20221218] amdccp(4): added trivial power management support [reinoud 20221218] - libc: Update Unicode tables to Unicode 13.0.0. [wiz 20221220] - libc: Update Unicode tables to Unicode 14.0.0. [wiz 20221220] ppp(4): Remove several non-functioning ioctls. [chs 20221221] - libc: Update Unicode tables to Unicode 15.0.0. [wiz 20221221] dse(4): Added Dayna SCSI/Link ethernet driver. [nat 20221222] binutils: Updated to FSF binutils 2.39. [christos 20221224] cribbage(6): Add -y option to keep playing without asking Index: src/doc/CHANGES.prev diff -u src/doc/CHANGES.prev:1.172 src/doc/CHANGES.prev:1.173 --- src/doc/CHANGES.prev:1.172 Wed Jul 12 16:07:52 2023 +++ src/doc/CHANGES.prev Wed Sep 13 09:27:53 2023 @@ -1,4 +1,4 @@ -LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.172 $> +LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.173 $> Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8: @@ -13396,6 +13396,9 @@ Changes from NetBSD 9.0 to NetBSD 10.0: i386: Enable options DISKLABEL_EI in GENERIC kernel. [tsutsui 20221211] tzcode: Updated to 2022g. [christos 20221211] wbsio(4),lm(4): Add Nuvoton NCT6797D support. [msaitoh 20221215] + libc: Update Unicode tables to Unicode 13.0.0. [wiz 20221220] + libc: Update Unicode tables to Unicode 14.0.0. [wiz 20221220] + libc: Update Unicode tables to Unicode 15.0.0. [wiz 20221221] m68k: Fix out of bounds invalidate and writeback bug in bus_dmamap_sync(9) that could cause panic by POOL_REDZONE assertion on mac68k with sn(4) driver. [tsutsui 20230105]
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Wed Sep 13 09:27:53 UTC 2023 Modified Files: src/doc: CHANGES CHANGES.prev Log Message: Unicode updates were pulled up To generate a diff of this commit: cvs rdiff -u -r1.2999 -r1.3000 src/doc/CHANGES cvs rdiff -u -r1.172 -r1.173 src/doc/CHANGES.prev Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Wed Sep 13 08:05:23 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
ixg(4): Count Queue Bytes {Transmit, Receive} counter.
To generate a diff of this commit:
cvs rdiff -u -r1.328 -r1.329 src/sys/dev/pci/ixgbe/ixgbe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Wed Sep 13 08:05:23 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
ixg(4): Count Queue Bytes {Transmit, Receive} counter.
To generate a diff of this commit:
cvs rdiff -u -r1.328 -r1.329 src/sys/dev/pci/ixgbe/ixgbe.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.328 src/sys/dev/pci/ixgbe/ixgbe.c:1.329
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.328 Wed Sep 13 07:38:31 2023
+++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Sep 13 08:05:23 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.328 2023/09/13 07:38:31 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.329 2023/09/13 08:05:23 msaitoh Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.328 2023/09/13 07:38:31 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.329 2023/09/13 08:05:23 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1638,8 +1638,19 @@ ixgbe_update_stats_counters(struct adapt
for (i = 0; i < queue_counters; i++) {
IXGBE_EVC_REGADD(hw, stats, IXGBE_QPRC(i), qprc[i]);
IXGBE_EVC_REGADD(hw, stats, IXGBE_QPTC(i), qptc[i]);
- if (hw->mac.type >= ixgbe_mac_82599EB)
+ if (hw->mac.type >= ixgbe_mac_82599EB) {
+ IXGBE_EVC_ADD(>qbrc[i],
+ IXGBE_READ_REG(hw, IXGBE_QBRC_L(i)) +
+ ((u64)IXGBE_READ_REG(hw, IXGBE_QBRC_H(i)) << 32));
+ IXGBE_EVC_ADD(>qbtc[i],
+ IXGBE_READ_REG(hw, IXGBE_QBTC_L(i)) +
+ ((u64)IXGBE_READ_REG(hw, IXGBE_QBTC_H(i)) << 32));
IXGBE_EVC_REGADD(hw, stats, IXGBE_QPRDC(i), qprdc[i]);
+ } else {
+ /* 82598 */
+ IXGBE_EVC_REGADD(hw, stats, IXGBE_QBRC(i), qbrc[i]);
+ IXGBE_EVC_REGADD(hw, stats, IXGBE_QBTC(i), qbtc[i]);
+ }
}
/* 8 registers exist */
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Wed Sep 13 07:38:31 UTC 2023 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c Log Message: ixg(4): Rename some descriptions of event counters. - Rename some descriptions from register name to the meaning. - For the same meaning's counters, add "(soft)" or "(reg)". The former is for a software level counter and the latter is for a statistics counter register based. To generate a diff of this commit: cvs rdiff -u -r1.327 -r1.328 src/sys/dev/pci/ixgbe/ixgbe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Wed Sep 13 07:38:31 UTC 2023 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c Log Message: ixg(4): Rename some descriptions of event counters. - Rename some descriptions from register name to the meaning. - For the same meaning's counters, add "(soft)" or "(reg)". The former is for a software level counter and the latter is for a statistics counter register based. To generate a diff of this commit: cvs rdiff -u -r1.327 -r1.328 src/sys/dev/pci/ixgbe/ixgbe.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.327 src/sys/dev/pci/ixgbe/ixgbe.c:1.328 --- src/sys/dev/pci/ixgbe/ixgbe.c:1.327 Wed Sep 13 07:28:51 2023 +++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Sep 13 07:38:31 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe.c,v 1.327 2023/09/13 07:28:51 msaitoh Exp $ */ +/* $NetBSD: ixgbe.c,v 1.328 2023/09/13 07:38:31 msaitoh Exp $ */ /** @@ -64,7 +64,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.327 2023/09/13 07:28:51 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.328 2023/09/13 07:38:31 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1948,14 +1948,14 @@ ixgbe_add_hw_stats(struct adapter *adapt if (i < __arraycount(stats->qbtc)) evcnt_attach_dynamic(>qbtc[i], EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf, - "qbtc"); + "Queue Bytes Transmitted (reg)"); evcnt_attach_dynamic(>total_packets, EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf, - "Queue Packets Transmitted"); + "Queue Packets Transmitted (soft)"); if (i < __arraycount(stats->qptc)) evcnt_attach_dynamic(>qptc[i], EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf, - "qptc"); + "Queue Packets Transmitted (reg)"); #ifndef IXGBE_LEGACY_TX evcnt_attach_dynamic(>pcq_drops, EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf, @@ -1969,24 +1969,24 @@ ixgbe_add_hw_stats(struct adapter *adapt evcnt_attach_dynamic(>rx_bytes, EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf, - "Queue Bytes Received"); + "Queue Bytes Received (soft)"); if (i < __arraycount(stats->qbrc)) evcnt_attach_dynamic(>qbrc[i], EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf, - "qbrc"); + "Queue Bytes Received (reg)"); evcnt_attach_dynamic(>rx_packets, EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf, - "Queue Packets Received"); + "Queue Packets Received (soft)"); if (i < __arraycount(stats->qprc)) evcnt_attach_dynamic(>qprc[i], EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf, - "qprc"); + "Queue Packets Received (reg)"); if ((i < __arraycount(stats->qprdc)) && (hw->mac.type >= ixgbe_mac_82599EB)) evcnt_attach_dynamic(>qprdc[i], EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf, -"qprdc"); +"Queue Packets Received Drop"); evcnt_attach_dynamic(>no_mbuf, EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf, "Rx no mbuf");
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Wed Sep 13 07:28:51 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixgbe.h ixv.c
Log Message:
ixgbe: Reorder some event counters for readability.
To generate a diff of this commit:
cvs rdiff -u -r1.326 -r1.327 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.183 -r1.184 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.326 src/sys/dev/pci/ixgbe/ixgbe.c:1.327
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.326 Mon May 15 08:01:22 2023
+++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Sep 13 07:28:51 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.326 2023/05/15 08:01:22 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.327 2023/09/13 07:28:51 msaitoh Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.326 2023/05/15 08:01:22 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.327 2023/09/13 07:28:51 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1870,7 +1870,7 @@ ixgbe_add_hw_stats(struct adapter *adapt
for (i = 0; i < adapter->num_queues; i++, rxr++, txr++) {
#ifdef LRO
struct lro_ctrl *lro = >lro;
-#endif /* LRO */
+#endif
snprintf(adapter->queues[i].evnamebuf,
sizeof(adapter->queues[i].evnamebuf), "%s q%d", xname, i);
@@ -1910,27 +1910,6 @@ ixgbe_add_hw_stats(struct adapter *adapt
0, CTL_CREATE, CTL_EOL) != 0)
break;
- evcnt_attach_dynamic(>queues[i].irqs, EVCNT_TYPE_INTR,
- NULL, adapter->queues[i].evnamebuf, "IRQs on queue");
- evcnt_attach_dynamic(>queues[i].handleq,
- EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf,
- "Handled queue in softint");
- evcnt_attach_dynamic(>queues[i].req, EVCNT_TYPE_MISC,
- NULL, adapter->queues[i].evnamebuf, "Requeued in softint");
- evcnt_attach_dynamic(>tso_tx, EVCNT_TYPE_MISC,
- NULL, adapter->queues[i].evnamebuf, "TSO");
- evcnt_attach_dynamic(>no_desc_avail, EVCNT_TYPE_MISC,
- NULL, adapter->queues[i].evnamebuf,
- "TX Queue No Descriptor Available");
- evcnt_attach_dynamic(>total_packets, EVCNT_TYPE_MISC,
- NULL, adapter->queues[i].evnamebuf,
- "Queue Packets Transmitted");
-#ifndef IXGBE_LEGACY_TX
- evcnt_attach_dynamic(>pcq_drops, EVCNT_TYPE_MISC,
- NULL, adapter->queues[i].evnamebuf,
- "Packets dropped in pcq");
-#endif
-
if (sysctl_createv(log, 0, , ,
CTLFLAG_READONLY, CTLTYPE_INT, "rxd_nxck",
SYSCTL_DESCR("Receive Descriptor next to check"),
@@ -1959,33 +1938,62 @@ ixgbe_add_hw_stats(struct adapter *adapt
CTL_CREATE, CTL_EOL) != 0)
break;
- if (i < __arraycount(stats->qprc)) {
- evcnt_attach_dynamic(>qprc[i], EVCNT_TYPE_MISC,
- NULL, adapter->queues[i].evnamebuf, "qprc");
- evcnt_attach_dynamic(>qptc[i], EVCNT_TYPE_MISC,
- NULL, adapter->queues[i].evnamebuf, "qptc");
- evcnt_attach_dynamic(>qbrc[i], EVCNT_TYPE_MISC,
- NULL, adapter->queues[i].evnamebuf, "qbrc");
+ evcnt_attach_dynamic(>queues[i].irqs, EVCNT_TYPE_INTR,
+ NULL, adapter->queues[i].evnamebuf, "IRQs on queue");
+ evcnt_attach_dynamic(>queues[i].handleq,
+ EVCNT_TYPE_MISC, NULL, adapter->queues[i].evnamebuf,
+ "Handled queue in softint");
+ evcnt_attach_dynamic(>queues[i].req, EVCNT_TYPE_MISC,
+ NULL, adapter->queues[i].evnamebuf, "Requeued in softint");
+ if (i < __arraycount(stats->qbtc))
evcnt_attach_dynamic(>qbtc[i], EVCNT_TYPE_MISC,
- NULL, adapter->queues[i].evnamebuf, "qbtc");
- if (hw->mac.type >= ixgbe_mac_82599EB)
-evcnt_attach_dynamic(>qprdc[i],
-EVCNT_TYPE_MISC, NULL,
-adapter->queues[i].evnamebuf, "qprdc");
- }
-
- evcnt_attach_dynamic(>rx_packets, EVCNT_TYPE_MISC,
+ NULL, adapter->queues[i].evnamebuf,
+ "qbtc");
+ evcnt_attach_dynamic(>total_packets, EVCNT_TYPE_MISC,
NULL, adapter->queues[i].evnamebuf,
- "Queue Packets Received");
+ "Queue Packets Transmitted");
+ if (i < __arraycount(stats->qptc))
+ evcnt_attach_dynamic(>qptc[i], EVCNT_TYPE_MISC,
+ NULL, adapter->queues[i].evnamebuf,
+ "qptc");
+#ifndef IXGBE_LEGACY_TX
+ evcnt_attach_dynamic(>pcq_drops, EVCNT_TYPE_MISC,
+ NULL, adapter->queues[i].evnamebuf,
+ "Packets dropped in pcq");
+#endif
+ evcnt_attach_dynamic(>no_desc_avail, EVCNT_TYPE_MISC,
+ NULL, adapter->queues[i].evnamebuf,
+ "TX Queue No Descriptor Available");
+ evcnt_attach_dynamic(>tso_tx, EVCNT_TYPE_MISC,
+ NULL, adapter->queues[i].evnamebuf, "TSO");
+
evcnt_attach_dynamic(>rx_bytes, EVCNT_TYPE_MISC,
NULL, adapter->queues[i].evnamebuf,
"Queue Bytes Received");
- evcnt_attach_dynamic(>rx_copies, EVCNT_TYPE_MISC,
- NULL,
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Wed Sep 13 07:28:51 UTC 2023 Modified Files: src/sys/dev/pci/ixgbe: ixgbe.c ixgbe.h ixv.c Log Message: ixgbe: Reorder some event counters for readability. To generate a diff of this commit: cvs rdiff -u -r1.326 -r1.327 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.86 -r1.87 src/sys/dev/pci/ixgbe/ixgbe.h cvs rdiff -u -r1.183 -r1.184 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/usr.sbin/cpuctl
Module Name:src
Committed By: wiz
Date: Wed Sep 13 06:53:23 UTC 2023
Modified Files:
src/usr.sbin/cpuctl: cpuctl.c
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
tabify
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/usr.sbin/cpuctl/cpuctl.c
cvs rdiff -u -r1.140 -r1.141 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/cpuctl/cpuctl.c
diff -u src/usr.sbin/cpuctl/cpuctl.c:1.34 src/usr.sbin/cpuctl/cpuctl.c:1.35
--- src/usr.sbin/cpuctl/cpuctl.c:1.34 Tue Sep 12 20:43:38 2023
+++ src/usr.sbin/cpuctl/cpuctl.c Wed Sep 13 06:53:23 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuctl.c,v 1.34 2023/09/12 20:43:38 wiz Exp $ */
+/* $NetBSD: cpuctl.c,v 1.35 2023/09/13 06:53:23 wiz Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2012, 2015 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#ifndef lint
#include
-__RCSID("$NetBSD: cpuctl.c,v 1.34 2023/09/12 20:43:38 wiz Exp $");
+__RCSID("$NetBSD: cpuctl.c,v 1.35 2023/09/13 06:53:23 wiz Exp $");
#endif /* not lint */
#include
@@ -247,8 +247,8 @@ cpu_ucode(char **argv)
cpuset_destroy(cpuset);
}
error = ioctl(fd, IOC_CPU_UCODE_APPLY, );
-if (error < 0 && (verbose || errno != EEXIST)) {
-warnx("please also check dmesg(8) output for additional error information");
+ if (error < 0 && (verbose || errno != EEXIST)) {
+ warnx("please also check dmesg(8) output for additional error information");
if (uc.fwname[0])
err(EXIT_FAILURE, "%s", uc.fwname);
else
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.140 src/usr.sbin/cpuctl/arch/i386.c:1.141
--- src/usr.sbin/cpuctl/arch/i386.c:1.140 Tue Sep 12 20:43:38 2023
+++ src/usr.sbin/cpuctl/arch/i386.c Wed Sep 13 06:53:23 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.140 2023/09/12 20:43:38 wiz Exp $ */
+/* $NetBSD: i386.c,v 1.141 2023/09/13 06:53:23 wiz Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.140 2023/09/12 20:43:38 wiz Exp $");
+__RCSID("$NetBSD: i386.c,v 1.141 2023/09/13 06:53:23 wiz Exp $");
#endif /* not lint */
#include
@@ -2584,8 +2584,8 @@ ucodeupdate_check(int fd, struct cpu_uco
switch (loader_version) {
case CPU_UCODE_LOADER_AMD:
-if (uc->cpu_nr != -1) {
-warnx("ucode updates on AMD can only be done on all CPUs at once");
+ if (uc->cpu_nr != -1) {
+ warnx("ucode updates on AMD can only be done on all CPUs at once");
return -1;
}
uc->cpu_nr = CPU_UCODE_ALL_CPUS;
CVS commit: src/usr.sbin/cpuctl
Module Name:src Committed By: wiz Date: Wed Sep 13 06:53:23 UTC 2023 Modified Files: src/usr.sbin/cpuctl: cpuctl.c src/usr.sbin/cpuctl/arch: i386.c Log Message: tabify To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/usr.sbin/cpuctl/cpuctl.c cvs rdiff -u -r1.140 -r1.141 src/usr.sbin/cpuctl/arch/i386.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
