CVS commit: src/external/gpl3/gcc/dist
Module Name:src Committed By: mrg Date: Sun Jul 30 05:51:45 UTC 2023 Modified Files: src/external/gpl3/gcc/dist: LAST_UPDATED MD5SUMS NEWS config.guess config.sub configure configure.ac src/external/gpl3/gcc/dist/INSTALL: binaries.html build.html configure.html download.html finalinstall.html gfdl.html index.html prerequisites.html specific.html test.html src/external/gpl3/gcc/dist/fixincludes: configure src/external/gpl3/gcc/dist/gcc: ChangeLog Makefile.in common.opt config.gcc config.host configure configure.ac debug.h file-prefix-map.h gcc.h genmultilib graphite.h hwint.h output.h system.h target-def.h tree.h src/external/gpl3/gcc/dist/gcc/c: Make-lang.in src/external/gpl3/gcc/dist/gcc/c-family: c-format.h c.opt src/external/gpl3/gcc/dist/gcc/config: freebsd-spec.h netbsd-elf.h netbsd-stdint.h netbsd.h t-linux t-netbsd x-netbsd src/external/gpl3/gcc/dist/gcc/config/aarch64: aarch64-netbsd.h aarch64.h t-aarch64 t-aarch64-netbsd src/external/gpl3/gcc/dist/gcc/config/alpha: alpha.h elf.h netbsd.h t-alpha src/external/gpl3/gcc/dist/gcc/config/arc: arc-modes.def arc-protos.h arc.h arc.md arc.opt t-arc src/external/gpl3/gcc/dist/gcc/config/arm: arm.h arm.md bpabi.h elf.h freebsd.h netbsd-eabi.h netbsd-elf.h t-arm thumb2.md src/external/gpl3/gcc/dist/gcc/config/i386: constraints.md cpuid.h i386-opts.h i386-protos.h i386.h i386.md i386.opt netbsd-elf.h netbsd64.h pmm_malloc.h predicates.md t-djgpp src/external/gpl3/gcc/dist/gcc/config/m68k: constraints.md m68k.md netbsd-elf.h src/external/gpl3/gcc/dist/gcc/config/mips: netbsd.h t-mips src/external/gpl3/gcc/dist/gcc/config/or1k: constraints.md elf.h or1k-protos.h or1k.h or1k.md or1k.opt predicates.md t-or1k src/external/gpl3/gcc/dist/gcc/config/pa: pa-netbsd.h pa.h pa32-netbsd.h t-pa src/external/gpl3/gcc/dist/gcc/config/riscv: constraints.md elf.h generic.md linux.h peephole.md predicates.md riscv-ftypes.def riscv-modes.def riscv-protos.h riscv.h riscv.md riscv.opt sync.md src/external/gpl3/gcc/dist/gcc/config/rs6000: netbsd.h ppc-asm.h sysv4.h t-netbsd t-rs6000 vxworksae.h src/external/gpl3/gcc/dist/gcc/config/sh: netbsd-elf.h sh.md t-sh src/external/gpl3/gcc/dist/gcc/config/sparc: constraints.md netbsd-elf.h predicates.md sparc.md sync.md src/external/gpl3/gcc/dist/gcc/config/vax: builtins.md constraints.md elf.h netbsd-elf.h predicates.md vax-protos.h vax.h vax.md src/external/gpl3/gcc/dist/gcc/cp: Make-lang.in cfns.gperf cfns.h src/external/gpl3/gcc/dist/gcc/doc: cpp.1 cpp.info cpp.texi cppenv.texi cppinternals.info cppopts.texi extend.texi fsf-funding.7 g++.1 gcc.1 gcc.info gccinstall.info gccint.info gcov-tool.1 gcov.1 gcov.texi gfdl.7 gfortran.1 gpl.7 invoke.texi src/external/gpl3/gcc/dist/gcc/ginclude: stddef.h unwind-arm-common.h src/external/gpl3/gcc/dist/gcc/objc: Make-lang.in src/external/gpl3/gcc/dist/gcc/objcp: Make-lang.in src/external/gpl3/gcc/dist/include: ansidecl.h objalloc.h src/external/gpl3/gcc/dist/intl: configure src/external/gpl3/gcc/dist/libbacktrace: configure src/external/gpl3/gcc/dist/libcpp: Makefile.in configure configure.ac internal.h src/external/gpl3/gcc/dist/libcpp/include: cpplib.h src/external/gpl3/gcc/dist/libdecnumber: configure src/external/gpl3/gcc/dist/libgcc: Makefile.in config.host configure emutls.c gthr-posix.h unwind-compat.c unwind-dw2-fde-dip.c unwind-dw2-fde.c unwind-dw2.c unwind-generic.h unwind-seh.c unwind-sjlj.c src/external/gpl3/gcc/dist/libgcc/config/alpha: qrnnd.S src/external/gpl3/gcc/dist/libgcc/config/arm: pr-support.c src/external/gpl3/gcc/dist/libgcc/config/c6x: pr-support.c src/external/gpl3/gcc/dist/libgcc/config/cr16: unwind-cr16.c src/external/gpl3/gcc/dist/libgcc/config/i386: morestack.S src/external/gpl3/gcc/dist/libgcc/config/ia64: unwind-ia64.c src/external/gpl3/gcc/dist/libgcc/config/m68k: lb1sf68.S src/external/gpl3/gcc/dist/libgcc/config/or1k: linux-unwind.h sfp-machine.h t-or1k src/external/gpl3/gcc/dist/libgcc/config/riscv: t-elf src/external/gpl3/gcc/dist/libgcc/config/xtensa: unwind-dw2-xtensa.c src/external/gpl3/gcc/dist/libgomp: Makefile.am Makefile.in acc_prof.h configure configure.ac libgomp.info src/external/gpl3/gcc/dist/libiberty: Makefile.in configure configure.ac cp-demangle.c floatformat.c make-temp-file.c objalloc.c sha1.c
CVS commit: src/external/gpl3/gcc/dist
Module Name:src Committed By: mrg Date: Sun Jul 30 05:51:45 UTC 2023 Modified Files: src/external/gpl3/gcc/dist: LAST_UPDATED MD5SUMS NEWS config.guess config.sub configure configure.ac src/external/gpl3/gcc/dist/INSTALL: binaries.html build.html configure.html download.html finalinstall.html gfdl.html index.html prerequisites.html specific.html test.html src/external/gpl3/gcc/dist/fixincludes: configure src/external/gpl3/gcc/dist/gcc: ChangeLog Makefile.in common.opt config.gcc config.host configure configure.ac debug.h file-prefix-map.h gcc.h genmultilib graphite.h hwint.h output.h system.h target-def.h tree.h src/external/gpl3/gcc/dist/gcc/c: Make-lang.in src/external/gpl3/gcc/dist/gcc/c-family: c-format.h c.opt src/external/gpl3/gcc/dist/gcc/config: freebsd-spec.h netbsd-elf.h netbsd-stdint.h netbsd.h t-linux t-netbsd x-netbsd src/external/gpl3/gcc/dist/gcc/config/aarch64: aarch64-netbsd.h aarch64.h t-aarch64 t-aarch64-netbsd src/external/gpl3/gcc/dist/gcc/config/alpha: alpha.h elf.h netbsd.h t-alpha src/external/gpl3/gcc/dist/gcc/config/arc: arc-modes.def arc-protos.h arc.h arc.md arc.opt t-arc src/external/gpl3/gcc/dist/gcc/config/arm: arm.h arm.md bpabi.h elf.h freebsd.h netbsd-eabi.h netbsd-elf.h t-arm thumb2.md src/external/gpl3/gcc/dist/gcc/config/i386: constraints.md cpuid.h i386-opts.h i386-protos.h i386.h i386.md i386.opt netbsd-elf.h netbsd64.h pmm_malloc.h predicates.md t-djgpp src/external/gpl3/gcc/dist/gcc/config/m68k: constraints.md m68k.md netbsd-elf.h src/external/gpl3/gcc/dist/gcc/config/mips: netbsd.h t-mips src/external/gpl3/gcc/dist/gcc/config/or1k: constraints.md elf.h or1k-protos.h or1k.h or1k.md or1k.opt predicates.md t-or1k src/external/gpl3/gcc/dist/gcc/config/pa: pa-netbsd.h pa.h pa32-netbsd.h t-pa src/external/gpl3/gcc/dist/gcc/config/riscv: constraints.md elf.h generic.md linux.h peephole.md predicates.md riscv-ftypes.def riscv-modes.def riscv-protos.h riscv.h riscv.md riscv.opt sync.md src/external/gpl3/gcc/dist/gcc/config/rs6000: netbsd.h ppc-asm.h sysv4.h t-netbsd t-rs6000 vxworksae.h src/external/gpl3/gcc/dist/gcc/config/sh: netbsd-elf.h sh.md t-sh src/external/gpl3/gcc/dist/gcc/config/sparc: constraints.md netbsd-elf.h predicates.md sparc.md sync.md src/external/gpl3/gcc/dist/gcc/config/vax: builtins.md constraints.md elf.h netbsd-elf.h predicates.md vax-protos.h vax.h vax.md src/external/gpl3/gcc/dist/gcc/cp: Make-lang.in cfns.gperf cfns.h src/external/gpl3/gcc/dist/gcc/doc: cpp.1 cpp.info cpp.texi cppenv.texi cppinternals.info cppopts.texi extend.texi fsf-funding.7 g++.1 gcc.1 gcc.info gccinstall.info gccint.info gcov-tool.1 gcov.1 gcov.texi gfdl.7 gfortran.1 gpl.7 invoke.texi src/external/gpl3/gcc/dist/gcc/ginclude: stddef.h unwind-arm-common.h src/external/gpl3/gcc/dist/gcc/objc: Make-lang.in src/external/gpl3/gcc/dist/gcc/objcp: Make-lang.in src/external/gpl3/gcc/dist/include: ansidecl.h objalloc.h src/external/gpl3/gcc/dist/intl: configure src/external/gpl3/gcc/dist/libbacktrace: configure src/external/gpl3/gcc/dist/libcpp: Makefile.in configure configure.ac internal.h src/external/gpl3/gcc/dist/libcpp/include: cpplib.h src/external/gpl3/gcc/dist/libdecnumber: configure src/external/gpl3/gcc/dist/libgcc: Makefile.in config.host configure emutls.c gthr-posix.h unwind-compat.c unwind-dw2-fde-dip.c unwind-dw2-fde.c unwind-dw2.c unwind-generic.h unwind-seh.c unwind-sjlj.c src/external/gpl3/gcc/dist/libgcc/config/alpha: qrnnd.S src/external/gpl3/gcc/dist/libgcc/config/arm: pr-support.c src/external/gpl3/gcc/dist/libgcc/config/c6x: pr-support.c src/external/gpl3/gcc/dist/libgcc/config/cr16: unwind-cr16.c src/external/gpl3/gcc/dist/libgcc/config/i386: morestack.S src/external/gpl3/gcc/dist/libgcc/config/ia64: unwind-ia64.c src/external/gpl3/gcc/dist/libgcc/config/m68k: lb1sf68.S src/external/gpl3/gcc/dist/libgcc/config/or1k: linux-unwind.h sfp-machine.h t-or1k src/external/gpl3/gcc/dist/libgcc/config/riscv: t-elf src/external/gpl3/gcc/dist/libgcc/config/xtensa: unwind-dw2-xtensa.c src/external/gpl3/gcc/dist/libgomp: Makefile.am Makefile.in acc_prof.h configure configure.ac libgomp.info src/external/gpl3/gcc/dist/libiberty: Makefile.in configure configure.ac cp-demangle.c floatformat.c make-temp-file.c objalloc.c sha1.c
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: rin
Date: Sun Jul 30 05:31:30 UTC 2023
Modified Files:
src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h
netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
COMPANT_NETBSD32: Regen for syscalls.master,v 1.143
To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.157 -r1.158 src/sys/compat/netbsd32/netbsd32_syscallargs.h \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.37 -r1.38 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.156 -r1.157 src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.50 -r1.51 src/sys/compat/netbsd32/netbsd32_systrace_args.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/compat/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.158 src/sys/compat/netbsd32/netbsd32_syscall.h:1.159
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.158 Sat Jul 29 12:39:20 2023
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Sun Jul 30 05:31:30 2023
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.158 2023/07/29 12:39:20 rin Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.159 2023/07/30 05:31:30 rin Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.142 2023/07/29 12:38:25 rin Exp
+ * created from NetBSD: syscalls.master,v 1.143 2023/07/30 05:30:45 rin Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -1338,6 +1338,9 @@
/* syscall: "netbsd32_lpathconf" ret: "long" args: "const netbsd32_charp" "int" */
#define NETBSD32_SYS_netbsd32_lpathconf 499
+/* syscall: "netbsd32_memfd_create" ret: "int" args: "const netbsd32_charp" "unsigned int" */
+#define NETBSD32_SYS_netbsd32_memfd_create 500
+
/* syscall: "netbsd32___kevent100" ret: "int" args: "int" "const netbsd32_keventp_t" "netbsd32_size_t" "netbsd32_keventp_t" "netbsd32_size_t" "const netbsd32_timespecp_t" */
#define NETBSD32_SYS_netbsd32___kevent100 501
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.157 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.158
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.157 Sat Jul 29 12:39:20 2023
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Sun Jul 30 05:31:30 2023
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.157 2023/07/29 12:39:20 rin Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.158 2023/07/30 05:31:30 rin Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.142 2023/07/29 12:38:25 rin Exp
+ * created from NetBSD: syscalls.master,v 1.143 2023/07/30 05:30:45 rin Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -2789,6 +2789,12 @@ struct netbsd32_lpathconf_args {
};
check_syscall_args(netbsd32_lpathconf)
+struct netbsd32_memfd_create_args {
+ syscallarg(const netbsd32_charp) name;
+ syscallarg(unsigned int) flags;
+};
+check_syscall_args(netbsd32_memfd_create)
+
struct netbsd32___kevent100_args {
syscallarg(int) fd;
syscallarg(const netbsd32_keventp_t) changelist;
@@ -3669,6 +3675,8 @@ int netbsd32___acl_aclcheck_fd(struct lw
int netbsd32_lpathconf(struct lwp *, const struct netbsd32_lpathconf_args *, register_t *);
+int netbsd32_memfd_create(struct lwp *, const struct netbsd32_memfd_create_args *, register_t *);
+
int netbsd32___kevent100(struct lwp *, const struct netbsd32___kevent100_args *, register_t *);
#endif /* _NETBSD32_SYS_SYSCALLARGS_H_ */
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.157 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.158
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.157 Sat Jul 29 12:39:20 2023
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Sun Jul 30 05:31:30 2023
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.157 2023/07/29 12:39:20 rin Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.158 2023/07/30 05:31:30 rin Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.142 2023/07/29 12:38:25 rin Exp
+ * created from NetBSD: syscalls.master,v 1.143 2023/07/30 05:30:45 rin Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.157 2023/07/29 12:39:20 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.158 2023/07/30 05:31:30 rin Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -538,7 +538,7 @@ const char *const netbsd32_syscallnames[
/* 497 */ "netbsd32___acl_aclcheck_file",
/* 498 */ "netbsd32___acl_aclcheck_fd",
/* 499 */ "netbsd32_lpathconf",
- /* 500 */ "#500 (unimplemented
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: rin Date: Sun Jul 30 05:31:30 UTC 2023 Modified Files: src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: COMPANT_NETBSD32: Regen for syscalls.master,v 1.143 To generate a diff of this commit: cvs rdiff -u -r1.158 -r1.159 src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.157 -r1.158 src/sys/compat/netbsd32/netbsd32_syscallargs.h \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.37 -r1.38 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.156 -r1.157 src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.50 -r1.51 src/sys/compat/netbsd32/netbsd32_systrace_args.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: rin
Date: Sun Jul 30 05:30:45 UTC 2023
Modified Files:
src/sys/compat/netbsd32: netbsd32_netbsd.c syscalls.master
Log Message:
COMPAT_NETBSD32: Add support for memfd_create(2).
To generate a diff of this commit:
cvs rdiff -u -r1.234 -r1.235 src/sys/compat/netbsd32/netbsd32_netbsd.c
cvs rdiff -u -r1.142 -r1.143 src/sys/compat/netbsd32/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.234 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.235
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.234 Sun Jul 30 05:10:47 2023
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Sun Jul 30 05:30:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.234 2023/07/30 05:10:47 rin Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.235 2023/07/30 05:30:45 rin Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2018 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.234 2023/07/30 05:10:47 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.235 2023/07/30 05:30:45 rin Exp $");
/*
* below are all the standard NetBSD system calls, in the 32bit
@@ -2648,6 +2648,21 @@ netbsd32_eventfd(struct lwp *l,
return sys_eventfd(l, , retval);
}
+int
+netbsd32_memfd_create(struct lwp *l,
+const struct netbsd32_memfd_create_args *uap, register_t *retval)
+{
+ /* {
+ syscallarg(const netbsd32_charp) name;
+ syscallarg(unsigned int) flags;
+ } */
+ struct sys_memfd_create_args ua;
+
+ NETBSD32TOP_UAP(name, const char);
+ NETBSD32TO64_UAP(flags);
+ return sys_memfd_create(l, , retval);
+}
+
/*
* MI indirect system call support.
* Only used if the MD netbsd32_syscall.c doesn't intercept the calls.
Index: src/sys/compat/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.142 src/sys/compat/netbsd32/syscalls.master:1.143
--- src/sys/compat/netbsd32/syscalls.master:1.142 Sat Jul 29 12:38:25 2023
+++ src/sys/compat/netbsd32/syscalls.master Sun Jul 30 05:30:45 2023
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.142 2023/07/29 12:38:25 rin Exp $
+ $NetBSD: syscalls.master,v 1.143 2023/07/30 05:30:45 rin Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -1214,7 +1214,8 @@
acl_type_t type, netbsd32_aclp_t aclp); }
499 STD { long|netbsd32||lpathconf(const netbsd32_charp path, \
int name); }
-500 UNIMPL memfd_create
+500 STD { int|netbsd32||memfd_create( \
+ const netbsd32_charp name, unsigned int flags); }
501 STD { int|netbsd32|100|kevent(int fd, \
const netbsd32_keventp_t changelist, \
netbsd32_size_t nchanges, \
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: rin Date: Sun Jul 30 05:30:45 UTC 2023 Modified Files: src/sys/compat/netbsd32: netbsd32_netbsd.c syscalls.master Log Message: COMPAT_NETBSD32: Add support for memfd_create(2). To generate a diff of this commit: cvs rdiff -u -r1.234 -r1.235 src/sys/compat/netbsd32/netbsd32_netbsd.c cvs rdiff -u -r1.142 -r1.143 src/sys/compat/netbsd32/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: rin Date: Sun Jul 30 05:10:48 UTC 2023 Modified Files: src/sys/compat/netbsd32: netbsd32_netbsd.c Log Message: netbsd32_netbsd: Sort headers. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.233 -r1.234 src/sys/compat/netbsd32/netbsd32_netbsd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: rin Date: Sun Jul 30 05:10:48 UTC 2023 Modified Files: src/sys/compat/netbsd32: netbsd32_netbsd.c Log Message: netbsd32_netbsd: Sort headers. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.233 -r1.234 src/sys/compat/netbsd32/netbsd32_netbsd.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/compat/netbsd32/netbsd32_netbsd.c diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.233 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.234 --- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.233 Mon Sep 20 01:07:45 2021 +++ src/sys/compat/netbsd32/netbsd32_netbsd.c Sun Jul 30 05:10:47 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_netbsd.c,v 1.233 2021/09/20 01:07:45 thorpej Exp $ */ +/* $NetBSD: netbsd32_netbsd.c,v 1.234 2023/07/30 05:10:47 rin Exp $ */ /* * Copyright (c) 1998, 2001, 2008, 2018 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.233 2021/09/20 01:07:45 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.234 2023/07/30 05:10:47 rin Exp $"); /* * below are all the standard NetBSD system calls, in the 32bit @@ -57,45 +57,44 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_net #endif #include -#include +#include +#include +#include +#include +#include #include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include #include -#include #include -#include -#include +#include #include #include +#include +#include #include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include #include #include #include -#include -#include -#include -#include - #include #include +#include #include #include #include -#include #include
CVS commit: src/sys/kern
Module Name:src Committed By: rin Date: Sun Jul 30 04:39:00 UTC 2023 Modified Files: src/sys/kern: sys_epoll.c Log Message: sys_epoll: whitespace -> tab. no binary changes. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/kern/sys_epoll.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: rin
Date: Sun Jul 30 04:39:00 UTC 2023
Modified Files:
src/sys/kern: sys_epoll.c
Log Message:
sys_epoll: whitespace -> tab. no binary changes.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/kern/sys_epoll.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sys_epoll.c
diff -u src/sys/kern/sys_epoll.c:1.2 src/sys/kern/sys_epoll.c:1.3
--- src/sys/kern/sys_epoll.c:1.2 Sat Jul 29 04:06:32 2023
+++ src/sys/kern/sys_epoll.c Sun Jul 30 04:39:00 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_epoll.c,v 1.2 2023/07/29 04:06:32 pgoyette Exp $ */
+/* $NetBSD: sys_epoll.c,v 1.3 2023/07/30 04:39:00 rin Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
@@ -28,7 +28,7 @@
* SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sys_epoll.c,v 1.2 2023/07/29 04:06:32 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_epoll.c,v 1.3 2023/07/30 04:39:00 rin Exp $");
#include
@@ -251,7 +251,7 @@ epoll_ctl_common(struct lwp *l, register
struct epoll_event *event)
{
struct kevent kev[2];
-struct kevent_ops k_ops = {
+ struct kevent_ops k_ops = {
.keo_private = NULL,
.keo_fetch_timeout = NULL,
.keo_fetch_changes = epoll_kev_fetch_changes,
@@ -502,7 +502,7 @@ epoll_register_kevent(register_t *retval
EV_SET(, fd, filter, flags, 0, 0, 0);
-return kevent1(retval, epfd, , 1, NULL, 0, NULL, _ops);
+ return kevent1(retval, epfd, , 1, NULL, 0, NULL, _ops);
}
/*
@@ -659,7 +659,7 @@ epoll_check_loop_and_depth(struct lwp *l
* number of edges, and once to actually fill them in. We add one
* because we want to include the edge epfd->fd.
*/
-nedges = 1 + epoll_recover_watch_tree(NULL, 0, nfds);
+ nedges = 1 + epoll_recover_watch_tree(NULL, 0, nfds);
edges = kmem_zalloc(nedges * sizeof(*edges), KM_SLEEP);
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Sun Jul 30 00:11:32 UTC 2023 Modified Files: src/share/man/man4: nvmm.4 Log Message: New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/nvmm.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/nvmm.4 diff -u src/share/man/man4/nvmm.4:1.7 src/share/man/man4/nvmm.4:1.8 --- src/share/man/man4/nvmm.4:1.7 Sat Jul 29 23:11:50 2023 +++ src/share/man/man4/nvmm.4 Sun Jul 30 00:11:32 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: nvmm.4,v 1.7 2023/07/29 23:11:50 gdt Exp $ +.\" $NetBSD: nvmm.4,v 1.8 2023/07/30 00:11:32 wiz Exp $ .\" .\" Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net .\" All rights reserved. @@ -54,8 +54,9 @@ x86-VMX, for x86 Intel CPUs .El Note that for VMX support, the CPU must also support "VMX Unrestricted Guest", which is only present if Extended Page Tables (EPT) is -supported. The earliest CPU family with this feature is Westmere, and -not all later CPUs have it. +supported. +The earliest CPU family with this feature is Westmere, and not all +later CPUs have it. .Sh SEE ALSO .Xr libnvmm 3 , .Xr nvmmctl 8
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Sun Jul 30 00:11:32 UTC 2023 Modified Files: src/share/man/man4: nvmm.4 Log Message: New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/nvmm.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: rin Date: Sat Jul 29 23:59:59 UTC 2023 Modified Files: src/sys/kern: sys_memfd.c Log Message: sys_memfd: Comply with our implicit naming convention; do_memfd_truncate() --> memfd_truncate_locked(). NFC. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/kern/sys_memfd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: rin
Date: Sat Jul 29 23:59:59 UTC 2023
Modified Files:
src/sys/kern: sys_memfd.c
Log Message:
sys_memfd: Comply with our implicit naming convention;
do_memfd_truncate() --> memfd_truncate_locked(). NFC.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/kern/sys_memfd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sys_memfd.c
diff -u src/sys/kern/sys_memfd.c:1.7 src/sys/kern/sys_memfd.c:1.8
--- src/sys/kern/sys_memfd.c:1.7 Sat Jul 29 23:51:29 2023
+++ src/sys/kern/sys_memfd.c Sat Jul 29 23:59:59 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_memfd.c,v 1.7 2023/07/29 23:51:29 rin Exp $ */
+/* $NetBSD: sys_memfd.c,v 1.8 2023/07/29 23:59:59 rin Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sys_memfd.c,v 1.7 2023/07/29 23:51:29 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_memfd.c,v 1.8 2023/07/29 23:59:59 rin Exp $");
#include
#include
@@ -60,7 +60,7 @@ static int memfd_close(file_t *);
static int memfd_mmap(file_t *, off_t *, size_t, int, int *, int *,
struct uvm_object **, int *);
static int memfd_seek(file_t *, off_t, int, off_t *, int);
-static int do_memfd_truncate(file_t *, off_t);
+static int memfd_truncate_locked(file_t *, off_t);
static int memfd_truncate(file_t *, off_t);
static const struct fileops memfd_fileops = {
@@ -210,7 +210,7 @@ memfd_write(file_t *fp, off_t *offp, str
todo = mfd->mfd_size - *offp;
} else if (*offp + uio->uio_resid >= mfd->mfd_size) {
/* Grow to accommodate the write request. */
- error = do_memfd_truncate(fp, *offp + uio->uio_resid);
+ error = memfd_truncate_locked(fp, *offp + uio->uio_resid);
if (error != 0)
goto leave;
}
@@ -406,7 +406,7 @@ leave:
}
static int
-do_memfd_truncate(file_t *fp, off_t length)
+memfd_truncate_locked(file_t *fp, off_t length)
{
struct memfd *mfd = fp->f_memfd;
voff_t start, end;
@@ -452,7 +452,7 @@ memfd_truncate(file_t *fp, off_t length)
int error;
mutex_enter(>f_lock);
- error = do_memfd_truncate(fp, length);
+ error = memfd_truncate_locked(fp, length);
mutex_exit(>f_lock);
return error;
}
CVS commit: src/sys/kern
Module Name:src Committed By: rin Date: Sat Jul 29 23:51:29 UTC 2023 Modified Files: src/sys/kern: sys_memfd.c Log Message: sys_memfd: Fix logic errors for offset in the previous. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/kern/sys_memfd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/sys_memfd.c diff -u src/sys/kern/sys_memfd.c:1.6 src/sys/kern/sys_memfd.c:1.7 --- src/sys/kern/sys_memfd.c:1.6 Sat Jul 29 17:54:54 2023 +++ src/sys/kern/sys_memfd.c Sat Jul 29 23:51:29 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_memfd.c,v 1.6 2023/07/29 17:54:54 christos Exp $ */ +/* $NetBSD: sys_memfd.c,v 1.7 2023/07/29 23:51:29 rin Exp $ */ /*- * Copyright (c) 2023 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sys_memfd.c,v 1.6 2023/07/29 17:54:54 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_memfd.c,v 1.7 2023/07/29 23:51:29 rin Exp $"); #include #include @@ -160,12 +160,12 @@ memfd_read(file_t *fp, off_t *offp, stru goto leave; } - if (flags & FOF_UPDATE_OFFSET) - *offp = uio->uio_offset; + uio->uio_offset = *offp; todo = MIN(uio->uio_resid, mfd->mfd_size - *offp); error = ubc_uiomove(mfd->mfd_uobj, uio, todo, UVM_ADV_SEQUENTIAL, UBC_READ|UBC_PARTIALOK); - *offp = uio->uio_offset; + if (flags & FOF_UPDATE_OFFSET) + *offp = uio->uio_offset; leave: getnanotime(>mfd_atime);
CVS commit: src/sys/kern
Module Name:src Committed By: rin Date: Sat Jul 29 23:51:29 UTC 2023 Modified Files: src/sys/kern: sys_memfd.c Log Message: sys_memfd: Fix logic errors for offset in the previous. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/kern/sys_memfd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src Committed By: riastradh Date: Sat Jul 29 23:50:03 UTC 2023 Modified Files: src/sys/external/bsd/drm2/linux: linux_ww_mutex.c Log Message: drm/linux_ww_mutex: Fix ww acquire context ordering. XXX pullup-8 XXX pullup-9 XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/linux/linux_ww_mutex.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/external/bsd/drm2/linux/linux_ww_mutex.c diff -u src/sys/external/bsd/drm2/linux/linux_ww_mutex.c:1.15 src/sys/external/bsd/drm2/linux/linux_ww_mutex.c:1.16 --- src/sys/external/bsd/drm2/linux/linux_ww_mutex.c:1.15 Sat Jul 29 22:43:56 2023 +++ src/sys/external/bsd/drm2/linux/linux_ww_mutex.c Sat Jul 29 23:50:03 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ww_mutex.c,v 1.15 2023/07/29 22:43:56 riastradh Exp $ */ +/* $NetBSD: linux_ww_mutex.c,v 1.16 2023/07/29 23:50:03 riastradh Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_ww_mutex.c,v 1.15 2023/07/29 22:43:56 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_ww_mutex.c,v 1.16 2023/07/29 23:50:03 riastradh Exp $"); #include #include @@ -62,7 +62,7 @@ ww_acquire_ctx_compare(void *cookie __un if (ctx_a->wwx_ticket < ctx_b->wwx_ticket) return -1; if (ctx_a->wwx_ticket > ctx_b->wwx_ticket) - return -1; + return +1; return 0; } @@ -76,7 +76,7 @@ ww_acquire_ctx_compare_key(void *cookie if (ctx->wwx_ticket < ticket) return -1; if (ctx->wwx_ticket > ticket) - return -1; + return +1; return 0; }
CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src Committed By: riastradh Date: Sat Jul 29 23:50:03 UTC 2023 Modified Files: src/sys/external/bsd/drm2/linux: linux_ww_mutex.c Log Message: drm/linux_ww_mutex: Fix ww acquire context ordering. XXX pullup-8 XXX pullup-9 XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/linux/linux_ww_mutex.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: gdt Date: Sat Jul 29 23:11:51 UTC 2023 Modified Files: src/share/man/man4: nvmm.4 Log Message: nvmm(4): Document that VMX Unrestricted Guest is required To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/nvmm.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/nvmm.4 diff -u src/share/man/man4/nvmm.4:1.6 src/share/man/man4/nvmm.4:1.7 --- src/share/man/man4/nvmm.4:1.6 Sat Sep 5 07:22:25 2020 +++ src/share/man/man4/nvmm.4 Sat Jul 29 23:11:50 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: nvmm.4,v 1.6 2020/09/05 07:22:25 maxv Exp $ +.\" $NetBSD: nvmm.4,v 1.7 2023/07/29 23:11:50 gdt Exp $ .\" .\" Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net .\" All rights reserved. @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 9, 2020 +.Dd July 30, 2023 .Dt NVMM 4 .Os .Sh NAME @@ -52,6 +52,10 @@ x86-SVM, for x86 AMD CPUs .It x86-VMX, for x86 Intel CPUs .El +Note that for VMX support, the CPU must also support "VMX Unrestricted +Guest", which is only present if Extended Page Tables (EPT) is +supported. The earliest CPU family with this feature is Westmere, and +not all later CPUs have it. .Sh SEE ALSO .Xr libnvmm 3 , .Xr nvmmctl 8
CVS commit: src/share/man/man4
Module Name:src Committed By: gdt Date: Sat Jul 29 23:11:51 UTC 2023 Modified Files: src/share/man/man4: nvmm.4 Log Message: nvmm(4): Document that VMX Unrestricted Guest is required To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/nvmm.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src
Committed By: riastradh
Date: Sat Jul 29 22:43:56 UTC 2023
Modified Files:
src/sys/external/bsd/drm2/linux: linux_ww_mutex.c
Log Message:
drm/linux_ww_mutex: Fix wait loops.
If cv_wait_sig returns because a signal is delivered, we may
nonetheless have been granted the lock. It is harmless for us to
ignore this fact in three of the four paths, but in
ww_mutex_state_wait_sig, we may now have ownership of the lock and
MUST NOT return failure because the caller MUST release the lock
before destroying the ww_acquire_ctx.
While here, restructure the other three loops for clarity, so they
match the structure of the fourth and so they have a little less
impenetrable negation.
PR kern/57537
XXX pullup-8
XXX pullup-9
XXX pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/linux/linux_ww_mutex.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/external/bsd/drm2/linux/linux_ww_mutex.c
diff -u src/sys/external/bsd/drm2/linux/linux_ww_mutex.c:1.14 src/sys/external/bsd/drm2/linux/linux_ww_mutex.c:1.15
--- src/sys/external/bsd/drm2/linux/linux_ww_mutex.c:1.14 Fri Mar 18 23:33:41 2022
+++ src/sys/external/bsd/drm2/linux/linux_ww_mutex.c Sat Jul 29 22:43:56 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_ww_mutex.c,v 1.14 2022/03/18 23:33:41 riastradh Exp $ */
+/* $NetBSD: linux_ww_mutex.c,v 1.15 2023/07/29 22:43:56 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_ww_mutex.c,v 1.14 2022/03/18 23:33:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ww_mutex.c,v 1.15 2023/07/29 22:43:56 riastradh Exp $");
#include
#include
@@ -286,8 +286,14 @@ ww_mutex_state_wait(struct ww_mutex *mut
KASSERT(mutex_owned(>wwm_lock));
KASSERT(mutex->wwm_state == state);
- do cv_wait(>wwm_cv, >wwm_lock);
- while (mutex->wwm_state == state);
+
+ for (;;) {
+ cv_wait(>wwm_cv, >wwm_lock);
+ if (mutex->wwm_state != state)
+ break;
+ }
+
+ KASSERT(mutex->wwm_state != state);
}
/*
@@ -310,18 +316,26 @@ ww_mutex_state_wait_sig(struct ww_mutex
KASSERT(mutex_owned(>wwm_lock));
KASSERT(mutex->wwm_state == state);
- do {
+
+ for (;;) {
/* XXX errno NetBSD->Linux */
ret = -cv_wait_sig(>wwm_cv, >wwm_lock);
+ if (mutex->wwm_state != state) {
+ ret = 0;
+ break;
+ }
if (ret) {
KASSERTMSG((ret == -EINTR || ret == -ERESTART),
"ret=%d", ret);
ret = -EINTR;
break;
}
- } while (mutex->wwm_state == state);
+ }
KASSERTMSG((ret == 0 || ret == -EINTR), "ret=%d", ret);
+ KASSERTMSG(ret != 0 || mutex->wwm_state != state,
+ "ret=%d mutex=%p mutex->wwm_state=%d state=%d",
+ ret, mutex, mutex->wwm_state, state);
return ret;
}
@@ -363,12 +377,18 @@ ww_mutex_lock_wait(struct ww_mutex *mute
"ticket number reused: %"PRId64" (%p) %"PRId64" (%p)",
ctx->wwx_ticket, ctx, collision->wwx_ticket, collision);
- do cv_wait(>wwm_cv, >wwm_lock);
- while (!(((mutex->wwm_state == WW_CTX) ||
- (mutex->wwm_state == WW_WANTOWN)) &&
- (mutex->wwm_u.ctx == ctx)));
+ for (;;) {
+ cv_wait(>wwm_cv, >wwm_lock);
+ if ((mutex->wwm_state == WW_CTX ||
+ mutex->wwm_state == WW_WANTOWN) &&
+ mutex->wwm_u.ctx == ctx)
+ break;
+ }
rb_tree_remove_node(>wwm_waiters, ctx);
+
+ KASSERT(mutex->wwm_state == WW_CTX || mutex->wwm_state == WW_WANTOWN);
+ KASSERT(mutex->wwm_u.ctx == ctx);
}
/*
@@ -411,21 +431,29 @@ ww_mutex_lock_wait_sig(struct ww_mutex *
"ticket number reused: %"PRId64" (%p) %"PRId64" (%p)",
ctx->wwx_ticket, ctx, collision->wwx_ticket, collision);
- do {
+ for (;;) {
/* XXX errno NetBSD->Linux */
ret = -cv_wait_sig(>wwm_cv, >wwm_lock);
+ if ((mutex->wwm_state == WW_CTX ||
+ mutex->wwm_state == WW_WANTOWN) &&
+ mutex->wwm_u.ctx == ctx) {
+ ret = 0;
+ break;
+ }
if (ret) {
KASSERTMSG((ret == -EINTR || ret == -ERESTART),
"ret=%d", ret);
ret = -EINTR;
- goto out;
+ break;
}
- } while (!(((mutex->wwm_state == WW_CTX) ||
- (mutex->wwm_state == WW_WANTOWN)) &&
- (mutex->wwm_u.ctx == ctx)));
+ }
+
+ rb_tree_remove_node(>wwm_waiters, ctx);
-out: rb_tree_remove_node(>wwm_waiters, ctx);
KASSERTMSG((ret == 0 || ret == -EINTR), "ret=%d", ret);
+ KASSERT(ret != 0 ||
+ mutex->wwm_state == WW_CTX || mutex->wwm_state == WW_WANTOWN);
+ KASSERT(ret != 0 || mutex->wwm_u.ctx == ctx);
return ret;
}
CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src Committed By: riastradh Date: Sat Jul 29 22:43:56 UTC 2023 Modified Files: src/sys/external/bsd/drm2/linux: linux_ww_mutex.c Log Message: drm/linux_ww_mutex: Fix wait loops. If cv_wait_sig returns because a signal is delivered, we may nonetheless have been granted the lock. It is harmless for us to ignore this fact in three of the four paths, but in ww_mutex_state_wait_sig, we may now have ownership of the lock and MUST NOT return failure because the caller MUST release the lock before destroying the ww_acquire_ctx. While here, restructure the other three loops for clarity, so they match the structure of the fourth and so they have a little less impenetrable negation. PR kern/57537 XXX pullup-8 XXX pullup-9 XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/linux/linux_ww_mutex.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Sat Jul 29 17:54:54 UTC 2023
Modified Files:
src/sys/kern: sys_memfd.c
src/sys/sys: memfd.h
Log Message:
Fix locking and offset issues pointed out by @riastradh (Theodore Preduta)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/kern/sys_memfd.c
cvs rdiff -u -r1.3 -r1.4 src/sys/sys/memfd.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/kern/sys_memfd.c
diff -u src/sys/kern/sys_memfd.c:1.5 src/sys/kern/sys_memfd.c:1.6
--- src/sys/kern/sys_memfd.c:1.5 Sat Jul 29 08:16:34 2023
+++ src/sys/kern/sys_memfd.c Sat Jul 29 13:54:54 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_memfd.c,v 1.5 2023/07/29 12:16:34 christos Exp $ */
+/* $NetBSD: sys_memfd.c,v 1.6 2023/07/29 17:54:54 christos Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sys_memfd.c,v 1.5 2023/07/29 12:16:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_memfd.c,v 1.6 2023/07/29 17:54:54 christos Exp $");
#include
#include
@@ -60,6 +60,7 @@ static int memfd_close(file_t *);
static int memfd_mmap(file_t *, off_t *, size_t, int, int *, int *,
struct uvm_object **, int *);
static int memfd_seek(file_t *, off_t, int, off_t *, int);
+static int do_memfd_truncate(file_t *, off_t);
static int memfd_truncate(file_t *, off_t);
static const struct fileops memfd_fileops = {
@@ -104,7 +105,6 @@ sys_memfd_create(struct lwp *l, const st
mfd = kmem_zalloc(sizeof(*mfd), KM_SLEEP);
mfd->mfd_size = 0;
mfd->mfd_uobj = uao_create(INT64_MAX - PAGE_SIZE, 0); /* same as tmpfs */
- mutex_init(>mfd_lock, MUTEX_DEFAULT, IPL_NONE);
CTASSERT(sizeof(memfd_prefix) < NAME_MAX); /* sanity check */
strcpy(mfd->mfd_name, memfd_prefix);
@@ -147,8 +147,7 @@ memfd_read(file_t *fp, off_t *offp, stru
vsize_t todo;
struct memfd *mfd = fp->f_memfd;
- if (offp == >f_offset)
- mutex_enter(>f_lock);
+ mutex_enter(>f_lock);
if (*offp < 0) {
error = EINVAL;
@@ -161,18 +160,19 @@ memfd_read(file_t *fp, off_t *offp, stru
goto leave;
}
- uio->uio_offset = *offp;
+ if (flags & FOF_UPDATE_OFFSET)
+ *offp = uio->uio_offset;
todo = MIN(uio->uio_resid, mfd->mfd_size - *offp);
error = ubc_uiomove(mfd->mfd_uobj, uio, todo, UVM_ADV_SEQUENTIAL,
UBC_READ|UBC_PARTIALOK);
*offp = uio->uio_offset;
leave:
- if (offp == >f_offset)
- mutex_exit(>f_lock);
-
getnanotime(>mfd_atime);
+
+ mutex_exit(>f_lock);
+
return error;
}
@@ -184,11 +184,12 @@ memfd_write(file_t *fp, off_t *offp, str
vsize_t todo;
struct memfd *mfd = fp->f_memfd;
- if (mfd->mfd_seals & F_SEAL_ANY_WRITE)
- return EPERM;
+ mutex_enter(>f_lock);
- if (offp == >f_offset)
- mutex_enter(>f_lock);
+ if (mfd->mfd_seals & F_SEAL_ANY_WRITE) {
+ error = EPERM;
+ goto leave;
+ }
if (*offp < 0) {
error = EINVAL;
@@ -209,20 +210,20 @@ memfd_write(file_t *fp, off_t *offp, str
todo = mfd->mfd_size - *offp;
} else if (*offp + uio->uio_resid >= mfd->mfd_size) {
/* Grow to accommodate the write request. */
- error = memfd_truncate(fp, *offp + uio->uio_resid);
+ error = do_memfd_truncate(fp, *offp + uio->uio_resid);
if (error != 0)
goto leave;
}
error = ubc_uiomove(mfd->mfd_uobj, uio, todo, UVM_ADV_SEQUENTIAL,
UBC_WRITE|UBC_PARTIALOK);
- *offp = uio->uio_offset;
+ if (flags & FOF_UPDATE_OFFSET)
+ *offp = uio->uio_offset;
getnanotime(>mfd_mtime);
leave:
- if (offp == >f_offset)
- mutex_exit(>f_lock);
+ mutex_exit(>f_lock);
return error;
}
@@ -238,14 +239,21 @@ static int
memfd_fcntl(file_t *fp, u_int cmd, void *data)
{
struct memfd *mfd = fp->f_memfd;
+ int error = 0;
switch (cmd) {
case F_ADD_SEALS:
- if (mfd->mfd_seals & F_SEAL_SEAL)
- return EPERM;
+ mutex_enter(>f_lock);
- if (*(int *)data & ~MFD_KNOWN_SEALS)
- return EINVAL;
+ if (mfd->mfd_seals & F_SEAL_SEAL) {
+ error = EPERM;
+ goto leave_add_seals;
+ }
+
+ if (*(int *)data & ~MFD_KNOWN_SEALS) {
+ error = EINVAL;
+ goto leave_add_seals;
+ }
/*
* Can only add F_SEAL_WRITE if there are no currently
@@ -257,13 +265,21 @@ memfd_fcntl(file_t *fp, u_int cmd, void
if ((mfd->mfd_seals & F_SEAL_WRITE) == 0 &&
(*(int *)data & F_SEAL_WRITE) != 0 &&
mfd->mfd_uobj->uo_refs > 1)
- return EBUSY;
+ {
+ error = EBUSY;
+ goto leave_add_seals;
+ }
mfd->mfd_seals |= *(int *)data;
- return 0;
+
+ leave_add_seals:
+ mutex_exit(>f_lock);
+ return error;
case F_GET_SEALS:
+ mutex_enter(>f_lock);
*(int *)data = mfd->mfd_seals;
+ mutex_exit(>f_lock);
return 0;
default:
@@ -276,6 +292,8 @@ memfd_stat(file_t *fp, struct stat *st)
{
struct memfd *mfd = fp->f_memfd;
+ mutex_enter(>f_lock);
+
memset(st, 0, sizeof(*st));
st->st_uid = kauth_cred_geteuid(fp->f_cred);
st->st_gid = kauth_cred_getegid(fp->f_cred);
@@
CVS commit: src/sys
Module Name:src Committed By: christos Date: Sat Jul 29 17:54:54 UTC 2023 Modified Files: src/sys/kern: sys_memfd.c src/sys/sys: memfd.h Log Message: Fix locking and offset issues pointed out by @riastradh (Theodore Preduta) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/kern/sys_memfd.c cvs rdiff -u -r1.3 -r1.4 src/sys/sys/memfd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/ews4800mips/floppies/ramdisk
Module Name:src
Committed By: rin
Date: Sat Jul 29 17:33:51 UTC 2023
Modified Files:
src/distrib/ews4800mips/floppies/ramdisk: Makefile
Log Message:
ews4800mips/floppies: Fix ramdisk overflow by dropping IEEE 802.11
support from x_ifconfig
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/ews4800mips/floppies/ramdisk/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/ews4800mips/floppies/ramdisk/Makefile
diff -u src/distrib/ews4800mips/floppies/ramdisk/Makefile:1.14 src/distrib/ews4800mips/floppies/ramdisk/Makefile:1.15
--- src/distrib/ews4800mips/floppies/ramdisk/Makefile:1.14 Sun Dec 29 18:26:17 2019
+++ src/distrib/ews4800mips/floppies/ramdisk/Makefile Sat Jul 29 17:33:50 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/12/29 18:26:17 christos Exp $
+# $NetBSD: Makefile,v 1.15 2023/07/29 17:33:50 rin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -11,6 +11,8 @@ WARNS= 1
DBG= -Os -mmemcpy -fno-unwind-tables
CRUNCHBIN= ramdiskbin
+# Drop IEEE 802.11 support from x_ifconfig.
+CRUNCHENV+= NOIEEE80211=1
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst.en
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= be
CVS commit: src/distrib/ews4800mips/floppies/ramdisk
Module Name:src Committed By: rin Date: Sat Jul 29 17:33:51 UTC 2023 Modified Files: src/distrib/ews4800mips/floppies/ramdisk: Makefile Log Message: ews4800mips/floppies: Fix ramdisk overflow by dropping IEEE 802.11 support from x_ifconfig To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/distrib/ews4800mips/floppies/ramdisk/Makefile 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: gutteridge Date: Sat Jul 29 16:47:28 UTC 2023 Modified Files: src/doc: CHANGES Log Message: CHANGES: remove entry that has been pulled up to netbsd-10 To generate a diff of this commit: cvs rdiff -u -r1.2988 -r1.2989 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.2988 src/doc/CHANGES:1.2989 --- src/doc/CHANGES:1.2988 Thu Jul 27 21:59:29 2023 +++ src/doc/CHANGES Sat Jul 29 16:47:28 2023 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2988 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2989 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -199,6 +199,4 @@ Changes from NetBSD 10.0 to NetBSD 11.0: x86: Add serial console support to efiboot via raw I/O port access. [rin 20230724] x86: Turn off Zenbleed chicken bit on Zen2 CPUs. [mrg 20230725] - evbmips: Add /dev/dk[0-3], dkctl(8), and gpt(8) to the ramdisk. - [gutteridge 20230725] OpenSSH: Import 9.3. [christos 20230726]
CVS commit: src/doc
Module Name:src Committed By: gutteridge Date: Sat Jul 29 16:47:28 UTC 2023 Modified Files: src/doc: CHANGES Log Message: CHANGES: remove entry that has been pulled up to netbsd-10 To generate a diff of this commit: cvs rdiff -u -r1.2988 -r1.2989 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/kernel
Module Name:src
Committed By: rin
Date: Sat Jul 29 16:24:36 UTC 2023
Modified Files:
src/tests/kernel: t_memfd_create.c
Log Message:
t_memfd_create: Fix printf-like format by using %zu for size_t, and
%jd for off_t with cast to intmax_t, respectively.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/t_memfd_create.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/t_memfd_create.c
diff -u src/tests/kernel/t_memfd_create.c:1.1 src/tests/kernel/t_memfd_create.c:1.2
--- src/tests/kernel/t_memfd_create.c:1.1 Sat Jul 29 12:16:34 2023
+++ src/tests/kernel/t_memfd_create.c Sat Jul 29 16:24:35 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: t_memfd_create.c,v 1.1 2023/07/29 12:16:34 christos Exp $ */
+/* $NetBSD: t_memfd_create.c,v 1.2 2023/07/29 16:24:35 rin Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_memfd_create.c,v 1.1 2023/07/29 12:16:34 christos Exp $");
+__RCSID("$NetBSD: t_memfd_create.c,v 1.2 2023/07/29 16:24:35 rin Exp $");
#include
#include
@@ -106,7 +106,7 @@ ATF_TC_BODY(read_write, tc)
RL(write(fd, write_buf, sizeof(write_buf)));
offset = lseek(fd, 0, SEEK_CUR);
ATF_REQUIRE_EQ_MSG(offset, sizeof(write_buf),
- "File offset not set after write (%ld != %ld)", offset,
+ "File offset not set after write (%jd != %zu)", (intmax_t)offset,
sizeof(write_buf));
RZ(lseek(fd, 0, SEEK_SET));
@@ -114,7 +114,7 @@ ATF_TC_BODY(read_write, tc)
RL(read(fd, read_buf, sizeof(read_buf)));
offset = lseek(fd, 0, SEEK_CUR);
ATF_REQUIRE_EQ_MSG(offset, sizeof(read_buf),
- "File offset not set after read (%ld != %ld)", offset,
+ "File offset not set after read (%jd != %zu)", (intmax_t)offset,
sizeof(read_buf));
for (size_t i = 0; i < sizeof(read_buf); i++)
@@ -143,20 +143,20 @@ ATF_TC_BODY(truncate, tc)
RL(fstat(fd, ));
ATF_REQUIRE_EQ_MSG(st.st_size, sizeof(write_buf),
- "Write did not grow size to %ld (is %ld)", sizeof(write_buf),
- st.st_size);
+ "Write did not grow size to %zu (is %jd)", sizeof(write_buf),
+ (intmax_t)st.st_size);
RL(ftruncate(fd, sizeof(write_buf)/2));
RL(fstat(fd, ));
ATF_REQUIRE_EQ_MSG(st.st_size, sizeof(write_buf)/2,
- "Truncate did not shrink size to %ld (is %ld)",
- sizeof(write_buf)/2, st.st_size);
+ "Truncate did not shrink size to %zu (is %jd)",
+ sizeof(write_buf)/2, (intmax_t)st.st_size);
RL(ftruncate(fd, sizeof(read_buf)));
RL(fstat(fd, ));
ATF_REQUIRE_EQ_MSG(st.st_size, sizeof(read_buf),
- "Truncate did not grow size to %ld (is %ld)", sizeof(read_buf),
- st.st_size);
+ "Truncate did not grow size to %zu (is %jd)", sizeof(read_buf),
+ (intmax_t)st.st_size);
RZ(lseek(fd, 0, SEEK_SET));
RL(read(fd, read_buf, sizeof(read_buf)));
CVS commit: src/tests/kernel
Module Name:src Committed By: rin Date: Sat Jul 29 16:24:36 UTC 2023 Modified Files: src/tests/kernel: t_memfd_create.c Log Message: t_memfd_create: Fix printf-like format by using %zu for size_t, and %jd for off_t with cast to intmax_t, respectively. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/t_memfd_create.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/miniroot
Module Name:src
Committed By: tsutsui
Date: Sat Jul 29 15:46:45 UTC 2023
Modified Files:
src/distrib/miniroot: install.sub
Log Message:
No need to ask whether to use the TCP option on NFS mount.
TCP mount has been default since NetBSD 9.0.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/distrib/miniroot/install.sub
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/miniroot/install.sub
diff -u src/distrib/miniroot/install.sub:1.64 src/distrib/miniroot/install.sub:1.65
--- src/distrib/miniroot/install.sub:1.64 Fri Dec 30 09:08:47 2022
+++ src/distrib/miniroot/install.sub Sat Jul 29 15:46:45 2023
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.sub,v 1.64 2022/12/30 09:08:47 andvar Exp $
+# $NetBSD: install.sub,v 1.65 2023/07/29 15:46:45 tsutsui Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1163,28 +1163,17 @@ install_nfs() {
done
_nfs_server_path=$resp
- # Determine use of TCP
- echo -n "Use TCP transport (only works with capable NFS server)? [n] "
+ # Check mount_nfs(8) options
+ echo "Use small NFS transfers (needed when server or client"
+ echo -n "has a slow network card)? [n] "
getresp "n"
case "$resp" in
y*|Y*)
- _nfs_tcp="-T"
+ _nfs_tcp="-r 1024 -w 1024"
;;
*)
- echo -n "Use small NFS transfers (needed when server "
- echo "or client"
- echo -n "has a slow network card)? [n] "
- getresp "n"
- case "$resp" in
- y*|Y*)
-_nfs_tcp="-r 1024 -w 1024"
-;;
-
- *)
-_nfs_tcp=""
-;;
- esac
+ _nfs_tcp=""
;;
esac
CVS commit: src/distrib/miniroot
Module Name:src Committed By: tsutsui Date: Sat Jul 29 15:46:45 UTC 2023 Modified Files: src/distrib/miniroot: install.sub Log Message: No need to ask whether to use the TCP option on NFS mount. TCP mount has been default since NetBSD 9.0. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/distrib/miniroot/install.sub Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/librump
Module Name:src
Committed By: rin
Date: Sat Jul 29 15:11:04 UTC 2023
Modified Files:
src/sys/rump/librump/rumpkern: rumpkern_syscalls.c
src/sys/rump/librump/rumpnet: rumpnet_syscalls.c
src/sys/rump/librump/rumpvfs: rumpvfs_syscalls.c
Log Message:
rump: Regen again to fix missing __kevent100 symbol.
makerumpsyscalls.sh requires rebuilt rump libraries installed in
/usr/lib or directory specified by its first argument.
Now, new failures observed for ATF after __kevent100 addition are
fixed at least for aarch64.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/librump/rumpkern/rumpkern_syscalls.c
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/librump/rumpnet/rumpnet_syscalls.c
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.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/rump/librump/rumpkern/rumpkern_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rumpkern_syscalls.c:1.8 src/sys/rump/librump/rumpkern/rumpkern_syscalls.c:1.9
--- src/sys/rump/librump/rumpkern/rumpkern_syscalls.c:1.8 Fri Jul 28 18:20:29 2023
+++ src/sys/rump/librump/rumpkern/rumpkern_syscalls.c Sat Jul 29 15:11:04 2023
@@ -1,9 +1,9 @@
-/* $NetBSD: rumpkern_syscalls.c,v 1.8 2023/07/28 18:20:29 christos Exp $ */
+/* $NetBSD: rumpkern_syscalls.c,v 1.9 2023/07/29 15:11:04 rin Exp $ */
/* AUTOMATICALLY GENERATED BY makerumpsyscalls.sh */
#include
-__KERNEL_RCSID(0, "$NetBSD: rumpkern_syscalls.c,v 1.8 2023/07/28 18:20:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpkern_syscalls.c,v 1.9 2023/07/29 15:11:04 rin Exp $");
#include
@@ -77,6 +77,7 @@ extern sy_call_t sys_dup3;
extern sy_call_t sys_kqueue1;
extern sy_call_t sys_clock_nanosleep;
extern sy_call_t sys_clock_getcpuclockid2;
+extern sy_call_t sys___kevent100;
static const struct rump_onesyscall mysys[] = {
{ 3, sys_read },
@@ -147,6 +148,7 @@ static const struct rump_onesyscall mysy
{ 455, sys_kqueue1 },
{ 477, sys_clock_nanosleep },
{ 482, sys_clock_getcpuclockid2 },
+ { 501, sys___kevent100 },
};
RUMP_COMPONENT(RUMP_COMPONENT_SYSCALL)
Index: src/sys/rump/librump/rumpnet/rumpnet_syscalls.c
diff -u src/sys/rump/librump/rumpnet/rumpnet_syscalls.c:1.7 src/sys/rump/librump/rumpnet/rumpnet_syscalls.c:1.8
--- src/sys/rump/librump/rumpnet/rumpnet_syscalls.c:1.7 Mon Jul 10 02:37:05 2023
+++ src/sys/rump/librump/rumpnet/rumpnet_syscalls.c Sat Jul 29 15:11:04 2023
@@ -1,9 +1,9 @@
-/* $NetBSD: rumpnet_syscalls.c,v 1.7 2023/07/10 02:37:05 christos Exp $ */
+/* $NetBSD: rumpnet_syscalls.c,v 1.8 2023/07/29 15:11:04 rin Exp $ */
/* AUTOMATICALLY GENERATED BY makerumpsyscalls.sh */
#include
-__KERNEL_RCSID(0, "$NetBSD: rumpnet_syscalls.c,v 1.7 2023/07/10 02:37:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpnet_syscalls.c,v 1.8 2023/07/29 15:11:04 rin Exp $");
#include
Index: src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c
diff -u src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c:1.9 src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c:1.10
--- src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c:1.9 Mon Jul 10 02:37:06 2023
+++ src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c Sat Jul 29 15:11:04 2023
@@ -1,9 +1,9 @@
-/* $NetBSD: rumpvfs_syscalls.c,v 1.9 2023/07/10 02:37:06 christos Exp $ */
+/* $NetBSD: rumpvfs_syscalls.c,v 1.10 2023/07/29 15:11:04 rin Exp $ */
/* AUTOMATICALLY GENERATED BY makerumpsyscalls.sh */
#include
-__KERNEL_RCSID(0, "$NetBSD: rumpvfs_syscalls.c,v 1.9 2023/07/10 02:37:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpvfs_syscalls.c,v 1.10 2023/07/29 15:11:04 rin Exp $");
#include
CVS commit: src/sys/rump/librump
Module Name:src Committed By: rin Date: Sat Jul 29 15:11:04 UTC 2023 Modified Files: src/sys/rump/librump/rumpkern: rumpkern_syscalls.c src/sys/rump/librump/rumpnet: rumpnet_syscalls.c src/sys/rump/librump/rumpvfs: rumpvfs_syscalls.c Log Message: rump: Regen again to fix missing __kevent100 symbol. makerumpsyscalls.sh requires rebuilt rump libraries installed in /usr/lib or directory specified by its first argument. Now, new failures observed for ATF after __kevent100 addition are fixed at least for aarch64. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/rump/librump/rumpkern/rumpkern_syscalls.c cvs rdiff -u -r1.7 -r1.8 src/sys/rump/librump/rumpnet/rumpnet_syscalls.c cvs rdiff -u -r1.9 -r1.10 src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/arch
Module Name:src Committed By: christos Date: Sat Jul 29 15:05:46 UTC 2023 Modified Files: src/sys/compat/linux/arch/aarch64: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c src/sys/compat/linux/arch/alpha: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/amd64: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c src/sys/compat/linux/arch/arm: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c src/sys/compat/linux/arch/i386: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c src/sys/compat/linux/arch/m68k: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/mips: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/powerpc: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/compat/linux/arch/aarch64/linux_syscall.h \ src/sys/compat/linux/arch/aarch64/linux_syscallargs.h \ src/sys/compat/linux/arch/aarch64/linux_syscalls.c \ src/sys/compat/linux/arch/aarch64/linux_sysent.c \ src/sys/compat/linux/arch/aarch64/linux_systrace_args.c cvs rdiff -u -r1.116 -r1.117 src/sys/compat/linux/arch/alpha/linux_syscall.h \ src/sys/compat/linux/arch/alpha/linux_sysent.c cvs rdiff -u -r1.115 -r1.116 \ src/sys/compat/linux/arch/alpha/linux_syscallargs.h cvs rdiff -u -r1.117 -r1.118 src/sys/compat/linux/arch/alpha/linux_syscalls.c cvs rdiff -u -r1.78 -r1.79 src/sys/compat/linux/arch/amd64/linux_syscall.h \ src/sys/compat/linux/arch/amd64/linux_syscallargs.h \ src/sys/compat/linux/arch/amd64/linux_syscalls.c \ src/sys/compat/linux/arch/amd64/linux_sysent.c cvs rdiff -u -r1.22 -r1.23 \ src/sys/compat/linux/arch/amd64/linux_systrace_args.c cvs rdiff -u -r1.89 -r1.90 src/sys/compat/linux/arch/arm/linux_syscall.h \ src/sys/compat/linux/arch/arm/linux_syscallargs.h \ src/sys/compat/linux/arch/arm/linux_syscalls.c \ src/sys/compat/linux/arch/arm/linux_sysent.c cvs rdiff -u -r1.22 -r1.23 \ src/sys/compat/linux/arch/arm/linux_systrace_args.c cvs rdiff -u -r1.123 -r1.124 src/sys/compat/linux/arch/i386/linux_syscall.h \ src/sys/compat/linux/arch/i386/linux_syscallargs.h \ src/sys/compat/linux/arch/i386/linux_sysent.c cvs rdiff -u -r1.124 -r1.125 src/sys/compat/linux/arch/i386/linux_syscalls.c cvs rdiff -u -r1.18 -r1.19 \ src/sys/compat/linux/arch/i386/linux_systrace_args.c cvs rdiff -u -r1.115 -r1.116 src/sys/compat/linux/arch/m68k/linux_syscall.h \ src/sys/compat/linux/arch/m68k/linux_syscalls.c \ src/sys/compat/linux/arch/m68k/linux_sysent.c cvs rdiff -u -r1.114 -r1.115 \ src/sys/compat/linux/arch/m68k/linux_syscallargs.h cvs rdiff -u -r1.87 -r1.88 src/sys/compat/linux/arch/mips/linux_syscall.h cvs rdiff -u -r1.86 -r1.87 src/sys/compat/linux/arch/mips/linux_syscallargs.h \ src/sys/compat/linux/arch/mips/linux_syscalls.c \ src/sys/compat/linux/arch/mips/linux_sysent.c cvs rdiff -u -r1.93 -r1.94 src/sys/compat/linux/arch/powerpc/linux_syscall.h \ src/sys/compat/linux/arch/powerpc/linux_sysent.c cvs rdiff -u -r1.92 -r1.93 \ src/sys/compat/linux/arch/powerpc/linux_syscallargs.h \ src/sys/compat/linux/arch/powerpc/linux_syscalls.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/compat/linux/arch/aarch64/linux_syscall.h diff -u src/sys/compat/linux/arch/aarch64/linux_syscall.h:1.7 src/sys/compat/linux/arch/aarch64/linux_syscall.h:1.8 --- src/sys/compat/linux/arch/aarch64/linux_syscall.h:1.7 Sat Jul 29 02:50:47 2023 +++ src/sys/compat/linux/arch/aarch64/linux_syscall.h Sat Jul 29 11:05:45 2023 @@ -1,10 +1,10 @@ -/* $NetBSD: linux_syscall.h,v 1.7 2023/07/29 06:50:47 rin Exp $ */ +/* $NetBSD: linux_syscall.h,v 1.8 2023/07/29 15:05:45 christos Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.8 2023/07/29 06:47:26 rin Exp + * created from NetBSD: syscalls.master,v 1.9 2023/07/29 15:04:28 christos Exp */ #ifndef _LINUX_SYS_SYSCALL_H_ @@ -528,6 +528,9 @@ /* syscall: "recvmsg" ret: "ssize_t" args: "int" "struct linux_msghdr *" "int" */ #define LINUX_SYS_recvmsg 212 +/* syscall: "readahead" ret: "ssize_t" args: "int" "off_t" "size_t" */ +#define LINUX_SYS_readahead 213 + /* syscall: "brk" ret: "int" args: "char *" */ #define LINUX_SYS_brk 214 @@ -603,6 +606,9 @@ /* syscall: "statx" ret: "int" args: "int" "const char *" "int" "unsigned int" "struct linux_statx *" */ #define LINUX_SYS_statx
CVS commit: src/sys/compat/linux/arch
Module Name:src Committed By: christos Date: Sat Jul 29 15:05:46 UTC 2023 Modified Files: src/sys/compat/linux/arch/aarch64: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c src/sys/compat/linux/arch/alpha: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/amd64: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c src/sys/compat/linux/arch/arm: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c src/sys/compat/linux/arch/i386: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c src/sys/compat/linux/arch/m68k: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/mips: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/powerpc: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/compat/linux/arch/aarch64/linux_syscall.h \ src/sys/compat/linux/arch/aarch64/linux_syscallargs.h \ src/sys/compat/linux/arch/aarch64/linux_syscalls.c \ src/sys/compat/linux/arch/aarch64/linux_sysent.c \ src/sys/compat/linux/arch/aarch64/linux_systrace_args.c cvs rdiff -u -r1.116 -r1.117 src/sys/compat/linux/arch/alpha/linux_syscall.h \ src/sys/compat/linux/arch/alpha/linux_sysent.c cvs rdiff -u -r1.115 -r1.116 \ src/sys/compat/linux/arch/alpha/linux_syscallargs.h cvs rdiff -u -r1.117 -r1.118 src/sys/compat/linux/arch/alpha/linux_syscalls.c cvs rdiff -u -r1.78 -r1.79 src/sys/compat/linux/arch/amd64/linux_syscall.h \ src/sys/compat/linux/arch/amd64/linux_syscallargs.h \ src/sys/compat/linux/arch/amd64/linux_syscalls.c \ src/sys/compat/linux/arch/amd64/linux_sysent.c cvs rdiff -u -r1.22 -r1.23 \ src/sys/compat/linux/arch/amd64/linux_systrace_args.c cvs rdiff -u -r1.89 -r1.90 src/sys/compat/linux/arch/arm/linux_syscall.h \ src/sys/compat/linux/arch/arm/linux_syscallargs.h \ src/sys/compat/linux/arch/arm/linux_syscalls.c \ src/sys/compat/linux/arch/arm/linux_sysent.c cvs rdiff -u -r1.22 -r1.23 \ src/sys/compat/linux/arch/arm/linux_systrace_args.c cvs rdiff -u -r1.123 -r1.124 src/sys/compat/linux/arch/i386/linux_syscall.h \ src/sys/compat/linux/arch/i386/linux_syscallargs.h \ src/sys/compat/linux/arch/i386/linux_sysent.c cvs rdiff -u -r1.124 -r1.125 src/sys/compat/linux/arch/i386/linux_syscalls.c cvs rdiff -u -r1.18 -r1.19 \ src/sys/compat/linux/arch/i386/linux_systrace_args.c cvs rdiff -u -r1.115 -r1.116 src/sys/compat/linux/arch/m68k/linux_syscall.h \ src/sys/compat/linux/arch/m68k/linux_syscalls.c \ src/sys/compat/linux/arch/m68k/linux_sysent.c cvs rdiff -u -r1.114 -r1.115 \ src/sys/compat/linux/arch/m68k/linux_syscallargs.h cvs rdiff -u -r1.87 -r1.88 src/sys/compat/linux/arch/mips/linux_syscall.h cvs rdiff -u -r1.86 -r1.87 src/sys/compat/linux/arch/mips/linux_syscallargs.h \ src/sys/compat/linux/arch/mips/linux_syscalls.c \ src/sys/compat/linux/arch/mips/linux_sysent.c cvs rdiff -u -r1.93 -r1.94 src/sys/compat/linux/arch/powerpc/linux_syscall.h \ src/sys/compat/linux/arch/powerpc/linux_sysent.c cvs rdiff -u -r1.92 -r1.93 \ src/sys/compat/linux/arch/powerpc/linux_syscallargs.h \ src/sys/compat/linux/arch/powerpc/linux_syscalls.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/arch/mips
Module Name:src Committed By: christos Date: Sat Jul 29 15:05:31 UTC 2023 Modified Files: src/sys/compat/linux/arch/mips: syscalls.master Log Message: typo To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/compat/linux/arch/mips/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/linux/arch/mips/syscalls.master diff -u src/sys/compat/linux/arch/mips/syscalls.master:1.76 src/sys/compat/linux/arch/mips/syscalls.master:1.77 --- src/sys/compat/linux/arch/mips/syscalls.master:1.76 Sat Jul 29 11:04:29 2023 +++ src/sys/compat/linux/arch/mips/syscalls.master Sat Jul 29 11:05:31 2023 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.76 2023/07/29 15:04:29 christos Exp $ + $NetBSD: syscalls.master,v 1.77 2023/07/29 15:05:31 christos Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -601,7 +601,7 @@ 356 UNIMPL execveat 357 UNIMPL userfaultfd 358 UNIMPL membarrier -369 UNIMPL mlock2 +359 UNIMPL mlock2 360 UNIMPL copy_file_range 361 UNIMPL preadv2 362 UNIMPL pwritev2
CVS commit: src/sys/compat/linux/arch/mips
Module Name:src Committed By: christos Date: Sat Jul 29 15:05:31 UTC 2023 Modified Files: src/sys/compat/linux/arch/mips: syscalls.master Log Message: typo To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/compat/linux/arch/mips/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux
Module Name:src
Committed By: christos
Date: Sat Jul 29 15:04:29 UTC 2023
Modified Files:
src/sys/compat/linux/arch/aarch64: syscalls.master
src/sys/compat/linux/arch/alpha: syscalls.master
src/sys/compat/linux/arch/amd64: syscalls.master
src/sys/compat/linux/arch/arm: syscalls.master
src/sys/compat/linux/arch/i386: syscalls.master
src/sys/compat/linux/arch/m68k: syscalls.master
src/sys/compat/linux/arch/mips: syscalls.master
src/sys/compat/linux/arch/powerpc: syscalls.master
src/sys/compat/linux/common: linux_file64.c linux_misc.c
Log Message:
Add/fix statx, readahead, close_range. From GSoC 2023 by Theodore Preduta
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/compat/linux/arch/aarch64/syscalls.master
cvs rdiff -u -r1.103 -r1.104 src/sys/compat/linux/arch/alpha/syscalls.master
cvs rdiff -u -r1.69 -r1.70 src/sys/compat/linux/arch/amd64/syscalls.master
cvs rdiff -u -r1.76 -r1.77 src/sys/compat/linux/arch/arm/syscalls.master
cvs rdiff -u -r1.131 -r1.132 src/sys/compat/linux/arch/i386/syscalls.master
cvs rdiff -u -r1.102 -r1.103 src/sys/compat/linux/arch/m68k/syscalls.master
cvs rdiff -u -r1.75 -r1.76 src/sys/compat/linux/arch/mips/syscalls.master
cvs rdiff -u -r1.81 -r1.82 src/sys/compat/linux/arch/powerpc/syscalls.master
cvs rdiff -u -r1.67 -r1.68 src/sys/compat/linux/common/linux_file64.c
cvs rdiff -u -r1.259 -r1.260 src/sys/compat/linux/common/linux_misc.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/compat/linux/arch/aarch64/syscalls.master
diff -u src/sys/compat/linux/arch/aarch64/syscalls.master:1.8 src/sys/compat/linux/arch/aarch64/syscalls.master:1.9
--- src/sys/compat/linux/arch/aarch64/syscalls.master:1.8 Sat Jul 29 02:47:26 2023
+++ src/sys/compat/linux/arch/aarch64/syscalls.master Sat Jul 29 11:04:28 2023
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.8 2023/07/29 06:47:26 rin Exp $
+ $NetBSD: syscalls.master,v 1.9 2023/07/29 15:04:28 christos Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -433,7 +433,8 @@
const struct linux_msghdr *msg, int flags); }
212 STD { ssize_t|linux_sys||recvmsg(int s, \
struct linux_msghdr *msg, int flags); }
-213 UNIMPL readahead
+213 STD { ssize_t|linux_sys||readahead(int fd, off_t offset, \
+ size_t count); }
214 STD { int|linux_sys||brk(char *nsize); }
215 NOARGS { int|sys||munmap(void *addr, size_t len); }
216 STD { void *|linux_sys||mremap(void *old_address, \
@@ -675,7 +676,8 @@
433 UNIMPL fspick
434 UNIMPL pidfd_open
435 UNIMPL clone3
-436 UNIMPL
+436 STD { int|linux_sys||close_range(unsigned int first, \
+ unsigned int last, unsigned int flags); }
437 UNIMPL openat2
438 UNIMPL pidfd_getfd
439 UNIMPL faccessat2
Index: src/sys/compat/linux/arch/alpha/syscalls.master
diff -u src/sys/compat/linux/arch/alpha/syscalls.master:1.103 src/sys/compat/linux/arch/alpha/syscalls.master:1.104
--- src/sys/compat/linux/arch/alpha/syscalls.master:1.103 Fri Jul 28 15:01:11 2023
+++ src/sys/compat/linux/arch/alpha/syscalls.master Sat Jul 29 11:04:28 2023
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.103 2023/07/28 19:01:11 christos Exp $
+ $NetBSD: syscalls.master,v 1.104 2023/07/29 15:04:28 christos Exp $
;
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -614,7 +614,8 @@
377 STD { int|linux_sys||getdents64(int fd, \
struct linux_dirent64 *dent, unsigned int count); }
378 NOARGS { pid_t|linux_sys||gettid(void); }
-379 UNIMPL readahead
+379 STD { ssize_t|linux_sys||readahead(int fd, off_t offset, \
+ size_t count); }
380 UNIMPL /* unused */
381 STD { int|linux_sys||tkill(int tid, int sig); }
382 STD { int|linux_sys||setxattr(char *path, char *name, \
@@ -830,7 +831,9 @@
519 UNIMPL
520 UNIMPL
521 UNIMPL
-522 UNIMPL
+522 STD { int|linux_sys||statx(int fd, const char *path, \
+ int flag, unsigned int mask, \
+ struct linux_statx *sp); }
523 UNIMPL
524 UNIMPL
525 UNIMPL
@@ -854,7 +857,8 @@
543 UNIMPL
544 UNIMPL
545 UNIMPL
-546 UNIMPL
+546 STD { int|linux_sys||close_range(unsigned int first, \
+ unsigned int last, unsigned int flags); }
547 UNIMPL
548 UNIMPL
549 UNIMPL
Index: src/sys/compat/linux/arch/amd64/syscalls.master
diff -u src/sys/compat/linux/arch/amd64/syscalls.master:1.69 src/sys/compat/linux/arch/amd64/syscalls.master:1.70
--- src/sys/compat/linux/arch/amd64/syscalls.master:1.69 Fri Jul 28 14:19:00 2023
+++ src/sys/compat/linux/arch/amd64/syscalls.master Sat Jul 29 11:04:28 2023
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.69 2023/07/28 18:19:00 christos Exp $
+ $NetBSD: syscalls.master,v 1.70 2023/07/29 15:04:28 christos Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -374,7 +374,8 @@
184 UNIMPL tuxcall
185 UNIMPL security
186 STD { pid_t|linux_sys||gettid(void); }
-187 UNIMPL readahead
+187 STD {
CVS commit: src/sys/compat/linux
Module Name:src Committed By: christos Date: Sat Jul 29 15:04:29 UTC 2023 Modified Files: src/sys/compat/linux/arch/aarch64: syscalls.master src/sys/compat/linux/arch/alpha: syscalls.master src/sys/compat/linux/arch/amd64: syscalls.master src/sys/compat/linux/arch/arm: syscalls.master src/sys/compat/linux/arch/i386: syscalls.master src/sys/compat/linux/arch/m68k: syscalls.master src/sys/compat/linux/arch/mips: syscalls.master src/sys/compat/linux/arch/powerpc: syscalls.master src/sys/compat/linux/common: linux_file64.c linux_misc.c Log Message: Add/fix statx, readahead, close_range. From GSoC 2023 by Theodore Preduta To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/compat/linux/arch/aarch64/syscalls.master cvs rdiff -u -r1.103 -r1.104 src/sys/compat/linux/arch/alpha/syscalls.master cvs rdiff -u -r1.69 -r1.70 src/sys/compat/linux/arch/amd64/syscalls.master cvs rdiff -u -r1.76 -r1.77 src/sys/compat/linux/arch/arm/syscalls.master cvs rdiff -u -r1.131 -r1.132 src/sys/compat/linux/arch/i386/syscalls.master cvs rdiff -u -r1.102 -r1.103 src/sys/compat/linux/arch/m68k/syscalls.master cvs rdiff -u -r1.75 -r1.76 src/sys/compat/linux/arch/mips/syscalls.master cvs rdiff -u -r1.81 -r1.82 src/sys/compat/linux/arch/powerpc/syscalls.master cvs rdiff -u -r1.67 -r1.68 src/sys/compat/linux/common/linux_file64.c cvs rdiff -u -r1.259 -r1.260 src/sys/compat/linux/common/linux_misc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src
Committed By: riastradh
Date: Sat Jul 29 14:54:02 UTC 2023
Modified Files:
src/sys/sys: memfd.h
Log Message:
sys/memfd.h: Fix include guards after rename.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/sys/memfd.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/memfd.h
diff -u src/sys/sys/memfd.h:1.2 src/sys/sys/memfd.h:1.3
--- src/sys/sys/memfd.h:1.2 Sat Jul 29 08:46:58 2023
+++ src/sys/sys/memfd.h Sat Jul 29 14:54:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: memfd.h,v 1.2 2023/07/29 08:46:58 riastradh Exp $ */
+/* $NetBSD: memfd.h,v 1.3 2023/07/29 14:54:02 riastradh Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -26,8 +26,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _SYS_MISCFD_H_
-#define _SYS_MISCFD_H_
+#ifndef _SYS_MEMFD_H_
+#define _SYS_MEMFD_H_
#include
@@ -47,4 +47,4 @@ struct memfd {
struct timespec mfd_mtime;
};
-#endif /* _SYS_MISCFD_H_ */
+#endif /* _SYS_MEMFD_H_ */
CVS commit: src/sys/sys
Module Name:src Committed By: riastradh Date: Sat Jul 29 14:54:02 UTC 2023 Modified Files: src/sys/sys: memfd.h Log Message: sys/memfd.h: Fix include guards after rename. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/sys/memfd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/compat/netbsd32
Oops, thanks for quick fix, and it seems that I need a cup of coffee... Thanks, rin On 2023/07/29 22:57, Paul Goyette wrote: Module Name:src Committed By: pgoyette Date: Sat Jul 29 13:57:28 UTC 2023 Modified Files: src/sys/compat/netbsd32: netbsd32_compat_80.c netbsd32_compat_90.c Log Message: Don't skip compat_netbsd32_90 in the dependency chain. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/compat/netbsd32/netbsd32_compat_80.c cvs rdiff -u -r1.1 -r1.2 src/sys/compat/netbsd32/netbsd32_compat_90.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sat Jul 29 13:57:28 UTC 2023
Modified Files:
src/sys/compat/netbsd32: netbsd32_compat_80.c netbsd32_compat_90.c
Log Message:
Don't skip compat_netbsd32_90 in the dependency chain.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/compat/netbsd32/netbsd32_compat_80.c
cvs rdiff -u -r1.1 -r1.2 src/sys/compat/netbsd32/netbsd32_compat_90.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/compat/netbsd32/netbsd32_compat_80.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_80.c:1.7 src/sys/compat/netbsd32/netbsd32_compat_80.c:1.8
--- src/sys/compat/netbsd32/netbsd32_compat_80.c:1.7 Sat Jul 29 13:40:51 2023
+++ src/sys/compat/netbsd32/netbsd32_compat_80.c Sat Jul 29 13:57:28 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_80.c,v 1.7 2023/07/29 13:40:51 rin Exp $ */
+/* $NetBSD: netbsd32_compat_80.c,v 1.8 2023/07/29 13:57:28 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_80.c,v 1.7 2023/07/29 13:40:51 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_80.c,v 1.8 2023/07/29 13:57:28 pgoyette Exp $");
#include
#include
@@ -175,7 +175,7 @@ netbsd32_80_modctl(struct lwp *lwp, cons
return error;
}
-MODULE(MODULE_CLASS_EXEC, compat_netbsd32_80, "compat_netbsd32_100,compat_80");
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_80, "compat_netbsd32_90,compat_80");
static int
compat_netbsd32_80_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/netbsd32/netbsd32_compat_90.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_90.c:1.1 src/sys/compat/netbsd32/netbsd32_compat_90.c:1.2
--- src/sys/compat/netbsd32/netbsd32_compat_90.c:1.1 Sun Sep 22 22:59:38 2019
+++ src/sys/compat/netbsd32/netbsd32_compat_90.c Sat Jul 29 13:57:28 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_90.c,v 1.1 2019/09/22 22:59:38 christos Exp $ */
+/* $NetBSD: netbsd32_compat_90.c,v 1.2 2023/07/29 13:57:28 pgoyette Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_90.c,v 1.1 2019/09/22 22:59:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_90.c,v 1.2 2023/07/29 13:57:28 pgoyette Exp $");
#include
#include
@@ -152,7 +152,8 @@ static struct syscall_package compat_net
{ 0, 0, NULL }
};
-MODULE(MODULE_CLASS_EXEC, compat_netbsd32_90, "compat_netbsd32,compat_90");
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_90, "compat_netbsd32_100,compat_90");
+
static int
compat_netbsd32_90_modcmd(modcmd_t cmd, void *arg)
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sat Jul 29 13:57:28 UTC 2023 Modified Files: src/sys/compat/netbsd32: netbsd32_compat_80.c netbsd32_compat_90.c Log Message: Don't skip compat_netbsd32_90 in the dependency chain. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/compat/netbsd32/netbsd32_compat_80.c cvs rdiff -u -r1.1 -r1.2 src/sys/compat/netbsd32/netbsd32_compat_90.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: rin
Date: Sat Jul 29 13:40:51 UTC 2023
Modified Files:
src/sys/compat/netbsd32: netbsd32_compat_50.c netbsd32_compat_80.c
Log Message:
COMPAT_NETBSD32: Reorganize the previous; Make compat_netbsd32_50 recursively
depended on compat_netbsd32_100, rather than directly depended on it.
Thanks pgoyette@ again for useful comments!
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/compat/netbsd32/netbsd32_compat_50.c
cvs rdiff -u -r1.6 -r1.7 src/sys/compat/netbsd32/netbsd32_compat_80.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/compat/netbsd32/netbsd32_compat_50.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.55 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.56
--- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.55 Sat Jul 29 13:13:50 2023
+++ src/sys/compat/netbsd32/netbsd32_compat_50.c Sat Jul 29 13:40:51 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50.c,v 1.55 2023/07/29 13:13:50 rin Exp $ */
+/* $NetBSD: netbsd32_compat_50.c,v 1.56 2023/07/29 13:40:51 rin Exp $ */
/*-
* Copyright (c) 2008, 2020 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.55 2023/07/29 13:13:50 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.56 2023/07/29 13:40:51 rin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -974,8 +974,7 @@ static struct syscall_package compat_net
{ 0, 0, NULL }
};
-MODULE(MODULE_CLASS_EXEC, compat_netbsd32_50,
-"compat_netbsd32_100,compat_netbsd32_60,compat_50");
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_50, "compat_netbsd32_60,compat_50");
static int
compat_netbsd32_50_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/netbsd32/netbsd32_compat_80.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_80.c:1.6 src/sys/compat/netbsd32/netbsd32_compat_80.c:1.7
--- src/sys/compat/netbsd32/netbsd32_compat_80.c:1.6 Thu Dec 12 02:15:42 2019
+++ src/sys/compat/netbsd32/netbsd32_compat_80.c Sat Jul 29 13:40:51 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_80.c,v 1.6 2019/12/12 02:15:42 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_80.c,v 1.7 2023/07/29 13:40:51 rin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_80.c,v 1.6 2019/12/12 02:15:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_80.c,v 1.7 2023/07/29 13:40:51 rin Exp $");
#include
#include
@@ -175,7 +175,7 @@ netbsd32_80_modctl(struct lwp *lwp, cons
return error;
}
-MODULE(MODULE_CLASS_EXEC, compat_netbsd32_80, "compat_netbsd32,compat_80");
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_80, "compat_netbsd32_100,compat_80");
static int
compat_netbsd32_80_modcmd(modcmd_t cmd, void *arg)
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: rin Date: Sat Jul 29 13:40:51 UTC 2023 Modified Files: src/sys/compat/netbsd32: netbsd32_compat_50.c netbsd32_compat_80.c Log Message: COMPAT_NETBSD32: Reorganize the previous; Make compat_netbsd32_50 recursively depended on compat_netbsd32_100, rather than directly depended on it. Thanks pgoyette@ again for useful comments! To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/compat/netbsd32/netbsd32_compat_50.c cvs rdiff -u -r1.6 -r1.7 src/sys/compat/netbsd32/netbsd32_compat_80.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/compat/netbsd32
On 2023/07/29 22:13, Rin Okuyama wrote: Module Name:src Committed By: rin Date: Sat Jul 29 13:13:50 UTC 2023 Modified Files: src/sys/compat/netbsd32: netbsd32_compat_50.c Log Message: Now, netbsd32_compat_50 module requires netbsd32_compat_100. Thanks pgoyette@ for hints. Hmm, file name is netbsd32_compat_x.c but module name is compat_netbsd32_x. Diff was correct :) Thanks, rin
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: rin
Date: Sat Jul 29 13:13:50 UTC 2023
Modified Files:
src/sys/compat/netbsd32: netbsd32_compat_50.c
Log Message:
Now, netbsd32_compat_50 module requires netbsd32_compat_100.
Thanks pgoyette@ for hints.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/compat/netbsd32/netbsd32_compat_50.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/compat/netbsd32/netbsd32_compat_50.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.54 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.55
--- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.54 Sat Jul 29 12:38:25 2023
+++ src/sys/compat/netbsd32/netbsd32_compat_50.c Sat Jul 29 13:13:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50.c,v 1.54 2023/07/29 12:38:25 rin Exp $ */
+/* $NetBSD: netbsd32_compat_50.c,v 1.55 2023/07/29 13:13:50 rin Exp $ */
/*-
* Copyright (c) 2008, 2020 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.54 2023/07/29 12:38:25 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.55 2023/07/29 13:13:50 rin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -974,7 +974,8 @@ static struct syscall_package compat_net
{ 0, 0, NULL }
};
-MODULE(MODULE_CLASS_EXEC, compat_netbsd32_50, "compat_netbsd32_60,compat_50");
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_50,
+"compat_netbsd32_100,compat_netbsd32_60,compat_50");
static int
compat_netbsd32_50_modcmd(modcmd_t cmd, void *arg)
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: rin Date: Sat Jul 29 13:13:50 UTC 2023 Modified Files: src/sys/compat/netbsd32: netbsd32_compat_50.c Log Message: Now, netbsd32_compat_50 module requires netbsd32_compat_100. Thanks pgoyette@ for hints. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/compat/netbsd32/netbsd32_compat_50.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/common
Module Name:src
Committed By: rin
Date: Sat Jul 29 12:58:51 UTC 2023
Modified Files:
src/sys/compat/linux/common: linux_misc.h
Log Message:
Add comment on packed attribution for struct linux_epoll_event on amd64.
NFC.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/compat/linux/common/linux_misc.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/compat/linux/common/linux_misc.h
diff -u src/sys/compat/linux/common/linux_misc.h:1.27 src/sys/compat/linux/common/linux_misc.h:1.28
--- src/sys/compat/linux/common/linux_misc.h:1.27 Fri Jul 28 18:19:01 2023
+++ src/sys/compat/linux/common/linux_misc.h Sat Jul 29 12:58:51 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc.h,v 1.27 2023/07/28 18:19:01 christos Exp $ */
+/* $NetBSD: linux_misc.h,v 1.28 2023/07/29 12:58:51 rin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -146,6 +146,7 @@ struct linux_epoll_event {
uint64_t data;
}
#if defined(__amd64__)
+/* Only for x86_64. See include/uapi/linux/eventpoll.h. */
__packed
#endif
;
CVS commit: src/sys/compat/linux/common
Module Name:src Committed By: rin Date: Sat Jul 29 12:58:51 UTC 2023 Modified Files: src/sys/compat/linux/common: linux_misc.h Log Message: Add comment on packed attribution for struct linux_epoll_event on amd64. NFC. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/compat/linux/common/linux_misc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: rin
Date: Sat Jul 29 12:48:15 UTC 2023
Modified Files:
src/sys/compat/netbsd32: netbsd32_compat_100.c netbsd32_event.c
netbsd32_event.h
Log Message:
COMPAT_NETBSD32: No need to have compat_100_netbsd32_kevent_fetch_timeout.
NFCI.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/compat/netbsd32/netbsd32_compat_100.c
cvs rdiff -u -r1.13 -r1.14 src/sys/compat/netbsd32/netbsd32_event.c
cvs rdiff -u -r1.1 -r1.2 src/sys/compat/netbsd32/netbsd32_event.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/compat/netbsd32/netbsd32_compat_100.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_100.c:1.2 src/sys/compat/netbsd32/netbsd32_compat_100.c:1.3
--- src/sys/compat/netbsd32/netbsd32_compat_100.c:1.2 Sat Jul 29 12:38:25 2023
+++ src/sys/compat/netbsd32/netbsd32_compat_100.c Sat Jul 29 12:48:15 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_100.c,v 1.2 2023/07/29 12:38:25 rin Exp $ */
+/* $NetBSD: netbsd32_compat_100.c,v 1.3 2023/07/29 12:48:15 rin Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_100.c,v 1.2 2023/07/29 12:38:25 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_100.c,v 1.3 2023/07/29 12:48:15 rin Exp $");
#include
#include
@@ -46,22 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include
#include
-static int
-compat_100_netbsd32_kevent_fetch_timeout(const void *src, void *dest,
-size_t length)
-{
- struct netbsd32_timespec ts32;
- int error;
-
- KASSERT(length == sizeof(struct timespec));
-
- error = copyin(src, , sizeof(ts32));
- if (error)
- return error;
- netbsd32_to_timespec(, (struct timespec *)dest);
- return 0;
-}
-
static void
compat_100_netbsd32_to_kevent(const struct netbsd32_kevent100 *ke32,
struct kevent *ke)
@@ -134,7 +118,7 @@ compat_100_netbsd32___kevent50(struct lw
syscallarg(netbsd32_timespecp_t) timeout;
} */
struct kevent_ops netbsd32_kevent_ops = {
- .keo_fetch_timeout = compat_100_netbsd32_kevent_fetch_timeout,
+ .keo_fetch_timeout = netbsd32_kevent_fetch_timeout,
.keo_fetch_changes = compat_100_netbsd32_kevent_fetch_changes,
.keo_put_events = compat_100_netbsd32_kevent_put_events,
};
Index: src/sys/compat/netbsd32/netbsd32_event.c
diff -u src/sys/compat/netbsd32/netbsd32_event.c:1.13 src/sys/compat/netbsd32/netbsd32_event.c:1.14
--- src/sys/compat/netbsd32/netbsd32_event.c:1.13 Sat Jul 29 12:38:25 2023
+++ src/sys/compat/netbsd32/netbsd32_event.c Sat Jul 29 12:48:15 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_event.c,v 1.13 2023/07/29 12:38:25 rin Exp $ */
+/* $NetBSD: netbsd32_event.c,v 1.14 2023/07/29 12:48:15 rin Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_event.c,v 1.13 2023/07/29 12:38:25 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_event.c,v 1.14 2023/07/29 12:48:15 rin Exp $");
#include
#include
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_eve
#include
#include
-static int
+int
netbsd32_kevent_fetch_timeout(const void *src, void *dest, size_t length)
{
struct netbsd32_timespec ts32;
Index: src/sys/compat/netbsd32/netbsd32_event.h
diff -u src/sys/compat/netbsd32/netbsd32_event.h:1.1 src/sys/compat/netbsd32/netbsd32_event.h:1.2
--- src/sys/compat/netbsd32/netbsd32_event.h:1.1 Sat Jul 29 12:38:25 2023
+++ src/sys/compat/netbsd32/netbsd32_event.h Sat Jul 29 12:48:15 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_event.h,v 1.1 2023/07/29 12:38:25 rin Exp $ */
+/* $NetBSD: netbsd32_event.h,v 1.2 2023/07/29 12:48:15 rin Exp $ */
/*
* Copyright (c) 2023 NetBSD Foundation, Inc.
@@ -32,6 +32,7 @@
#include
/* netbsd32_event.c */
+int netbsd32_kevent_fetch_timeout(const void *, void *, size_t);
int netbsd32_kevent1(register_t *, int, const netbsd32_kevent100p_t,
netbsd32_size_t, netbsd32_kevent100p_t, netbsd32_size_t,
netbsd32_timespecp_t, struct kevent_ops *);
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: rin Date: Sat Jul 29 12:48:15 UTC 2023 Modified Files: src/sys/compat/netbsd32: netbsd32_compat_100.c netbsd32_event.c netbsd32_event.h Log Message: COMPAT_NETBSD32: No need to have compat_100_netbsd32_kevent_fetch_timeout. NFCI. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/compat/netbsd32/netbsd32_compat_100.c cvs rdiff -u -r1.13 -r1.14 src/sys/compat/netbsd32/netbsd32_event.c cvs rdiff -u -r1.1 -r1.2 src/sys/compat/netbsd32/netbsd32_event.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: rin
Date: Sat Jul 29 12:39:20 UTC 2023
Modified Files:
src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h
netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
COMPAT_NETBSD32: Regen for syscalls.master,v 1.142
To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.156 -r1.157 src/sys/compat/netbsd32/netbsd32_syscallargs.h \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.36 -r1.37 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.155 -r1.156 src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.49 -r1.50 src/sys/compat/netbsd32/netbsd32_systrace_args.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/compat/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.157 src/sys/compat/netbsd32/netbsd32_syscall.h:1.158
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.157 Mon Sep 20 01:07:56 2021
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Sat Jul 29 12:39:20 2023
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.157 2021/09/20 01:07:56 thorpej Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.158 2023/07/29 12:39:20 rin Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.141 2021/09/20 01:07:45 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.142 2023/07/29 12:38:25 rin Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -917,7 +917,7 @@
/* syscall: "kqueue" ret: "int" args: */
#define NETBSD32_SYS_kqueue 344
-/* syscall: "compat_50_netbsd32_kevent" ret: "int" args: "int" "netbsd32_keventp_t" "netbsd32_size_t" "netbsd32_keventp_t" "netbsd32_size_t" "netbsd32_timespec50p_t" */
+/* syscall: "compat_50_netbsd32_kevent" ret: "int" args: "int" "netbsd32_kevent100p_t" "netbsd32_size_t" "netbsd32_kevent100p_t" "netbsd32_size_t" "netbsd32_timespec50p_t" */
#define NETBSD32_SYS_compat_50_netbsd32_kevent 345
/* syscall: "netbsd32__sched_setparam" ret: "int" args: "pid_t" "lwpid_t" "int" "const netbsd32_sched_paramp_t" */
@@ -1144,8 +1144,8 @@
/* syscall: "compat_60_netbsd32__lwp_park" ret: "int" args: "const netbsd32_timespecp_t" "lwpid_t" "const netbsd32_voidp" "const netbsd32_voidp" */
#define NETBSD32_SYS_compat_60_netbsd32__lwp_park 434
-/* syscall: "netbsd32___kevent50" ret: "int" args: "int" "const netbsd32_keventp_t" "netbsd32_size_t" "netbsd32_keventp_t" "netbsd32_size_t" "const netbsd32_timespecp_t" */
-#define NETBSD32_SYS_netbsd32___kevent50 435
+/* syscall: "compat_100_netbsd32___kevent50" ret: "int" args: "int" "const netbsd32_kevent100p_t" "netbsd32_size_t" "netbsd32_kevent100p_t" "netbsd32_size_t" "const netbsd32_timespecp_t" */
+#define NETBSD32_SYS_compat_100_netbsd32___kevent50 435
/* syscall: "netbsd32___pselect50" ret: "int" args: "int" "netbsd32_fd_setp_t" "netbsd32_fd_setp_t" "netbsd32_fd_setp_t" "const netbsd32_timespecp_t" "const netbsd32_sigsetp_t" */
#define NETBSD32_SYS_netbsd32___pselect50 436
@@ -1338,6 +1338,9 @@
/* syscall: "netbsd32_lpathconf" ret: "long" args: "const netbsd32_charp" "int" */
#define NETBSD32_SYS_netbsd32_lpathconf 499
-#define NETBSD32_SYS_MAXSYSCALL 500
+/* syscall: "netbsd32___kevent100" ret: "int" args: "int" "const netbsd32_keventp_t" "netbsd32_size_t" "netbsd32_keventp_t" "netbsd32_size_t" "const netbsd32_timespecp_t" */
+#define NETBSD32_SYS_netbsd32___kevent100 501
+
+#define NETBSD32_SYS_MAXSYSCALL 505
#define NETBSD32_SYS_NSYSENT 512
#endif /* _NETBSD32_SYS_SYSCALL_H_ */
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.156 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.157
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.156 Mon Sep 20 01:07:56 2021
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Sat Jul 29 12:39:20 2023
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.156 2021/09/20 01:07:56 thorpej Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.157 2023/07/29 12:39:20 rin Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.141 2021/09/20 01:07:45 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.142 2023/07/29 12:38:25 rin Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -1777,9 +1777,9 @@ check_syscall_args(netbsd32_rasctl)
struct compat_50_netbsd32_kevent_args {
syscallarg(int) fd;
- syscallarg(netbsd32_keventp_t) changelist;
+ syscallarg(netbsd32_kevent100p_t) changelist;
syscallarg(netbsd32_size_t) nchanges;
- syscallarg(netbsd32_keventp_t) eventlist;
+ syscallarg(netbsd32_kevent100p_t) eventlist;
syscallarg(netbsd32_size_t) nevents;
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: rin Date: Sat Jul 29 12:39:20 UTC 2023 Modified Files: src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: COMPAT_NETBSD32: Regen for syscalls.master,v 1.142 To generate a diff of this commit: cvs rdiff -u -r1.157 -r1.158 src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.156 -r1.157 src/sys/compat/netbsd32/netbsd32_syscallargs.h \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.36 -r1.37 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.155 -r1.156 src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.49 -r1.50 src/sys/compat/netbsd32/netbsd32_systrace_args.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: rin
Date: Sat Jul 29 12:38:25 UTC 2023
Modified Files:
src/sys/compat/netbsd32: netbsd32.h netbsd32_compat_100.c
netbsd32_compat_50.c netbsd32_conv.h netbsd32_event.c
syscalls.master
Added Files:
src/sys/compat/netbsd32: netbsd32_event.h
Log Message:
COMPAT_NETBSD32: Catch up with sys___kevent100() addition.
XXX
Add epoll_* and memfd_create.
To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/compat/netbsd32/netbsd32.h \
src/sys/compat/netbsd32/syscalls.master
cvs rdiff -u -r1.1 -r1.2 src/sys/compat/netbsd32/netbsd32_compat_100.c
cvs rdiff -u -r1.53 -r1.54 src/sys/compat/netbsd32/netbsd32_compat_50.c
cvs rdiff -u -r1.46 -r1.47 src/sys/compat/netbsd32/netbsd32_conv.h
cvs rdiff -u -r1.12 -r1.13 src/sys/compat/netbsd32/netbsd32_event.c
cvs rdiff -u -r0 -r1.1 src/sys/compat/netbsd32/netbsd32_event.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/compat/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.141 src/sys/compat/netbsd32/netbsd32.h:1.142
--- src/sys/compat/netbsd32/netbsd32.h:1.141 Sun Feb 12 16:28:32 2023
+++ src/sys/compat/netbsd32/netbsd32.h Sat Jul 29 12:38:25 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.141 2023/02/12 16:28:32 andvar Exp $ */
+/* $NetBSD: netbsd32.h,v 1.142 2023/07/29 12:38:25 rin Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green
@@ -1024,6 +1024,19 @@ struct netbsd32_kevent {
uint32_t fflags;
netbsd32_int64 data;
netbsd32_pointer_t udata;
+ netbsd32_uint64 ext[4];
+};
+
+/* from */
+typedef netbsd32_pointer_t netbsd32_kevent100p_t;
+
+struct netbsd32_kevent100 {
+ netbsd32_uintptr_t ident;
+ uint32_t filter;
+ uint32_t flags;
+ uint32_t fflags;
+ netbsd32_int64 data;
+ netbsd32_pointer_t udata;
};
/* from */
Index: src/sys/compat/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.141 src/sys/compat/netbsd32/syscalls.master:1.142
--- src/sys/compat/netbsd32/syscalls.master:1.141 Mon Sep 20 01:07:45 2021
+++ src/sys/compat/netbsd32/syscalls.master Sat Jul 29 12:38:25 2023
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.141 2021/09/20 01:07:45 thorpej Exp $
+ $NetBSD: syscalls.master,v 1.142 2023/07/29 12:38:25 rin Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -783,9 +783,9 @@
344 NOARGS { int|sys||kqueue(void); }
345 COMPAT_50 MODULAR compat_netbsd32_50 \
{ int|netbsd32||kevent(int fd, \
- netbsd32_keventp_t changelist, \
+ netbsd32_kevent100p_t changelist, \
netbsd32_size_t nchanges, \
- netbsd32_keventp_t eventlist, \
+ netbsd32_kevent100p_t eventlist, \
netbsd32_size_t nevents, \
netbsd32_timespec50p_t timeout); }
; Scheduling system calls.
@@ -1016,10 +1016,11 @@
const netbsd32_timespecp_t ts, \
lwpid_t unpark, const netbsd32_voidp hint, \
const netbsd32_voidp unparkhint); }
-435 STD { int|netbsd32|50|kevent(int fd, \
- const netbsd32_keventp_t changelist, \
+435 COMPAT_100 MODULAR compat_netbsd32_100 \
+ { int|netbsd32|50|kevent(int fd, \
+ const netbsd32_kevent100p_t changelist, \
netbsd32_size_t nchanges, \
- netbsd32_keventp_t eventlist, \
+ netbsd32_kevent100p_t eventlist, \
netbsd32_size_t nevents, \
const netbsd32_timespecp_t timeout); }
436 STD { int|netbsd32|50|pselect(int nd, \
@@ -1213,3 +1214,13 @@
acl_type_t type, netbsd32_aclp_t aclp); }
499 STD { long|netbsd32||lpathconf(const netbsd32_charp path, \
int name); }
+500 UNIMPL memfd_create
+501 STD { int|netbsd32|100|kevent(int fd, \
+ const netbsd32_keventp_t changelist, \
+ netbsd32_size_t nchanges, \
+ netbsd32_keventp_t eventlist, \
+ netbsd32_size_t nevents, \
+ const netbsd32_timespecp_t timeout); }
+502 UNIMPL epoll_create1
+503 UNIMPL epoll_ctl
+504 UNIMPL epoll_pwait2
Index: src/sys/compat/netbsd32/netbsd32_compat_100.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_100.c:1.1 src/sys/compat/netbsd32/netbsd32_compat_100.c:1.2
--- src/sys/compat/netbsd32/netbsd32_compat_100.c:1.1 Mon Dec 19 23:19:51 2022
+++ src/sys/compat/netbsd32/netbsd32_compat_100.c Sat Jul 29 12:38:25 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_100.c,v 1.1 2022/12/19 23:19:51 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_100.c,v 1.2 2023/07/29 12:38:25 rin Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -30,14 +30,126 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_100.c,v 1.1 2022/12/19 23:19:51 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_100.c,v 1.2 2023/07/29 12:38:25 rin Exp $");
+#include
+#include
+#include
#include
+#include
+#include
+#include
#include
#include
#include
#include
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: rin Date: Sat Jul 29 12:38:25 UTC 2023 Modified Files: src/sys/compat/netbsd32: netbsd32.h netbsd32_compat_100.c netbsd32_compat_50.c netbsd32_conv.h netbsd32_event.c syscalls.master Added Files: src/sys/compat/netbsd32: netbsd32_event.h Log Message: COMPAT_NETBSD32: Catch up with sys___kevent100() addition. XXX Add epoll_* and memfd_create. To generate a diff of this commit: cvs rdiff -u -r1.141 -r1.142 src/sys/compat/netbsd32/netbsd32.h \ src/sys/compat/netbsd32/syscalls.master cvs rdiff -u -r1.1 -r1.2 src/sys/compat/netbsd32/netbsd32_compat_100.c cvs rdiff -u -r1.53 -r1.54 src/sys/compat/netbsd32/netbsd32_compat_50.c cvs rdiff -u -r1.46 -r1.47 src/sys/compat/netbsd32/netbsd32_conv.h cvs rdiff -u -r1.12 -r1.13 src/sys/compat/netbsd32/netbsd32_event.c cvs rdiff -u -r0 -r1.1 src/sys/compat/netbsd32/netbsd32_event.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: christos Date: Sat Jul 29 12:16:34 UTC 2023 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi src/sys/kern: sys_memfd.c src/tests/kernel: Makefile t_fcntl.c Added Files: src/tests/kernel: t_memfd_create.c Log Message: Add tests for t_memfd_create and fix bug found by tests To generate a diff of this commit: cvs rdiff -u -r1.407 -r1.408 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1278 -r1.1279 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.4 -r1.5 src/sys/kern/sys_memfd.c cvs rdiff -u -r1.73 -r1.74 src/tests/kernel/Makefile cvs rdiff -u -r1.2 -r1.3 src/tests/kernel/t_fcntl.c cvs rdiff -u -r0 -r1.1 src/tests/kernel/t_memfd_create.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.407 src/distrib/sets/lists/debug/mi:1.408 --- src/distrib/sets/lists/debug/mi:1.407 Fri Jul 28 14:18:59 2023 +++ src/distrib/sets/lists/debug/mi Sat Jul 29 08:16:34 2023 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.407 2023/07/28 18:18:59 christos Exp $ +# $NetBSD: mi,v 1.408 2023/07/29 12:16:34 christos Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -1800,6 +1800,7 @@ ./usr/libdata/debug/usr/tests/kernel/t_lock.debug tests-kernel-tests debug,atf,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_lockf.debug tests-kernel-tests debug,atf,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_lwpctl.debug tests-obsolete obsolete,compattestfile +./usr/libdata/debug/usr/tests/kernel/t_memfd_create.debug tests-kernel-tests debug,atf,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_mkdir.debug tests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_mqueue.debug tests-kernel-tests debug,atf,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_open_pr_57260.debug tests-kernel-tests debug,atf,compattestfile Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.1278 src/distrib/sets/lists/tests/mi:1.1279 --- src/distrib/sets/lists/tests/mi:1.1278 Fri Jul 28 14:19:00 2023 +++ src/distrib/sets/lists/tests/mi Sat Jul 29 08:16:34 2023 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1278 2023/07/28 18:19:00 christos Exp $ +# $NetBSD: mi,v 1.1279 2023/07/29 12:16:34 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2310,6 +2310,7 @@ ./usr/tests/kernel/t_lockftests-kernel-tests compattestfile,atf ./usr/tests/kernel/t_lwpctltests-obsolete obsolete ./usr/tests/kernel/t_magic_symlinks tests-kernel-tests compattestfile,atf +./usr/tests/kernel/t_memfd_create tests-kernel-tests compattestfile,atf ./usr/tests/kernel/t_mkdirtests-obsolete obsolete ./usr/tests/kernel/t_mqueuetests-kernel-tests compattestfile,atf ./usr/tests/kernel/t_nointerpreter tests-kernel-tests atf Index: src/sys/kern/sys_memfd.c diff -u src/sys/kern/sys_memfd.c:1.4 src/sys/kern/sys_memfd.c:1.5 --- src/sys/kern/sys_memfd.c:1.4 Sat Jul 29 04:46:47 2023 +++ src/sys/kern/sys_memfd.c Sat Jul 29 08:16:34 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_memfd.c,v 1.4 2023/07/29 08:46:47 riastradh Exp $ */ +/* $NetBSD: sys_memfd.c,v 1.5 2023/07/29 12:16:34 christos Exp $ */ /*- * Copyright (c) 2023 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sys_memfd.c,v 1.4 2023/07/29 08:46:47 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_memfd.c,v 1.5 2023/07/29 12:16:34 christos Exp $"); #include #include @@ -165,6 +165,7 @@ memfd_read(file_t *fp, off_t *offp, stru todo = MIN(uio->uio_resid, mfd->mfd_size - *offp); error = ubc_uiomove(mfd->mfd_uobj, uio, todo, UVM_ADV_SEQUENTIAL, UBC_READ|UBC_PARTIALOK); + *offp = uio->uio_offset; leave: if (offp == >f_offset) @@ -215,6 +216,7 @@ memfd_write(file_t *fp, off_t *offp, str error = ubc_uiomove(mfd->mfd_uobj, uio, todo, UVM_ADV_SEQUENTIAL, UBC_WRITE|UBC_PARTIALOK); + *offp = uio->uio_offset; getnanotime(>mfd_mtime); Index: src/tests/kernel/Makefile diff -u src/tests/kernel/Makefile:1.73 src/tests/kernel/Makefile:1.74 --- src/tests/kernel/Makefile:1.73 Fri Jul 28 14:19:01 2023 +++ src/tests/kernel/Makefile Sat Jul 29 08:16:34 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2023/07/28 18:19:01 christos Exp $ +# $NetBSD: Makefile,v 1.74 2023/07/29 12:16:34 christos Exp $ NOMAN= # defined @@ -12,6 +12,7 @@ TESTS_C+= t_fcntl TESTS_C+= t_lock TESTS_C+= t_lockf TESTS_C+= t_pty +TESTS_C+= t_memfd_create TESTS_C+= t_mqueue TESTS_C+= t_proccwd TESTS_C+= t_sysv Index: src/tests/kernel/t_fcntl.c diff -u src/tests/kernel/t_fcntl.c:1.2 src/tests/kernel/t_fcntl.c:1.3 --- src/tests/kernel/t_fcntl.c:1.2 Sun Oct 20 12:02:11 2019 +++
CVS commit: src
Module Name:src Committed By: christos Date: Sat Jul 29 12:16:34 UTC 2023 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi src/sys/kern: sys_memfd.c src/tests/kernel: Makefile t_fcntl.c Added Files: src/tests/kernel: t_memfd_create.c Log Message: Add tests for t_memfd_create and fix bug found by tests To generate a diff of this commit: cvs rdiff -u -r1.407 -r1.408 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1278 -r1.1279 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.4 -r1.5 src/sys/kern/sys_memfd.c cvs rdiff -u -r1.73 -r1.74 src/tests/kernel/Makefile cvs rdiff -u -r1.2 -r1.3 src/tests/kernel/t_fcntl.c cvs rdiff -u -r0 -r1.1 src/tests/kernel/t_memfd_create.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/sys
Module Name:src
Committed By: rin
Date: Sat Jul 29 11:58:53 UTC 2023
Modified Files:
src/sys/compat/sys: event.h
Log Message:
Sprinkle __inline to compat_100___kevent50_{fetch_changes,put_events}
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/sys/event.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/compat/sys/event.h
diff -u src/sys/compat/sys/event.h:1.3 src/sys/compat/sys/event.h:1.4
--- src/sys/compat/sys/event.h:1.3 Fri Jul 28 18:19:01 2023
+++ src/sys/compat/sys/event.h Sat Jul 29 11:58:53 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: event.h,v 1.3 2023/07/28 18:19:01 christos Exp $ */
+/* $NetBSD: event.h,v 1.4 2023/07/29 11:58:53 rin Exp $ */
/*-
* Copyright (c) 1999,2000,2001 Jonathan Lemon
@@ -63,7 +63,7 @@ kevent_to_kevent100(const struct kevent
}
#ifdef _KERNEL
-static int
+static __inline int
compat_100___kevent50_fetch_changes(void *ctx, const struct kevent *changelist,
struct kevent *changes, size_t index, int n)
{
@@ -88,7 +88,7 @@ leave:
return error;
}
-static int
+static __inline int
compat_100___kevent50_put_events(void *ctx, struct kevent *events,
struct kevent *eventlist, size_t index, int n)
{
CVS commit: src/sys/compat/sys
Module Name:src
Committed By: rin
Date: Sat Jul 29 11:58:53 UTC 2023
Modified Files:
src/sys/compat/sys: event.h
Log Message:
Sprinkle __inline to compat_100___kevent50_{fetch_changes,put_events}
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/sys/event.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sat Jul 29 11:48:37 UTC 2023 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1853 - #1857 To generate a diff of this commit: cvs rdiff -u -r1.1.2.184 -r1.1.2.185 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.184 src/doc/CHANGES-8.3:1.1.2.185 --- src/doc/CHANGES-8.3:1.1.2.184 Thu Jul 27 18:12:07 2023 +++ src/doc/CHANGES-8.3 Sat Jul 29 11:48:37 2023 @@ -1,4 +1,4 @@ - $NetBSD: CHANGES-8.3,v 1.1.2.184 2023/07/27 18:12:07 martin Exp $ + $NetBSD: CHANGES-8.3,v 1.1.2.185 2023/07/29 11:48:37 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -3585,3 +3585,38 @@ sys/arch/x86/x86/errata.c 1.32 x86: fix the cpuids for the zen2 client CPUs. [mrg, ticket #1852] +sys/arch/x86/include/specialreg.h 1.204-1.206, 1.208 + (via patch) + + - Add Intel CPUID 0x07 %ecx bit 24 BUS_LOCK_DETECT. + - Add AMD CPUID 0x8008 %ebx bit 30 IBPB_RET and CPUID 0x800a + %edx bit 29 BusLockThreshold. + - Fix typo in comment. + [msaitoh, ticket #1853] + +usr.sbin/cpuctl/arch/i386.c 1.137-1.139 + (via patch) + + - CPU model 0x5a is not Atom E3500 but Atom Z3500. + - Add Alder Lake-N. + [msaitoh, ticket #1854] + +sys/dev/pci/pcidevs1.1481-1.1482 (patch) +sys/dev/pci/pcidevs.hregen +sys/dev/pci/pcidevs_data.h regen + + Add Intel Alder Lake-N, Raptor Lake and 700 series chipset devices. + [msaitoh, ticket #1855] + +sys/dev/pci/ichsmb.c1.83-1.84 (patch) + + - Add support Intel 700 series chipset and Alder Lake-N devices. + - Use device_printf() instead of aprint_error_dev() in + ichsmb_i2c_exec(). + [msaitoh, ticket #1856] + +sys/arch/x86/x86/coretemp.c 1.38-1.39 (patch) + + coretemp(4): change limits of Tjmax. + [msaitoh, ticket #1857] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sat Jul 29 11:48:37 UTC 2023 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1853 - #1857 To generate a diff of this commit: cvs rdiff -u -r1.1.2.184 -r1.1.2.185 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sat Jul 29 11:44:09 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1669 - #1673 To generate a diff of this commit: cvs rdiff -u -r1.1.2.80 -r1.1.2.81 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: Sat Jul 29 11:44:09 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1669 - #1673 To generate a diff of this commit: cvs rdiff -u -r1.1.2.80 -r1.1.2.81 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.80 src/doc/CHANGES-9.4:1.1.2.81 --- src/doc/CHANGES-9.4:1.1.2.80 Thu Jul 27 18:11:16 2023 +++ src/doc/CHANGES-9.4 Sat Jul 29 11:44:09 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.80 2023/07/27 18:11:16 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.81 2023/07/29 11:44:09 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -1671,3 +1671,38 @@ sys/arch/xen/xen/xen_clock.c 1.10,1.12 up, which could cause a hardclock() storm. [bouyer, ticket #1668] +sys/arch/x86/include/specialreg.h 1.204-1.206, 1.208 + (via patch) + + - Add Intel CPUID 0x07 %ecx bit 24 BUS_LOCK_DETECT. + - Add AMD CPUID 0x8008 %ebx bit 30 IBPB_RET and CPUID 0x800a + %edx bit 29 BusLockThreshold. + - Fix typo in comment. + [msaitoh, ticket #1669] + +usr.sbin/cpuctl/arch/i386.c 1.137-1.139 + (via patch) + +- CPU model 0x5a is not Atom E3500 but Atom Z3500. +- Add Alder Lake-N. + [msaitoh, ticket #1670] + +sys/dev/pci/pcidevs 1.1481-1.1482 (patch) +sys/dev/pci/pcidevs.h regen +sys/dev/pci/pcidevs_data.h regen + +Add Intel Alder Lake-N, Raptor Lake and 700 series chipset devices. + [msaitoh, ticket #1671] + +sys/dev/pci/ichsmb.c1.83-1.84 (patch) + + - Add support Intel 700 series chipset and Alder Lake-N devices. + - Use device_printf() instead of aprint_error_dev() in + ichsmb_i2c_exec(). + [msaitoh, ticket #1672] + +sys/arch/x86/x86/coretemp.c 1.38-1.39 (patch) + + coretemp(4): change limits of Tjmax. + [msaitoh, ticket #1673] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sat Jul 29 11:42:32 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #250 - #255 To generate a diff of this commit: cvs rdiff -u -r1.1.2.90 -r1.1.2.91 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.90 src/doc/CHANGES-10.0:1.1.2.91 --- src/doc/CHANGES-10.0:1.1.2.90 Thu Jul 27 18:10:25 2023 +++ src/doc/CHANGES-10.0 Sat Jul 29 11:42:32 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.90 2023/07/27 18:10:25 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.91 2023/07/29 11:42:32 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -3154,3 +3154,43 @@ distrib/evbmips/instkernel/ramdisk/list Add some device nodes and utilities to the evbmips installer. [gutteridge, ticket #249] +sys/arch/x86/include/specialreg.h 1.204-1.206, 1.208 + (via patch) + + - Add Intel CPUID 0x07 %ecx bit 24 BUS_LOCK_DETECT. + - Add AMD CPUID 0x8008 %ebx bit 30 IBPB_RET and CPUID 0x800a + %edx bit 29 BusLockThreshold. + - Fix typo in comment. + [msaitoh, ticket #250] + +usr.sbin/cpuctl/arch/i386.c 1.137-1.139 + (via patch) + + - CPU model 0x5a is not Atom E3500 but Atom Z3500. + - Add Alder Lake-N. + [msaitoh, ticket #251] + +sys/dev/pci/pcidevs1.1481-1.1482 (patch) +sys/dev/pci/pcidevs.hregen +sys/dev/pci/pcidevs_data.h regen + + Add Intel Alder Lake-N, Raptor Lake and 700 series chipset devices. + [msaitoh, ticket #252] + +sys/dev/pci/ichsmb.c1.83-1.84 (patch) + + - Add support Intel 700 series chipset and Alder Lake-N devices. + - Use device_printf() instead of aprint_error_dev() in + ichsmb_i2c_exec(). + [msaitoh, ticket #253] + +sys/arch/x86/x86/coretemp.c 1.39 + + coretemp(4): change limits of Tjmax. + [msaitoh, ticket #254] + +usr.sbin/tprof/arch/tprof_x86.c 1.18,1.19 + + tprof(8): add support for Skylake-X and Cascade Lake. + [msaitoh, ticket #255] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sat Jul 29 11:42:32 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #250 - #255 To generate a diff of this commit: cvs rdiff -u -r1.1.2.90 -r1.1.2.91 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/usr.sbin/tprof/arch
Module Name:src
Committed By: martin
Date: Sat Jul 29 11:07:17 UTC 2023
Modified Files:
src/usr.sbin/tprof/arch [netbsd-10]: tprof_x86.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #255):
usr.sbin/tprof/arch/tprof_x86.c: revision 1.18
usr.sbin/tprof/arch/tprof_x86.c: revision 1.19
Modify comment. No functional change.
tprof(8): Add support for Skylake-X and Cascade Lake.
To generate a diff of this commit:
cvs rdiff -u -r1.15.2.1 -r1.15.2.2 src/usr.sbin/tprof/arch/tprof_x86.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/tprof/arch/tprof_x86.c
diff -u src/usr.sbin/tprof/arch/tprof_x86.c:1.15.2.1 src/usr.sbin/tprof/arch/tprof_x86.c:1.15.2.2
--- src/usr.sbin/tprof/arch/tprof_x86.c:1.15.2.1 Wed Jun 21 22:34:51 2023
+++ src/usr.sbin/tprof/arch/tprof_x86.c Sat Jul 29 11:07:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: tprof_x86.c,v 1.15.2.1 2023/06/21 22:34:51 martin Exp $ */
+/* $NetBSD: tprof_x86.c,v 1.15.2.2 2023/07/29 11:07:17 martin Exp $ */
/*
* Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
@@ -529,11 +529,276 @@ init_intel_skylake_kabylake(void)
return _skylake_kabylake;
}
+/*
+ * Intel Skylake-X (and Cascade Lake).
+ */
+static struct name_to_event intel_skylake_x_names[] = {
+ { "INST_RETIRED.ANY",0x00, 0x01, true },
+ { "CPU_CLK_UNHALTED.THREAD", 0x00, 0x02, true },
+ { "CPU_CLK_UNHALTED.REF_TSC", 0x00, 0x03, true },
+ { "LD_BLOCKS.STORE_FORWARD", 0x03, 0x02, true },
+ { "LD_BLOCKS.NO_SR",0x03, 0x08, true },
+ { "LD_BLOCKS_PARTIAL.ADDRESS_ALIAS", 0x07, 0x01, true },
+ { "DTLB_LOAD_MISSES.MISS_CAUSES_A_WALK", 0x08, 0x01, true },
+ { "DTLB_LOAD_MISSES.WALK_COMPLETED_4K", 0x08, 0x02, true },
+ { "DTLB_LOAD_MISSES.WALK_COMPLETED_2M_4M", 0x08, 0x04, true },
+ { "DTLB_LOAD_MISSES.WALK_COMPLETED_1G", 0x08, 0x08, true },
+ { "DTLB_LOAD_MISSES.WALK_COMPLETED", 0x08, 0x0E, true },
+ { "DTLB_LOAD_MISSES.WALK_PENDING", 0x08, 0x10, true },
+ { "DTLB_LOAD_MISSES.STLB_HIT", 0x08, 0x20, true },
+ { "INT_MISC.RECOVERY_CYCLES", 0x0D, 0x01, true },
+ { "INT_MISC.CLEAR_RESTEER_CYCLES", 0x0D, 0x80, true },
+ { "UOPS_ISSUED.ANY",0x0E, 0x01, true },
+ { "UOPS_ISSUED.VECTOR_WIDTH_MISMATCH", 0x0E, 0x02, true },
+ { "UOPS_ISSUED.SLOW_LEA", 0x0E, 0x20, true },
+ { "ARITH.DIVIDER_ACTIVE", 0x14, 0x01, true },
+ { "L2_RQSTS.DEMAND_DATA_RD_MISS", 0x24, 0x21, true },
+ { "L2_RQSTS.RFO_MISS",0x24, 0x22, true },
+ { "L2_RQSTS.CODE_RD_MISS", 0x24, 0x24, true },
+ { "L2_RQSTS.ALL_DEMAND_MISS", 0x24, 0x27, true },
+ { "L2_RQSTS.PF_MISS",0x24, 0x38, true },
+ { "L2_RQSTS.MISS",0x24, 0x3F, true },
+ { "L2_RQSTS.DEMAND_DATA_RD_HIT", 0x24, 0x41, true },
+ { "L2_RQSTS.RFO_HIT",0x24, 0x42, true },
+ { "L2_RQSTS.CODE_RD_HIT", 0x24, 0x44, true },
+ { "L2_RQSTS.PF_HIT",0x24, 0xD8, true },
+ { "L2_RQSTS.ALL_DEMAND_DATA_RD", 0x24, 0xE1, true },
+ { "L2_RQSTS.ALL_RFO",0x24, 0xE2, true },
+ { "L2_RQSTS.ALL_CODE_RD", 0x24, 0xE4, true },
+ { "L2_RQSTS.ALL_DEMAND_REFERENCES", 0x24, 0xE7, true },
+ { "L2_RQSTS.ALL_PF",0x24, 0xF8, true },
+ { "L2_RQSTS.REFERENCES All L2", 0x24, 0xFF, true },
+ { "CORE_POWER.LVL0_TURBO_LICENSE", 0x28, 0x07, true },
+ { "CORE_POWER.LVL1_TURBO_LICENSE", 0x28, 0x18, true },
+ { "CORE_POWER.LVL2_TURBO_LICENSE", 0x28, 0x20, true },
+ { "CORE_POWER.THROTTLE", 0x28, 0x40, true },
+ { "LONGEST_LAT_CACHE.MISS", 0x2E, 0x41, true },
+ { "LONGEST_LAT_CACHE.REFERENCE", 0x2E, 0x4F, true },
+ { "CPU_CLK_UNHALTED.THREAD_P", 0x3C, 0x00, true },
+ { "CPU_CLK_THREAD_UNHALTED.REF_XCLK", 0x3C, 0x01, true },
+ { "CPU_CLK_THREAD_UNHALTED.ONE_THREAD_ACTIVE", 0x3C, 0x02, true },
+ { "L1D_PEND_MISS.PENDING", 0x48, 0x01, true },
+ { "L1D_PEND_MISS.FB_FULL", 0x48, 0x02, true },
+ { "DTLB_STORE_MISSES.MISS_CAUSES_A_WALK", 0x49, 0x01, true },
+ { "DTLB_STORE_MISSES.WALK_COMPLETED_4K", 0x49, 0x02, true },
+ { "DTLB_STORE_MISSES.WALK_COMPLETED_2M_4M", 0x49, 0x04, true },
+ { "DTLB_STORE_MISSES.WALK_COMPLETED_1G", 0x49, 0x08, true },
+ { "DTLB_STORE_MISSES.WALK_COMPLETED", 0x49, 0x0E, true },
+ { "DTLB_STORE_MISSES.WALK_PENDING", 0x49, 0x10, true },
+ { "DTLB_STORE_MISSES.STLB_HIT", 0x49, 0x20, true },
+ { "LOAD_HIT_PRE.SW_PF",0x4C, 0x01, true },
+ { "EPT.WALK_PENDING",0x4F, 0x10, true },
+ { "L1D.REPLACEMENT",0x51, 0x01, true },
+ { "TX_MEM.ABORT_CONFLICT", 0x54, 0x01, true },
+ { "TX_MEM.ABORT_CAPACITY", 0x54, 0x02, true },
+ { "TX_MEM.ABORT_HLE_STORE_TO_ELIDED_LOCK", 0x54, 0x04, true },
+ { "TX_MEM.ABORT_HLE_ELISION_BUFFER_NOT_EMPTY", 0x54, 0x08, true },
+ { "TX_MEM.ABORT_HLE_ELISION_BUFFER_MISMATCH", 0x54, 0x10, true },
+ { "TX_MEM.ABORT_HLE_ELISION_BUFFER_UNSUPPORTED_ALIGNMENT",
+ 0x54, 0x20, true },
+ { "TX_MEM.HLE_ELISION_BUFFER_FULL", 0x54, 0x40, true },
+ { "TX_EXEC.MISC1",0x5D, 0x01, true },
+ { "TX_EXEC.MISC2",0x5D, 0x02, true },
+ {
CVS commit: [netbsd-10] src/usr.sbin/tprof/arch
Module Name:src Committed By: martin Date: Sat Jul 29 11:07:17 UTC 2023 Modified Files: src/usr.sbin/tprof/arch [netbsd-10]: tprof_x86.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #255): usr.sbin/tprof/arch/tprof_x86.c: revision 1.18 usr.sbin/tprof/arch/tprof_x86.c: revision 1.19 Modify comment. No functional change. tprof(8): Add support for Skylake-X and Cascade Lake. To generate a diff of this commit: cvs rdiff -u -r1.15.2.1 -r1.15.2.2 src/usr.sbin/tprof/arch/tprof_x86.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/arch/x86/x86
Module Name:src
Committed By: martin
Date: Sat Jul 29 11:03:21 UTC 2023
Modified Files:
src/sys/arch/x86/x86 [netbsd-8]: coretemp.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1857):
sys/arch/x86/x86/coretemp.c: revision 1.38-1.39 (patch)
coretemp(4): Change limits of Tjmax.
- Change the lower limit from 70 to 60. At least, some BIOSes can change
the value down to 62.
- Change the upper limit from 110 to 120. At least, some BIOSes can change
the value up to 115.
- Print error message when rdmsr(TEMPERATURE_TARGET) failed.
- When Tjmax exceeded the limit, print warning message and use the value
as it is.
- KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.35.10.2 -r1.35.10.3 src/sys/arch/x86/x86/coretemp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/coretemp.c
diff -u src/sys/arch/x86/x86/coretemp.c:1.35.10.2 src/sys/arch/x86/x86/coretemp.c:1.35.10.3
--- src/sys/arch/x86/x86/coretemp.c:1.35.10.2 Wed Aug 5 16:05:49 2020
+++ src/sys/arch/x86/x86/coretemp.c Sat Jul 29 11:03:21 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: coretemp.c,v 1.35.10.2 2020/08/05 16:05:49 martin Exp $ */
+/* $NetBSD: coretemp.c,v 1.35.10.3 2023/07/29 11:03:21 martin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.35.10.2 2020/08/05 16:05:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.35.10.3 2023/07/29 11:03:21 martin Exp $");
#include
#include
@@ -102,6 +102,10 @@ __KERNEL_RCSID(0, "$NetBSD: coretemp.c,v
#define MSR_TEMP_TARGET_READOUT __BITS(16, 23)
+#define TJMAX_DEFAULT 100
+#define TJMAX_LIMIT_LOW 60
+#define TJMAX_LIMIT_HIGH 120
+
static int coretemp_match(device_t, cfdata_t, void *);
static void coretemp_attach(device_t, device_t, void *);
static int coretemp_detach(device_t, int);
@@ -259,16 +263,15 @@ coretemp_tjmax(device_t self)
{
struct coretemp_softc *sc = device_private(self);
struct cpu_info *ci = sc->sc_ci;
- uint32_t model, stepping;
uint64_t msr;
+ uint32_t model, stepping;
+ int tjmax;
model = CPUID_TO_MODEL(ci->ci_signature);
stepping = CPUID_TO_STEPPING(ci->ci_signature);
- /*
- * Use 100C as the initial value.
- */
- sc->sc_tjmax = 100;
+ /* Set the initial value. */
+ sc->sc_tjmax = TJMAX_DEFAULT;
if ((model == 0x0f && stepping >= 2) || (model == 0x0e)) {
/*
@@ -304,20 +307,20 @@ coretemp_tjmax(device_t self)
sc->sc_tjmax = 90;
} else {
notee:
- /*
- * Attempt to get Tj(max) from IA32_TEMPERATURE_TARGET,
- * but only consider the interval [70, 110] C as valid.
- * It is not fully known which CPU models have the MSR.
- */
- if (rdmsr_safe(MSR_TEMPERATURE_TARGET, ) == EFAULT)
- return;
-
- msr = __SHIFTOUT(msr, MSR_TEMP_TARGET_READOUT);
-
- if (msr >= 70 && msr <= 110) {
- sc->sc_tjmax = msr;
+ /* Attempt to get Tj(max) from IA32_TEMPERATURE_TARGET. */
+ if (rdmsr_safe(MSR_TEMPERATURE_TARGET, ) == EFAULT) {
+ aprint_error_dev(sc->sc_dev,
+ "Failed to read TEMPERATURE_TARGET MSR. "
+ "Use the default (%d)\n", sc->sc_tjmax);
return;
}
+
+ tjmax = __SHIFTOUT(msr, MSR_TEMP_TARGET_READOUT);
+ if ((tjmax < TJMAX_LIMIT_LOW) || (tjmax > TJMAX_LIMIT_HIGH))
+ aprint_error_dev(sc->sc_dev,
+ "WARNING: Tjmax(%d) might exceeded the limit.\n",
+ tjmax);
+ sc->sc_tjmax = tjmax;
}
}
@@ -334,7 +337,7 @@ coretemp_refresh(struct sysmon_envsys *s
static void
coretemp_refresh_xcall(void *arg0, void *arg1)
{
-struct coretemp_softc *sc = arg0;
+ struct coretemp_softc *sc = arg0;
envsys_data_t *edata = arg1;
uint64_t msr;
CVS commit: [netbsd-8] src/sys/arch/x86/x86
Module Name:src Committed By: martin Date: Sat Jul 29 11:03:21 UTC 2023 Modified Files: src/sys/arch/x86/x86 [netbsd-8]: coretemp.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1857): sys/arch/x86/x86/coretemp.c: revision 1.38-1.39 (patch) coretemp(4): Change limits of Tjmax. - Change the lower limit from 70 to 60. At least, some BIOSes can change the value down to 62. - Change the upper limit from 110 to 120. At least, some BIOSes can change the value up to 115. - Print error message when rdmsr(TEMPERATURE_TARGET) failed. - When Tjmax exceeded the limit, print warning message and use the value as it is. - KNF. To generate a diff of this commit: cvs rdiff -u -r1.35.10.2 -r1.35.10.3 src/sys/arch/x86/x86/coretemp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 29 11:03:19 UTC 2023
Modified Files:
src/usr.bin/xlint/lint1: decl.c
Log Message:
lint: eliminate redundant code
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.366 -r1.367 src/usr.bin/xlint/lint1/decl.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/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.366 src/usr.bin/xlint/lint1/decl.c:1.367
--- src/usr.bin/xlint/lint1/decl.c:1.366 Sat Jul 29 07:49:14 2023
+++ src/usr.bin/xlint/lint1/decl.c Sat Jul 29 11:03:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.366 2023/07/29 07:49:14 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.367 2023/07/29 11:03:18 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: decl.c,v 1.366 2023/07/29 07:49:14 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.367 2023/07/29 11:03:18 rillig Exp $");
#endif
#include
@@ -264,26 +264,27 @@ typedef_error(type_t *td, tspec_t t)
if (t != LONG)
goto invalid;
+ tspec_t lt;
if (t2 == INT)
- td = gettyp(LONG);
+ lt = LONG;
else if (t2 == UINT)
- td = gettyp(ULONG);
+ lt = ULONG;
else if (t2 == LONG)
- td = gettyp(LLONG);
+ lt = LLONG;
else if (t2 == ULONG)
- td = gettyp(ULLONG);
+ lt = ULLONG;
else if (t2 == FLOAT)
- td = gettyp(DOUBLE);
+ lt = DOUBLE;
else if (t2 == DOUBLE)
- td = gettyp(LDOUBLE);
+ lt = LDOUBLE;
else if (t2 == DCOMPLEX)
- td = gettyp(LCOMPLEX);
+ lt = LCOMPLEX;
else
goto invalid;
/* modifying typedef with '%s'; only qualifiers allowed */
warning(5, "long");
- td = block_dup_type(td);
+ td = block_dup_type(gettyp(lt));
td->t_typedef = true;
return td;
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sat Jul 29 11:03:19 UTC 2023 Modified Files: src/usr.bin/xlint/lint1: decl.c Log Message: lint: eliminate redundant code No functional change. To generate a diff of this commit: cvs rdiff -u -r1.366 -r1.367 src/usr.bin/xlint/lint1/decl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/x86/x86
Module Name:src
Committed By: martin
Date: Sat Jul 29 11:01:15 UTC 2023
Modified Files:
src/sys/arch/x86/x86 [netbsd-9]: coretemp.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #254):
sys/arch/x86/x86/coretemp.c: revision 1.38-1.39 (patch)
coretemp(4): Change limits of Tjmax.
- Change the lower limit from 70 to 60. At least, some BIOSes can change
the value down to 62.
- Change the upper limit from 110 to 120. At least, some BIOSes can change
the value up to 115.
- Print error message when rdmsr(TEMPERATURE_TARGET) failed.
- When Tjmax exceeded the limit, print warning message and use the value
as it is.
- KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.36.4.1 -r1.36.4.2 src/sys/arch/x86/x86/coretemp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/coretemp.c
diff -u src/sys/arch/x86/x86/coretemp.c:1.36.4.1 src/sys/arch/x86/x86/coretemp.c:1.36.4.2
--- src/sys/arch/x86/x86/coretemp.c:1.36.4.1 Wed Jul 15 14:02:36 2020
+++ src/sys/arch/x86/x86/coretemp.c Sat Jul 29 11:01:14 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: coretemp.c,v 1.36.4.1 2020/07/15 14:02:36 martin Exp $ */
+/* $NetBSD: coretemp.c,v 1.36.4.2 2023/07/29 11:01:14 martin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.36.4.1 2020/07/15 14:02:36 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.36.4.2 2023/07/29 11:01:14 martin Exp $");
#include
#include
@@ -102,6 +102,10 @@ __KERNEL_RCSID(0, "$NetBSD: coretemp.c,v
#define MSR_TEMP_TARGET_READOUT __BITS(16, 23)
+#define TJMAX_DEFAULT 100
+#define TJMAX_LIMIT_LOW 60
+#define TJMAX_LIMIT_HIGH 120
+
static int coretemp_match(device_t, cfdata_t, void *);
static void coretemp_attach(device_t, device_t, void *);
static int coretemp_detach(device_t, int);
@@ -259,16 +263,15 @@ coretemp_tjmax(device_t self)
{
struct coretemp_softc *sc = device_private(self);
struct cpu_info *ci = sc->sc_ci;
- uint32_t model, stepping;
uint64_t msr;
+ uint32_t model, stepping;
+ int tjmax;
model = CPUID_TO_MODEL(ci->ci_signature);
stepping = CPUID_TO_STEPPING(ci->ci_signature);
- /*
- * Use 100C as the initial value.
- */
- sc->sc_tjmax = 100;
+ /* Set the initial value. */
+ sc->sc_tjmax = TJMAX_DEFAULT;
if ((model == 0x0f && stepping >= 2) || (model == 0x0e)) {
/*
@@ -304,20 +307,20 @@ coretemp_tjmax(device_t self)
sc->sc_tjmax = 90;
} else {
notee:
- /*
- * Attempt to get Tj(max) from IA32_TEMPERATURE_TARGET,
- * but only consider the interval [70, 110] C as valid.
- * It is not fully known which CPU models have the MSR.
- */
- if (rdmsr_safe(MSR_TEMPERATURE_TARGET, ) == EFAULT)
- return;
-
- msr = __SHIFTOUT(msr, MSR_TEMP_TARGET_READOUT);
-
- if (msr >= 70 && msr <= 110) {
- sc->sc_tjmax = msr;
+ /* Attempt to get Tj(max) from IA32_TEMPERATURE_TARGET. */
+ if (rdmsr_safe(MSR_TEMPERATURE_TARGET, ) == EFAULT) {
+ aprint_error_dev(sc->sc_dev,
+ "Failed to read TEMPERATURE_TARGET MSR. "
+ "Use the default (%d)\n", sc->sc_tjmax);
return;
}
+
+ tjmax = __SHIFTOUT(msr, MSR_TEMP_TARGET_READOUT);
+ if ((tjmax < TJMAX_LIMIT_LOW) || (tjmax > TJMAX_LIMIT_HIGH))
+ aprint_error_dev(sc->sc_dev,
+ "WARNING: Tjmax(%d) might exceeded the limit.\n",
+ tjmax);
+ sc->sc_tjmax = tjmax;
}
}
@@ -334,7 +337,7 @@ coretemp_refresh(struct sysmon_envsys *s
static void
coretemp_refresh_xcall(void *arg0, void *arg1)
{
-struct coretemp_softc *sc = arg0;
+ struct coretemp_softc *sc = arg0;
envsys_data_t *edata = arg1;
uint64_t msr;
CVS commit: [netbsd-9] src/sys/arch/x86/x86
Module Name:src Committed By: martin Date: Sat Jul 29 11:01:15 UTC 2023 Modified Files: src/sys/arch/x86/x86 [netbsd-9]: coretemp.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #254): sys/arch/x86/x86/coretemp.c: revision 1.38-1.39 (patch) coretemp(4): Change limits of Tjmax. - Change the lower limit from 70 to 60. At least, some BIOSes can change the value down to 62. - Change the upper limit from 110 to 120. At least, some BIOSes can change the value up to 115. - Print error message when rdmsr(TEMPERATURE_TARGET) failed. - When Tjmax exceeded the limit, print warning message and use the value as it is. - KNF. To generate a diff of this commit: cvs rdiff -u -r1.36.4.1 -r1.36.4.2 src/sys/arch/x86/x86/coretemp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/x86/x86
Module Name:src
Committed By: martin
Date: Sat Jul 29 10:58:02 UTC 2023
Modified Files:
src/sys/arch/x86/x86 [netbsd-10]: coretemp.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #254):
sys/arch/x86/x86/coretemp.c: revision 1.39
coretemp(4): Change limits of Tjmax.
- Change the lower limit from 70 to 60. At least, some BIOSes can change
the value down to 62.
- Change the upper limit from 110 to 120. At least, some BIOSes can change
the value up to 115.
- Print error message when rdmsr(TEMPERATURE_TARGET) failed.
- When Tjmax exceeded the limit, print warning message and use the value
as it is.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.38.4.1 src/sys/arch/x86/x86/coretemp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/coretemp.c
diff -u src/sys/arch/x86/x86/coretemp.c:1.38 src/sys/arch/x86/x86/coretemp.c:1.38.4.1
--- src/sys/arch/x86/x86/coretemp.c:1.38 Thu Oct 7 12:52:27 2021
+++ src/sys/arch/x86/x86/coretemp.c Sat Jul 29 10:58:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: coretemp.c,v 1.38 2021/10/07 12:52:27 msaitoh Exp $ */
+/* $NetBSD: coretemp.c,v 1.38.4.1 2023/07/29 10:58:02 martin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.38 2021/10/07 12:52:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.38.4.1 2023/07/29 10:58:02 martin Exp $");
#include
#include
@@ -102,6 +102,10 @@ __KERNEL_RCSID(0, "$NetBSD: coretemp.c,v
#define MSR_TEMP_TARGET_READOUT __BITS(16, 23)
+#define TJMAX_DEFAULT 100
+#define TJMAX_LIMIT_LOW 60
+#define TJMAX_LIMIT_HIGH 120
+
static int coretemp_match(device_t, cfdata_t, void *);
static void coretemp_attach(device_t, device_t, void *);
static int coretemp_detach(device_t, int);
@@ -259,16 +263,15 @@ coretemp_tjmax(device_t self)
{
struct coretemp_softc *sc = device_private(self);
struct cpu_info *ci = sc->sc_ci;
- uint32_t model, stepping;
uint64_t msr;
+ uint32_t model, stepping;
+ int tjmax;
model = CPUID_TO_MODEL(ci->ci_signature);
stepping = CPUID_TO_STEPPING(ci->ci_signature);
- /*
- * Use 100C as the initial value.
- */
- sc->sc_tjmax = 100;
+ /* Set the initial value. */
+ sc->sc_tjmax = TJMAX_DEFAULT;
if ((model == 0x0f && stepping >= 2) || (model == 0x0e)) {
/*
@@ -304,20 +307,20 @@ coretemp_tjmax(device_t self)
sc->sc_tjmax = 90;
} else {
notee:
- /*
- * Attempt to get Tj(max) from IA32_TEMPERATURE_TARGET,
- * but only consider the interval [70, 110] C as valid.
- * It is not fully known which CPU models have the MSR.
- */
- if (rdmsr_safe(MSR_TEMPERATURE_TARGET, ) == EFAULT)
- return;
-
- msr = __SHIFTOUT(msr, MSR_TEMP_TARGET_READOUT);
-
- if (msr >= 70 && msr <= 110) {
- sc->sc_tjmax = msr;
+ /* Attempt to get Tj(max) from IA32_TEMPERATURE_TARGET. */
+ if (rdmsr_safe(MSR_TEMPERATURE_TARGET, ) == EFAULT) {
+ aprint_error_dev(sc->sc_dev,
+ "Failed to read TEMPERATURE_TARGET MSR. "
+ "Use the default (%d)\n", sc->sc_tjmax);
return;
}
+
+ tjmax = __SHIFTOUT(msr, MSR_TEMP_TARGET_READOUT);
+ if ((tjmax < TJMAX_LIMIT_LOW) || (tjmax > TJMAX_LIMIT_HIGH))
+ aprint_error_dev(sc->sc_dev,
+ "WARNING: Tjmax(%d) might exceeded the limit.\n",
+ tjmax);
+ sc->sc_tjmax = tjmax;
}
}
CVS commit: [netbsd-10] src/sys/arch/x86/x86
Module Name:src Committed By: martin Date: Sat Jul 29 10:58:02 UTC 2023 Modified Files: src/sys/arch/x86/x86 [netbsd-10]: coretemp.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #254): sys/arch/x86/x86/coretemp.c: revision 1.39 coretemp(4): Change limits of Tjmax. - Change the lower limit from 70 to 60. At least, some BIOSes can change the value down to 62. - Change the upper limit from 110 to 120. At least, some BIOSes can change the value up to 115. - Print error message when rdmsr(TEMPERATURE_TARGET) failed. - When Tjmax exceeded the limit, print warning message and use the value as it is. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.38.4.1 src/sys/arch/x86/x86/coretemp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sat Jul 29 10:54:05 UTC 2023
Modified Files:
src/sys/dev/pci [netbsd-8]: ichsmb.c
Log Message:
Pull up the following revisions, via patch, requested by msaitoh in
ticket #1856:
sys/dev/pci/ichsmb.c1.83-1.84
- Add support Intel 700 series chipset and Alder Lake-N devices.
- Use device_printf() instead of aprint_error_dev() in
ichsmb_i2c_exec().
To generate a diff of this commit:
cvs rdiff -u -r1.50.6.6 -r1.50.6.7 src/sys/dev/pci/ichsmb.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/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.50.6.6 src/sys/dev/pci/ichsmb.c:1.50.6.7
--- src/sys/dev/pci/ichsmb.c:1.50.6.6 Sat Oct 15 10:33:42 2022
+++ src/sys/dev/pci/ichsmb.c Sat Jul 29 10:54:05 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ichsmb.c,v 1.50.6.6 2022/10/15 10:33:42 martin Exp $ */
+/* $NetBSD: ichsmb.c,v 1.50.6.7 2023/07/29 10:54:05 martin Exp $ */
/* $OpenBSD: ichiic.c,v 1.44 2020/10/07 11:23:05 jsg Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.50.6.6 2022/10/15 10:33:42 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.50.6.7 2023/07/29 10:54:05 martin Exp $");
#include
#include
@@ -130,6 +130,7 @@ ichsmb_match(device_t parent, cfdata_t m
case PCI_PRODUCT_INTEL_GLK_SMB:
case PCI_PRODUCT_INTEL_EHL_SMB:
case PCI_PRODUCT_INTEL_JSL_SMB:
+ case PCI_PRODUCT_INTEL_ADL_N_SMB:
case PCI_PRODUCT_INTEL_C600_SMBUS:
case PCI_PRODUCT_INTEL_C600_SMB_0:
case PCI_PRODUCT_INTEL_C600_SMB_1:
@@ -147,6 +148,7 @@ ichsmb_match(device_t parent, cfdata_t m
case PCI_PRODUCT_INTEL_5HS_LP_SMB:
case PCI_PRODUCT_INTEL_6HS_H_SMB:
case PCI_PRODUCT_INTEL_6HS_LP_SMB:
+ case PCI_PRODUCT_INTEL_7HS_SMB:
return 1;
}
}
@@ -398,7 +400,7 @@ timeout:
st = bus_space_read_1(sc->sc_iot, sc->sc_ioh, LPCIB_SMB_HS);
if ((st & LPCIB_SMB_HS_FAILED) == 0) {
snprintb(fbuf, sizeof(fbuf), LPCIB_SMB_HS_BITS, st);
- aprint_error_dev(sc->sc_dev, "abort failed, status %s\n",
+ device_printf(sc->sc_dev, "abort failed, status %s\n",
fbuf);
}
bus_space_write_1(sc->sc_iot, sc->sc_ioh, LPCIB_SMB_HS, st);
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sat Jul 29 10:54:05 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-8]: ichsmb.c Log Message: Pull up the following revisions, via patch, requested by msaitoh in ticket #1856: sys/dev/pci/ichsmb.c1.83-1.84 - Add support Intel 700 series chipset and Alder Lake-N devices. - Use device_printf() instead of aprint_error_dev() in ichsmb_i2c_exec(). To generate a diff of this commit: cvs rdiff -u -r1.50.6.6 -r1.50.6.7 src/sys/dev/pci/ichsmb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sat Jul 29 10:52:20 UTC 2023
Modified Files:
src/sys/dev/pci [netbsd-9]: ichsmb.c
Log Message:
Pull up the following revisions, via patch, requested by msaitoh in
ticket #1672:
sys/dev/pci/ichsmb.c1.83-1.84
- Add support Intel 700 series chipset and Alder Lake-N devices.
- Use device_printf() instead of aprint_error_dev() in
ichsmb_i2c_exec().
To generate a diff of this commit:
cvs rdiff -u -r1.60.4.4 -r1.60.4.5 src/sys/dev/pci/ichsmb.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/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.60.4.4 src/sys/dev/pci/ichsmb.c:1.60.4.5
--- src/sys/dev/pci/ichsmb.c:1.60.4.4 Sat Oct 15 10:29:40 2022
+++ src/sys/dev/pci/ichsmb.c Sat Jul 29 10:52:20 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ichsmb.c,v 1.60.4.4 2022/10/15 10:29:40 martin Exp $ */
+/* $NetBSD: ichsmb.c,v 1.60.4.5 2023/07/29 10:52:20 martin Exp $ */
/* $OpenBSD: ichiic.c,v 1.44 2020/10/07 11:23:05 jsg Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.60.4.4 2022/10/15 10:29:40 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.60.4.5 2023/07/29 10:52:20 martin Exp $");
#include
#include
@@ -137,6 +137,7 @@ ichsmb_match(device_t parent, cfdata_t m
case PCI_PRODUCT_INTEL_GLK_SMB:
case PCI_PRODUCT_INTEL_EHL_SMB:
case PCI_PRODUCT_INTEL_JSL_SMB:
+ case PCI_PRODUCT_INTEL_ADL_N_SMB:
case PCI_PRODUCT_INTEL_C600_SMBUS:
case PCI_PRODUCT_INTEL_C600_SMB_0:
case PCI_PRODUCT_INTEL_C600_SMB_1:
@@ -154,6 +155,7 @@ ichsmb_match(device_t parent, cfdata_t m
case PCI_PRODUCT_INTEL_5HS_LP_SMB:
case PCI_PRODUCT_INTEL_6HS_H_SMB:
case PCI_PRODUCT_INTEL_6HS_LP_SMB:
+ case PCI_PRODUCT_INTEL_7HS_SMB:
return 1;
}
}
@@ -439,7 +441,7 @@ timeout:
st = bus_space_read_1(sc->sc_iot, sc->sc_ioh, LPCIB_SMB_HS);
if ((st & LPCIB_SMB_HS_FAILED) == 0) {
snprintb(fbuf, sizeof(fbuf), LPCIB_SMB_HS_BITS, st);
- aprint_error_dev(sc->sc_dev, "abort failed, status %s\n",
+ device_printf(sc->sc_dev, "abort failed, status %s\n",
fbuf);
}
bus_space_write_1(sc->sc_iot, sc->sc_ioh, LPCIB_SMB_HS, st);
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sat Jul 29 10:52:20 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: ichsmb.c Log Message: Pull up the following revisions, via patch, requested by msaitoh in ticket #1672: sys/dev/pci/ichsmb.c1.83-1.84 - Add support Intel 700 series chipset and Alder Lake-N devices. - Use device_printf() instead of aprint_error_dev() in ichsmb_i2c_exec(). To generate a diff of this commit: cvs rdiff -u -r1.60.4.4 -r1.60.4.5 src/sys/dev/pci/ichsmb.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/dev/pci
Module Name:src
Committed By: martin
Date: Sat Jul 29 10:50:05 UTC 2023
Modified Files:
src/sys/dev/pci [netbsd-10]: ichsmb.c
Log Message:
Pull up the following revisions, via patch, requested by msaitoh in
ticket #253:
sys/dev/pci/ichsmb.c1.83-1.84
- Add support Intel 700 series chipset and Alder Lake-N devices.
- Use device_printf() instead of aprint_error_dev() in
ichsmb_i2c_exec().
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.81.4.1 src/sys/dev/pci/ichsmb.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/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.81 src/sys/dev/pci/ichsmb.c:1.81.4.1
--- src/sys/dev/pci/ichsmb.c:1.81 Thu Sep 22 14:45:33 2022
+++ src/sys/dev/pci/ichsmb.c Sat Jul 29 10:50:05 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ichsmb.c,v 1.81 2022/09/22 14:45:33 riastradh Exp $ */
+/* $NetBSD: ichsmb.c,v 1.81.4.1 2023/07/29 10:50:05 martin Exp $ */
/* $OpenBSD: ichiic.c,v 1.44 2020/10/07 11:23:05 jsg Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.81 2022/09/22 14:45:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.81.4.1 2023/07/29 10:50:05 martin Exp $");
#include
#include
@@ -138,6 +138,7 @@ ichsmb_match(device_t parent, cfdata_t m
case PCI_PRODUCT_INTEL_GLK_SMB:
case PCI_PRODUCT_INTEL_EHL_SMB:
case PCI_PRODUCT_INTEL_JSL_SMB:
+ case PCI_PRODUCT_INTEL_ADL_N_SMB:
case PCI_PRODUCT_INTEL_C600_SMBUS:
case PCI_PRODUCT_INTEL_C600_SMB_0:
case PCI_PRODUCT_INTEL_C600_SMB_1:
@@ -155,6 +156,7 @@ ichsmb_match(device_t parent, cfdata_t m
case PCI_PRODUCT_INTEL_5HS_LP_SMB:
case PCI_PRODUCT_INTEL_6HS_H_SMB:
case PCI_PRODUCT_INTEL_6HS_LP_SMB:
+ case PCI_PRODUCT_INTEL_7HS_SMB:
return 1;
}
}
@@ -423,7 +425,7 @@ timeout:
st = bus_space_read_1(sc->sc_iot, sc->sc_ioh, SMB_HS);
if ((st & SMB_HS_FAILED) == 0) {
snprintb(fbuf, sizeof(fbuf), SMB_HS_BITS, st);
- aprint_error_dev(sc->sc_dev, "abort failed, status %s\n",
+ device_printf(sc->sc_dev, "abort failed, status %s\n",
fbuf);
}
bus_space_write_1(sc->sc_iot, sc->sc_ioh, SMB_HS, st);
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sat Jul 29 10:50:05 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-10]: ichsmb.c Log Message: Pull up the following revisions, via patch, requested by msaitoh in ticket #253: sys/dev/pci/ichsmb.c1.83-1.84 - Add support Intel 700 series chipset and Alder Lake-N devices. - Use device_printf() instead of aprint_error_dev() in ichsmb_i2c_exec(). To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.81.4.1 src/sys/dev/pci/ichsmb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sat Jul 29 10:44:35 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-8]: pcidevs.h pcidevs_data.h Log Message: regen (ticket #1855) To generate a diff of this commit: cvs rdiff -u -r1.1281.2.25 -r1.1281.2.26 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1280.2.25 -r1.1280.2.26 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sat Jul 29 10:45:00 UTC 2023 Modified Files: src/usr.bin/xlint/lint1: Makefile err.c main1.c Log Message: lint1: remove option -m The list of lint messages is only needed for generating the manual page lint.7. Since 2022-07-06, that list is extracted from the source code instead of compiling and then running lint1. To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/usr.bin/xlint/lint1/Makefile cvs rdiff -u -r1.213 -r1.214 src/usr.bin/xlint/lint1/err.c cvs rdiff -u -r1.76 -r1.77 src/usr.bin/xlint/lint1/main1.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 29 10:45:00 UTC 2023
Modified Files:
src/usr.bin/xlint/lint1: Makefile err.c main1.c
Log Message:
lint1: remove option -m
The list of lint messages is only needed for generating the manual page
lint.7. Since 2022-07-06, that list is extracted from the source code
instead of compiling and then running lint1.
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r1.213 -r1.214 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.76 -r1.77 src/usr.bin/xlint/lint1/main1.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/lint1/Makefile
diff -u src/usr.bin/xlint/lint1/Makefile:1.101 src/usr.bin/xlint/lint1/Makefile:1.102
--- src/usr.bin/xlint/lint1/Makefile:1.101 Sat Jul 29 10:34:24 2023
+++ src/usr.bin/xlint/lint1/Makefile Sat Jul 29 10:45:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2023/07/29 10:34:24 rillig Exp $
+# $NetBSD: Makefile,v 1.102 2023/07/29 10:45:00 rillig Exp $
.include
@@ -35,11 +35,6 @@ BINDIR= /usr/libexec
CLEANFILES+= ${MAN} ${MAN}.date
-.if ${USETOOLS} == "yes"
-LINT1= ${TOOLDIR}/libexec/${MACHINE_GNU_PLATFORM}-lint1
-.endif
-LINT1?= ./${PROG}
-
${MAN}.date: err.c
${_MKTARGET_CREATE}
${TOOL_SED} -E \
Index: src/usr.bin/xlint/lint1/err.c
diff -u src/usr.bin/xlint/lint1/err.c:1.213 src/usr.bin/xlint/lint1/err.c:1.214
--- src/usr.bin/xlint/lint1/err.c:1.213 Fri Jul 21 06:02:07 2023
+++ src/usr.bin/xlint/lint1/err.c Sat Jul 29 10:45:00 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: err.c,v 1.213 2023/07/21 06:02:07 rillig Exp $ */
+/* $NetBSD: err.c,v 1.214 2023/07/29 10:45:00 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: err.c,v 1.213 2023/07/21 06:02:07 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.214 2023/07/29 10:45:00 rillig Exp $");
#endif
#include
@@ -484,22 +484,6 @@ print_stack_trace(void)
}
/*
- * print a list of the messages with their ids
- */
-void
-msglist(void)
-{
- size_t i;
-
- for (i = 0; i < sizeof(msgs) / sizeof(msgs[0]); i++) {
- if (msgs[i][0] != '\0')
- printf("%zu\t%s\n", i, msgs[i]);
- else
- printf("---\t(no longer used)\n");
- }
-}
-
-/*
* If Fflag is not set, lbasename() returns a pointer to the last
* component of the path, otherwise it returns the argument.
*/
Index: src/usr.bin/xlint/lint1/main1.c
diff -u src/usr.bin/xlint/lint1/main1.c:1.76 src/usr.bin/xlint/lint1/main1.c:1.77
--- src/usr.bin/xlint/lint1/main1.c:1.76 Sat Jul 29 07:49:14 2023
+++ src/usr.bin/xlint/lint1/main1.c Sat Jul 29 10:45:00 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: main1.c,v 1.76 2023/07/29 07:49:14 rillig Exp $ */
+/* $NetBSD: main1.c,v 1.77 2023/07/29 10:45:00 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: main1.c,v 1.76 2023/07/29 07:49:14 rillig Exp $");
+__RCSID("$NetBSD: main1.c,v 1.77 2023/07/29 10:45:00 rillig Exp $");
#endif
#include
@@ -136,7 +136,7 @@ main(int argc, char *argv[])
setprogname(argv[0]);
- while ((c = getopt(argc, argv, "abceghmpq:rstuvwyzA:FPR:STX:")) != -1) {
+ while ((c = getopt(argc, argv, "abceghpq:rstuvwyzA:FPR:STX:")) != -1) {
switch (c) {
case 'a': aflag++; break;
case 'b': bflag = true; break;
@@ -194,10 +194,6 @@ main(int argc, char *argv[])
usage();
break;
- case 'm':
- msglist();
- return 0;
-
case 'R':
add_directory_replacement(optarg);
break;
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sat Jul 29 10:42:40 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-8]: pcidevs Log Message: Pull up the following revisions, via patch, requested by msaitoh in ticket #1855: sys/dev/pci/pcidevs 1.1481-1.1482 Add Intel Alder Lake-N, Raptor Lake and 700 series chipset devices. To generate a diff of this commit: cvs rdiff -u -r1.1289.2.25 -r1.1289.2.26 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1289.2.25 src/sys/dev/pci/pcidevs:1.1289.2.26 --- src/sys/dev/pci/pcidevs:1.1289.2.25 Wed Jun 21 22:25:32 2023 +++ src/sys/dev/pci/pcidevs Sat Jul 29 10:42:39 2023 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1289.2.25 2023/06/21 22:25:32 martin Exp $ +$NetBSD: pcidevs,v 1.1289.2.26 2023/07/29 10:42:39 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -5868,8 +5868,11 @@ product INTEL ADL_U9_2_4_HOST 0x460a Ald product INTEL ADL_PCIE_RP_0 0x460d Alder Lake PCIe G5 Root Port 0 (x16) product INTEL ADL_XDCI 0x460e Alder Lake USB-C Device (xDCI) product INTEL ADL_S_2_0_HOST 0x4610 Alder Lake (S,2+0) Host +product INTEL ADL_N_8_HOST 0x4617 Alder Lake-N (0+8) Host product INTEL ADL_U15_1_4_HOST 0x4619 Alder Lake (U15,1+4) Host product INTEL ADL_U9_1_4_HOST 0x461a Alder Lake (U9,1+4) Host +product INTEL ADL_N_4_N2_HOST 0x461b Alder Lake-N (0+4, N200) Host +product INTEL ADL_N_4_N1_HOST 0x461c Alder Lake-N (0+4, N100) Host product INTEL ADL_DTT 0x461d Alder Lake Dynamic Tuning Technology product INTEL ADL_XHCI 0x461e Alder Lake USB-C Host (xHCI) product INTEL ADL_TBT_PCIE_3 0x461f Alder Lake Thunderbolt PCIe 3 @@ -5878,6 +5881,7 @@ product INTEL ADL_HX_4_8_HOST 0x4623 Ald product INTEL ADL_H_4_4_HOST 0x4629 Alder Lake (H,4+4) Host product INTEL ADL_HX_4_4_HOST 0x462b Alder Lake (HX,4+4) Host product INTEL ADL_PCIE_RP_1 0x462d Alder Lake PCIe G5 Root Port 1 (x8) +product INTEL ADL_N_IPU 0x462e Alder Lake-N Image Processing Unit product INTEL ADL_TBT_PCIE_2 0x462f Alder Lake Thunderbolt PCIe 2 product INTEL ADL_S_4_0_HOST 0x4630 Alder Lake (S,4+0) Host product INTEL ADL_HX_8_8_HOST 0x4637 Alder Lake (HX,8+8) Host @@ -5889,15 +5893,18 @@ product INTEL ADL_H_6_8_HOST 0x4641 Alde product INTEL ADL_S_6_4_HOST 0x4648 Alder Lake (S,6+4) Host product INTEL ADL_H_6_4_HOST 0x4649 Alder Lake (H,6+4) Host product INTEL ADL_PCIE_RP_2 0x464d Alder Lake PCIe G4 Root Port 2 (x4) +product INTEL ADL_N_XHCI 0x464e Alder Lake-N USB Host (xHCI) product INTEL ADL_GNA 0x464f Alder Lake Gauss Newton Algorithm product INTEL ADL_S_6_0_HOST 0x4650 Alder Lake (S,6+0) Host product INTEL ADL_IPU 0x465d Alder Lake Image Processing Unit +product INTEL ADL_N_XDCI 0x465e Alder Lake-N USB Device (xDCI) product INTEL ADL_S_8_8_HOST 0x4660 Alder Lake (S,8+8) Host product INTEL ADL_S_8_4_HOST 0x4668 Alder Lake (S,8+4) Host product INTEL ADL_TBTDMA_1 0x466d Alder Lake Thunderbolt DMA 1 product INTEL ADL_TBT_PCIE_0 0x466e Alder Lake Thunderbolt PCIe 0 -product INTEL ADL_TRACE 0x466f Alder Lake Trace Hub (Compute Die?XXX) +product INTEL ADL_TRACE 0x466f Alder Lake Trace Hub (Compute Die) product INTEL ADL_CLSRAM 0x467d Alder Lake Crash Log & Telemetry +product INTEL ADL_N_GNA 0x467e Alder Lake-N Gauss Newton Algorithm product INTEL ADL_VMD 0x467f Alder Lake Volume Management Device product INTEL ADL_IGD_1 0x4680 Alder Lake Graphics (32EU) product INTEL ADL_IGD_2 0x4682 Alder Lake Graphics (24EU) @@ -5912,6 +5919,8 @@ product INTEL ADL_IGD_10 0x46a8 Alder La product INTEL ADL_IGD_11 0x46aa Alder Lake Graphics product INTEL ADL_IGD_12 0x46b3 Alder Lake Graphics product INTEL ADL_IGD_13 0x46c3 Alder Lake Graphics +product INTEL ADL_N_IGD_1 0x46d0 Alder Lake Graphics (32EU) +product INTEL ADL_N_IGD_2 0x46d1 Alder Lake Graphics (24EU) product INTEL EHL_ESPI 0x4b00 Elkhart Lake eSPI product INTEL EHL_P2SB 0x4b20 Elkhart Lake P2SB product INTEL EHL_PMC 0x4b21 Elkhart Lake PMC @@ -6096,6 +6105,7 @@ product INTEL EP80579_LAN_1 0x5040 EP805 product INTEL EP80579_LAN_2 0x5044 EP80579 LAN product INTEL EP80579_LAN_3 0x5048 EP80579 LAN product INTEL 6HS_LP_ESPI 0x5182 600 Series PCH-LP eSPI +product INTEL 7HS_P_ESPI 0x519d 700 Series PCH-P eSPI product INTEL 6HS_LP_P2SB 0x51a0 600 Series PCH-LP P2SB product INTEL 6HS_LP_PMC 0x51a1 600 Series PCH-LP PMC product INTEL 6HS_LP_SMB 0x51a3 600 Series PCH-LP SMBus @@ -6121,6 +6131,7 @@ product INTEL 6HS_LP_I2C_4 0x51c5 600 Se product INTEL 6HS_LP_I2C_5 0x51c6 600 Series PCH-LP I2C 5 product INTEL 6HS_LP_UART_2 0x51c7 600 Series PCH-LP UART 2 product INTEL 6HS_LP_HDA 0x51c8 600 Series PCH-LP HD Audio +product INTEL 7HS_P_HDA 0x51ca 700 Series PCH HD Audio product INTEL 6HS_LP_THC_0 0x51d0 600 Series PCH-LP THC 0 product INTEL 6HS_LP_THC_1 0x51d1 600 Series PCH-LP THC 1 product
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sat Jul 29 10:34:24 UTC 2023 Modified Files: src/usr.bin/xlint/lint1: Makefile lint1.h Log Message: lint: only generate err-msgs.h in debug mode To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/usr.bin/xlint/lint1/Makefile cvs rdiff -u -r1.196 -r1.197 src/usr.bin/xlint/lint1/lint1.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sat Jul 29 10:42:40 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-8]: pcidevs Log Message: Pull up the following revisions, via patch, requested by msaitoh in ticket #1855: sys/dev/pci/pcidevs 1.1481-1.1482 Add Intel Alder Lake-N, Raptor Lake and 700 series chipset devices. To generate a diff of this commit: cvs rdiff -u -r1.1289.2.25 -r1.1289.2.26 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 29 10:34:24 UTC 2023
Modified Files:
src/usr.bin/xlint/lint1: Makefile lint1.h
Log Message:
lint: only generate err-msgs.h in debug mode
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r1.196 -r1.197 src/usr.bin/xlint/lint1/lint1.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/Makefile
diff -u src/usr.bin/xlint/lint1/Makefile:1.100 src/usr.bin/xlint/lint1/Makefile:1.101
--- src/usr.bin/xlint/lint1/Makefile:1.100 Fri Jul 21 15:00:32 2023
+++ src/usr.bin/xlint/lint1/Makefile Sat Jul 29 10:34:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2023/07/21 15:00:32 lukem Exp $
+# $NetBSD: Makefile,v 1.101 2023/07/29 10:34:24 rillig Exp $
.include
@@ -91,9 +91,6 @@ CLEANFILES+= err-msgs.h
DPSRCS+= err-msgs.h
CPPFLAGS+= -I.
-externs1.h: err-msgs.h
-${SRCS:Nerr.c}: err-msgs.h
-
add-test: .PHONY
@set -eu; \
test=${NAME:Q}; \
Index: src/usr.bin/xlint/lint1/lint1.h
diff -u src/usr.bin/xlint/lint1/lint1.h:1.196 src/usr.bin/xlint/lint1/lint1.h:1.197
--- src/usr.bin/xlint/lint1/lint1.h:1.196 Fri Jul 28 21:50:03 2023
+++ src/usr.bin/xlint/lint1/lint1.h Sat Jul 29 10:34:24 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lint1.h,v 1.196 2023/07/28 21:50:03 rillig Exp $ */
+/* $NetBSD: lint1.h,v 1.197 2023/07/29 10:34:24 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -33,7 +33,6 @@
*/
#include "lint.h"
-#include "err-msgs.h"
#include "op.h"
/*
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sat Jul 29 10:30:37 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up the following revisions, via patch, requested by msaitoh in ticket #1671: sys/dev/pci/pcidevs 1.1481-1.1482 Add Intel Alder Lake-N, Raptor Lake and 700 series chipset devices. To generate a diff of this commit: cvs rdiff -u -r1.1383.2.16 -r1.1383.2.17 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1383.2.16 src/sys/dev/pci/pcidevs:1.1383.2.17 --- src/sys/dev/pci/pcidevs:1.1383.2.16 Wed Jun 21 22:20:31 2023 +++ src/sys/dev/pci/pcidevs Sat Jul 29 10:30:37 2023 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1383.2.16 2023/06/21 22:20:31 martin Exp $ +$NetBSD: pcidevs,v 1.1383.2.17 2023/07/29 10:30:37 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -5870,8 +5870,11 @@ product INTEL ADL_U9_2_4_HOST 0x460a Ald product INTEL ADL_PCIE_RP_0 0x460d Alder Lake PCIe G5 Root Port 0 (x16) product INTEL ADL_XDCI 0x460e Alder Lake USB-C Device (xDCI) product INTEL ADL_S_2_0_HOST 0x4610 Alder Lake (S,2+0) Host +product INTEL ADL_N_8_HOST 0x4617 Alder Lake-N (0+8) Host product INTEL ADL_U15_1_4_HOST 0x4619 Alder Lake (U15,1+4) Host product INTEL ADL_U9_1_4_HOST 0x461a Alder Lake (U9,1+4) Host +product INTEL ADL_N_4_N2_HOST 0x461b Alder Lake-N (0+4, N200) Host +product INTEL ADL_N_4_N1_HOST 0x461c Alder Lake-N (0+4, N100) Host product INTEL ADL_DTT 0x461d Alder Lake Dynamic Tuning Technology product INTEL ADL_XHCI 0x461e Alder Lake USB-C Host (xHCI) product INTEL ADL_TBT_PCIE_3 0x461f Alder Lake Thunderbolt PCIe 3 @@ -5880,6 +5883,7 @@ product INTEL ADL_HX_4_8_HOST 0x4623 Ald product INTEL ADL_H_4_4_HOST 0x4629 Alder Lake (H,4+4) Host product INTEL ADL_HX_4_4_HOST 0x462b Alder Lake (HX,4+4) Host product INTEL ADL_PCIE_RP_1 0x462d Alder Lake PCIe G5 Root Port 1 (x8) +product INTEL ADL_N_IPU 0x462e Alder Lake-N Image Processing Unit product INTEL ADL_TBT_PCIE_2 0x462f Alder Lake Thunderbolt PCIe 2 product INTEL ADL_S_4_0_HOST 0x4630 Alder Lake (S,4+0) Host product INTEL ADL_HX_8_8_HOST 0x4637 Alder Lake (HX,8+8) Host @@ -5891,15 +5895,18 @@ product INTEL ADL_H_6_8_HOST 0x4641 Alde product INTEL ADL_S_6_4_HOST 0x4648 Alder Lake (S,6+4) Host product INTEL ADL_H_6_4_HOST 0x4649 Alder Lake (H,6+4) Host product INTEL ADL_PCIE_RP_2 0x464d Alder Lake PCIe G4 Root Port 2 (x4) +product INTEL ADL_N_XHCI 0x464e Alder Lake-N USB Host (xHCI) product INTEL ADL_GNA 0x464f Alder Lake Gauss Newton Algorithm product INTEL ADL_S_6_0_HOST 0x4650 Alder Lake (S,6+0) Host product INTEL ADL_IPU 0x465d Alder Lake Image Processing Unit +product INTEL ADL_N_XDCI 0x465e Alder Lake-N USB Device (xDCI) product INTEL ADL_S_8_8_HOST 0x4660 Alder Lake (S,8+8) Host product INTEL ADL_S_8_4_HOST 0x4668 Alder Lake (S,8+4) Host product INTEL ADL_TBTDMA_1 0x466d Alder Lake Thunderbolt DMA 1 product INTEL ADL_TBT_PCIE_0 0x466e Alder Lake Thunderbolt PCIe 0 -product INTEL ADL_TRACE 0x466f Alder Lake Trace Hub (Compute Die?XXX) +product INTEL ADL_TRACE 0x466f Alder Lake Trace Hub (Compute Die) product INTEL ADL_CLSRAM 0x467d Alder Lake Crash Log & Telemetry +product INTEL ADL_N_GNA 0x467e Alder Lake-N Gauss Newton Algorithm product INTEL ADL_VMD 0x467f Alder Lake Volume Management Device product INTEL ADL_IGD_1 0x4680 Alder Lake Graphics (32EU) product INTEL ADL_IGD_2 0x4682 Alder Lake Graphics (24EU) @@ -5914,6 +5921,8 @@ product INTEL ADL_IGD_10 0x46a8 Alder La product INTEL ADL_IGD_11 0x46aa Alder Lake Graphics product INTEL ADL_IGD_12 0x46b3 Alder Lake Graphics product INTEL ADL_IGD_13 0x46c3 Alder Lake Graphics +product INTEL ADL_N_IGD_1 0x46d0 Alder Lake Graphics (32EU) +product INTEL ADL_N_IGD_2 0x46d1 Alder Lake Graphics (24EU) product INTEL EHL_ESPI 0x4b00 Elkhart Lake eSPI product INTEL EHL_P2SB 0x4b20 Elkhart Lake P2SB product INTEL EHL_PMC 0x4b21 Elkhart Lake PMC @@ -6098,6 +6107,7 @@ product INTEL EP80579_LAN_1 0x5040 EP805 product INTEL EP80579_LAN_2 0x5044 EP80579 LAN product INTEL EP80579_LAN_3 0x5048 EP80579 LAN product INTEL 6HS_LP_ESPI 0x5182 600 Series PCH-LP eSPI +product INTEL 7HS_P_ESPI 0x519d 700 Series PCH-P eSPI product INTEL 6HS_LP_P2SB 0x51a0 600 Series PCH-LP P2SB product INTEL 6HS_LP_PMC 0x51a1 600 Series PCH-LP PMC product INTEL 6HS_LP_SMB 0x51a3 600 Series PCH-LP SMBus @@ -6123,6 +6133,7 @@ product INTEL 6HS_LP_I2C_4 0x51c5 600 Se product INTEL 6HS_LP_I2C_5 0x51c6 600 Series PCH-LP I2C 5 product INTEL 6HS_LP_UART_2 0x51c7 600 Series PCH-LP UART 2 product INTEL 6HS_LP_HDA 0x51c8 600 Series PCH-LP HD Audio +product INTEL 7HS_P_HDA 0x51ca 700 Series PCH HD Audio product INTEL 6HS_LP_THC_0 0x51d0 600 Series PCH-LP THC 0 product INTEL 6HS_LP_THC_1 0x51d1 600 Series PCH-LP THC 1 product
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sat Jul 29 10:32:07 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: regen (ticket #1671) To generate a diff of this commit: cvs rdiff -u -r1.1371.2.16 -r1.1371.2.17 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.16 -r1.1370.2.17 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sat Jul 29 10:30:37 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up the following revisions, via patch, requested by msaitoh in ticket #1671: sys/dev/pci/pcidevs 1.1481-1.1482 Add Intel Alder Lake-N, Raptor Lake and 700 series chipset devices. To generate a diff of this commit: cvs rdiff -u -r1.1383.2.16 -r1.1383.2.17 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sat Jul 29 10:27:38 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-10]: pcidevs.h pcidevs_data.h Log Message: regen (ticket #252) To generate a diff of this commit: cvs rdiff -u -r1.1452.2.4 -r1.1452.2.5 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1451.2.4 -r1.1451.2.5 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sat Jul 29 10:26:20 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-10]: pcidevs Log Message: Pull up the following revisions, via patch, requested by msaitoh in ticket #252: sys/dev/pci/pcidevs 1.1481-1.1482 Add Intel Alder Lake-N, Raptor Lake and 700 series chipset devices. To generate a diff of this commit: cvs rdiff -u -r1.1471.2.3 -r1.1471.2.4 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1471.2.3 src/sys/dev/pci/pcidevs:1.1471.2.4 --- src/sys/dev/pci/pcidevs:1.1471.2.3 Wed Jun 21 22:17:38 2023 +++ src/sys/dev/pci/pcidevs Sat Jul 29 10:26:20 2023 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1471.2.3 2023/06/21 22:17:38 martin Exp $ +$NetBSD: pcidevs,v 1.1471.2.4 2023/07/29 10:26:20 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -5870,8 +5870,11 @@ product INTEL ADL_U9_2_4_HOST 0x460a Ald product INTEL ADL_PCIE_RP_0 0x460d Alder Lake PCIe G5 Root Port 0 (x16) product INTEL ADL_XDCI 0x460e Alder Lake USB-C Device (xDCI) product INTEL ADL_S_2_0_HOST 0x4610 Alder Lake (S,2+0) Host +product INTEL ADL_N_8_HOST 0x4617 Alder Lake-N (0+8) Host product INTEL ADL_U15_1_4_HOST 0x4619 Alder Lake (U15,1+4) Host product INTEL ADL_U9_1_4_HOST 0x461a Alder Lake (U9,1+4) Host +product INTEL ADL_N_4_N2_HOST 0x461b Alder Lake-N (0+4, N200) Host +product INTEL ADL_N_4_N1_HOST 0x461c Alder Lake-N (0+4, N100) Host product INTEL ADL_DTT 0x461d Alder Lake Dynamic Tuning Technology product INTEL ADL_XHCI 0x461e Alder Lake USB-C Host (xHCI) product INTEL ADL_TBT_PCIE_3 0x461f Alder Lake Thunderbolt PCIe 3 @@ -5880,6 +5883,7 @@ product INTEL ADL_HX_4_8_HOST 0x4623 Ald product INTEL ADL_H_4_4_HOST 0x4629 Alder Lake (H,4+4) Host product INTEL ADL_HX_4_4_HOST 0x462b Alder Lake (HX,4+4) Host product INTEL ADL_PCIE_RP_1 0x462d Alder Lake PCIe G5 Root Port 1 (x8) +product INTEL ADL_N_IPU 0x462e Alder Lake-N Image Processing Unit product INTEL ADL_TBT_PCIE_2 0x462f Alder Lake Thunderbolt PCIe 2 product INTEL ADL_S_4_0_HOST 0x4630 Alder Lake (S,4+0) Host product INTEL ADL_HX_8_8_HOST 0x4637 Alder Lake (HX,8+8) Host @@ -5891,15 +5895,18 @@ product INTEL ADL_H_6_8_HOST 0x4641 Alde product INTEL ADL_S_6_4_HOST 0x4648 Alder Lake (S,6+4) Host product INTEL ADL_H_6_4_HOST 0x4649 Alder Lake (H,6+4) Host product INTEL ADL_PCIE_RP_2 0x464d Alder Lake PCIe G4 Root Port 2 (x4) +product INTEL ADL_N_XHCI 0x464e Alder Lake-N USB Host (xHCI) product INTEL ADL_GNA 0x464f Alder Lake Gauss Newton Algorithm product INTEL ADL_S_6_0_HOST 0x4650 Alder Lake (S,6+0) Host product INTEL ADL_IPU 0x465d Alder Lake Image Processing Unit +product INTEL ADL_N_XDCI 0x465e Alder Lake-N USB Device (xDCI) product INTEL ADL_S_8_8_HOST 0x4660 Alder Lake (S,8+8) Host product INTEL ADL_S_8_4_HOST 0x4668 Alder Lake (S,8+4) Host product INTEL ADL_TBTDMA_1 0x466d Alder Lake Thunderbolt DMA 1 product INTEL ADL_TBT_PCIE_0 0x466e Alder Lake Thunderbolt PCIe 0 -product INTEL ADL_TRACE 0x466f Alder Lake Trace Hub (Compute Die?XXX) +product INTEL ADL_TRACE 0x466f Alder Lake Trace Hub (Compute Die) product INTEL ADL_CLSRAM 0x467d Alder Lake Crash Log & Telemetry +product INTEL ADL_N_GNA 0x467e Alder Lake-N Gauss Newton Algorithm product INTEL ADL_VMD 0x467f Alder Lake Volume Management Device product INTEL ADL_IGD_1 0x4680 Alder Lake Graphics (32EU) product INTEL ADL_IGD_2 0x4682 Alder Lake Graphics (24EU) @@ -5914,6 +5921,8 @@ product INTEL ADL_IGD_10 0x46a8 Alder La product INTEL ADL_IGD_11 0x46aa Alder Lake Graphics product INTEL ADL_IGD_12 0x46b3 Alder Lake Graphics product INTEL ADL_IGD_13 0x46c3 Alder Lake Graphics +product INTEL ADL_N_IGD_1 0x46d0 Alder Lake Graphics (32EU) +product INTEL ADL_N_IGD_2 0x46d1 Alder Lake Graphics (24EU) product INTEL EHL_ESPI 0x4b00 Elkhart Lake eSPI product INTEL EHL_P2SB 0x4b20 Elkhart Lake P2SB product INTEL EHL_PMC 0x4b21 Elkhart Lake PMC @@ -6098,6 +6107,7 @@ product INTEL EP80579_LAN_1 0x5040 EP805 product INTEL EP80579_LAN_2 0x5044 EP80579 LAN product INTEL EP80579_LAN_3 0x5048 EP80579 LAN product INTEL 6HS_LP_ESPI 0x5182 600 Series PCH-LP eSPI +product INTEL 7HS_P_ESPI 0x519d 700 Series PCH-P eSPI product INTEL 6HS_LP_P2SB 0x51a0 600 Series PCH-LP P2SB product INTEL 6HS_LP_PMC 0x51a1 600 Series PCH-LP PMC product INTEL 6HS_LP_SMB 0x51a3 600 Series PCH-LP SMBus @@ -6123,6 +6133,7 @@ product INTEL 6HS_LP_I2C_4 0x51c5 600 Se product INTEL 6HS_LP_I2C_5 0x51c6 600 Series PCH-LP I2C 5 product INTEL 6HS_LP_UART_2 0x51c7 600 Series PCH-LP UART 2 product INTEL 6HS_LP_HDA 0x51c8 600 Series PCH-LP HD Audio +product INTEL 7HS_P_HDA 0x51ca 700 Series PCH HD Audio product INTEL 6HS_LP_THC_0 0x51d0 600 Series PCH-LP THC 0 product INTEL 6HS_LP_THC_1 0x51d1 600 Series PCH-LP THC 1 product INTEL
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sat Jul 29 10:26:20 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-10]: pcidevs Log Message: Pull up the following revisions, via patch, requested by msaitoh in ticket #252: sys/dev/pci/pcidevs 1.1481-1.1482 Add Intel Alder Lake-N, Raptor Lake and 700 series chipset devices. To generate a diff of this commit: cvs rdiff -u -r1.1471.2.3 -r1.1471.2.4 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/usr.sbin/cpuctl/arch
Module Name:src
Committed By: martin
Date: Sat Jul 29 10:23:07 UTC 2023
Modified Files:
src/usr.sbin/cpuctl/arch [netbsd-8]: i386.c
Log Message:
Pull up the following revisions, via patch, requested by msaitoh
in ticket #1854:
usr.sbin/cpuctl/arch/i386.c 1.137-1.139
- CPU model 0x5a is not Atom E3500 but Atom Z3500.
- Add Alder Lake-N.
To generate a diff of this commit:
cvs rdiff -u -r1.74.6.17 -r1.74.6.18 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/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.74.6.17 src/usr.sbin/cpuctl/arch/i386.c:1.74.6.18
--- src/usr.sbin/cpuctl/arch/i386.c:1.74.6.17 Wed Jun 21 19:06:15 2023
+++ src/usr.sbin/cpuctl/arch/i386.c Sat Jul 29 10:23:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.74.6.17 2023/06/21 19:06:15 martin Exp $ */
+/* $NetBSD: i386.c,v 1.74.6.18 2023/07/29 10:23:07 martin 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.74.6.17 2023/06/21 19:06:15 martin Exp $");
+__RCSID("$NetBSD: i386.c,v 1.74.6.18 2023/07/29 10:23:07 martin Exp $");
#endif /* not lint */
#include
@@ -335,7 +335,7 @@ const struct cpu_cpuid_nameclass i386_cp
[0x55] = "Xeon Scalable (Skylake, Cascade Lake, Copper Lake)",
[0x56] = "Xeon D-1500 (Broadwell)",
[0x57] = "Xeon Phi [357]200 (Knights Landing)",
-[0x5a] = "Atom E3500",
+[0x5a] = "Atom Z3500",
[0x5c] = "Atom (Goldmont)",
[0x5d] = "Atom X3-C3000 (Silvermont)",
[0x5e] = "6th gen Core, Xeon E3-1[25]00 v5 (Skylake)",
@@ -361,8 +361,9 @@ const struct cpu_cpuid_nameclass i386_cp
[0xa6] = "10th gen Core (Comet Lake)",
[0xa7] = "11th gen Core (Rocket Lake)",
[0xa8] = "11th gen Core (Rocket Lake)",
-[0xba] = "13th gen Core (Raptor Lake)",
[0xb7] = "13th gen Core (Raptor Lake)",
+[0xba] = "13th gen Core (Raptor Lake)",
+[0xbe] = "Core i3-N3xx N[12]xx Nxx Atom x7xxxE (Alder Lake-N)",
[0xbf] = "13th gen Core (Raptor Lake)",
},
"Pentium Pro, II or III", /* Default */
CVS commit: [netbsd-8] src/usr.sbin/cpuctl/arch
Module Name:src Committed By: martin Date: Sat Jul 29 10:23:07 UTC 2023 Modified Files: src/usr.sbin/cpuctl/arch [netbsd-8]: i386.c Log Message: Pull up the following revisions, via patch, requested by msaitoh in ticket #1854: usr.sbin/cpuctl/arch/i386.c 1.137-1.139 - CPU model 0x5a is not Atom E3500 but Atom Z3500. - Add Alder Lake-N. To generate a diff of this commit: cvs rdiff -u -r1.74.6.17 -r1.74.6.18 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.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 29 10:22:50 UTC 2023
Modified Files:
src/usr.bin/xlint/lint1: mem1.c
Log Message:
lint: fix use-after-free in memory debug mode
A node may be allocated before its type. Since the objects are freed in
reverse allocation order, the type cannot be accessed anymore when the
node is freed.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/usr.bin/xlint/lint1/mem1.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/lint1/mem1.c
diff -u src/usr.bin/xlint/lint1/mem1.c:1.71 src/usr.bin/xlint/lint1/mem1.c:1.72
--- src/usr.bin/xlint/lint1/mem1.c:1.71 Sat Jul 15 15:56:17 2023
+++ src/usr.bin/xlint/lint1/mem1.c Sat Jul 29 10:22:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mem1.c,v 1.71 2023/07/15 15:56:17 rillig Exp $ */
+/* $NetBSD: mem1.c,v 1.72 2023/07/29 10:22:50 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: mem1.c,v 1.71 2023/07/15 15:56:17 rillig Exp $");
+__RCSID("$NetBSD: mem1.c,v 1.72 2023/07/29 10:22:50 rillig Exp $");
#endif
#include
@@ -199,12 +199,13 @@ mpool_free(memory_pool *pool)
debug_step("%s: freeing type '%s'",
__func__, type_name(p));
else if (strcmp(item->descr, "tnode") == 0)
- debug_step("%s: freeing node '%s' with type '%s'",
- __func__, op_name(((const tnode_t *)p)->tn_op),
- type_name(((const tnode_t *)p)->tn_type));
+ debug_step("%s: freeing node '%s'",
+ __func__, op_name(((const tnode_t *)p)->tn_op));
else
debug_step("%s: freeing '%s' with %zu bytes",
__func__, item->descr, item->size);
+ static void *(*volatile memset_ptr)(void *, int, size_t) = memset;
+ memset_ptr(p, 'Z', item->size);
#endif
free(p);
}
