CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: skrll
Date: Tue Jun 7 05:39:16 UTC 2022
Modified Files:
src/tests/lib/libc/sys: t_ptrace_core_wait.h
Log Message:
PR/56865: hppa: t_ptrace_core_wait test doesn't know it must advance PC after
breakpoint
Add __hppa__ to the list of architectures that need to advance to the
instruction
after the breakpoint
Thanks to Tom Lane for the fix.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/sys/t_ptrace_core_wait.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/t_ptrace_core_wait.h
diff -u src/tests/lib/libc/sys/t_ptrace_core_wait.h:1.5 src/tests/lib/libc/sys/t_ptrace_core_wait.h:1.6
--- src/tests/lib/libc/sys/t_ptrace_core_wait.h:1.5 Sat Mar 26 16:22:50 2022
+++ src/tests/lib/libc/sys/t_ptrace_core_wait.h Tue Jun 7 05:39:16 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_core_wait.h,v 1.5 2022/03/26 16:22:50 martin Exp $ */
+/* $NetBSD: t_ptrace_core_wait.h,v 1.6 2022/06/07 05:39:16 skrll Exp $ */
/*-
* Copyright (c) 2016, 2017, 2018, 2019, 2020 The NetBSD Foundation, Inc.
@@ -208,8 +208,8 @@ ATF_TC_BODY(core_dump_procinfo, tc)
DPRINTF("Before resuming the child process where it left off and "
"without signal to be sent\n");
-#if defined(__aarch64__) || defined(__arm__) || defined(__powerpc__) || \
-defined(__sh3__) || defined(sparc)
+#if defined(__aarch64__) || defined(__arm__) || defined(__hppa___) || \
+defined(__powerpc__) || defined(__sh3__) || defined(sparc)
/*
* For these archs, program counter is not automatically incremented
* by a trap instruction. We cannot increment PC in the trap handler,
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: skrll Date: Tue Jun 7 05:39:16 UTC 2022 Modified Files: src/tests/lib/libc/sys: t_ptrace_core_wait.h Log Message: PR/56865: hppa: t_ptrace_core_wait test doesn't know it must advance PC after breakpoint Add __hppa__ to the list of architectures that need to advance to the instruction after the breakpoint Thanks to Tom Lane for the fix. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/sys/t_ptrace_core_wait.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src Committed By: ryo Date: Tue Jun 7 04:12:10 UTC 2022 Modified Files: src/sys/arch/aarch64/aarch64: cpuswitch.S Log Message: use stp if possible. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/arch/aarch64/aarch64/cpuswitch.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: ryo
Date: Tue Jun 7 04:12:10 UTC 2022
Modified Files:
src/sys/arch/aarch64/aarch64: cpuswitch.S
Log Message:
use stp if possible.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/aarch64/aarch64/cpuswitch.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/cpuswitch.S
diff -u src/sys/arch/aarch64/aarch64/cpuswitch.S:1.36 src/sys/arch/aarch64/aarch64/cpuswitch.S:1.37
--- src/sys/arch/aarch64/aarch64/cpuswitch.S:1.36 Fri Jun 3 19:59:59 2022
+++ src/sys/arch/aarch64/aarch64/cpuswitch.S Tue Jun 7 04:12:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuswitch.S,v 1.36 2022/06/03 19:59:59 ryo Exp $ */
+/* $NetBSD: cpuswitch.S,v 1.37 2022/06/07 04:12:10 ryo Exp $ */
/*-
* Copyright (c) 2014, 2020 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include "opt_ddb.h"
#include "opt_kasan.h"
-RCSID("$NetBSD: cpuswitch.S,v 1.36 2022/06/03 19:59:59 ryo Exp $")
+RCSID("$NetBSD: cpuswitch.S,v 1.37 2022/06/07 04:12:10 ryo Exp $")
ARMV8_DEFINE_OPTIONS
@@ -61,8 +61,13 @@ ENTRY_NP(cpu_switchto)
stp x27, x28, [sp, #TF_X27]
stp x29, x30, [sp, #TF_X29]
#ifdef DDB
- str lr, [sp, #TF_PC] /* for backtrace */
- str xzr, [sp, #TF_SP] /* mark as switchframe */
+ /* mark as switchframe for backtrace */
+ .if TF_SP + 8 == TF_PC
+ stp xzr, lr, [sp, #TF_SP]
+ .else
+ str xzr, [sp, #TF_SP]
+ str lr, [sp, #TF_PC]
+ .endif
#endif
/*
CVS commit: src
Module Name:src Committed By: nia Date: Mon Jun 6 13:28:55 UTC 2022 Modified Files: src/distrib/sets/lists/base: mi src/sbin: Makefile Log Message: revert bits and pieces I accidentally included in my last commit from hannken To generate a diff of this commit: cvs rdiff -u -r1.1307 -r1.1308 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.138 -r1.139 src/sbin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1307 src/distrib/sets/lists/base/mi:1.1308 --- src/distrib/sets/lists/base/mi:1.1307 Mon Jun 6 10:56:27 2022 +++ src/distrib/sets/lists/base/mi Mon Jun 6 13:28:55 2022 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1307 2022/06/06 10:56:27 nia Exp $ +# $NetBSD: mi,v 1.1308 2022/06/06 13:28:55 nia Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -384,7 +384,7 @@ ./sbin/fsck_lfs base-sysutil-root ./sbin/fsck_msdosbase-sysutil-root ./sbin/fsck_udf base-sysutil-root -./sbin/fsck_v7fsbase-sysutil-root v7fs +./sbin/fsck_v7fsbase-sysutil-root ./sbin/fsdb base-sysutil-root ./sbin/fsirand base-sysutil-root ./sbin/gpt base-sysutil-root @@ -405,23 +405,23 @@ ./sbin/modstat base-sysutil-root ./sbin/modunloadbase-sysutil-root ./sbin/mount base-sysutil-root -./sbin/mount_adosbase-adosfs-root ados +./sbin/mount_adosbase-adosfs-root ./sbin/mount_autofsbase-sysutil-root ./sbin/mount_cd9660base-sysutil-root -./sbin/mount_chfsbase-sysutil-root chfs -./sbin/mount_efsbase-efs-root efs +./sbin/mount_chfsbase-sysutil-root +./sbin/mount_efsbase-efs-root ./sbin/mount_ext2fsbase-ext2fs-root ./sbin/mount_fdescbase-miscfs-root ./sbin/mount_ffsbase-sysutil-root -./sbin/mount_filecorebase-filecorefs-root filecore -./sbin/mount_hfsbase-hfs-root hfs +./sbin/mount_filecorebase-filecorefs-root +./sbin/mount_hfsbase-hfs-root ./sbin/mount_hfspbase-obsolete obsolete ./sbin/mount_kernfsbase-sysutil-root ./sbin/mount_lfsbase-sysutil-root ./sbin/mount_mfsbase-sysutil-root ./sbin/mount_msdosbase-sysutil-root ./sbin/mount_nfsbase-nfsclient-root -./sbin/mount_nilfsbase-sysutil-root nilfs +./sbin/mount_nilfsbase-sysutil-root ./sbin/mount_ntfsbase-ntfs-root ./sbin/mount_nullbase-miscfs-root ./sbin/mount_overlaybase-miscfs-root @@ -431,13 +431,13 @@ ./sbin/mount_puffsbase-sysutil-root ./sbin/mount_qemufwcfgbase-sysutil-root ./sbin/mount_smbfsbase-obsolete obsolete -./sbin/mount_sysvbfsbase-sysutil-root sysvbfs +./sbin/mount_sysvbfsbase-sysutil-root ./sbin/mount_tmpfsbase-miscfs-root ./sbin/mount_udfbase-sysutil-root ./sbin/mount_ufsbase-sysutil-root ./sbin/mount_umapbase-miscfs-root ./sbin/mount_unionbase-miscfs-root -./sbin/mount_v7fsbase-sysutil-root v7fs +./sbin/mount_v7fsbase-sysutil-root ./sbin/mount_zfsbase-zfs-root zfs ./sbin/mountd base-obsolete obsolete ./sbin/newbtconfbase-sysutil-root @@ -445,9 +445,9 @@ ./sbin/newfs_ext2fsbase-sysutil-root ./sbin/newfs_lfsbase-sysutil-root ./sbin/newfs_msdosbase-sysutil-root -./sbin/newfs_sysvbfsbase-sysutil-root sysvbfs +./sbin/newfs_sysvbfsbase-sysutil-root ./sbin/newfs_udfbase-sysutil-root -./sbin/newfs_v7fsbase-sysutil-root v7fs +./sbin/newfs_v7fsbase-sysutil-root ./sbin/newlfs base-obsolete obsolete ./sbin/nfsd base-obsolete obsolete ./sbin/nfsiod base-obsolete obsolete Index: src/sbin/Makefile diff -u src/sbin/Makefile:1.138 src/sbin/Makefile:1.139 --- src/sbin/Makefile:1.138 Mon Jun 6 10:56:28 2022 +++ src/sbin/Makefile Mon Jun 6 13:28:55 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.138 2022/06/06 10:56:28 nia Exp $ +# $NetBSD: Makefile,v 1.139 2022/06/06 13:28:55 nia Exp $ # @(#)Makefile 8.5 (Berkeley) 3/31/94 # Not ported: XNSrouted enpload scsiformat startslip @@ -21,17 +21,25 @@ SUBDIR+= newfs_ext2fs fsck_ext2fs SUBDIR+= newfs fsck_ffs fsdb dump restore clri tunefs resize_ffs SUBDIR+= newfs_lfs fsck_lfs dump_lfs resize_lfs SUBDIR+= newfs_msdos fsck_msdos +SUBDIR+= newfs_sysvbfs SUBDIR+= newfs_udf fsck_udf +SUBDIR+= newfs_v7fs fsck_v7fs +SUBDIR+= mount_ados SUBDIR+= mount_autofs SUBDIR+= mount_cd9660 +SUBDIR+= mount_chfs +SUBDIR+= mount_efs SUBDIR+= mount_ext2fs SUBDIR+= mount_fdesc +SUBDIR+= mount_filecore SUBDIR+= mount_ffs +SUBDIR+= mount_hfs SUBDIR+= mount_kernfs SUBDIR+= mount_lfs SUBDIR+= mount_msdos SUBDIR+= mount_udf SUBDIR+= mount_nfs +SUBDIR+= mount_nilfs SUBDIR+= mount_ntfs SUBDIR+= mount_null SUBDIR+= mount_overlay @@ -40,9 +48,11 @@ SUBDIR+= mount_procfs SUBDIR+= mount_ptyfs SUBDIR+= mount_puffs SUBDIR+= mount_qemufwcfg +SUBDIR+= mount_sysvbfs SUBDIR+= mount_tmpfs SUBDIR+= mount_umap
CVS commit: src
Module Name:src Committed By: nia Date: Mon Jun 6 13:28:55 UTC 2022 Modified Files: src/distrib/sets/lists/base: mi src/sbin: Makefile Log Message: revert bits and pieces I accidentally included in my last commit from hannken To generate a diff of this commit: cvs rdiff -u -r1.1307 -r1.1308 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.138 -r1.139 src/sbin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Jun 6 11:36:16 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.3 Log Message: Tickets #1464 and #1465 To generate a diff of this commit: cvs rdiff -u -r1.1.2.103 -r1.1.2.104 src/doc/CHANGES-9.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-9.3 diff -u src/doc/CHANGES-9.3:1.1.2.103 src/doc/CHANGES-9.3:1.1.2.104 --- src/doc/CHANGES-9.3:1.1.2.103 Mon Jun 6 03:08:35 2022 +++ src/doc/CHANGES-9.3 Mon Jun 6 11:36:16 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.3,v 1.1.2.103 2022/06/06 03:08:35 msaitoh Exp $ +# $NetBSD: CHANGES-9.3,v 1.1.2.104 2022/06/06 11:36:16 martin Exp $ A complete list of changes from the NetBSD 9.2 release to the NetBSD 9.3 release: @@ -1760,3 +1760,15 @@ crypto/external/bsd/openssh/dist/version ssh(1): apply upstream fix for CVE-2019-16905. [martin, ticket #1463] + +lib/libc/arch/hppa/sys/ptrace.S 1.8 + + PR 56864: preserve register %r19 across calls to __cerror. + [skrll, ticket #1464] + +usr.sbin/makemandb/makemandb.c 1.63 + + PR 56118: fix out of bounds array access. + [skrll, ticket #1465] + +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Jun 6 11:36:16 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.3 Log Message: Tickets #1464 and #1465 To generate a diff of this commit: cvs rdiff -u -r1.1.2.103 -r1.1.2.104 src/doc/CHANGES-9.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/usr.sbin/makemandb
Module Name:src
Committed By: martin
Date: Mon Jun 6 11:34:12 UTC 2022
Modified Files:
src/usr.sbin/makemandb [netbsd-9]: makemandb.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1465):
usr.sbin/makemandb/makemandb.c: revision 1.63
Don't index outside the mdocs array of function pointers. Analysis and
suggested fixes from Tom Lane. I played it safe and went with (my
variation of) the minimal fix.
PR port-hppa/56118: sporadic app crashes in HPPA -current
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.60.2.1 src/usr.sbin/makemandb/makemandb.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/makemandb/makemandb.c
diff -u src/usr.sbin/makemandb/makemandb.c:1.60 src/usr.sbin/makemandb/makemandb.c:1.60.2.1
--- src/usr.sbin/makemandb/makemandb.c:1.60 Sat May 18 07:56:43 2019
+++ src/usr.sbin/makemandb/makemandb.c Mon Jun 6 11:34:11 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: makemandb.c,v 1.60 2019/05/18 07:56:43 abhinav Exp $ */
+/* $NetBSD: makemandb.c,v 1.60.2.1 2022/06/06 11:34:11 martin Exp $ */
/*
* Copyright (c) 2011 Abhinav Upadhyay
* Copyright (c) 2011 Kristaps Dzonsons
@@ -17,7 +17,7 @@
*/
#include
-__RCSID("$NetBSD: makemandb.c,v 1.60 2019/05/18 07:56:43 abhinav Exp $");
+__RCSID("$NetBSD: makemandb.c,v 1.60.2.1 2022/06/06 11:34:11 martin Exp $");
#include
#include
@@ -1079,15 +1079,18 @@ mdoc_parse_Sh(const struct roff_node *n,
if (n->type == ROFFT_TEXT) {
mdoc_parse_section(n->sec, n->string, rec);
- } else if (mdocs[n->tok] == pmdoc_Xr) {
- /*
- * When encountering other inline macros,
- * call pmdoc_macro_handler.
- */
- pmdoc_macro_handler(n, rec, MDOC_Xr);
- xr_found = 1;
- } else if (mdocs[n->tok] == pmdoc_Pp) {
- pmdoc_macro_handler(n, rec, MDOC_Pp);
+ } else if (n->tok >= MDOC_Dd && n->tok < MDOC_MAX) {
+ const int tok_idx = n->tok - MDOC_Dd;
+ if (mdocs[tok_idx] == pmdoc_Xr) {
+ /*
+ * When encountering other inline macros,
+ * call pmdoc_macro_handler.
+ */
+ pmdoc_macro_handler(n, rec, MDOC_Xr);
+ xr_found = 1;
+ } else if (mdocs[tok_idx] == pmdoc_Pp) {
+ pmdoc_macro_handler(n, rec, MDOC_Pp);
+ }
}
/*
CVS commit: [netbsd-9] src/usr.sbin/makemandb
Module Name:src Committed By: martin Date: Mon Jun 6 11:34:12 UTC 2022 Modified Files: src/usr.sbin/makemandb [netbsd-9]: makemandb.c Log Message: Pull up following revision(s) (requested by skrll in ticket #1465): usr.sbin/makemandb/makemandb.c: revision 1.63 Don't index outside the mdocs array of function pointers. Analysis and suggested fixes from Tom Lane. I played it safe and went with (my variation of) the minimal fix. PR port-hppa/56118: sporadic app crashes in HPPA -current To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.60.2.1 src/usr.sbin/makemandb/makemandb.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/lib/libc/arch/hppa/sys
Module Name:src Committed By: martin Date: Mon Jun 6 11:31:13 UTC 2022 Modified Files: src/lib/libc/arch/hppa/sys [netbsd-9]: ptrace.S Log Message: Pull up following revision(s) (requested by skrll in ticket #1464): lib/libc/arch/hppa/sys/ptrace.S: revision 1.8 Save and restore %r19 the "linkage table pointer register" across the call to __cerror so if the ptrace syscall fails we can call __cerror again with the correct %r19 value. Do this even though the call of __cerror doesn't go via the PLT because __cerror calls __errno which does. Analysis and fix from Tom Lane in PR port-hppa/56864: hppa: ptrace(2) dumps core when returning an error I changed the location of where %r19 is stored on the stack to follow the ABI. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.66.1 src/lib/libc/arch/hppa/sys/ptrace.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/hppa/sys/ptrace.S diff -u src/lib/libc/arch/hppa/sys/ptrace.S:1.6 src/lib/libc/arch/hppa/sys/ptrace.S:1.6.66.1 --- src/lib/libc/arch/hppa/sys/ptrace.S:1.6 Mon Apr 28 20:22:56 2008 +++ src/lib/libc/arch/hppa/sys/ptrace.S Mon Jun 6 11:31:13 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: ptrace.S,v 1.6 2008/04/28 20:22:56 martin Exp $ */ +/* $NetBSD: ptrace.S,v 1.6.66.1 2022/06/06 11:31:13 martin Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -44,10 +44,12 @@ ENTRY(ptrace, HPPA_FRAME_SIZE) stw %arg1, HPPA_FRAME_ARG(1)(%sp) stw %arg2, HPPA_FRAME_ARG(2)(%sp) stw %arg3, HPPA_FRAME_ARG(3)(%sp) + stw %r19, HPPA_FRAME_EDP(%sp) ldo HPPA_FRAME_SIZE(%sp),%sp bl __cerror, %rp copy %r0, %t1 ldo -HPPA_FRAME_SIZE(%sp), %sp + ldw HPPA_FRAME_EDP(%sp), %r19 ldw HPPA_FRAME_ARG(0)(%sp), %arg0 ldw HPPA_FRAME_ARG(1)(%sp), %arg1 ldw HPPA_FRAME_ARG(2)(%sp), %arg2
CVS commit: [netbsd-9] src/lib/libc/arch/hppa/sys
Module Name:src Committed By: martin Date: Mon Jun 6 11:31:13 UTC 2022 Modified Files: src/lib/libc/arch/hppa/sys [netbsd-9]: ptrace.S Log Message: Pull up following revision(s) (requested by skrll in ticket #1464): lib/libc/arch/hppa/sys/ptrace.S: revision 1.8 Save and restore %r19 the "linkage table pointer register" across the call to __cerror so if the ptrace syscall fails we can call __cerror again with the correct %r19 value. Do this even though the call of __cerror doesn't go via the PLT because __cerror calls __errno which does. Analysis and fix from Tom Lane in PR port-hppa/56864: hppa: ptrace(2) dumps core when returning an error I changed the location of where %r19 is stored on the stack to follow the ABI. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.66.1 src/lib/libc/arch/hppa/sys/ptrace.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Jun 6 11:10:24 UTC 2022 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1748 To generate a diff of this commit: cvs rdiff -u -r1.1.2.134 -r1.1.2.135 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.134 src/doc/CHANGES-8.3:1.1.2.135 --- src/doc/CHANGES-8.3:1.1.2.134 Sat Jun 4 12:41:38 2022 +++ src/doc/CHANGES-8.3 Mon Jun 6 11:10:24 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.134 2022/06/04 12:41:38 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.135 2022/06/06 11:10:24 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -2679,3 +2679,8 @@ sys/arch/atari/atari/stalloc.c 1.17 PR 56859: restore NULL pointer checks lost in rev 1.16. [tsutsui, ticket #1747] +sys/dev/pci/ixgbe/ixgbe.c (apply patch) + + Fix the location of "break" statement. No functional change intended. + [msaitoh, ticket #1748] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Jun 6 11:10:24 UTC 2022 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1748 To generate a diff of this commit: cvs rdiff -u -r1.1.2.134 -r1.1.2.135 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci/ixgbe
Module Name:src Committed By: martin Date: Mon Jun 6 11:09:16 UTC 2022 Modified Files: src/sys/dev/pci/ixgbe [netbsd-8]: ixgbe.c Log Message: Apply patch, requested by msaitoh in ticket #1746: sys/dev/pci/ixgbe/ixgbe.c (apply patch) Fix the location of "break" statement. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.88.2.52 -r1.88.2.53 src/sys/dev/pci/ixgbe/ixgbe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/ixgbe/ixgbe.c diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.52 src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.53 --- src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.52 Fri Jun 3 12:31:10 2022 +++ src/sys/dev/pci/ixgbe/ixgbe.c Mon Jun 6 11:09:16 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe.c,v 1.88.2.52 2022/06/03 12:31:10 martin Exp $ */ +/* $NetBSD: ixgbe.c,v 1.88.2.53 2022/06/06 11:09:16 martin Exp $ */ /** @@ -64,7 +64,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.88.2.52 2022/06/03 12:31:10 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.88.2.53 2022/06/06 11:09:16 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -3170,8 +3170,8 @@ ixgbe_intr_admin_common(struct adapter * "PHY IS SHUT DOWN!!\n"); device_printf(adapter->dev, "System shutdown required!\n"); - break; } +break; } }
CVS commit: [netbsd-8] src/sys/dev/pci/ixgbe
Module Name:src Committed By: martin Date: Mon Jun 6 11:09:16 UTC 2022 Modified Files: src/sys/dev/pci/ixgbe [netbsd-8]: ixgbe.c Log Message: Apply patch, requested by msaitoh in ticket #1746: sys/dev/pci/ixgbe/ixgbe.c (apply patch) Fix the location of "break" statement. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.88.2.52 -r1.88.2.53 src/sys/dev/pci/ixgbe/ixgbe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src
On Mon, Jun 06, 2022 at 10:15:59AM +, nia wrote: > On Sun, Jun 05, 2022 at 10:30:42PM +0100, Alistair Crooks wrote: > > Then you can create a target file system, possibly by using some of the > > in-tree tools > > The idea was to use the in-tree tooling we are already using for live > images, which can be adapted to add custom software by changing a > configuration file. Although doing it this way is fine too. > > > Cutting single programs out of the initial build process is insufficient > > and wrong > > I understand how strong your objections are. > > If the changes aren't reverted by the end of today, I was unable to > complete a checkout due to unstable internet connectivity. And done.
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: nia Date: Mon Jun 6 10:57:05 UTC 2022 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Remove accidentally committed merge conflict line. To generate a diff of this commit: cvs rdiff -u -r1.1210 -r1.1211 src/distrib/sets/lists/tests/mi 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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.1210 src/distrib/sets/lists/tests/mi:1.1211 --- src/distrib/sets/lists/tests/mi:1.1210 Mon Jun 6 10:56:28 2022 +++ src/distrib/sets/lists/tests/mi Mon Jun 6 10:57:05 2022 @@ -1,5 +1,4 @@ -=== -# $NetBSD: mi,v 1.1210 2022/06/06 10:56:28 nia Exp $ +# $NetBSD: mi,v 1.1211 2022/06/06 10:57:05 nia Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. #
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: nia Date: Mon Jun 6 10:57:05 UTC 2022 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Remove accidentally committed merge conflict line. To generate a diff of this commit: cvs rdiff -u -r1.1210 -r1.1211 src/distrib/sets/lists/tests/mi 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: nia Date: Mon Jun 6 10:56:30 UTC 2022 Modified Files: src/distrib/sets/lists/base: mi shl.mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/debug: mi shl.mi src/distrib/sets/lists/etc: mi src/distrib/sets/lists/man: mi src/distrib/sets/lists/misc: mi src/distrib/sets/lists/tests: mi src/etc: Makefile src/etc/mtree: Makefile NetBSD.dist.base NetBSD.dist.dhcpd special src/etc/rc.d: Makefile src/external/bsd: Makefile src/external/mpl: Makefile src/libexec: Makefile src/sbin: Makefile src/share/man/man5: mk.conf.5 src/share/mk: bsd.README bsd.own.mk src/sys/rump/fs: Makefile.rumpfscomp src/tests/fs: Makefile src/tests/fs/vfs: Makefile src/usr.bin: Makefile src/usr.sbin: Makefile src/usr.sbin/puffs: Makefile Log Message: build system: Revert all the recent additions of MK[...] knobs that allow conditionally disabling the building of certain user space programs in the 'base' set. There is not enough consensus that this is the right way and a few people had strong objections, see source-changes-d@. To generate a diff of this commit: cvs rdiff -u -r1.1306 -r1.1307 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.936 -r1.937 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.2415 -r1.2416 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.386 -r1.387 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.293 -r1.294 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.269 -r1.270 src/distrib/sets/lists/etc/mi cvs rdiff -u -r1.1747 -r1.1748 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.222 -r1.223 src/distrib/sets/lists/misc/mi cvs rdiff -u -r1.1209 -r1.1210 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.464 -r1.465 src/etc/Makefile cvs rdiff -u -r1.46 -r1.47 src/etc/mtree/Makefile cvs rdiff -u -r1.244 -r1.245 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.1 -r1.2 src/etc/mtree/NetBSD.dist.dhcpd cvs rdiff -u -r1.174 -r1.175 src/etc/mtree/special cvs rdiff -u -r1.115 -r1.116 src/etc/rc.d/Makefile cvs rdiff -u -r1.74 -r1.75 src/external/bsd/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mpl/Makefile cvs rdiff -u -r1.63 -r1.64 src/libexec/Makefile cvs rdiff -u -r1.137 -r1.138 src/sbin/Makefile cvs rdiff -u -r1.95 -r1.96 src/share/man/man5/mk.conf.5 cvs rdiff -u -r1.438 -r1.439 src/share/mk/bsd.README cvs rdiff -u -r1.1284 -r1.1285 src/share/mk/bsd.own.mk cvs rdiff -u -r1.9 -r1.10 src/sys/rump/fs/Makefile.rumpfscomp cvs rdiff -u -r1.24 -r1.25 src/tests/fs/Makefile cvs rdiff -u -r1.29 -r1.30 src/tests/fs/vfs/Makefile cvs rdiff -u -r1.237 -r1.238 src/usr.bin/Makefile cvs rdiff -u -r1.290 -r1.291 src/usr.sbin/Makefile cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/puffs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1306 src/distrib/sets/lists/base/mi:1.1307 --- src/distrib/sets/lists/base/mi:1.1306 Sun May 29 15:23:20 2022 +++ src/distrib/sets/lists/base/mi Mon Jun 6 10:56:27 2022 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1306 2022/05/29 15:23:20 nia Exp $ +# $NetBSD: mi,v 1.1307 2022/06/06 10:56:27 nia Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -327,7 +327,7 @@ ./libexec/dhcpcd-hooks/30-hostname base-dhcpcd-root ./libexec/dhcpcd-hooks/50-ntp.conf base-dhcpcd-root ./libexec/dhcpcd-run-hooks base-dhcpcd-root -./libexec/lfs_cleanerdbase-sysutil-bin lfs +./libexec/lfs_cleanerdbase-sysutil-bin ./libexec/resolvconfbase-resolvconf-root ./libexec/resolvconf/dnsmasq base-resolvconf-root ./libexec/resolvconf/libc base-resolvconf-root @@ -371,7 +371,7 @@ ./sbin/dmsetup base-lvm-root lvm ./sbin/drvctl base-sysutil-root ./sbin/dump base-sysutil-root -./sbin/dump_lfs base-sysutil-root lfs +./sbin/dump_lfs base-sysutil-root ./sbin/dumpfs base-obsolete obsolete ./sbin/dumplfs base-obsolete obsolete ./sbin/fastboot base-sysutil-root @@ -381,10 +381,10 @@ ./sbin/fsck base-sysutil-root ./sbin/fsck_ext2fsbase-ext2fs-root ./sbin/fsck_ffs base-sysutil-root -./sbin/fsck_lfs base-sysutil-root lfs +./sbin/fsck_lfs base-sysutil-root ./sbin/fsck_msdosbase-sysutil-root ./sbin/fsck_udf base-sysutil-root -./sbin/fsck_v7fsbase-sysutil-root +./sbin/fsck_v7fsbase-sysutil-root v7fs ./sbin/fsdb base-sysutil-root ./sbin/fsirand base-sysutil-root ./sbin/gpt base-sysutil-root @@ -405,23 +405,23 @@ ./sbin/modstat base-sysutil-root ./sbin/modunloadbase-sysutil-root ./sbin/mount base-sysutil-root -./sbin/mount_adosbase-adosfs-root +./sbin/mount_adosbase-adosfs-root ados ./sbin/mount_autofsbase-sysutil-root ./sbin/mount_cd9660base-sysutil-root
CVS commit: src
Module Name:src Committed By: nia Date: Mon Jun 6 10:56:30 UTC 2022 Modified Files: src/distrib/sets/lists/base: mi shl.mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/debug: mi shl.mi src/distrib/sets/lists/etc: mi src/distrib/sets/lists/man: mi src/distrib/sets/lists/misc: mi src/distrib/sets/lists/tests: mi src/etc: Makefile src/etc/mtree: Makefile NetBSD.dist.base NetBSD.dist.dhcpd special src/etc/rc.d: Makefile src/external/bsd: Makefile src/external/mpl: Makefile src/libexec: Makefile src/sbin: Makefile src/share/man/man5: mk.conf.5 src/share/mk: bsd.README bsd.own.mk src/sys/rump/fs: Makefile.rumpfscomp src/tests/fs: Makefile src/tests/fs/vfs: Makefile src/usr.bin: Makefile src/usr.sbin: Makefile src/usr.sbin/puffs: Makefile Log Message: build system: Revert all the recent additions of MK[...] knobs that allow conditionally disabling the building of certain user space programs in the 'base' set. There is not enough consensus that this is the right way and a few people had strong objections, see source-changes-d@. To generate a diff of this commit: cvs rdiff -u -r1.1306 -r1.1307 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.936 -r1.937 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.2415 -r1.2416 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.386 -r1.387 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.293 -r1.294 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.269 -r1.270 src/distrib/sets/lists/etc/mi cvs rdiff -u -r1.1747 -r1.1748 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.222 -r1.223 src/distrib/sets/lists/misc/mi cvs rdiff -u -r1.1209 -r1.1210 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.464 -r1.465 src/etc/Makefile cvs rdiff -u -r1.46 -r1.47 src/etc/mtree/Makefile cvs rdiff -u -r1.244 -r1.245 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.1 -r1.2 src/etc/mtree/NetBSD.dist.dhcpd cvs rdiff -u -r1.174 -r1.175 src/etc/mtree/special cvs rdiff -u -r1.115 -r1.116 src/etc/rc.d/Makefile cvs rdiff -u -r1.74 -r1.75 src/external/bsd/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mpl/Makefile cvs rdiff -u -r1.63 -r1.64 src/libexec/Makefile cvs rdiff -u -r1.137 -r1.138 src/sbin/Makefile cvs rdiff -u -r1.95 -r1.96 src/share/man/man5/mk.conf.5 cvs rdiff -u -r1.438 -r1.439 src/share/mk/bsd.README cvs rdiff -u -r1.1284 -r1.1285 src/share/mk/bsd.own.mk cvs rdiff -u -r1.9 -r1.10 src/sys/rump/fs/Makefile.rumpfscomp cvs rdiff -u -r1.24 -r1.25 src/tests/fs/Makefile cvs rdiff -u -r1.29 -r1.30 src/tests/fs/vfs/Makefile cvs rdiff -u -r1.237 -r1.238 src/usr.bin/Makefile cvs rdiff -u -r1.290 -r1.291 src/usr.sbin/Makefile cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/puffs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src
On Sun, Jun 05, 2022 at 10:30:42PM +0100, Alistair Crooks wrote: > Then you can create a target file system, possibly by using some of the > in-tree tools The idea was to use the in-tree tooling we are already using for live images, which can be adapted to add custom software by changing a configuration file. Although doing it this way is fine too. > Cutting single programs out of the initial build process is insufficient > and wrong I understand how strong your objections are. If the changes aren't reverted by the end of today, I was unable to complete a checkout due to unstable internet connectivity.
CVS commit: src/usr.sbin/makemandb
Module Name:src Committed By: skrll Date: Mon Jun 6 07:41:23 UTC 2022 Modified Files: src/usr.sbin/makemandb: makemandb.c Log Message: Don't index outside the mdocs array of function pointers. Analysis and suggested fixes from Tom Lane. I played it safe and went with (my variation of) the minimal fix. port-hppa/56118: sporadic app crashes in HPPA -current To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/usr.sbin/makemandb/makemandb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/makemandb
Module Name:src
Committed By: skrll
Date: Mon Jun 6 07:41:23 UTC 2022
Modified Files:
src/usr.sbin/makemandb: makemandb.c
Log Message:
Don't index outside the mdocs array of function pointers. Analysis and
suggested fixes from Tom Lane. I played it safe and went with (my
variation of) the minimal fix.
port-hppa/56118: sporadic app crashes in HPPA -current
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/usr.sbin/makemandb/makemandb.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/makemandb/makemandb.c
diff -u src/usr.sbin/makemandb/makemandb.c:1.62 src/usr.sbin/makemandb/makemandb.c:1.63
--- src/usr.sbin/makemandb/makemandb.c:1.62 Wed Apr 6 03:23:38 2022
+++ src/usr.sbin/makemandb/makemandb.c Mon Jun 6 07:41:23 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: makemandb.c,v 1.62 2022/04/06 03:23:38 gutteridge Exp $ */
+/* $NetBSD: makemandb.c,v 1.63 2022/06/06 07:41:23 skrll Exp $ */
/*
* Copyright (c) 2011 Abhinav Upadhyay
* Copyright (c) 2011 Kristaps Dzonsons
@@ -17,7 +17,7 @@
*/
#include
-__RCSID("$NetBSD: makemandb.c,v 1.62 2022/04/06 03:23:38 gutteridge Exp $");
+__RCSID("$NetBSD: makemandb.c,v 1.63 2022/06/06 07:41:23 skrll Exp $");
#include
#include
@@ -1078,15 +1078,18 @@ mdoc_parse_Sh(const struct roff_node *n,
if (n->type == ROFFT_TEXT) {
mdoc_parse_section(n->sec, n->string, rec);
- } else if (mdocs[n->tok] == pmdoc_Xr) {
- /*
- * When encountering other inline macros,
- * call pmdoc_macro_handler.
- */
- pmdoc_macro_handler(n, rec, MDOC_Xr);
- xr_found = 1;
- } else if (mdocs[n->tok] == pmdoc_Pp) {
- pmdoc_macro_handler(n, rec, MDOC_Pp);
+ } else if (n->tok >= MDOC_Dd && n->tok < MDOC_MAX) {
+ const int tok_idx = n->tok - MDOC_Dd;
+ if (mdocs[tok_idx] == pmdoc_Xr) {
+ /*
+ * When encountering other inline macros,
+ * call pmdoc_macro_handler.
+ */
+ pmdoc_macro_handler(n, rec, MDOC_Xr);
+ xr_found = 1;
+ } else if (mdocs[tok_idx] == pmdoc_Pp) {
+ pmdoc_macro_handler(n, rec, MDOC_Pp);
+ }
}
/*
CVS commit: src/sys/arch/hppa/include
Module Name:src
Committed By: skrll
Date: Mon Jun 6 07:22:31 UTC 2022
Modified Files:
src/sys/arch/hppa/include: ptrace.h
Log Message:
Match up PTRACE_BREAKPOINT_ASM with PTRACE_BREAKPOINT which is the
gdb breakpoint instruction.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hppa/include/ptrace.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/include/ptrace.h
diff -u src/sys/arch/hppa/include/ptrace.h:1.11 src/sys/arch/hppa/include/ptrace.h:1.12
--- src/sys/arch/hppa/include/ptrace.h:1.11 Mon Jun 6 06:41:43 2022
+++ src/sys/arch/hppa/include/ptrace.h Mon Jun 6 07:22:31 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ptrace.h,v 1.11 2022/06/06 06:41:43 skrll Exp $ */
+/* $NetBSD: ptrace.h,v 1.12 2022/06/06 07:22:31 skrll Exp $ */
/* $OpenBSD: ptrace.h,v 1.2 1998/12/01 03:05:44 mickey Exp $ */
@@ -58,8 +58,11 @@
#define PTRACE_REG_SP(r) (r)->r_regs[30]
#define PTRACE_REG_INTRV(r) (r)->r_regs[28]
+#define HPPA_BREAK_GDB 4
+#define HPPA_BREAK_GDB_SS 8
+
#define PTRACE_BREAKPOINT ((const uint8_t[]) { 0x00, 0x01, 0x00, 0x04 })
-#define PTRACE_BREAKPOINT_ASM __asm __volatile("break %0, %1" :: "i" (HPPA_BREAK_KERNEL), "i" (HPPA_BREAK_SS) : "memory")
+#define PTRACE_BREAKPOINT_ASM __asm __volatile("break %0, %1" :: "i" (HPPA_BREAK_GDB), "i" (HPPA_BREAK_GDB_SS) : "memory")
#define PTRACE_BREAKPOINT_SIZE 4
#define PTRACE_ILLEGAL_ASM __asm __volatile (".word 0x000ff000" : : : "memory")
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Mon Jun 6 07:22:31 UTC 2022 Modified Files: src/sys/arch/hppa/include: ptrace.h Log Message: Match up PTRACE_BREAKPOINT_ASM with PTRACE_BREAKPOINT which is the gdb breakpoint instruction. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hppa/include/ptrace.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src
On Sun, Jun 5, 2022 at 12:50 nia wrote: > On Sun, May 29, 2022 at 07:35:45PM +0200, J. Hannken-Illjes wrote: > > Just a side note, how do we test a build system with say 20 knobs, > > do we build all 2**20 configurations to be sure everything at > > least builds? > > > > Isn't it better to always build everything and move this selection > > into the set lists or whatever you use to get the final image? > > Just "for info" - everything knobified so far is what we'd call > a "leaf package" in pkgsc. The knob only affects the build of > that one program. > And it is still the wrong way to do this, as was mentioned by Frank previously in this thread. Apologies, I obviously didn't make myself clear If a bootable image is the endgoal, as mentioned above: Everything needs to be built first Then packages can be built - possibly using the sets you have just built, and, depending on the packages needed, even cross built Embedded systems providers would build their own software around about now Then you can create a target file system, possibly by using some of the in-tree tools Then select binaries/libraries/utilities/configs/scripts/maybe even docs can be installed onto your image Or you could go wild and build a single crunchgenned binary, with a single db file for /etc (the db file was lukem's idea at wasabi, and worked well) Or, instead of building src/xsrc into sets, try the syspkg approach Cutting single programs out of the initial build process is insufficient and wrong
CVS commit: src/sys/uvm
Module Name:src Committed By: rin Date: Mon Jun 6 07:00:02 UTC 2022 Modified Files: src/sys/uvm: uvm_map.c Log Message: PR kern/51254 uvm_map_findspace(): Output current value of "entry" when KASSERT fires. To generate a diff of this commit: cvs rdiff -u -r1.400 -r1.401 src/sys/uvm/uvm_map.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm
Module Name:src
Committed By: rin
Date: Mon Jun 6 07:00:02 UTC 2022
Modified Files:
src/sys/uvm: uvm_map.c
Log Message:
PR kern/51254
uvm_map_findspace(): Output current value of "entry" when KASSERT fires.
To generate a diff of this commit:
cvs rdiff -u -r1.400 -r1.401 src/sys/uvm/uvm_map.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/uvm/uvm_map.c
diff -u src/sys/uvm/uvm_map.c:1.400 src/sys/uvm/uvm_map.c:1.401
--- src/sys/uvm/uvm_map.c:1.400 Sun Jun 5 13:45:28 2022
+++ src/sys/uvm/uvm_map.c Mon Jun 6 07:00:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_map.c,v 1.400 2022/06/05 13:45:28 riastradh Exp $ */
+/* $NetBSD: uvm_map.c,v 1.401 2022/06/06 07:00:02 rin Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.400 2022/06/05 13:45:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.401 2022/06/06 07:00:02 rin Exp $");
#include "opt_ddb.h"
#include "opt_pax.h"
@@ -1781,24 +1781,24 @@ uvm_map_space_avail(vaddr_t *start, vsiz
static void
uvm_findspace_invariants(struct vm_map *map, vaddr_t orig_hint, vaddr_t length,
struct uvm_object *uobj, voff_t uoffset, vsize_t align, int flags,
-vaddr_t hint, int line)
+vaddr_t hint, struct vm_map_entry *entry, int line)
{
const int topdown = map->flags & VM_MAP_TOPDOWN;
KASSERTMSG( topdown || hint >= orig_hint,
"map=%p hint=%#"PRIxVADDR" orig_hint=%#"PRIxVADDR
" length=%#"PRIxVSIZE" uobj=%p uoffset=%#llx align=%"PRIxVSIZE
- " flags=%#x (uvm_map_findspace line %d)",
+ " flags=%#x entry=%p (uvm_map_findspace line %d)",
map, hint, orig_hint,
length, uobj, (unsigned long long)uoffset, align,
- flags, line);
+ flags, entry, line);
KASSERTMSG(!topdown || hint <= orig_hint,
"map=%p hint=%#"PRIxVADDR" orig_hint=%#"PRIxVADDR
" length=%#"PRIxVSIZE" uobj=%p uoffset=%#llx align=%"PRIxVSIZE
- " flags=%#x (uvm_map_findspace line %d)",
+ " flags=%#x entry=%p (uvm_map_findspace line %d)",
map, hint, orig_hint,
length, uobj, (unsigned long long)uoffset, align,
- flags, line);
+ flags, entry, line);
}
/*
@@ -1821,7 +1821,7 @@ uvm_map_findspace(struct vm_map *map, va
{
#define INVARIANTS() \
uvm_findspace_invariants(map, orig_hint, length, uobj, uoffset, align,\
- flags, hint, __LINE__)
+ flags, hint, entry, __LINE__)
struct vm_map_entry *entry;
struct vm_map_entry *child, *prev, *tmp;
vaddr_t orig_hint __diagused;
CVS commit: src/sys/arch/hppa/include
Module Name:src
Committed By: skrll
Date: Mon Jun 6 06:41:44 UTC 2022
Modified Files:
src/sys/arch/hppa/include: ptrace.h
Log Message:
Define a PTRACE_ILLEGAL_ASM
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hppa/include/ptrace.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/include/ptrace.h
diff -u src/sys/arch/hppa/include/ptrace.h:1.10 src/sys/arch/hppa/include/ptrace.h:1.11
--- src/sys/arch/hppa/include/ptrace.h:1.10 Tue Dec 24 14:50:59 2019
+++ src/sys/arch/hppa/include/ptrace.h Mon Jun 6 06:41:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ptrace.h,v 1.10 2019/12/24 14:50:59 kamil Exp $ */
+/* $NetBSD: ptrace.h,v 1.11 2022/06/06 06:41:43 skrll Exp $ */
/* $OpenBSD: ptrace.h,v 1.2 1998/12/01 03:05:44 mickey Exp $ */
@@ -62,6 +62,8 @@
#define PTRACE_BREAKPOINT_ASM __asm __volatile("break %0, %1" :: "i" (HPPA_BREAK_KERNEL), "i" (HPPA_BREAK_SS) : "memory")
#define PTRACE_BREAKPOINT_SIZE 4
+#define PTRACE_ILLEGAL_ASM __asm __volatile (".word 0x000ff000" : : : "memory")
+
#ifdef _KERNEL
#define PTRACE_LWP_GETPRIVATE(l) (l)->l_md.md_regs->tf_cr27
#endif
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Mon Jun 6 06:41:44 UTC 2022 Modified Files: src/sys/arch/hppa/include: ptrace.h Log Message: Define a PTRACE_ILLEGAL_ASM To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hppa/include/ptrace.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/hppa/sys
Module Name:src Committed By: skrll Date: Mon Jun 6 06:32:44 UTC 2022 Modified Files: src/lib/libc/arch/hppa/sys: ptrace.S Log Message: Save and restore %r19 the "linkage table pointer register" across the call to __cerror so if the ptrace syscall fails we can call __cerror again with the correct %r19 value. Do this even though the call of __cerror doesn't go via the PLT because __cerror calls __errno which does. Analysis and fix from Tom Lane in port-hppa/56864: hppa: ptrace(2) dumps core when returning an error I changed the location of where %r19 is stored on the stack to follow the ABI. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/hppa/sys/ptrace.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/hppa/sys/ptrace.S diff -u src/lib/libc/arch/hppa/sys/ptrace.S:1.7 src/lib/libc/arch/hppa/sys/ptrace.S:1.8 --- src/lib/libc/arch/hppa/sys/ptrace.S:1.7 Sat May 9 08:25:33 2020 +++ src/lib/libc/arch/hppa/sys/ptrace.S Mon Jun 6 06:32:44 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: ptrace.S,v 1.7 2020/05/09 08:25:33 skrll Exp $ */ +/* $NetBSD: ptrace.S,v 1.8 2022/06/06 06:32:44 skrll Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -42,10 +42,12 @@ ENTRY(ptrace, HPPA_FRAME_SIZE) stw %arg1, HPPA_FRAME_ARG(1)(%sp) stw %arg2, HPPA_FRAME_ARG(2)(%sp) stw %arg3, HPPA_FRAME_ARG(3)(%sp) + stw %r19, HPPA_FRAME_EDP(%sp) ldo HPPA_FRAME_SIZE(%sp),%sp bl __cerror, %rp copy %r0, %t1 ldo -HPPA_FRAME_SIZE(%sp), %sp + ldw HPPA_FRAME_EDP(%sp), %r19 ldw HPPA_FRAME_ARG(0)(%sp), %arg0 ldw HPPA_FRAME_ARG(1)(%sp), %arg1 ldw HPPA_FRAME_ARG(2)(%sp), %arg2
