Re: CVS commit: src/sys/kern

2022-09-30 Thread Paul Goyette

On Sat, 1 Oct 2022, Robert Elz wrote:


Currently fd_affix (I mistakenly made it fp_affix in the last message...)
doesn't have a flags parameter, so to do it the way you suggest, we'd need
to alter its signature, bump to 9.99.101 ...


and add some COMPAT_09 goop for backward compability  :)



... (and I haven't yet gotten around
to making my kernel be 98.99.100 which I'm kind of planning to do ...)
and go alter all the calls everywhere, mostly just filling in an extra
arg with a 0.

kre


!DSPAM:63376773211686829812153!




++--+--+
| Paul Goyette   | PGP Key fingerprint: | E-mail addresses:|
| (Retired)  | FA29 0E3B 35AF E8AE 6651 | p...@whooppee.com|
| Software Developer | 0786 F758 55DE 53BA 7731 | pgoye...@netbsd.org  |
| & Network Engineer |  | pgoyett...@gmail.com |
++--+--+


CVS commit: src/share/misc

2022-09-09 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Fri Sep  9 14:16:16 UTC 2022

Modified Files:
src/share/misc: acronyms

Log Message:
Add YMMD


To generate a diff of this commit:
cvs rdiff -u -r1.312 -r1.313 src/share/misc/acronyms

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.312 src/share/misc/acronyms:1.313
--- src/share/misc/acronyms:1.312	Thu Sep 16 08:33:24 2021
+++ src/share/misc/acronyms	Fri Sep  9 14:16:16 2022
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.312 2021/09/16 08:33:24 leot Exp $
+$NetBSD: acronyms,v 1.313 2022/09/09 14:16:16 pgoyette Exp $
 10Q	thank you
 10X	thanks
 1337	elite ("leet")
@@ -651,6 +651,7 @@ YHBT	you have been trolled
 YHL	you have lost
 YKWIM	you know what I mean
 YMMV	your mileage may vary
+YMMD	you made my day
 YOLO	you only live once
 YW	you're welcome
 YWSYLS	you win some, you lose some



CVS commit: src/share/misc

2022-09-09 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Fri Sep  9 14:16:16 UTC 2022

Modified Files:
src/share/misc: acronyms

Log Message:
Add YMMD


To generate a diff of this commit:
cvs rdiff -u -r1.312 -r1.313 src/share/misc/acronyms

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/share/man/man9

2022-09-06 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Wed Sep  7 01:18:33 UTC 2022

Modified Files:
src/share/man/man9: sysctl.9

Log Message:
Update to match recent changes in implementation.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/share/man/man9/sysctl.9

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/man9/sysctl.9
diff -u src/share/man/man9/sysctl.9:1.23 src/share/man/man9/sysctl.9:1.24
--- src/share/man/man9/sysctl.9:1.23	Wed Aug  7 19:58:50 2019
+++ src/share/man/man9/sysctl.9	Wed Sep  7 01:18:32 2022
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sysctl.9,v 1.23 2019/08/07 19:58:50 wiz Exp $
+.\"	$NetBSD: sysctl.9,v 1.24 2022/09/07 01:18:32 pgoyette Exp $
 .\"
 .\" Copyright (c) 2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd August 7, 2019
+.Dd September 6, 2022
 .Dt SYSCTL 9
 .Os
 .Sh NAME
@@ -546,7 +546,8 @@ specifically ignores any arguments given
 to zero, and returns success.
 .Sh SETUP FUNCTIONS
 Although nodes can be added to the SYSCTL tree at any time, in order to
-add nodes during the kernel bootstrap phase, a proper
+add nodes during the kernel bootstrap phase (and during loadable module
+initialization), a proper
 .Dq setup
 function must be used.
 Setup functions are declared using the
@@ -565,11 +566,11 @@ The address of the function is added to 
 traverses during initialization.
 For loadable kernel modules (see
 .Xr module 9 ) ,
-the list of functions is called from the module loader after the module's
+the list of functions is called from the module loader before the module's
 initialization routine.
 Any sysctl nodes created for the loadable module are removed using
 .Fn sysctl_teardown
-before calling the module's termination code.
+after calling the module's termination code.
 .Pp
 Setup functions do not have to add nodes to the main tree, but can set
 up their own trees for emulation or other purposes.



CVS commit: src/share/man/man9

2022-09-06 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Wed Sep  7 01:18:33 UTC 2022

Modified Files:
src/share/man/man9: sysctl.9

Log Message:
Update to match recent changes in implementation.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/share/man/man9/sysctl.9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/kern

2022-09-06 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Tue Sep  6 13:31:09 UTC 2022

Modified Files:
src/sys/kern: kern_module.c

Log Message:
Resequence the sysctl_setup and evcnt stuff so that they always occur
_before_ the module's MODULE_CMD_INIT call.  Also update the unload
code to invoke the sysctl_setup and evcnt stuff _after_ the module's
MODULE_CMD_FINI call.  This makes the behaviour and order consistent
whether the module is built-in or loaded at run-time.

As reported by riastradh@


To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/sys/kern/kern_module.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

2022-09-06 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Tue Sep  6 13:31:09 UTC 2022

Modified Files:
src/sys/kern: kern_module.c

Log Message:
Resequence the sysctl_setup and evcnt stuff so that they always occur
_before_ the module's MODULE_CMD_INIT call.  Also update the unload
code to invoke the sysctl_setup and evcnt stuff _after_ the module's
MODULE_CMD_FINI call.  This makes the behaviour and order consistent
whether the module is built-in or loaded at run-time.

As reported by riastradh@


To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/sys/kern/kern_module.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/kern_module.c
diff -u src/sys/kern/kern_module.c:1.158 src/sys/kern/kern_module.c:1.159
--- src/sys/kern/kern_module.c:1.158	Fri Aug 12 15:17:10 2022
+++ src/sys/kern/kern_module.c	Tue Sep  6 13:31:09 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_module.c,v 1.158 2022/08/12 15:17:10 riastradh Exp $	*/
+/*	$NetBSD: kern_module.c,v 1.159 2022/09/06 13:31:09 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.158 2022/08/12 15:17:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.159 2022/09/06 13:31:09 pgoyette Exp $");
 
 #define _MODULE_INTERNAL
 
@@ -1371,6 +1371,17 @@ module_do_load(const char *name, bool is
 
 	prev_active = module_active;
 	module_active = mod;
+
+	/*
+	 * Note that we handle sysctl and evcnt setup _before_ we
+	 * initialize the module itself.  This maintains a consistent
+	 * order between built-in and run-time-loaded modules.  If
+	 * initialization then fails, we'll need to undo these, too.
+	 */
+	module_load_sysctl(mod);	/* Set-up module's sysctl if any */
+	module_load_evcnt(mod);		/* Attach any static evcnt needed */
+
+
 	error = (*mi->mi_modcmd)(MODULE_CMD_INIT, filedict ? filedict : props);
 	module_active = prev_active;
 	if (filedict) {
@@ -1380,7 +1391,7 @@ module_do_load(const char *name, bool is
 	if (error != 0) {
 		module_error("modcmd(CMD_INIT) failed for `%s', error %d",
 		mi->mi_name, error);
-		goto fail;
+		goto fail3;
 	}
 
 	/*
@@ -1395,9 +1406,6 @@ module_do_load(const char *name, bool is
 		goto fail1;
 	}
 
-	module_load_sysctl(mod);	/* Set-up module's sysctl if any */
-	module_load_evcnt(mod);		/* Attach any static evcnt needed */
-
 	/*
 	 * Good, the module loaded successfully.  Put it onto the
 	 * list and add references to its requisite modules.
@@ -1423,6 +1431,16 @@ module_do_load(const char *name, bool is
 
  fail1:
 	(*mi->mi_modcmd)(MODULE_CMD_FINI, NULL);
+ fail3:
+	/*
+	 * If there were any registered SYSCTL_SETUP funcs, make sure
+	 * we release the sysctl entries
+	 */
+	if (mod->mod_sysctllog) {
+		sysctl_teardown(>mod_sysctllog);
+	}
+	/* Also detach any static evcnt's */
+	module_unload_evcnt(mod);
  fail:
 	kobj_unload(mod->mod_kobj);
  fail2:
@@ -1478,20 +1496,22 @@ module_do_unload(const char *name, bool 
 	module_active = mod;
 	module_callback_unload(mod);
 
+	/* let the module clean up after itself */
+	error = (*mod->mod_info->mi_modcmd)(MODULE_CMD_FINI, NULL);
+
 	/*
 	 * If there were any registered SYSCTL_SETUP funcs, make sure
-	 * we release the sysctl entries
+	 * we release the sysctl entries.  Same for static evcnt.
 	 */
-	if (mod->mod_sysctllog) {
-		sysctl_teardown(>mod_sysctllog);
+	if (error == 0) {
+		if (mod->mod_sysctllog) {
+			sysctl_teardown(>mod_sysctllog);
+		}
+		module_unload_evcnt(mod);
 	}
-	module_unload_evcnt(mod);
-	error = (*mod->mod_info->mi_modcmd)(MODULE_CMD_FINI, NULL);
 	module_active = prev_active;
 	if (error != 0) {
-		module_load_sysctl(mod);	/* re-enable sysctl stuff */
-		module_load_evcnt(mod);		/* and reenable evcnts */
-		module_print("cannot unload module `%s' error=%d", name,
+		module_print("could not unload module `%s' error=%d", name,
 		error);
 		return error;
 	}



CVS commit: src/sys/dev/pci

2022-08-15 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Mon Aug 15 18:06:04 UTC 2022

Modified Files:
src/sys/dev/pci: nvme_pci.c

Log Message:
Remove stray debug line (already commented out)


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/pci/nvme_pci.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/nvme_pci.c
diff -u src/sys/dev/pci/nvme_pci.c:1.36 src/sys/dev/pci/nvme_pci.c:1.37
--- src/sys/dev/pci/nvme_pci.c:1.36	Sat Jul  9 01:24:32 2022
+++ src/sys/dev/pci/nvme_pci.c	Mon Aug 15 18:06:04 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvme_pci.c,v 1.36 2022/07/09 01:24:32 pgoyette Exp $	*/
+/*	$NetBSD: nvme_pci.c,v 1.37 2022/08/15 18:06:04 pgoyette Exp $	*/
 /*	$OpenBSD: nvme_pci.c,v 1.3 2016/04/14 11:18:32 dlg Exp $ */
 
 /*
@@ -43,7 +43,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.36 2022/07/09 01:24:32 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.37 2022/08/15 18:06:04 pgoyette Exp $");
 
 #include 
 #include 
@@ -506,7 +506,6 @@ nvme_modcmd(modcmd_t cmd, void *opaque)
 		error = devsw_attach(nvme_cd.cd_name, NULL, ,
 		_cdevsw, );
 		if (error) {
-			/*XXXPRG devsw_ok = false;*/
 			aprint_error("%s: unable to register devsw, err %d\n",
 			nvme_cd.cd_name, error);
 			/* do not abort, just /dev/nvme* will not work */



CVS commit: src/sys/dev/pci

2022-08-15 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Mon Aug 15 18:06:04 UTC 2022

Modified Files:
src/sys/dev/pci: nvme_pci.c

Log Message:
Remove stray debug line (already commented out)


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/pci/nvme_pci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/modules

2022-08-09 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Tue Aug  9 20:05:14 UTC 2022

Modified Files:
src/sys/modules/ffs: Makefile
src/sys/modules/ufs: Makefile

Log Message:
Now that UFS_DIRHASH is default for biuilt-in file system modules, we
need to update the loadable module builds, too.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/modules/ffs/Makefile
cvs rdiff -u -r1.7 -r1.8 src/sys/modules/ufs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/modules

2022-08-09 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Tue Aug  9 20:05:14 UTC 2022

Modified Files:
src/sys/modules/ffs: Makefile
src/sys/modules/ufs: Makefile

Log Message:
Now that UFS_DIRHASH is default for biuilt-in file system modules, we
need to update the loadable module builds, too.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/modules/ffs/Makefile
cvs rdiff -u -r1.7 -r1.8 src/sys/modules/ufs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/ffs/Makefile
diff -u src/sys/modules/ffs/Makefile:1.21 src/sys/modules/ffs/Makefile:1.22
--- src/sys/modules/ffs/Makefile:1.21	Sat Jan  8 01:58:16 2022
+++ src/sys/modules/ffs/Makefile	Tue Aug  9 20:05:14 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.21 2022/01/08 01:58:16 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.22 2022/08/09 20:05:14 pgoyette Exp $
 
 .include "../Makefile.inc"
 
@@ -6,8 +6,7 @@
 
 KMOD=	ffs
 CPPFLAGS+=	-DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
-CPPFLAGS+=	-DUFS_EXTATTR -DUFS_ACL
-#CPPFLAGS+=	-DUFS_DIRHASH	# disabled - suspected of corrupting memory
+CPPFLAGS+=	-DUFS_EXTATTR -DUFS_ACL -DUFS_DIRHASH
 
 CWARNFLAGS.clang=	-Wno-conversion
 COPTS.ffs_appleufs.c+=   ${NO_ADDR_OF_PACKED_MEMBER}

Index: src/sys/modules/ufs/Makefile
diff -u src/sys/modules/ufs/Makefile:1.7 src/sys/modules/ufs/Makefile:1.8
--- src/sys/modules/ufs/Makefile:1.7	Sat Jan  8 02:00:49 2022
+++ src/sys/modules/ufs/Makefile	Tue Aug  9 20:05:14 2022
@@ -1,12 +1,11 @@
-#	$NetBSD: Makefile,v 1.7 2022/01/08 02:00:49 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.8 2022/08/09 20:05:14 pgoyette Exp $
 
 .include "../Makefile.inc"
 
 KMOD=	ufs
 
 CPPFLAGS+=	-DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
-CPPFLAGS+=	-DUFS_EXTATTR -DUFS_ACL
-#CPPFLAGS+=	-DUFS_DIRHASH	# disabled - suspected of corrupting memory
+CPPFLAGS+=	-DUFS_EXTATTR -DUFS_ACL -DUFS_DIRHASH
 
 CWARNFLAGS.clang=	-Wno-conversion
 



Re: CVS commit: src/sys/kern

2022-08-07 Thread Paul Goyette

On Sun, 7 Aug 2022, Paul Goyette wrote:


On Sun, 7 Aug 2022, Taylor R Campbell wrote:


Module Name:src
Committed By:   riastradh
Date:   Sun Aug  7 21:17:18 UTC 2022

Modified Files:
src/sys/kern: kern_module.c

Log Message:
module(9): Disable module autounload by default.

I don't know why this was ever enabled by default; many modules are
still not safe to unload, let alone autounload.  If any autounload is
to happen by default, it should only be for modules that have opted
into it in some way after audit.


One reason for the current behavior involves the modules used for
various emulations.  When a file is executed, and none of the
currently-loaded modules can "deal" with it, we load _all_ of the
available emulation modules with the hope that one of them will
"deal with" the new executable, and with the expectation that the
remaining emulation modules will just "go away".

Modules that are known to be unsafe to unload should declare that
in their modcmd() unload (by returning EBUSY).  After all, one
might well expect that the module itself is the most likely place
that the unloadable status would be known.

Making no-autounload as the default seems like using a 20-pound
sledge hammer on a carpet tack.


I might also note that making such a fundamental behavior change
when we're so close to the -10 release, without actually providing
the suggested "opt-in" mechanism to retain current behavior, is
not very user friendly.   :-)

At least this should be discussed (on tech-kern@, perhaps) before
being unilaterally decided and committed.  IIRC, we had this
discussion some time ago, and the decision at that time was to
retain current behavior.  Unfortunately, I didn't save any pointer
to that old discussion.  :-(




++------+--+
| Paul Goyette   | PGP Key fingerprint: | E-mail addresses:|
| (Retired)  | FA29 0E3B 35AF E8AE 6651 | p...@whooppee.com|
| Software Developer | 0786 F758 55DE 53BA 7731 | pgoye...@netbsd.org  |
| & Network Engineer |  | pgoyett...@gmail.com |
++--+--+

!DSPAM:62f0321a29502088639869!




++------+--+
| Paul Goyette   | PGP Key fingerprint: | E-mail addresses:|
| (Retired)  | FA29 0E3B 35AF E8AE 6651 | p...@whooppee.com|
| Software Developer | 0786 F758 55DE 53BA 7731 | pgoye...@netbsd.org  |
| & Network Engineer |  | pgoyett...@gmail.com |
++--+--+


Re: CVS commit: src/sys/kern

2022-08-07 Thread Paul Goyette

On Sun, 7 Aug 2022, Taylor R Campbell wrote:


Module Name:src
Committed By:   riastradh
Date:   Sun Aug  7 21:17:18 UTC 2022

Modified Files:
src/sys/kern: kern_module.c

Log Message:
module(9): Disable module autounload by default.

I don't know why this was ever enabled by default; many modules are
still not safe to unload, let alone autounload.  If any autounload is
to happen by default, it should only be for modules that have opted
into it in some way after audit.


One reason for the current behavior involves the modules used for
various emulations.  When a file is executed, and none of the
currently-loaded modules can "deal" with it, we load _all_ of the
available emulation modules with the hope that one of them will
"deal with" the new executable, and with the expectation that the
remaining emulation modules will just "go away".

Modules that are known to be unsafe to unload should declare that
in their modcmd() unload (by returning EBUSY).  After all, one
might well expect that the module itself is the most likely place
that the unloadable status would be known.

Making no-autounload as the default seems like using a 20-pound
sledge hammer on a carpet tack.


++------+------+
| Paul Goyette   | PGP Key fingerprint: | E-mail addresses:|
| (Retired)  | FA29 0E3B 35AF E8AE 6651 | p...@whooppee.com|
| Software Developer | 0786 F758 55DE 53BA 7731 | pgoye...@netbsd.org  |
| & Network Engineer |  | pgoyett...@gmail.com |
++--+--+


CVS commit: src/distrib/amd64/installimage

2022-07-29 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Jul 30 00:55:38 UTC 2022

Modified Files:
src/distrib/amd64/installimage: installimage.mk

Log Message:
The new drm modules made the image file grow again!  Bump the size
limit a bit.

XXX Other $ARCH might also need this.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/installimage/installimage.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/amd64/installimage

2022-07-29 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Jul 30 00:55:38 UTC 2022

Modified Files:
src/distrib/amd64/installimage: installimage.mk

Log Message:
The new drm modules made the image file grow again!  Bump the size
limit a bit.

XXX Other $ARCH might also need this.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/installimage/installimage.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/amd64/installimage/installimage.mk
diff -u src/distrib/amd64/installimage/installimage.mk:1.2 src/distrib/amd64/installimage/installimage.mk:1.3
--- src/distrib/amd64/installimage/installimage.mk:1.2	Sun May 22 19:32:41 2022
+++ src/distrib/amd64/installimage/installimage.mk	Sat Jul 30 00:55:38 2022
@@ -1,12 +1,12 @@
-#	$NetBSD: installimage.mk,v 1.2 2022/05/22 19:32:41 jmcneill Exp $
+#	$NetBSD: installimage.mk,v 1.3 2022/07/30 00:55:38 pgoyette Exp $
 
 # common code between distrib/amd64/installimage/Makefile and
 # distrib/amd64/installimage-bios/Makefile.
 
 .if ${USE_XZ_SETS:Uno} != "no"
-INSTIMAGEMB?=	2250			# for all installation binaries
+INSTIMAGEMB?=	2500			# for all installation binaries
 .else
-INSTIMAGEMB?=	3500			# for all installation binaries
+INSTIMAGEMB?=	4000			# for all installation binaries
 .endif
 
 PRIMARY_BOOT=		bootxx_ffsv1



CVS commit: src/distrib/sets/lists/debug

2022-07-27 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Jul 28 00:33:57 UTC 2022

Modified Files:
src/distrib/sets/lists/debug: module.md.amd64

Log Message:
And, we're not ready for 10.0 yet, so remove a couple premature lines!

Thanks, Rin!


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/debug/module.md.amd64

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/debug/module.md.amd64
diff -u src/distrib/sets/lists/debug/module.md.amd64:1.9 src/distrib/sets/lists/debug/module.md.amd64:1.10
--- src/distrib/sets/lists/debug/module.md.amd64:1.9	Thu Jul 28 00:14:40 2022
+++ src/distrib/sets/lists/debug/module.md.amd64	Thu Jul 28 00:33:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: module.md.amd64,v 1.9 2022/07/28 00:14:40 pgoyette Exp $
+# $NetBSD: module.md.amd64,v 1.10 2022/07/28 00:33:57 pgoyette Exp $
 ./usr/libdata/debug/@MODULEDIR@/acpiacadmodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/acpiacad/acpiacad.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/acpibatmodules-base-kernel	kmod,debug
@@ -75,10 +75,6 @@
 ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_80/compat_netbsd32_80.kmod.debug modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_90		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_90/compat_netbsd32_90.kmod.debug modules-base-kernel	kmod,debug
-./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_100		modules-base-kernel	kmod,debug
-./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_100/compat_netbsd32_100.kmod.debug modules-base-kernel	kmod,debug
-./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_coredump		modules-base-kernel	kmod,debug
-./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_coredump/compat_netbsd32_coredump.kmod.debug	modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_mqueue		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_mqueue/compat_netbsd32_mqueue.kmod.debug	modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_nfssrv		modules-base-kernel	kmod,debug



CVS commit: src/distrib/sets/lists/debug

2022-07-27 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Jul 28 00:33:57 UTC 2022

Modified Files:
src/distrib/sets/lists/debug: module.md.amd64

Log Message:
And, we're not ready for 10.0 yet, so remove a couple premature lines!

Thanks, Rin!


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/debug/module.md.amd64

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/sets/lists/debug

2022-07-27 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Jul 28 00:14:40 UTC 2022

Modified Files:
src/distrib/sets/lists/debug: module.md.amd64

Log Message:
remove duplicate entry and blank line that crept in from somewhere.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/debug/module.md.amd64

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/sets/lists/debug

2022-07-27 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Jul 28 00:14:40 UTC 2022

Modified Files:
src/distrib/sets/lists/debug: module.md.amd64

Log Message:
remove duplicate entry and blank line that crept in from somewhere.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/debug/module.md.amd64

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/debug/module.md.amd64
diff -u src/distrib/sets/lists/debug/module.md.amd64:1.8 src/distrib/sets/lists/debug/module.md.amd64:1.9
--- src/distrib/sets/lists/debug/module.md.amd64:1.8	Wed Jul 27 20:34:30 2022
+++ src/distrib/sets/lists/debug/module.md.amd64	Thu Jul 28 00:14:40 2022
@@ -1,4 +1,4 @@
-# $NetBSD: module.md.amd64,v 1.8 2022/07/27 20:34:30 pgoyette Exp $
+# $NetBSD: module.md.amd64,v 1.9 2022/07/28 00:14:40 pgoyette Exp $
 ./usr/libdata/debug/@MODULEDIR@/acpiacadmodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/acpiacad/acpiacad.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/acpibatmodules-base-kernel	kmod,debug
@@ -29,8 +29,6 @@
 ./usr/libdata/debug/@MODULEDIR@/aibs/aibs.kmod.debug			modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/amdgpumodules-base-kernel kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/amdgpu/amdgpu.kmod.debug	modules-base-kernel kmod,debug
- ./usr/libdata/debug/@MODULEDIR@/amdsmn modules-base-kernel kmod,debug
-
 ./usr/libdata/debug/@MODULEDIR@/amdsmnmodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/amdsmn/amdsmn.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/amdtempmodules-base-kernel	kmod,debug
@@ -77,6 +75,8 @@
 ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_80/compat_netbsd32_80.kmod.debug modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_90		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_90/compat_netbsd32_90.kmod.debug modules-base-kernel	kmod,debug
+./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_100		modules-base-kernel	kmod,debug
+./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_100/compat_netbsd32_100.kmod.debug modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_coredump		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_coredump/compat_netbsd32_coredump.kmod.debug	modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/compat_netbsd32_mqueue		modules-base-kernel	kmod,debug



CVS commit: src/distrib/sets/lists/debug

2022-07-27 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Wed Jul 27 20:34:30 UTC 2022

Modified Files:
src/distrib/sets/lists/debug: module.md.amd64 module.md.i386

Log Message:
Oopppss, /usr has no `e'  :)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/debug/module.md.amd64
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug/module.md.i386

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/sets/lists/debug

2022-07-27 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Wed Jul 27 20:34:30 UTC 2022

Modified Files:
src/distrib/sets/lists/debug: module.md.amd64 module.md.i386

Log Message:
Oopppss, /usr has no `e'  :)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/debug/module.md.amd64
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug/module.md.i386

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/module.md.amd64
diff -u src/distrib/sets/lists/debug/module.md.amd64:1.7 src/distrib/sets/lists/debug/module.md.amd64:1.8
--- src/distrib/sets/lists/debug/module.md.amd64:1.7	Wed Jul 27 20:28:41 2022
+++ src/distrib/sets/lists/debug/module.md.amd64	Wed Jul 27 20:34:30 2022
@@ -1,4 +1,4 @@
-# $NetBSD: module.md.amd64,v 1.7 2022/07/27 20:28:41 pgoyette Exp $
+# $NetBSD: module.md.amd64,v 1.8 2022/07/27 20:34:30 pgoyette Exp $
 ./usr/libdata/debug/@MODULEDIR@/acpiacadmodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/acpiacad/acpiacad.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/acpibatmodules-base-kernel	kmod,debug
@@ -27,8 +27,8 @@
 ./usr/libdata/debug/@MODULEDIR@/acpiwmi/acpiwmi.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/aibsmodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/aibs/aibs.kmod.debug			modules-base-kernel	kmod,debug
-./user/libdata/debug/@MODULEDIR@/amdgpumodules-base-kernel kmod,debug
-./user/libdata/debug/@MODULEDIR@/amdgpu/amdgpu.kmod.debug	modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/amdgpumodules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/amdgpu/amdgpu.kmod.debug	modules-base-kernel kmod,debug
  ./usr/libdata/debug/@MODULEDIR@/amdsmn modules-base-kernel kmod,debug
 
 ./usr/libdata/debug/@MODULEDIR@/amdsmnmodules-base-kernel	kmod,debug

Index: src/distrib/sets/lists/debug/module.md.i386
diff -u src/distrib/sets/lists/debug/module.md.i386:1.5 src/distrib/sets/lists/debug/module.md.i386:1.6
--- src/distrib/sets/lists/debug/module.md.i386:1.5	Wed Jul 27 20:28:41 2022
+++ src/distrib/sets/lists/debug/module.md.i386	Wed Jul 27 20:34:30 2022
@@ -1,4 +1,4 @@
-# $NetBSD: module.md.i386,v 1.5 2022/07/27 20:28:41 pgoyette Exp $
+# $NetBSD: module.md.i386,v 1.6 2022/07/27 20:34:30 pgoyette Exp $
 ./usr/libdata/debug/@MODULEDIR@/acpiacadmodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/acpiacad/acpiacad.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/acpibatmodules-base-kernel	kmod,debug
@@ -27,8 +27,8 @@
 ./usr/libdata/debug/@MODULEDIR@/acpiwmi/acpiwmi.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/aibsmodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/aibs/aibs.kmod.debug			modules-base-kernel	kmod,debug
-./user/libdata/debug/@MODULEDIR@/amdgpumodules-base-kernel kmod,debug
-./user/libdata/debug/@MODULEDIR@/amdgpu/amdgpu.kmod.debug	modules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/amdgpumodules-base-kernel kmod,debug
+./usr/libdata/debug/@MODULEDIR@/amdgpu/amdgpu.kmod.debug	modules-base-kernel kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/amdsmnmodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/amdsmn/amdsmn.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/amdtempmodules-base-kernel	kmod,debug



CVS commit: src/distrib/sets/lists/debug

2022-07-27 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Wed Jul 27 20:28:41 UTC 2022

Modified Files:
src/distrib/sets/lists/debug: module.md.amd64 module.md.i386

Log Message:
Include debug files for new amdgpu modules


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/debug/module.md.amd64
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug/module.md.i386

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/module.md.amd64
diff -u src/distrib/sets/lists/debug/module.md.amd64:1.6 src/distrib/sets/lists/debug/module.md.amd64:1.7
--- src/distrib/sets/lists/debug/module.md.amd64:1.6	Sat Sep 25 17:55:37 2021
+++ src/distrib/sets/lists/debug/module.md.amd64	Wed Jul 27 20:28:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: module.md.amd64,v 1.6 2021/09/25 17:55:37 maya Exp $
+# $NetBSD: module.md.amd64,v 1.7 2022/07/27 20:28:41 pgoyette Exp $
 ./usr/libdata/debug/@MODULEDIR@/acpiacadmodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/acpiacad/acpiacad.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/acpibatmodules-base-kernel	kmod,debug
@@ -27,6 +27,10 @@
 ./usr/libdata/debug/@MODULEDIR@/acpiwmi/acpiwmi.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/aibsmodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/aibs/aibs.kmod.debug			modules-base-kernel	kmod,debug
+./user/libdata/debug/@MODULEDIR@/amdgpumodules-base-kernel kmod,debug
+./user/libdata/debug/@MODULEDIR@/amdgpu/amdgpu.kmod.debug	modules-base-kernel kmod,debug
+ ./usr/libdata/debug/@MODULEDIR@/amdsmn modules-base-kernel kmod,debug
+
 ./usr/libdata/debug/@MODULEDIR@/amdsmnmodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/amdsmn/amdsmn.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/amdtempmodules-base-kernel	kmod,debug

Index: src/distrib/sets/lists/debug/module.md.i386
diff -u src/distrib/sets/lists/debug/module.md.i386:1.4 src/distrib/sets/lists/debug/module.md.i386:1.5
--- src/distrib/sets/lists/debug/module.md.i386:1.4	Sat Sep 25 17:55:37 2021
+++ src/distrib/sets/lists/debug/module.md.i386	Wed Jul 27 20:28:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: module.md.i386,v 1.4 2021/09/25 17:55:37 maya Exp $
+# $NetBSD: module.md.i386,v 1.5 2022/07/27 20:28:41 pgoyette Exp $
 ./usr/libdata/debug/@MODULEDIR@/acpiacadmodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/acpiacad/acpiacad.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/acpibatmodules-base-kernel	kmod,debug
@@ -27,6 +27,8 @@
 ./usr/libdata/debug/@MODULEDIR@/acpiwmi/acpiwmi.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/aibsmodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/aibs/aibs.kmod.debug			modules-base-kernel	kmod,debug
+./user/libdata/debug/@MODULEDIR@/amdgpumodules-base-kernel kmod,debug
+./user/libdata/debug/@MODULEDIR@/amdgpu/amdgpu.kmod.debug	modules-base-kernel kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/amdsmnmodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/amdsmn/amdsmn.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/amdtempmodules-base-kernel	kmod,debug



CVS commit: src/distrib/sets/lists/debug

2022-07-27 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Wed Jul 27 20:28:41 UTC 2022

Modified Files:
src/distrib/sets/lists/debug: module.md.amd64 module.md.i386

Log Message:
Include debug files for new amdgpu modules


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/debug/module.md.amd64
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug/module.md.i386

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



Re: CVS commit: src

2022-07-27 Thread Paul Goyette

On Wed, 27 Jul 2022, Paul Goyette wrote:


If you're going to add new modules, please also update the
debug-module sets info!  :)


The following should work (watch out for spaces-vs-tabs)

Index: module.md.i386
===
RCS file: /cvsroot/src/distrib/sets/lists/debug/module.md.i386,v
retrieving revision 1.4
diff -u -p -r1.4 module.md.i386
--- module.md.i386  25 Sep 2021 17:55:37 -  1.4
+++ module.md.i386  27 Jul 2022 19:51:40 -
@@ -27,6 +27,8 @@
 ./usr/libdata/debug/@MODULEDIR@/acpiwmi/acpiwmi.kmod.debug 
modules-base-kernel kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/aibs 
modules-base-kernel kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/aibs/aibs.kmod.debug 
modules-base-kernel kmod,debug
+./user/libdata/debug/@MODULEDIR@/amdgpu 
modules-base-kernel kmod
+./user/libdata/debug/@MODULEDIR@/amdgpu/amdgpu.kmod.debug 
modules-base-kernel kmod
 ./usr/libdata/debug/@MODULEDIR@/amdsmn 
modules-base-kernel kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/amdsmn/amdsmn.kmod.debug 
modules-base-kernel kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/amdtemp 
modules-base-kernel kmod,debug

Index: module.md.amd64
===
RCS file: /cvsroot/src/distrib/sets/lists/debug/module.md.amd64,v
retrieving revision 1.6
diff -u -p -r1.6 module.md.amd64
--- module.md.amd64 25 Sep 2021 17:55:37 -  1.6
+++ module.md.amd64 27 Jul 2022 19:51:40 -
@@ -27,6 +27,8 @@
 ./usr/libdata/debug/@MODULEDIR@/acpiwmi/acpiwmi.kmod.debug 
modules-base-kernel kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/aibs 
modules-base-kernel kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/aibs/aibs.kmod.debug 
modules-base-kernel kmod,debug
+./user/libdata/debug/@MODULEDIR@/amdgpu 
modules-base-kernel kmod
+.user/libdata/debug//@MODULEDIR@/amdgpu/amdgpu.kmod.debug 
modules-base-kernel kmod
 ./usr/libdata/debug/@MODULEDIR@/amdsmn 
modules-base-kernel kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/amdsmn/amdsmn.kmod.debug 
modules-base-kernel kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/amdtemp 
modules-base-kernel kmod,debug

@@ -163,6 +165,10 @@





On Wed, 27 Jul 2022, Maya Rashish wrote:


Module Name:src
Committed By:   maya
Date:   Wed Jul 27 18:29:35 UTC 2022

Modified Files:
src/distrib/sets/lists/modules: md.amd64 md.i386
src/share/mk: bsd.own.mk
src/sys/modules: Makefile

Log Message:
Enable amdgpu module & firmware on x86

Make it easier to test this one out, add `load amdgpu` before boot netbsd.

XXX there should probably be a drm block in sys/modules/Makefile which
includes aarch64.


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.1286 -r1.1287 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.267 -r1.268 src/sys/modules/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.







++--+--+
| Paul Goyette   | PGP Key fingerprint: | E-mail addresses:|
| (Retired)  | FA29 0E3B 35AF E8AE 6651 | p...@whooppee.com|
| Software Developer | 0786 F758 55DE 53BA 7731 | pgoye...@netbsd.org  |
| & Network Engineer |  | pgoyett...@gmail.com |
++--+--+

!DSPAM:62e18f4e100851469358365!




++--+--+
| Paul Goyette   | PGP Key fingerprint: | E-mail addresses:|
| (Retired)  | FA29 0E3B 35AF E8AE 6651 | p...@whooppee.com|
| Software Developer | 0786 F758 55DE 53BA 7731 | pgoye...@netbsd.org  |
| & Network Engineer |  | pgoyett...@gmail.com |
++--+--+


Re: CVS commit: src

2022-07-27 Thread Paul Goyette

If you're going to add new modules, please also update the
debug-module sets info!  :)


On Wed, 27 Jul 2022, Maya Rashish wrote:


Module Name:src
Committed By:   maya
Date:   Wed Jul 27 18:29:35 UTC 2022

Modified Files:
src/distrib/sets/lists/modules: md.amd64 md.i386
src/share/mk: bsd.own.mk
src/sys/modules: Makefile

Log Message:
Enable amdgpu module & firmware on x86

Make it easier to test this one out, add `load amdgpu` before boot netbsd.

XXX there should probably be a drm block in sys/modules/Makefile which
includes aarch64.


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.1286 -r1.1287 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.267 -r1.268 src/sys/modules/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


!DSPAM:62e1843519657999028606!




++--+--+
| Paul Goyette   | PGP Key fingerprint: | E-mail addresses:|
| (Retired)  | FA29 0E3B 35AF E8AE 6651 | p...@whooppee.com|
| Software Developer | 0786 F758 55DE 53BA 7731 | pgoye...@netbsd.org  |
| & Network Engineer |  | pgoyett...@gmail.com |
++--+--+


CVS commit: src/share/man/man7

2022-07-25 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Mon Jul 25 14:46:53 UTC 2022

Modified Files:
src/share/man/man7: sysctl.7

Log Message:
kern.maxvnodes _can_ be lowered, but not below the number of currently
active vnodes.


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/share/man/man7/sysctl.7

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/man7/sysctl.7
diff -u src/share/man/man7/sysctl.7:1.156 src/share/man/man7/sysctl.7:1.157
--- src/share/man/man7/sysctl.7:1.156	Sun Dec  5 07:35:17 2021
+++ src/share/man/man7/sysctl.7	Mon Jul 25 14:46:53 2022
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sysctl.7,v 1.156 2021/12/05 07:35:17 msaitoh Exp $
+.\"	$NetBSD: sysctl.7,v 1.157 2022/07/25 14:46:53 pgoyette Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)sysctl.3	8.4 (Berkeley) 5/9/95
 .\"
-.Dd December 5, 2021
+.Dd July 25, 2022
 .Dt SYSCTL 7
 .Os
 .Sh NAME
@@ -778,7 +778,7 @@ See also
 .Xr pty 4 .
 .It Li kern.maxvnodes ( Dv KERN_MAXVNODES )
 The maximum number of vnodes available on the system.
-This can only be raised.
+This cannot be lowered below the number of currently active vnodes.
 .It Li kern.mbuf ( Dv KERN_MBUF )
 Return information about the mbuf control variables.
 Mbufs are data structures which store network packets and other data



CVS commit: src/share/man/man7

2022-07-25 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Mon Jul 25 14:46:53 UTC 2022

Modified Files:
src/share/man/man7: sysctl.7

Log Message:
kern.maxvnodes _can_ be lowered, but not below the number of currently
active vnodes.


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/share/man/man7/sysctl.7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/pci

2022-07-08 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Jul  9 01:24:32 UTC 2022

Modified Files:
src/sys/dev/pci: nvme_pci.c

Log Message:
Remove redundant ``devsw_ok = false;''

Thanks mrg@


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pci/nvme_pci.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/nvme_pci.c
diff -u src/sys/dev/pci/nvme_pci.c:1.35 src/sys/dev/pci/nvme_pci.c:1.36
--- src/sys/dev/pci/nvme_pci.c:1.35	Fri Jul  8 17:32:19 2022
+++ src/sys/dev/pci/nvme_pci.c	Sat Jul  9 01:24:32 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvme_pci.c,v 1.35 2022/07/08 17:32:19 pgoyette Exp $	*/
+/*	$NetBSD: nvme_pci.c,v 1.36 2022/07/09 01:24:32 pgoyette Exp $	*/
 /*	$OpenBSD: nvme_pci.c,v 1.3 2016/04/14 11:18:32 dlg Exp $ */
 
 /*
@@ -43,7 +43,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.35 2022/07/08 17:32:19 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.36 2022/07/09 01:24:32 pgoyette Exp $");
 
 #include 
 #include 
@@ -506,7 +506,7 @@ nvme_modcmd(modcmd_t cmd, void *opaque)
 		error = devsw_attach(nvme_cd.cd_name, NULL, ,
 		_cdevsw, );
 		if (error) {
-			devsw_ok = false;
+			/*XXXPRG devsw_ok = false;*/
 			aprint_error("%s: unable to register devsw, err %d\n",
 			nvme_cd.cd_name, error);
 			/* do not abort, just /dev/nvme* will not work */



CVS commit: src/sys/dev/pci

2022-07-08 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Jul  9 01:24:32 UTC 2022

Modified Files:
src/sys/dev/pci: nvme_pci.c

Log Message:
Remove redundant ``devsw_ok = false;''

Thanks mrg@


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pci/nvme_pci.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/dev/pci

2022-07-08 Thread Paul Goyette

On Sat, 9 Jul 2022, matthew green wrote:


"Paul Goyette" writes:

Module Name:src
Committed By:   pgoyette
Date:   Fri Jul  8 17:32:19 UTC 2022

Modified Files:
src/sys/dev/pci: nvme_pci.c

Log Message:
devsw_ok needs to survive across invocations of nvme_modcmd() so
allocate it statically.

Should address remaining issues with kern/56914


   if (error) {
+   devsw_ok = false;


shouldn't devsw_ok be "false" here already?  seems more like
something to ASSERT() than assign.


Yeah, this is likely unnecessary now.  It got there during a
debug iteration.

I will remove.


++--+------+
| Paul Goyette   | PGP Key fingerprint: | E-mail addresses:|
| (Retired)  | FA29 0E3B 35AF E8AE 6651 | p...@whooppee.com|
| Software Developer | 0786 F758 55DE 53BA 7731 | pgoye...@netbsd.org  |
| & Network Engineer |  | pgoyett...@gmail.com |
++--+--+


CVS commit: src/sys/dev/pci

2022-07-08 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Fri Jul  8 17:32:19 UTC 2022

Modified Files:
src/sys/dev/pci: nvme_pci.c

Log Message:
devsw_ok needs to survive across invocations of nvme_modcmd() so
allocate it statically.

Should address remaining issues with kern/56914


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pci/nvme_pci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/pci

2022-07-08 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Fri Jul  8 17:32:19 UTC 2022

Modified Files:
src/sys/dev/pci: nvme_pci.c

Log Message:
devsw_ok needs to survive across invocations of nvme_modcmd() so
allocate it statically.

Should address remaining issues with kern/56914


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pci/nvme_pci.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/nvme_pci.c
diff -u src/sys/dev/pci/nvme_pci.c:1.34 src/sys/dev/pci/nvme_pci.c:1.35
--- src/sys/dev/pci/nvme_pci.c:1.34	Fri Jul  8 16:10:34 2022
+++ src/sys/dev/pci/nvme_pci.c	Fri Jul  8 17:32:19 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvme_pci.c,v 1.34 2022/07/08 16:10:34 pgoyette Exp $	*/
+/*	$NetBSD: nvme_pci.c,v 1.35 2022/07/08 17:32:19 pgoyette Exp $	*/
 /*	$OpenBSD: nvme_pci.c,v 1.3 2016/04/14 11:18:32 dlg Exp $ */
 
 /*
@@ -43,7 +43,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.34 2022/07/08 16:10:34 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.35 2022/07/08 17:32:19 pgoyette Exp $");
 
 #include 
 #include 
@@ -495,7 +495,7 @@ nvme_modcmd(modcmd_t cmd, void *opaque)
 #ifdef _MODULE
 	devmajor_t cmajor, bmajor;
 	extern const struct cdevsw nvme_cdevsw;
-	bool devsw_ok = false;
+	static bool devsw_ok;
 #endif
 	int error = 0;
 
@@ -506,6 +506,7 @@ nvme_modcmd(modcmd_t cmd, void *opaque)
 		error = devsw_attach(nvme_cd.cd_name, NULL, ,
 		_cdevsw, );
 		if (error) {
+			devsw_ok = false;
 			aprint_error("%s: unable to register devsw, err %d\n",
 			nvme_cd.cd_name, error);
 			/* do not abort, just /dev/nvme* will not work */
@@ -516,16 +517,20 @@ nvme_modcmd(modcmd_t cmd, void *opaque)
 		error = config_init_component(cfdriver_ioconf_nvme_pci,
 		cfattach_ioconf_nvme_pci, cfdata_ioconf_nvme_pci);
 		if (error) {
-			if (devsw_ok)
+			if (devsw_ok) {
 devsw_detach(NULL, _cdevsw);
+devsw_ok = false;
+			}
 			break;
 		}
 		break;
 	case MODULE_CMD_FINI:
 		error = config_fini_component(cfdriver_ioconf_nvme_pci,
 		cfattach_ioconf_nvme_pci, cfdata_ioconf_nvme_pci);
-		if (devsw_ok)
+		if (devsw_ok) {
 			devsw_detach(NULL, _cdevsw);
+			devsw_ok = false;
+		}
 		break;
 	default:
 		break;



CVS commit: src/sys/dev/pci

2022-07-08 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Fri Jul  8 16:10:34 UTC 2022

Modified Files:
src/sys/dev/pci: nvme_pci.c

Log Message:
Initialize cmajor & bmajor so the devsw_attach() has a chance of
succeeding.

Record the success of devsw_attach(), and do not try later to
devsw_detach() unless the attach succeeded.

Partial fix for kern/56914


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/pci/nvme_pci.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/nvme_pci.c
diff -u src/sys/dev/pci/nvme_pci.c:1.33 src/sys/dev/pci/nvme_pci.c:1.34
--- src/sys/dev/pci/nvme_pci.c:1.33	Thu Jul  7 23:54:17 2022
+++ src/sys/dev/pci/nvme_pci.c	Fri Jul  8 16:10:34 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvme_pci.c,v 1.33 2022/07/07 23:54:17 pgoyette Exp $	*/
+/*	$NetBSD: nvme_pci.c,v 1.34 2022/07/08 16:10:34 pgoyette Exp $	*/
 /*	$OpenBSD: nvme_pci.c,v 1.3 2016/04/14 11:18:32 dlg Exp $ */
 
 /*
@@ -43,7 +43,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.33 2022/07/07 23:54:17 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.34 2022/07/08 16:10:34 pgoyette Exp $");
 
 #include 
 #include 
@@ -495,12 +495,14 @@ nvme_modcmd(modcmd_t cmd, void *opaque)
 #ifdef _MODULE
 	devmajor_t cmajor, bmajor;
 	extern const struct cdevsw nvme_cdevsw;
+	bool devsw_ok = false;
 #endif
 	int error = 0;
 
 #ifdef _MODULE
 	switch (cmd) {
 	case MODULE_CMD_INIT:
+		bmajor = cmajor = NODEVMAJOR;
 		error = devsw_attach(nvme_cd.cd_name, NULL, ,
 		_cdevsw, );
 		if (error) {
@@ -508,18 +510,22 @@ nvme_modcmd(modcmd_t cmd, void *opaque)
 			nvme_cd.cd_name, error);
 			/* do not abort, just /dev/nvme* will not work */
 		}
+		else
+			devsw_ok = true;
+
 		error = config_init_component(cfdriver_ioconf_nvme_pci,
 		cfattach_ioconf_nvme_pci, cfdata_ioconf_nvme_pci);
 		if (error) {
-			devsw_detach(NULL, _cdevsw);
+			if (devsw_ok)
+devsw_detach(NULL, _cdevsw);
 			break;
 		}
-		bmajor = cmajor = NODEVMAJOR;
 		break;
 	case MODULE_CMD_FINI:
 		error = config_fini_component(cfdriver_ioconf_nvme_pci,
 		cfattach_ioconf_nvme_pci, cfdata_ioconf_nvme_pci);
-		devsw_detach(NULL, _cdevsw);
+		if (devsw_ok)
+			devsw_detach(NULL, _cdevsw);
 		break;
 	default:
 		break;



CVS commit: src/sys/dev/pci

2022-07-08 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Fri Jul  8 16:10:34 UTC 2022

Modified Files:
src/sys/dev/pci: nvme_pci.c

Log Message:
Initialize cmajor & bmajor so the devsw_attach() has a chance of
succeeding.

Record the success of devsw_attach(), and do not try later to
devsw_detach() unless the attach succeeded.

Partial fix for kern/56914


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/pci/nvme_pci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/pci

2022-07-07 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Jul  7 23:54:17 UTC 2022

Modified Files:
src/sys/dev/pci: nvme_pci.c

Log Message:
Add errno tto message when fail to attach the devsw


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/nvme_pci.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/nvme_pci.c
diff -u src/sys/dev/pci/nvme_pci.c:1.32 src/sys/dev/pci/nvme_pci.c:1.33
--- src/sys/dev/pci/nvme_pci.c:1.32	Thu Mar 31 19:30:16 2022
+++ src/sys/dev/pci/nvme_pci.c	Thu Jul  7 23:54:17 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvme_pci.c,v 1.32 2022/03/31 19:30:16 pgoyette Exp $	*/
+/*	$NetBSD: nvme_pci.c,v 1.33 2022/07/07 23:54:17 pgoyette Exp $	*/
 /*	$OpenBSD: nvme_pci.c,v 1.3 2016/04/14 11:18:32 dlg Exp $ */
 
 /*
@@ -43,7 +43,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.32 2022/03/31 19:30:16 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.33 2022/07/07 23:54:17 pgoyette Exp $");
 
 #include 
 #include 
@@ -504,8 +504,8 @@ nvme_modcmd(modcmd_t cmd, void *opaque)
 		error = devsw_attach(nvme_cd.cd_name, NULL, ,
 		_cdevsw, );
 		if (error) {
-			aprint_error("%s: unable to register devsw\n",
-			nvme_cd.cd_name);
+			aprint_error("%s: unable to register devsw, err %d\n",
+			nvme_cd.cd_name, error);
 			/* do not abort, just /dev/nvme* will not work */
 		}
 		error = config_init_component(cfdriver_ioconf_nvme_pci,



CVS commit: src/sys/dev/pci

2022-07-07 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Jul  7 23:54:17 UTC 2022

Modified Files:
src/sys/dev/pci: nvme_pci.c

Log Message:
Add errno tto message when fail to attach the devsw


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/nvme_pci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/nvmm

2022-07-07 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Jul  7 23:50:34 UTC 2022

Modified Files:
src/sys/dev/nvmm: nvmm.c

Log Message:
Only detach the cfdriver if we just attached it.

Report errno in message when fail to attach cdevsw


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/nvmm/nvmm.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/nvmm/nvmm.c
diff -u src/sys/dev/nvmm/nvmm.c:1.45 src/sys/dev/nvmm/nvmm.c:1.46
--- src/sys/dev/nvmm/nvmm.c:1.45	Wed Jul  6 13:10:49 2022
+++ src/sys/dev/nvmm/nvmm.c	Thu Jul  7 23:50:33 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvmm.c,v 1.45 2022/07/06 13:10:49 riastradh Exp $	*/
+/*	$NetBSD: nvmm.c,v 1.46 2022/07/07 23:50:33 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.45 2022/07/06 13:10:49 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.46 2022/07/07 23:50:33 pgoyette Exp $");
 
 #include 
 #include 
@@ -1255,7 +1255,9 @@ nvmm_modcmd(modcmd_t cmd, void *arg)
 #endif
 		error = config_cfattach_attach(nvmm_cd.cd_name, _ca);
 		if (error) {
+#if defined(_MODULE)
 			config_cfdriver_detach(_cd);
+#endif
 			aprint_error("%s: config_cfattach_attach failed\n",
 			nvmm_cd.cd_name);
 			return error;
@@ -1264,7 +1266,9 @@ nvmm_modcmd(modcmd_t cmd, void *arg)
 		error = config_cfdata_attach(nvmm_cfdata, 1);
 		if (error) {
 			config_cfattach_detach(nvmm_cd.cd_name, _ca);
+#if defined(_MODULE)
 			config_cfdriver_detach(_cd);
+#endif
 			aprint_error("%s: unable to register cfdata\n",
 			nvmm_cd.cd_name);
 			return error;
@@ -1274,7 +1278,9 @@ nvmm_modcmd(modcmd_t cmd, void *arg)
 			aprint_error("%s: config_attach_pseudo failed\n",
 			nvmm_cd.cd_name);
 			config_cfattach_detach(nvmm_cd.cd_name, _ca);
+#if defined(_MODULE)
 			config_cfdriver_detach(_cd);
+#endif
 			return ENXIO;
 		}
 
@@ -1283,8 +1289,8 @@ nvmm_modcmd(modcmd_t cmd, void *arg)
 		error = devsw_attach(nvmm_cd.cd_name, NULL, ,
 			_cdevsw, );
 		if (error) {
-			aprint_error("%s: unable to register devsw\n",
-			nvmm_cd.cd_name);
+			aprint_error("%s: unable to register devsw, err %d\n",
+			nvmm_cd.cd_name, error);
 			config_cfattach_detach(nvmm_cd.cd_name, _ca);
 			config_cfdriver_detach(_cd);
 			return error;



CVS commit: src/sys/dev/nvmm

2022-07-07 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Jul  7 23:50:34 UTC 2022

Modified Files:
src/sys/dev/nvmm: nvmm.c

Log Message:
Only detach the cfdriver if we just attached it.

Report errno in message when fail to attach cdevsw


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/nvmm/nvmm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/tests/lib/libc/kevent_nullmnt

2022-06-04 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Jun  4 20:32:49 UTC 2022

Modified Files:
src/tests/lib/libc/kevent_nullmnt: t_nullmnt.sh

Log Message:
Fix syntax error


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/tests/lib/libc/kevent_nullmnt

2022-06-04 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Jun  4 20:32:49 UTC 2022

Modified Files:
src/tests/lib/libc/kevent_nullmnt: t_nullmnt.sh

Log Message:
Fix syntax error


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh
diff -u src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh:1.4 src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh:1.5
--- src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh:1.4	Mon May 30 14:28:31 2022
+++ src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh	Sat Jun  4 20:32:49 2022
@@ -78,9 +78,9 @@ nullmnt_lower_lower_body()
 {
 	nullmnt_common lower_dir lower_dir
 } 
-nullmnt_lower_lower_cleanup
+nullmnt_lower_lower_cleanup()
 {
-	nullmnt_common_cleanup()
+	nullmnt_common_cleanup
 }
 
 atf_init_test_cases()



Re: CVS commit: src/sys

2022-06-04 Thread Paul Goyette

Should be fixed now.

On Sat, 4 Jun 2022, J. Hannken-Illjes wrote:


On 4. Jun 2022, at 05:31, Paul Goyette  wrote:

Module Name:src
Committed By:   pgoyette
Date:   Sat Jun  4 03:31:10 UTC 2022

Modified Files:
src/sys/dev: files.audio files.dev midi.c sequencer.c
src/sys/modules: Makefile
src/sys/modules/midi: Makefile
src/sys/modules/sequencer: Makefile
Added Files:
src/sys/dev: midi_mod.c midi_seq_mod.c sequencer_mod.c
src/sys/modules/midi_seq: Makefile midi_seq.ioconf
Removed Files:
src/sys/modules/midi: midi.ioconf
src/sys/modules/sequencer: sequencer.ioconf

Log Message:
Combine the midi and sequencer modules into a single midi_seq module
to avoid a circular dependency as noted in kern/56772.  Retain minimal
modules of the original names to accomodate auto-loading upon access
to the /dev/xxx nodes.


This breaks at least sparc64/GENERIC:

sys/dev/sequencer.c:285:1: error: no previous prototype for 'sequencerattach' 
[-Werror=missing-prototypes]
 285 | sequencerattach(int n)
 | ^~~

It has "midi* at midibus?" but no "pseudo-device sequencer".

--
J. Hannken-Illjes - hann...@mailbox.org



++--+------+
| Paul Goyette   | PGP Key fingerprint: | E-mail addresses:|
| (Retired)  | FA29 0E3B 35AF E8AE 6651 | p...@whooppee.com|
| Software Developer | 0786 F758 55DE 53BA 7731 | pgoye...@netbsd.org  |
| & Network Engineer |  | pgoyett...@gmail.com |
++--+--+


CVS commit: src/sys/dev

2022-06-04 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Jun  4 20:12:10 UTC 2022

Modified Files:
src/sys/dev: files.audio midi_seq_mod.c

Log Message:
Include sequencer code conditionally.  Fixes build for sparc and sparc64
(and anything else that has a midi but no sequencer).


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/files.audio
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/midi_seq_mod.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/files.audio
diff -u src/sys/dev/files.audio:1.15 src/sys/dev/files.audio:1.16
--- src/sys/dev/files.audio:1.15	Sat Jun  4 03:31:10 2022
+++ src/sys/dev/files.audio	Sat Jun  4 20:12:10 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: files.audio,v 1.15 2022/06/04 03:31:10 pgoyette Exp $
+#	$NetBSD: files.audio,v 1.16 2022/06/04 20:12:10 pgoyette Exp $
 
 defparam opt_audio.h	AUDIO_BLK_MS
 
@@ -28,6 +28,6 @@ file	dev/midi_mod.c			midi | sequencer	n
 file	dev/midi_seq_mod.c		midi | sequencer	needs-flag
 file	dev/midictl.c			midisyn
 file	dev/midisyn.c			midisyn
-file	dev/sequencer.c			midi | sequencer	needs-flag
-file	dev/sequencer_mod.c		midi | sequencer	needs-flag
+file	dev/sequencer.c			sequencer		needs-flag
+file	dev/sequencer_mod.c		sequencer		needs-flag
 file	dev/spkr_audio.c		spkr_audio		needs-flag

Index: src/sys/dev/midi_seq_mod.c
diff -u src/sys/dev/midi_seq_mod.c:1.1 src/sys/dev/midi_seq_mod.c:1.2
--- src/sys/dev/midi_seq_mod.c:1.1	Sat Jun  4 03:31:10 2022
+++ src/sys/dev/midi_seq_mod.c	Sat Jun  4 20:12:10 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: midi_seq_mod.c,v 1.1 2022/06/04 03:31:10 pgoyette Exp $	*/
+/*	$NetBSD: midi_seq_mod.c,v 1.2 2022/06/04 20:12:10 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: midi_seq_mod.c,v 1.1 2022/06/04 03:31:10 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midi_seq_mod.c,v 1.2 2022/06/04 20:12:10 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "midi.h"
@@ -85,32 +85,48 @@ midi_seq_modcmd(modcmd_t cmd, void *arg)
 #ifdef _MODULE
 	switch (cmd) {
 	case MODULE_CMD_INIT:
+#if NMIDI > 0
 		error = devsw_attach(midi_cd.cd_name, NULL, _bmajor,
 		_cdevsw, _cmajor);
 		if (error)
 			break;
+#endif
 
+#if NSEQUENCER > 0
 		error = devsw_attach(sequencer_cd.cd_name,
 		NULL, _bmajor,
 		_cdevsw, _cmajor);
 		if (error) {
+#if NMIDI > 0
 			devsw_detach(NULL, _cdevsw);
+#endif
 			break;
 		}
+#endif
 
+#if NMIDI > 0
 		error = config_init_component(cfdriver_ioconf_midi_seq,
 		cfattach_ioconf_midi_seq, cfdata_ioconf_midi_seq);
 		if (error) {
+#if NSEQUENCER > 0
 			devsw_detach(NULL, _cdevsw);
+#endif
 			devsw_detach(NULL, _cdevsw);
+#endif
 		}
 		break;
 	case MODULE_CMD_FINI:
+#if NMIDI > 0
 		error = config_fini_component(cfdriver_ioconf_midi_seq,
 		   cfattach_ioconf_midi_seq, cfdata_ioconf_midi_seq);
 		if (error == 0) {
+#endif
+#if NSEQUENCER > 0
 			devsw_detach(NULL, _cdevsw);
+#endif
+#if NMIDI > 0
 			devsw_detach(NULL, _cdevsw);
+#endif
 		}
 		break;
 	default:



CVS commit: src/sys/dev

2022-06-04 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Jun  4 20:12:10 UTC 2022

Modified Files:
src/sys/dev: files.audio midi_seq_mod.c

Log Message:
Include sequencer code conditionally.  Fixes build for sparc and sparc64
(and anything else that has a midi but no sequencer).


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/files.audio
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/midi_seq_mod.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

2022-06-04 Thread Paul Goyette

yeah, working on it.

On Sat, 4 Jun 2022, J. Hannken-Illjes wrote:


On 4. Jun 2022, at 05:31, Paul Goyette  wrote:

Module Name:src
Committed By:   pgoyette
Date:   Sat Jun  4 03:31:10 UTC 2022

Modified Files:
src/sys/dev: files.audio files.dev midi.c sequencer.c
src/sys/modules: Makefile
src/sys/modules/midi: Makefile
src/sys/modules/sequencer: Makefile
Added Files:
src/sys/dev: midi_mod.c midi_seq_mod.c sequencer_mod.c
src/sys/modules/midi_seq: Makefile midi_seq.ioconf
Removed Files:
src/sys/modules/midi: midi.ioconf
src/sys/modules/sequencer: sequencer.ioconf

Log Message:
Combine the midi and sequencer modules into a single midi_seq module
to avoid a circular dependency as noted in kern/56772.  Retain minimal
modules of the original names to accomodate auto-loading upon access
to the /dev/xxx nodes.


This breaks at least sparc64/GENERIC:

sys/dev/sequencer.c:285:1: error: no previous prototype for 'sequencerattach' 
[-Werror=missing-prototypes]
 285 | sequencerattach(int n)
 | ^~~

It has "midi* at midibus?" but no "pseudo-device sequencer".

--
J. Hannken-Illjes - hann...@mailbox.org



++--+------+
| Paul Goyette   | PGP Key fingerprint: | E-mail addresses:|
| (Retired)  | FA29 0E3B 35AF E8AE 6651 | p...@whooppee.com|
| Software Developer | 0786 F758 55DE 53BA 7731 | pgoye...@netbsd.org  |
| & Network Engineer |  | pgoyett...@gmail.com |
++--+--+


CVS commit: src/distrib/sets/lists

2022-06-03 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Jun  4 03:32:04 UTC 2022

Modified Files:
src/distrib/sets/lists/debug: module.mi
src/distrib/sets/lists/modules: mi

Log Message:
Add sets-lists entries for the new combined midi_seq module


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/debug/module.mi
cvs rdiff -u -r1.153 -r1.154 src/distrib/sets/lists/modules/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/debug/module.mi
diff -u src/distrib/sets/lists/debug/module.mi:1.19 src/distrib/sets/lists/debug/module.mi:1.20
--- src/distrib/sets/lists/debug/module.mi:1.19	Thu Apr 14 16:51:57 2022
+++ src/distrib/sets/lists/debug/module.mi	Sat Jun  4 03:32:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: module.mi,v 1.19 2022/04/14 16:51:57 pgoyette Exp $
+# $NetBSD: module.mi,v 1.20 2022/06/04 03:32:04 pgoyette Exp $
 ./usr/libdata/debug/@MODULEDIR@	modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/accf_dataready			modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/accf_dataready/accf_dataready.kmod.debug	modules-base-kernel	kmod,debug
@@ -258,6 +258,8 @@
 ./usr/libdata/debug/@MODULEDIR@/mfs/mfs.kmod.debug			modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/midimodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/midi/midi.kmod.debug			modules-base-kernel	kmod,debug
+./usr/libdata/debug/@MODULEDIR@/midi_seqmodules-base-kernel	kmod,debug
+./usr/libdata/debug/@MODULEDIR@/midi_seq/midi_seq.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/miiverbose			modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/miiverbose/miiverbose.kmod.debug	modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/minirootmodules-base-kernel	kmod,debug

Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.153 src/distrib/sets/lists/modules/mi:1.154
--- src/distrib/sets/lists/modules/mi:1.153	Thu Apr 14 16:51:57 2022
+++ src/distrib/sets/lists/modules/mi	Sat Jun  4 03:32:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.153 2022/04/14 16:51:57 pgoyette Exp $
+# $NetBSD: mi,v 1.154 2022/06/04 03:32:04 pgoyette Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -311,6 +311,8 @@
 ./@MODULEDIR@/mfs/mfs.kmod			modules-base-kernel	kmod
 ./@MODULEDIR@/midimodules-base-kernel	kmod
 ./@MODULEDIR@/midi/midi.kmod			modules-base-kernel	kmod
+./@MODULEDIR@/midi_seqmodules-base-kernel	kmod
+./@MODULEDIR@/midi_seq/midi_seq.kmod		modules-base-kernel	kmod
 ./@MODULEDIR@/miiverbose			modules-base-kernel	kmod
 ./@MODULEDIR@/miiverbose/miiverbose.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/minirootmodules-base-kernel	kmod



CVS commit: src/distrib/sets/lists

2022-06-03 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Jun  4 03:32:04 UTC 2022

Modified Files:
src/distrib/sets/lists/debug: module.mi
src/distrib/sets/lists/modules: mi

Log Message:
Add sets-lists entries for the new combined midi_seq module


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/debug/module.mi
cvs rdiff -u -r1.153 -r1.154 src/distrib/sets/lists/modules/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys

2022-06-03 Thread Paul Goyette
: src/sys/dev/sequencer.c
diff -u src/sys/dev/sequencer.c:1.79 src/sys/dev/sequencer.c:1.80
--- src/sys/dev/sequencer.c:1.79	Sat Apr 16 11:13:10 2022
+++ src/sys/dev/sequencer.c	Sat Jun  4 03:31:10 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: sequencer.c,v 1.79 2022/04/16 11:13:10 riastradh Exp $	*/
+/*	$NetBSD: sequencer.c,v 1.80 2022/06/04 03:31:10 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -55,10 +55,9 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.79 2022/04/16 11:13:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.80 2022/06/04 03:31:10 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
-#include "sequencer.h"
 #include "midi.h"
 #endif
 
@@ -76,7 +75,6 @@ __KERNEL_RCSID(0, "$NetBSD: sequencer.c,
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -1656,21 +1654,6 @@ midiseq_loadpatch(struct midi_dev *md,
 static dev_type_open(midiopen);
 static dev_type_close(midiclose);
 
-const struct cdevsw midi_cdevsw = {
-	.d_open = midiopen,
-	.d_close = midiclose,
-	.d_read = noread,
-	.d_write = nowrite,
-	.d_ioctl = noioctl,
-	.d_stop = nostop,
-	.d_tty = notty,
-	.d_poll = nopoll,
-	.d_mmap = nommap,
-	.d_kqfilter = nokqfilter,
-	.d_discard = nodiscard,
-	.d_flag = D_OTHER | D_MPSAFE
-};
-
 /*
  * If someone has a sequencer, but no midi devices there will
  * be unresolved references, so we provide little stubs.
@@ -1688,8 +1671,6 @@ midiopen(dev_t dev, int flags, int ifmt,
 	return ENXIO;
 }
 
-struct cfdriver midi_cd;
-
 void
 midi_getinfo(dev_t dev, struct midi_info *mi)
 {
@@ -1709,46 +1690,3 @@ midi_writebytes(int unit, u_char *bf, in
 	return ENXIO;
 }
 #endif /* NMIDI == 0 */
-
-#ifdef _MODULE
-#include "ioconf.c"
-
-devmajor_t sequencer_bmajor = -1, sequencer_cmajor = -1;
-#endif
-
-MODULE(MODULE_CLASS_DRIVER, sequencer, "midi");
-
-static int
-sequencer_modcmd(modcmd_t cmd, void *arg)
-{
-	int error = 0;
-
-#ifdef _MODULE
-	switch (cmd) {
-	case MODULE_CMD_INIT:
-		error = devsw_attach(sequencer_cd.cd_name,
-		NULL, _bmajor,
-		_cdevsw, _cmajor);
-		if (error)
-			break;
-
-		error = config_init_component(cfdriver_ioconf_sequencer,
-		cfattach_ioconf_sequencer, cfdata_ioconf_sequencer);
-		if (error) {
-			devsw_detach(NULL, _cdevsw);
-		}
-		break;
-	case MODULE_CMD_FINI:
-		error = config_fini_component(cfdriver_ioconf_sequencer,
-		   cfattach_ioconf_sequencer, cfdata_ioconf_sequencer);
-		if (error == 0)
-			devsw_detach(NULL, _cdevsw);
-		break;
-	default:
-		error = ENOTTY;
-		break;
-	}
-#endif
-
-	return error;
-}

Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.265 src/sys/modules/Makefile:1.266
--- src/sys/modules/Makefile:1.265	Thu Apr 14 16:50:26 2022
+++ src/sys/modules/Makefile	Sat Jun  4 03:31:10 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.265 2022/04/14 16:50:26 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.266 2022/06/04 03:31:10 pgoyette Exp $
 
 .include 
 
@@ -115,6 +115,7 @@ SUBDIR+=	luasystm
 SUBDIR+=	luapmf
 SUBDIR+=	mfs
 SUBDIR+=	midi
+SUBDIR+=	midi_seq
 SUBDIR+=	miiverbose
 SUBDIR+=	miniroot
 SUBDIR+=	mqueue

Index: src/sys/modules/midi/Makefile
diff -u src/sys/modules/midi/Makefile:1.2 src/sys/modules/midi/Makefile:1.3
--- src/sys/modules/midi/Makefile:1.2	Sun Feb 17 04:05:54 2019
+++ src/sys/modules/midi/Makefile	Sat Jun  4 03:31:10 2022
@@ -1,20 +1,12 @@
-#	$NetBSD: Makefile,v 1.2 2019/02/17 04:05:54 rin Exp $
+#	$NetBSD: Makefile,v 1.3 2022/06/04 03:31:10 pgoyette Exp $ */
 
 .include "../Makefile.inc"
 
 .PATH:	${S}/dev
 
 KMOD=	midi
-IOCONF=	midi.ioconf
-SRCS=	midi.c \
-	midictl.c \
-	midisyn.c
+SRCS=	midi_mod.c
 
 CPPFLAGS+=	-DNMIDI=1 -DNSEQUENCER=1
 
-# Rather than our usual WARNS=5, we need to use 3, since there are a
-# lot of signed-vs-unsigned compares
-
-WARNS=  3
-
 .include 

Index: src/sys/modules/sequencer/Makefile
diff -u src/sys/modules/sequencer/Makefile:1.2 src/sys/modules/sequencer/Makefile:1.3
--- src/sys/modules/sequencer/Makefile:1.2	Sun Feb 17 04:05:57 2019
+++ src/sys/modules/sequencer/Makefile	Sat Jun  4 03:31:10 2022
@@ -1,18 +1,12 @@
-#	$NetBSD: Makefile,v 1.2 2019/02/17 04:05:57 rin Exp $
+#	$NetBSD: Makefile,v 1.3 2022/06/04 03:31:10 pgoyette Exp $
 
 .include "../Makefile.inc"
 
 .PATH:	${S}/dev
 
 KMOD=	sequencer
-IOCONF=	sequencer.ioconf
-SRCS=	sequencer.c
+SRCS=	sequencer_mod.c
 
 CPPFLAGS+=	-DNSEQUENCER=1 -DNMIDI=1
 
-# Rather than our usual WARNS=5, we need to use 3, since there are a
-# lot of signed-vs-unsigned compares
-
-WARNS=  3
-
 .include 

Added files:

Index: src/sys/dev/midi_mod.c
diff -u /dev/null src/sys/dev/midi_mod.c:1.1
--- /dev/null	Sat Jun  4 03:31:11 2022
+++ src/sys/dev/midi_mod.c	Sat Jun  4 03:31:10 2022
@@ -0,0 +1,63 @@
+/*	$NetBSD: midi_mod.c,v 1.1 2022/06/04 03:31:10 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2022 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed 

CVS commit: src/sys

2022-06-03 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Jun  4 03:31:10 UTC 2022

Modified Files:
src/sys/dev: files.audio files.dev midi.c sequencer.c
src/sys/modules: Makefile
src/sys/modules/midi: Makefile
src/sys/modules/sequencer: Makefile
Added Files:
src/sys/dev: midi_mod.c midi_seq_mod.c sequencer_mod.c
src/sys/modules/midi_seq: Makefile midi_seq.ioconf
Removed Files:
src/sys/modules/midi: midi.ioconf
src/sys/modules/sequencer: sequencer.ioconf

Log Message:
Combine the midi and sequencer modules into a single midi_seq module
to avoid a circular dependency as noted in kern/56772.  Retain minimal
modules of the original names to accomodate auto-loading upon access
to the /dev/xxx nodes.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/files.audio
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/files.dev
cvs rdiff -u -r1.97 -r1.98 src/sys/dev/midi.c
cvs rdiff -u -r0 -r1.1 src/sys/dev/midi_mod.c src/sys/dev/midi_seq_mod.c \
src/sys/dev/sequencer_mod.c
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/sequencer.c
cvs rdiff -u -r1.265 -r1.266 src/sys/modules/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/midi/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/modules/midi/midi.ioconf
cvs rdiff -u -r0 -r1.1 src/sys/modules/midi_seq/Makefile \
src/sys/modules/midi_seq/midi_seq.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/sequencer/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/modules/sequencer/sequencer.ioconf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/tests/lib/libc/kevent_nullmnt

2022-05-30 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Mon May 30 14:28:31 UTC 2022

Modified Files:
src/tests/lib/libc/kevent_nullmnt: t_nullmnt.sh

Log Message:
More factoring of common code.  NFCI


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh
diff -u src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh:1.3 src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh:1.4
--- src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh:1.3	Mon May 30 03:33:07 2022
+++ src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh	Mon May 30 14:28:31 2022
@@ -1,12 +1,14 @@
+# find where everything lives
+
+curdir=$(pwd)
+helper=$(atf_get_srcdir)/h_nullmnt
+
 # common test body
-#$1 = pathname of file to monitor
-#$2 = pathname of file to update/modify
+#$1 = directory of file to monitor
+#$2 = directory of file to update/modify
 
 nullmnt_common()
 {
-	curdir=$(pwd)
-	helper=$(atf_get_srcdir)/h_nullmnt
-
 	mkdir ${curdir}/lower_dir
 	mkdir ${curdir}/upper_dir
 	mount -t null ${curdir}/lower_dir ${curdir}/upper_dir
@@ -14,7 +16,7 @@ nullmnt_common()
 	touch ${curdir}/lower_dir/afile
 
 	atf_check -e ignore -o ignore -s exit:0		\
-		${helper} ${curdir}/${1} ${curdir}/${2}
+		${helper} ${curdir}/${1}/afile ${curdir}/${2}/afile
 }
 
 nullmnt_common_cleanup()
@@ -32,7 +34,7 @@ nullmnt_upper_lower_head()
 nullmnt_upper_lower_body()
 {
 	atf_expect_fail "PR kern/56713"
-	nullmnt_common lower_dir/afile upper_dir/afile
+	nullmnt_common lower_dir upper_dir
 } 
 nullmnt_upper_lower_cleanup()
 {
@@ -47,7 +49,7 @@ nullmnt_upper_upper_head()
 nullmnt_upper_upper_body()
 {
 	atf_expect_fail "PR kern/56713"
-	nullmnt_common upper_dir/afile upper_dir/afile
+	nullmnt_common upper_dir upper_dir
 } 
 nullmnt_upper_upper_cleanup()
 {
@@ -60,7 +62,7 @@ nullmnt_lower_upper_head()
 }
 nullmnt_lower_upper_body()
 {
-	nullmnt_common upper_dir/afile lower_dir/afile
+	nullmnt_common upper_dir lower_dir
 } 
 nullmnt_lower_upper_cleanup()
 {
@@ -74,7 +76,7 @@ nullmnt_lower_lower_head()
 }
 nullmnt_lower_lower_body()
 {
-	nullmnt_common lower_dir/afile lower_dir/afile
+	nullmnt_common lower_dir lower_dir
 } 
 nullmnt_lower_lower_cleanup
 {



CVS commit: src/tests/lib/libc/kevent_nullmnt

2022-05-30 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Mon May 30 14:28:31 UTC 2022

Modified Files:
src/tests/lib/libc/kevent_nullmnt: t_nullmnt.sh

Log Message:
More factoring of common code.  NFCI


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/tests/lib/libc/kevent_nullmnt

2022-05-29 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Mon May 30 03:33:07 UTC 2022

Modified Files:
src/tests/lib/libc/kevent_nullmnt: t_nullmnt.sh

Log Message:
Update test so all four combinations of update_{upper, lower} x
monitor_{upper, lower}} can be verified.  Currently update_upper
is expected to fail regardless of which file is being monitored.

PR kern/56713


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/tests/lib/libc/kevent_nullmnt

2022-05-29 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Mon May 30 03:33:07 UTC 2022

Modified Files:
src/tests/lib/libc/kevent_nullmnt: t_nullmnt.sh

Log Message:
Update test so all four combinations of update_{upper, lower} x
monitor_{upper, lower}} can be verified.  Currently update_upper
is expected to fail regardless of which file is being monitored.

PR kern/56713


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh
diff -u src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh:1.2 src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh:1.3
--- src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh:1.2	Sat Apr 30 17:09:44 2022
+++ src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh	Mon May 30 03:33:07 2022
@@ -1,35 +1,90 @@
-atf_test_case nullmnt cleanup
-nullmnt_head()
-{ 
-	atf_set "descr" "ensure file events traverse null-mounts"
-}
+# common test body
+#$1 = pathname of file to monitor
+#$2 = pathname of file to update/modify
 
-nullmnt_body()
+nullmnt_common()
 {
 	curdir=$(pwd)
 	helper=$(atf_get_srcdir)/h_nullmnt
 
-	mkdir ${curdir}/realdir
-	mkdir ${curdir}/nulldir
-	mount -t null ${curdir}/realdir ${curdir}/nulldir
-	rm -f ${curdir}/realdir/afile
-	touch ${curdir}/realdir/afile
+	mkdir ${curdir}/lower_dir
+	mkdir ${curdir}/upper_dir
+	mount -t null ${curdir}/lower_dir ${curdir}/upper_dir
+	rm -f ${curdir}/lower_dir/afile
+	touch ${curdir}/lower_dir/afile
 
-	atf_expect_fail "PR kern/56713"
+	atf_check -e ignore -o ignore -s exit:0		\
+		${helper} ${curdir}/${1} ${curdir}/${2}
+}
 
-	atf_check -e ignore -o ignore -s exit:0 \
-		${helper} ${curdir}/realdir/afile ${curdir}/nulldir/afile
+nullmnt_common_cleanup()
+{
+	curdir=$(pwd)
+	umount ${curdir}/upper_dir
+	rm -rf ${curdir}/lower_dir ${curdir}/upper_dir
+}
 
+atf_test_case nullmnt_upper_lower cleanup
+nullmnt_upper_lower_head()
+{
+	atf_set "descr" "ensure upper fs events seen on lower fs"
+}
+nullmnt_upper_lower_body()
+{
+	atf_expect_fail "PR kern/56713"
+	nullmnt_common lower_dir/afile upper_dir/afile
 } 
+nullmnt_upper_lower_cleanup()
+{
+	nullmnt_common_cleanup
+}
 
-nullmnt_cleanup()
+atf_test_case nullmnt_upper_upper cleanup
+nullmnt_upper_upper_head()
 {
-	curdir=$(pwd)
-	umount ${curdir}/nulldir
-	rm -rf ${curdir}/realdir ${curdir}/nulldir
+	atf_set "descr" "ensure upper fs events seen on upper fs"
+}
+nullmnt_upper_upper_body()
+{
+	atf_expect_fail "PR kern/56713"
+	nullmnt_common upper_dir/afile upper_dir/afile
+} 
+nullmnt_upper_upper_cleanup()
+{
+	nullmnt_common_cleanup
+}
+atf_test_case nullmnt_lower_upper cleanup
+nullmnt_lower_upper_head()
+{
+	atf_set "descr" "ensure lower fs events seen on upper fs"
+}
+nullmnt_lower_upper_body()
+{
+	nullmnt_common upper_dir/afile lower_dir/afile
+} 
+nullmnt_lower_upper_cleanup()
+{
+	nullmnt_common_cleanup
+}
+
+atf_test_case nullmnt_lower_lower cleanup
+nullmnt_lower_lower_head()
+{
+	atf_set "descr" "ensure lower fs events seen on lower fs"
+}
+nullmnt_lower_lower_body()
+{
+	nullmnt_common lower_dir/afile lower_dir/afile
+} 
+nullmnt_lower_lower_cleanup
+{
+	nullmnt_common_cleanup()
 }
 
 atf_init_test_cases()
 {
-	atf_add_test_case nullmnt
+	atf_add_test_case nullmnt_upper_upper
+	atf_add_test_case nullmnt_upper_lower
+	atf_add_test_case nullmnt_lower_upper
+	atf_add_test_case nullmnt_lower_lower
 }



CVS commit: src/tests/lib/libc/kevent_nullmnt

2022-04-30 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sun May  1 03:18:41 UTC 2022

Modified Files:
src/tests/lib/libc/kevent_nullmnt: h_nullmnt.c

Log Message:
Rename variables to be more descriptive of their local meaning rather
than referring to external usage.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/kevent_nullmnt/h_nullmnt.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/lib/libc/kevent_nullmnt/h_nullmnt.c
diff -u src/tests/lib/libc/kevent_nullmnt/h_nullmnt.c:1.1 src/tests/lib/libc/kevent_nullmnt/h_nullmnt.c:1.2
--- src/tests/lib/libc/kevent_nullmnt/h_nullmnt.c:1.1	Fri Apr 29 22:17:49 2022
+++ src/tests/lib/libc/kevent_nullmnt/h_nullmnt.c	Sun May  1 03:18:41 2022
@@ -7,7 +7,7 @@
 #include 
 
 /*
- * External set-up code is expected to do the equivalent of
+ * External test set-up code is expected to do the equivalent of
  *	cd $TOPDIR
  *	mkdir realdir
  *	mkdir nulldir
@@ -29,7 +29,7 @@
 
 int main(int argc, char **argv)
 {
-	int realfile, nullfile;
+	int watch_file, write_file;
 	int kq, nev, rsize;
 	struct timespec timeout;
 	struct kevent eventlist;
@@ -39,14 +39,14 @@ int main(int argc, char **argv)
 	if (argc <= 2)
 		errx(EXIT_FAILURE, "insufficient args %d", argc);
 
-	realfile = open(argv[1], O_RDONLY);
-	if (realfile == -1)
-		err(EXIT_FAILURE, "failed to open realfile %s",
+	watch_file = open(argv[1], O_RDONLY);
+	if (watch_file == -1)
+		err(EXIT_FAILURE, "failed to open watch_file %s",
 		argv[1]);
 
-	nullfile = open(argv[2], O_WRONLY, O_APPEND);
-	if (nullfile == -1)
-		err(EXIT_FAILURE, "failed to open nullfile %s",
+	write_file = open(argv[2], O_WRONLY, O_APPEND);
+	if (write_file == -1)
+		err(EXIT_FAILURE, "failed to open write_file %s",
 		argv[2]);
 
 	if ((kq = kqueue()) == -1)
@@ -55,18 +55,18 @@ int main(int argc, char **argv)
 	timeout.tv_sec = 5;
 	timeout.tv_nsec = 0;
 
-	EV_SET(, realfile,
+	EV_SET(, watch_file,
 	EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
 	NOTE_WRITE | NOTE_EXTEND, 0, 0);
 	if (kevent(kq, , 1, NULL, 0, NULL) == -1)
 		err(EXIT_FAILURE, "Failed to set eventlist for fd %d",
-		realfile);
+		watch_file);
 
-	rsize = read(realfile, , sizeof(inbuf));
+	rsize = read(watch_file, , sizeof(inbuf));
 	if (rsize)
 		errx(EXIT_FAILURE, "Ooops we got %d bytes of data!\n", rsize);
 
-	write(nullfile, , sizeof(outbuf) - 1);
+	write(write_file, , sizeof(outbuf) - 1);
 
 	nev = kevent(kq, NULL, 0, , 1, );
 	if (nev == -1)



CVS commit: src/tests/lib/libc/kevent_nullmnt

2022-04-30 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sun May  1 03:18:41 UTC 2022

Modified Files:
src/tests/lib/libc/kevent_nullmnt: h_nullmnt.c

Log Message:
Rename variables to be more descriptive of their local meaning rather
than referring to external usage.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/kevent_nullmnt/h_nullmnt.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/tests/lib/libc/kevent_nullmnt

2022-04-30 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Apr 30 17:09:44 UTC 2022

Modified Files:
src/tests/lib/libc/kevent_nullmnt: t_nullmnt.sh

Log Message:
Don't put temporary files and directories into the atf_srcdir (that
might be read-only!).  Instead, put them in the test's working
directory what the atf framework will automatically clean up after
the test completes.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh
diff -u src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh:1.1 src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh:1.2
--- src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh:1.1	Fri Apr 29 22:17:49 2022
+++ src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh	Sat Apr 30 17:09:44 2022
@@ -6,27 +6,27 @@ nullmnt_head()
 
 nullmnt_body()
 {
-	srcdir=$(atf_get_srcdir)
-	helper=${srcdir}/h_nullmnt
+	curdir=$(pwd)
+	helper=$(atf_get_srcdir)/h_nullmnt
 
-	mkdir ${srcdir}/realdir
-	mkdir ${srcdir}/nulldir
-	mount -t null ${srcdir}/realdir ${srcdir}/nulldir
-	rm -f ${srcdir}/realdir/afile
-	touch ${srcdir}/realdir/afile
+	mkdir ${curdir}/realdir
+	mkdir ${curdir}/nulldir
+	mount -t null ${curdir}/realdir ${curdir}/nulldir
+	rm -f ${curdir}/realdir/afile
+	touch ${curdir}/realdir/afile
 
 	atf_expect_fail "PR kern/56713"
 
 	atf_check -e ignore -o ignore -s exit:0 \
-		${helper} ${srcdir}/realdir/afile ${srcdir}/nulldir/afile
+		${helper} ${curdir}/realdir/afile ${curdir}/nulldir/afile
 
 } 
 
 nullmnt_cleanup()
 {
-	srcdir=$(atf_get_srcdir)
-	umount ${srcdir}/nulldir
-	rm -rf ${srcdir}/realdir ${srcdir}/nulldir
+	curdir=$(pwd)
+	umount ${curdir}/nulldir
+	rm -rf ${curdir}/realdir ${curdir}/nulldir
 }
 
 atf_init_test_cases()



CVS commit: src/tests/lib/libc/kevent_nullmnt

2022-04-30 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Apr 30 17:09:44 UTC 2022

Modified Files:
src/tests/lib/libc/kevent_nullmnt: t_nullmnt.sh

Log Message:
Don't put temporary files and directories into the atf_srcdir (that
might be read-only!).  Instead, put them in the test's working
directory what the atf framework will automatically clean up after
the test completes.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src

2022-04-29 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Fri Apr 29 22:17:50 UTC 2022

Modified Files:
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/lib/libc: Makefile
Added Files:
src/tests/lib/libc/kevent_nullmnt: Makefile h_nullmnt.c t_nullmnt.sh

Log Message:
Add a new test for PR kern/56713 and set to expected_failure for now.


To generate a diff of this commit:
cvs rdiff -u -r1.376 -r1.377 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.1200 -r1.1201 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.190 -r1.191 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.51 -r1.52 src/tests/lib/libc/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/kevent_nullmnt/Makefile \
src/tests/lib/libc/kevent_nullmnt/h_nullmnt.c \
src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src

2022-04-29 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Fri Apr 29 22:17:50 UTC 2022

Modified Files:
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/lib/libc: Makefile
Added Files:
src/tests/lib/libc/kevent_nullmnt: Makefile h_nullmnt.c t_nullmnt.sh

Log Message:
Add a new test for PR kern/56713 and set to expected_failure for now.


To generate a diff of this commit:
cvs rdiff -u -r1.376 -r1.377 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.1200 -r1.1201 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.190 -r1.191 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.51 -r1.52 src/tests/lib/libc/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/kevent_nullmnt/Makefile \
src/tests/lib/libc/kevent_nullmnt/h_nullmnt.c \
src/tests/lib/libc/kevent_nullmnt/t_nullmnt.sh

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.376 src/distrib/sets/lists/debug/mi:1.377
--- src/distrib/sets/lists/debug/mi:1.376	Fri Apr  8 23:35:51 2022
+++ src/distrib/sets/lists/debug/mi	Fri Apr 29 22:17:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.376 2022/04/08 23:35:51 riastradh Exp $
+# $NetBSD: mi,v 1.377 2022/04/29 22:17:49 pgoyette 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
@@ -2041,6 +2041,7 @@
 ./usr/libdata/debug/usr/tests/lib/libc/ieeefp/t_subnormal.debug		tests-obsolete		obsolete,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libc/inet/t_inet_addr.debug		tests-lib-debug		debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libc/inet/t_inet_network.debug	tests-lib-debug		debug,atf,compattestfile
+./usr/libdata/debug/usr/tests/lib/libc/kevent_nullmnt/h_nullmnt.debug	tests-lib-debug		debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libc/locale/t_btowc.debug		tests-lib-debug		debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libc/locale/t_ctype1.debug		tests-obsolete		obsolete,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libc/locale/t_ctype2.debug		tests-obsolete		obsolete,compattestfile

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1200 src/distrib/sets/lists/tests/mi:1.1201
--- src/distrib/sets/lists/tests/mi:1.1200	Thu Apr 28 21:38:38 2022
+++ src/distrib/sets/lists/tests/mi	Fri Apr 29 22:17:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1200 2022/04/28 21:38:38 rillig Exp $
+# $NetBSD: mi,v 1.1201 2022/04/29 22:17:50 pgoyette Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -103,6 +103,7 @@
 ./usr/libdata/debug/usr/tests/lib/libc/hash		tests-lib-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/lib/libc/ieeefp		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libc/inet		tests-lib-debug		compattestfile,atf
+./usr/libdata/debug/usr/tests/lib/libc/kevent_nullmnt	tests-lib-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/lib/libc/locale		tests-lib-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/lib/libc/membar		tests-lib-debug		compattestfile,atf
 ./usr/libdata/debug/usr/tests/lib/libc/misc		tests-lib-debug		compattestfile,atf
@@ -2932,6 +2933,11 @@
 ./usr/tests/lib/libc/inet/Kyuafile			tests-lib-tests		compattestfile,atf,kyua
 ./usr/tests/lib/libc/inet/t_inet_addr			tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libc/inet/t_inet_network		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libc/kevent_nullmnt			tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libc/kevent_nullmnt/Atffile		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libc/kevent_nullmnt/Kyuafile		tests-lib-tests		compattestfile,atf,kyua
+./usr/tests/lib/libc/kevent_nullmnt/h_nullmnt		tests-lib-tests		compattestfile,atf
+./usr/tests/lib/libc/kevent_nullmnt/t_nullmnt		tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libc/localetests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libc/locale/Atffile			tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libc/locale/Kyuafile			tests-lib-tests		compattestfile,atf,kyua

Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.190 src/etc/mtree/NetBSD.dist.tests:1.191
--- src/etc/mtree/NetBSD.dist.tests:1.190	Fri Apr  8 23:35:52 2022
+++ src/etc/mtree/NetBSD.dist.tests	Fri Apr 29 22:17:50 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.tests,v 1.190 2022/04/08 23:35:52 riastradh Exp $
+#	$NetBSD: NetBSD.dist.tests,v 1.191 2022/04/29 22:17:50 pgoyette Exp $
 
 ./usr/libdata/debug/usr/tests
 ./usr/libdata/debug/usr/tests/atf
@@ -85,6 +85,7 @@
 ./usr/libdata/debug/usr/tests/lib/libc/hash
 ./usr/libdata/debug/usr/tests/lib/libc/inet
 ./usr/libdata/debug/usr/tests/lib/libc/locale
+./usr/libdata/debug/usr/tests/lib/libc/kevent_nullmnt
 

CVS commit: src/sbin/iscsid

2022-04-14 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Apr 14 18:52:27 UTC 2022

Modified Files:
src/sbin/iscsid: iscsid.8

Log Message:
iscsid(8) no longer requires scsibus(4) and sd(4) to be built-in to
the kernel.  The scsi_subr module will be loaded if needed to resolve
any dependencies.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sbin/iscsid/iscsid.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sbin/iscsid/iscsid.8
diff -u src/sbin/iscsid/iscsid.8:1.13 src/sbin/iscsid/iscsid.8:1.14
--- src/sbin/iscsid/iscsid.8:1.13	Sun May 29 13:35:45 2016
+++ src/sbin/iscsid/iscsid.8	Thu Apr 14 18:52:27 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: iscsid.8,v 1.13 2016/05/29 13:35:45 mlelstv Exp $
+.\" $NetBSD: iscsid.8,v 1.14 2022/04/14 18:52:27 pgoyette Exp $
 .\"
 .\" Copyright (c) 2011 Alistair Crooks 
 .\" All rights reserved.
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd November 10, 2015
+.Dd April 14, 2022
 .Dt ISCSID 8
 .Os
 .Sh NAME
@@ -77,13 +77,6 @@ utility, rather than directly over its c
 An example of setting up the in-kernel iSCSI initiator
 is shown in
 .Xr iscsictl 8 .
-.Pp
-.Nm
-requires
-.Xr scsibus 4
-and
-.Xr sd 4
-compiled in the kernel to load the iscsi kernel module.
 .Sh SEE ALSO
 .Xr daemon 3 ,
 .Xr isns 3 ,



CVS commit: src/sbin/iscsid

2022-04-14 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Apr 14 18:52:27 UTC 2022

Modified Files:
src/sbin/iscsid: iscsid.8

Log Message:
iscsid(8) no longer requires scsibus(4) and sd(4) to be built-in to
the kernel.  The scsi_subr module will be loaded if needed to resolve
any dependencies.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sbin/iscsid/iscsid.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/sets/lists

2022-04-14 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Apr 14 16:51:57 UTC 2022

Modified Files:
src/distrib/sets/lists/debug: module.mi
src/distrib/sets/lists/modules: mi

Log Message:
Add the new scsi_subr module to sets lists.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/debug/module.mi
cvs rdiff -u -r1.152 -r1.153 src/distrib/sets/lists/modules/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/sets/lists

2022-04-14 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Apr 14 16:51:57 UTC 2022

Modified Files:
src/distrib/sets/lists/debug: module.mi
src/distrib/sets/lists/modules: mi

Log Message:
Add the new scsi_subr module to sets lists.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/debug/module.mi
cvs rdiff -u -r1.152 -r1.153 src/distrib/sets/lists/modules/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/debug/module.mi
diff -u src/distrib/sets/lists/debug/module.mi:1.18 src/distrib/sets/lists/debug/module.mi:1.19
--- src/distrib/sets/lists/debug/module.mi:1.18	Fri Apr  1 21:09:24 2022
+++ src/distrib/sets/lists/debug/module.mi	Thu Apr 14 16:51:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: module.mi,v 1.18 2022/04/01 21:09:24 pgoyette Exp $
+# $NetBSD: module.mi,v 1.19 2022/04/14 16:51:57 pgoyette Exp $
 ./usr/libdata/debug/@MODULEDIR@	modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/accf_dataready			modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/accf_dataready/accf_dataready.kmod.debug	modules-base-kernel	kmod,debug
@@ -326,6 +326,8 @@
 ./usr/libdata/debug/@MODULEDIR@/scmd/scmd.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/scmdi2cmodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/scmdi2c/scmdi2c.kmod.debug		modules-base-kernel	kmod,debug
+./usr/libdata/debug/@MODULEDIR@/scsi_subr			modules-base-kernel	kmod,debug
+./usr/libdata/debug/@MODULEDIR@/scsi_subr/scsi_subr.kmod.debug	modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/scsiverbose			modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/scsiverbose/scsiverbose.kmod.debug	modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/sdtempmodules-base-kernel	kmod,debug

Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.152 src/distrib/sets/lists/modules/mi:1.153
--- src/distrib/sets/lists/modules/mi:1.152	Fri Apr  1 21:09:24 2022
+++ src/distrib/sets/lists/modules/mi	Thu Apr 14 16:51:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.152 2022/04/01 21:09:24 pgoyette Exp $
+# $NetBSD: mi,v 1.153 2022/04/14 16:51:57 pgoyette Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -385,6 +385,8 @@
 ./@MODULEDIR@/putter/putter.kmod		modules-base-kernel	kmod
 ./@MODULEDIR@/raidmodules-base-kernel	kmod
 ./@MODULEDIR@/raid/raid.kmod			modules-base-kernel	kmod
+./@MODULEDIR@/scsi_subrmodules-base-kernel	kmod
+./@MODULEDIR@/scsi_subr/scsi_subr.kmod		modules-base-kernel	kmod
 ./@MODULEDIR@/scsiverbose			modules-base-kernel	kmod
 ./@MODULEDIR@/scsiverbose/scsiverbose.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/sdtbase-obsolete		obsolete



CVS commit: src/sys

2022-04-14 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Apr 14 16:50:27 UTC 2022

Modified Files:
src/sys/dev/iscsi: iscsi_main.c
src/sys/dev/scsipi: files.scsipi scsiconf.c
src/sys/modules: Makefile
src/sys/rump/dev/lib/libscsipi: Makefile
Added Files:
src/sys/dev/scsipi: scsi_subr.c
src/sys/modules/scsi_subr: Makefile

Log Message:
Split some common stuff into scsi_subr module.  This enables loading
of the iscsi module whether or not there are any scsi things built
into the kernel.

Addresses the iscsi portion of kern/56772


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/iscsi/iscsi_main.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/scsipi/files.scsipi
cvs rdiff -u -r0 -r1.1 src/sys/dev/scsipi/scsi_subr.c
cvs rdiff -u -r1.301 -r1.302 src/sys/dev/scsipi/scsiconf.c
cvs rdiff -u -r1.264 -r1.265 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/scsi_subr/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libscsipi/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/iscsi/iscsi_main.c
diff -u src/sys/dev/iscsi/iscsi_main.c:1.39 src/sys/dev/iscsi/iscsi_main.c:1.40
--- src/sys/dev/iscsi/iscsi_main.c:1.39	Thu Mar 31 19:30:16 2022
+++ src/sys/dev/iscsi/iscsi_main.c	Thu Apr 14 16:50:26 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: iscsi_main.c,v 1.39 2022/03/31 19:30:16 pgoyette Exp $	*/
+/*	$NetBSD: iscsi_main.c,v 1.40 2022/04/14 16:50:26 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -656,7 +656,7 @@ SYSCTL_SETUP(sysctl_iscsi_setup, "ISCSI 
 
 #include 
 
-MODULE(MODULE_CLASS_DRIVER, iscsi, NULL); /* Possibly a builtin module */
+MODULE(MODULE_CLASS_DRIVER, iscsi, "scsi_subr"); /* Possibly a builtin module */
 
 #ifdef _MODULE
 static const struct cfiattrdata ibescsi_info = { "scsi", 1,

Index: src/sys/dev/scsipi/files.scsipi
diff -u src/sys/dev/scsipi/files.scsipi:1.42 src/sys/dev/scsipi/files.scsipi:1.43
--- src/sys/dev/scsipi/files.scsipi:1.42	Tue Feb 12 13:49:13 2019
+++ src/sys/dev/scsipi/files.scsipi	Thu Apr 14 16:50:26 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: files.scsipi,v 1.42 2019/02/12 13:49:13 kardel Exp $
+#	$NetBSD: files.scsipi,v 1.43 2022/04/14 16:50:26 pgoyette Exp $
 #
 # Config file and device description for machine-independent SCSI code.
 # Included by ports that need it.  Ports that use it must provide
@@ -26,6 +26,7 @@ file	dev/scsipi/atapi_wdc.c		atapibus & 
 device	scsibus {[target = -1], [lun = -1]}: scsi_core
 attach	scsibus at scsi
 file	dev/scsipi/scsiconf.c		scsibus			needs-flag
+file	dev/scsipi/scsi_subr.c		scsibus
 
 device	atapibus {[drive = -1]}
 attach	atapibus at atapi

Index: src/sys/dev/scsipi/scsiconf.c
diff -u src/sys/dev/scsipi/scsiconf.c:1.301 src/sys/dev/scsipi/scsiconf.c:1.302
--- src/sys/dev/scsipi/scsiconf.c:1.301	Sat Apr  9 23:38:32 2022
+++ src/sys/dev/scsipi/scsiconf.c	Thu Apr 14 16:50:26 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: scsiconf.c,v 1.301 2022/04/09 23:38:32 riastradh Exp $	*/
+/*	$NetBSD: scsiconf.c,v 1.302 2022/04/14 16:50:26 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.301 2022/04/09 23:38:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.302 2022/04/14 16:50:26 pgoyette Exp $");
 
 #include 
 #include 
@@ -126,46 +126,6 @@ static int	scsibusprint(void *, const ch
 static void	scsibus_discover_thread(void *);
 static void	scsibus_config(struct scsibus_softc *);
 
-const struct scsipi_bustype scsi_bustype = {
-	.bustype_type = SCSIPI_BUSTYPE_BUSTYPE(SCSIPI_BUSTYPE_SCSI,
-	SCSIPI_BUSTYPE_SCSI_PSCSI),
-	.bustype_cmd = scsi_scsipi_cmd,
-	.bustype_interpret_sense = scsipi_interpret_sense,
-	.bustype_printaddr = scsi_print_addr,
-	.bustype_kill_pending = scsi_kill_pending,
-	.bustype_async_event_xfer_mode = scsi_async_event_xfer_mode,
-};
-
-const struct scsipi_bustype scsi_fc_bustype = {
-	.bustype_type = SCSIPI_BUSTYPE_BUSTYPE(SCSIPI_BUSTYPE_SCSI,
-	SCSIPI_BUSTYPE_SCSI_FC),
-	.bustype_cmd = scsi_scsipi_cmd,
-	.bustype_interpret_sense = scsipi_interpret_sense,
-	.bustype_printaddr = scsi_print_addr,
-	.bustype_kill_pending = scsi_kill_pending,
-	.bustype_async_event_xfer_mode = scsi_fc_sas_async_event_xfer_mode,
-};
-
-const struct scsipi_bustype scsi_sas_bustype = {
-	.bustype_type = SCSIPI_BUSTYPE_BUSTYPE(SCSIPI_BUSTYPE_SCSI,
-	SCSIPI_BUSTYPE_SCSI_SAS),
-	.bustype_cmd = scsi_scsipi_cmd,
-	.bustype_interpret_sense = scsipi_interpret_sense,
-	.bustype_printaddr = scsi_print_addr,
-	.bustype_kill_pending = scsi_kill_pending,
-	.bustype_async_event_xfer_mode = scsi_fc_sas_async_event_xfer_mode,
-};
-
-const struct scsipi_bustype scsi_usb_bustype = {
-	.bustype_type = SCSIPI_BUSTYPE_BUSTYPE(SCSIPI_BUSTYPE_SCSI,
-	SCSIPI_BUSTYPE_SCSI_USB),
-	.bustype_cmd = scsi_scsipi_cmd,
-	

CVS commit: src/sys

2022-04-14 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Apr 14 16:50:27 UTC 2022

Modified Files:
src/sys/dev/iscsi: iscsi_main.c
src/sys/dev/scsipi: files.scsipi scsiconf.c
src/sys/modules: Makefile
src/sys/rump/dev/lib/libscsipi: Makefile
Added Files:
src/sys/dev/scsipi: scsi_subr.c
src/sys/modules/scsi_subr: Makefile

Log Message:
Split some common stuff into scsi_subr module.  This enables loading
of the iscsi module whether or not there are any scsi things built
into the kernel.

Addresses the iscsi portion of kern/56772


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/iscsi/iscsi_main.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/scsipi/files.scsipi
cvs rdiff -u -r0 -r1.1 src/sys/dev/scsipi/scsi_subr.c
cvs rdiff -u -r1.301 -r1.302 src/sys/dev/scsipi/scsiconf.c
cvs rdiff -u -r1.264 -r1.265 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/scsi_subr/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libscsipi/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/lib/libcurses

2022-04-13 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Wed Apr 13 19:17:09 UTC 2022

Modified Files:
src/lib/libcurses: refresh.c

Log Message:
Fix build (enabled only for MKDEBUG?)


To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/lib/libcurses/refresh.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libcurses/refresh.c
diff -u src/lib/libcurses/refresh.c:1.120 src/lib/libcurses/refresh.c:1.121
--- src/lib/libcurses/refresh.c:1.120	Tue Apr 12 21:54:16 2022
+++ src/lib/libcurses/refresh.c	Wed Apr 13 19:17:09 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: refresh.c,v 1.120 2022/04/12 21:54:16 blymn Exp $	*/
+/*	$NetBSD: refresh.c,v 1.121 2022/04/13 19:17:09 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)refresh.c	8.7 (Berkeley) 8/13/94";
 #else
-__RCSID("$NetBSD: refresh.c,v 1.120 2022/04/12 21:54:16 blymn Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.121 2022/04/13 19:17:09 pgoyette Exp $");
 #endif
 #endif/* not lint */
 
@@ -1256,7 +1256,7 @@ makech(int wy)
 else
 	clsp = 0;
 __CTRACE(__CTRACE_REFRESH,
-"makech: clsp = %zu, nlsp = %zu, strlen(ce) = %ld\n",
+"makech: clsp = %zu, nlsp = %zu, strlen(ce) = %zu\n",
 clsp, nlsp, strlen(ce));
 __CTRACE(__CTRACE_REFRESH,
 "makech: line = %p, cep = %p, begx = %u\n",



CVS commit: src/lib/libcurses

2022-04-13 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Wed Apr 13 19:17:09 UTC 2022

Modified Files:
src/lib/libcurses: refresh.c

Log Message:
Fix build (enabled only for MKDEBUG?)


To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/lib/libcurses/refresh.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src

2022-04-01 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Fri Apr  1 21:09:24 UTC 2022

Modified Files:
src/distrib/sets/lists/debug: module.mi
src/distrib/sets/lists/modules: mi
src/sys/dev: cgd.c
src/sys/modules: Makefile
Added Files:
src/sys/modules/adiantum: Makefile

Log Message:
Create a loaable adiantum module, and make cgd require it.

This enablees use of a loadable cgd module, rather thtan requiring
it to be built-in.

Partially resolves kern/56772


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/debug/module.mi
cvs rdiff -u -r1.151 -r1.152 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.144 -r1.145 src/sys/dev/cgd.c
cvs rdiff -u -r1.263 -r1.264 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/adiantum/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/debug/module.mi
diff -u src/distrib/sets/lists/debug/module.mi:1.17 src/distrib/sets/lists/debug/module.mi:1.18
--- src/distrib/sets/lists/debug/module.mi:1.17	Fri Apr  1 15:49:11 2022
+++ src/distrib/sets/lists/debug/module.mi	Fri Apr  1 21:09:24 2022
@@ -1,9 +1,11 @@
-# $NetBSD: module.mi,v 1.17 2022/04/01 15:49:11 pgoyette Exp $
+# $NetBSD: module.mi,v 1.18 2022/04/01 21:09:24 pgoyette Exp $
 ./usr/libdata/debug/@MODULEDIR@	modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/accf_dataready			modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/accf_dataready/accf_dataready.kmod.debug	modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/accf_httpready			modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/accf_httpready/accf_httpready.kmod.debug	modules-base-kernel	kmod,debug
+./usr/libdata/debug/@MODULEDIR@/adiantum			modules-base-kernel	kmod,debug
+./usr/libdata/debug/@MODULEDIR@/adiantum/adiantum.kmod.debug	modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/adosfsmodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/adosfs/adosfs.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/aiomodules-base-kernel	kmod,debug

Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.151 src/distrib/sets/lists/modules/mi:1.152
--- src/distrib/sets/lists/modules/mi:1.151	Fri Apr  1 15:49:11 2022
+++ src/distrib/sets/lists/modules/mi	Fri Apr  1 21:09:24 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.151 2022/04/01 15:49:11 pgoyette Exp $
+# $NetBSD: mi,v 1.152 2022/04/01 21:09:24 pgoyette Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -11,6 +11,8 @@
 ./@MODULEDIR@/accf_httpready/accf_httpready.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/adosfsmodules-base-kernel	kmod
 ./@MODULEDIR@/adosfs/adosfs.kmod		modules-base-kernel	kmod
+./@MODULEDIR@/adiantummodules-base-kernel	kmod
+./@MODULEDIR@/adiantum/adiantum.kmod		modules-base-kernel	kmod
 ./@MODULEDIR@/aiomodules-base-kernel	kmod
 ./@MODULEDIR@/aio/aio.kmod			modules-base-kernel	kmod
 ./@MODULEDIR@/am2315temp			modules-base-kernel	kmod

Index: src/sys/dev/cgd.c
diff -u src/sys/dev/cgd.c:1.144 src/sys/dev/cgd.c:1.145
--- src/sys/dev/cgd.c:1.144	Fri Apr  1 00:21:19 2022
+++ src/sys/dev/cgd.c	Fri Apr  1 21:09:24 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.144 2022/04/01 00:21:19 riastradh Exp $ */
+/* $NetBSD: cgd.c,v 1.145 2022/04/01 21:09:24 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.144 2022/04/01 00:21:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.145 2022/04/01 21:09:24 pgoyette Exp $");
 
 #include 
 #include 
@@ -1723,7 +1723,7 @@ cgd_selftest(void)
 	aprint_debug("cgd: self-tests passed\n");
 }
 
-MODULE(MODULE_CLASS_DRIVER, cgd, "blowfish,des,dk_subr,bufq_fcfs");
+MODULE(MODULE_CLASS_DRIVER, cgd, "adiantum,blowfish,des,dk_subr,bufq_fcfs");
 
 #ifdef _MODULE
 CFDRIVER_DECL(cgd, DV_DISK, NULL);

Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.263 src/sys/modules/Makefile:1.264
--- src/sys/modules/Makefile:1.263	Fri Apr  1 15:49:11 2022
+++ src/sys/modules/Makefile	Fri Apr  1 21:09:24 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.263 2022/04/01 15:49:11 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.264 2022/04/01 21:09:24 pgoyette Exp $
 
 .include 
 
@@ -24,6 +24,7 @@ SUBDIR+=	compat_crypto_50
 SUBDIR+=	accf_dataready
 SUBDIR+=	accf_httpready
 SUBDIR+=	adosfs
+SUBDIR+=	adiantum
 SUBDIR+=	aio
 SUBDIR+=	audio
 SUBDIR+=	autofs

Added files:

Index: src/sys/modules/adiantum/Makefile
diff -u /dev/null src/sys/modules/adiantum/Makefile:1.1
--- /dev/null	Fri Apr  1 21:09:24 2022
+++ src/sys/modules/adiantum/Makefile	Fri Apr  1 21:09:24 2022
@@ -0,0 +1,10 @@
+#	$NetBSD: Makefile,v 1.1 2022/04/01 21:09:24 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH:	${S}/crypto/adiantum
+
+KMOD=	

CVS commit: src

2022-04-01 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Fri Apr  1 21:09:24 UTC 2022

Modified Files:
src/distrib/sets/lists/debug: module.mi
src/distrib/sets/lists/modules: mi
src/sys/dev: cgd.c
src/sys/modules: Makefile
Added Files:
src/sys/modules/adiantum: Makefile

Log Message:
Create a loaable adiantum module, and make cgd require it.

This enablees use of a loadable cgd module, rather thtan requiring
it to be built-in.

Partially resolves kern/56772


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/debug/module.mi
cvs rdiff -u -r1.151 -r1.152 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.144 -r1.145 src/sys/dev/cgd.c
cvs rdiff -u -r1.263 -r1.264 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/adiantum/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src

2022-04-01 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Fri Apr  1 15:49:12 UTC 2022

Modified Files:
src/distrib/sets/lists/debug: module.mi
src/distrib/sets/lists/modules: mi
src/sys/dev/i2c: i2c.c i2c_subr.c
src/sys/modules: Makefile
src/sys/modules/iic: Makefile
Added Files:
src/sys/modules/i2c_subr: Makefile

Log Message:
Split i2c_subr.c into a separate module rather than including it in
the iic module.  There are valid configurations where i2c_subr code
can be both built-in and part of a loaded module (eg, piixpm is in
the kernel, but the iic module is loaded later).  This causes the
in-kernel linker to detect a duplicate symbol.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/debug/module.mi
cvs rdiff -u -r1.150 -r1.151 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/i2c/i2c.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/i2c_subr.c
cvs rdiff -u -r1.262 -r1.263 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/i2c_subr/Makefile
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/iic/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/debug/module.mi
diff -u src/distrib/sets/lists/debug/module.mi:1.16 src/distrib/sets/lists/debug/module.mi:1.17
--- src/distrib/sets/lists/debug/module.mi:1.16	Tue Dec  7 17:39:53 2021
+++ src/distrib/sets/lists/debug/module.mi	Fri Apr  1 15:49:11 2022
@@ -1,4 +1,4 @@
-# $NetBSD: module.mi,v 1.16 2021/12/07 17:39:53 brad Exp $
+# $NetBSD: module.mi,v 1.17 2022/04/01 15:49:11 pgoyette Exp $
 ./usr/libdata/debug/@MODULEDIR@	modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/accf_dataready			modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/accf_dataready/accf_dataready.kmod.debug	modules-base-kernel	kmod,debug
@@ -166,6 +166,8 @@
 ./usr/libdata/debug/@MODULEDIR@/i2c_bitbang/i2c_bitbang.kmod.debug	modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/i2cexecmodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/i2cexec/i2cexec.kmod.debug		modules-base-kernel	kmod,debug
+./usr/libdata/debug/@MODULEDIR@/i2c_subrmodules-base-kernel	kmod,debug
+./usr/libdata/debug/@MODULEDIR@/i2c_subr/i2c_subr.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/if_agrmodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/if_agr/if_agr.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/if_auemodules-base-kernel	kmod,debug

Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.150 src/distrib/sets/lists/modules/mi:1.151
--- src/distrib/sets/lists/modules/mi:1.150	Tue Dec  7 17:39:53 2021
+++ src/distrib/sets/lists/modules/mi	Fri Apr  1 15:49:11 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.150 2021/12/07 17:39:53 brad Exp $
+# $NetBSD: mi,v 1.151 2022/04/01 15:49:11 pgoyette Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -189,6 +189,8 @@
 ./@MODULEDIR@/i2c_bitbang/i2c_bitbang.kmod	modules-base-kernel	kmod
 ./@MODULEDIR@/i2cexecmodules-base-kernel	kmod
 ./@MODULEDIR@/i2cexec/i2cexec.kmod		modules-base-kernel	kmod
+./@MODULEDIR@/i2c_subrmodules-base-kernel	kmod
+./@MODULEDIR@/i2c_subr/i2c_subr.kmod		modules-base-kernel	kmod
 ./@MODULEDIR@/if_agrmodules-base-kernel	kmod
 ./@MODULEDIR@/if_agr/if_agr.kmod		modules-base-kernel	kmod
 ./@MODULEDIR@/if_auemodules-base-kernel	kmod

Index: src/sys/dev/i2c/i2c.c
diff -u src/sys/dev/i2c/i2c.c:1.85 src/sys/dev/i2c/i2c.c:1.86
--- src/sys/dev/i2c/i2c.c:1.85	Mon Mar 28 12:33:21 2022
+++ src/sys/dev/i2c/i2c.c	Fri Apr  1 15:49:12 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: i2c.c,v 1.85 2022/03/28 12:33:21 riastradh Exp $	*/
+/*	$NetBSD: i2c.c,v 1.86 2022/04/01 15:49:12 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -53,7 +53,7 @@
 #endif /* _KERNEL_OPT */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.85 2022/03/28 12:33:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.86 2022/04/01 15:49:12 pgoyette Exp $");
 
 #include 
 #include 
@@ -900,7 +900,7 @@ CFATTACH_DECL3_NEW(iic, sizeof(struct ii
 iic_match, iic_attach, iic_detach, NULL, iic_rescan, iic_child_detach,
 DVF_DETACH_SHUTDOWN);
 
-MODULE(MODULE_CLASS_DRIVER, iic, "i2cexec,i2c_bitbang");
+MODULE(MODULE_CLASS_DRIVER, iic, "i2cexec,i2c_bitbang,i2c_subr");
 
 #ifdef _MODULE
 #include "ioconf.c"

Index: src/sys/dev/i2c/i2c_subr.c
diff -u src/sys/dev/i2c/i2c_subr.c:1.1 src/sys/dev/i2c/i2c_subr.c:1.2
--- src/sys/dev/i2c/i2c_subr.c:1.1	Mon Oct  3 22:27:23 2011
+++ src/sys/dev/i2c/i2c_subr.c	Fri Apr  1 15:49:12 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: i2c_subr.c,v 1.1 2011/10/03 22:27:23 jmcneill Exp $	*/
+/*	$NetBSD: i2c_subr.c,v 1.2 2022/04/01 15:49:12 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,13 +36,29 @@
  */
 
 

CVS commit: src

2022-04-01 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Fri Apr  1 15:49:12 UTC 2022

Modified Files:
src/distrib/sets/lists/debug: module.mi
src/distrib/sets/lists/modules: mi
src/sys/dev/i2c: i2c.c i2c_subr.c
src/sys/modules: Makefile
src/sys/modules/iic: Makefile
Added Files:
src/sys/modules/i2c_subr: Makefile

Log Message:
Split i2c_subr.c into a separate module rather than including it in
the iic module.  There are valid configurations where i2c_subr code
can be both built-in and part of a loaded module (eg, piixpm is in
the kernel, but the iic module is loaded later).  This causes the
in-kernel linker to detect a duplicate symbol.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/debug/module.mi
cvs rdiff -u -r1.150 -r1.151 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/i2c/i2c.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/i2c_subr.c
cvs rdiff -u -r1.262 -r1.263 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/i2c_subr/Makefile
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/iic/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/pci

2022-04-01 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Fri Apr  1 15:34:34 UTC 2022

Modified Files:
src/sys/dev/pci: piixpm.c

Log Message:
Call iic_fini_tag() when the tag is no longer needed.

Without this, a LOCKDEBUG kernel can panic when trying to re-init the tag.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/pci/piixpm.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/piixpm.c
diff -u src/sys/dev/pci/piixpm.c:1.66 src/sys/dev/pci/piixpm.c:1.67
--- src/sys/dev/pci/piixpm.c:1.66	Tue Oct 12 08:36:29 2021
+++ src/sys/dev/pci/piixpm.c	Fri Apr  1 15:34:34 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpm.c,v 1.66 2021/10/12 08:36:29 andvar Exp $ */
+/* $NetBSD: piixpm.c,v 1.67 2022/04/01 15:34:34 pgoyette Exp $ */
 /*	$OpenBSD: piixpm.c,v 1.39 2013/10/01 20:06:02 sf Exp $	*/
 
 /*
@@ -22,7 +22,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.66 2021/10/12 08:36:29 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.67 2022/04/01 15:34:34 pgoyette Exp $");
 
 #include 
 #include 
@@ -352,6 +352,8 @@ piixpm_rescan(device_t self, const char 
 		iba.iba_tag = tag;
 		sc->sc_i2c_device[i] =
 		config_found(self, , piixpm_iicbus_print, CFARGS_NONE);
+		if (sc->sc_i2c_device[i] == NULL)
+			iic_tag_fini(tag);
 	}
 
 	return 0;
@@ -365,6 +367,10 @@ piixpm_chdet(device_t self, device_t chi
 
 	for (i = 0; i < sc->sc_numbusses; i++) {
 		if (sc->sc_i2c_device[i] == child) {
+
+			struct i2c_controller *tag = >sc_i2c_tags[i];
+
+			iic_tag_fini(tag);
 			sc->sc_i2c_device[i] = NULL;
 			break;
 		}



CVS commit: src/sys/dev/pci

2022-04-01 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Fri Apr  1 15:34:34 UTC 2022

Modified Files:
src/sys/dev/pci: piixpm.c

Log Message:
Call iic_fini_tag() when the tag is no longer needed.

Without this, a LOCKDEBUG kernel can panic when trying to re-init the tag.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/pci/piixpm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys

2022-03-31 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Mar 31 19:30:18 UTC 2022

Modified Files:
src/sys/dev: cgd.c fss.c midi.c sequencer.c spkr.c vnd.c
src/sys/dev/audio: audio.c
src/sys/dev/dm: device-mapper.c
src/sys/dev/dtv: dtv_device.c
src/sys/dev/flash: flash.c
src/sys/dev/gpio: gpio.c gpiopps.c
src/sys/dev/i2c: sht3x.c
src/sys/dev/ic: scmd.c
src/sys/dev/ir: cir.c
src/sys/dev/iscsi: iscsi_main.c
src/sys/dev/pad: pad.c
src/sys/dev/pci: nvme_pci.c vio9p.c
src/sys/dev/wscons: wsbell.c
src/sys/modules/lua: lua.c
src/sys/net: if_tap.c
src/sys/opencrypto: cryptodev.c
src/sys/rump/dev/lib/libmd: md_component.c
src/sys/rump/dev/lib/libpci: pci_at_mainbus.c
src/sys/rump/dev/lib/libscsipi: scsipi_component.c
src/sys/rump/dev/lib/libucom: ucom_at_usb.c
src/sys/rump/dev/lib/libulpt: ulpt_at_usb.c
src/sys/rump/dev/lib/libvirtio_ld: ld_at_virtio.c
src/sys/rump/dev/lib/libwscons: wscons_component.c

Log Message:
For device modules that provide both auto-config and /dev/xxx
interfaces, make sure that initialization and destruction
follow the proper sequence.  This is triggered by the recent
changes to the devsw stuff; per riastradh@ the required call
sequence is:

devsw_attach()
config_init_component() or config_cf*_attach()
...
config_fini_component() or config_cf*_detach()
devsw_detach()

While here, add a few missing calls to some of the detach
routines.

Testing of these changes has been limited to:
1. compile without build break
2. no related test failures from atf
3. modload/modunload work as well as
   before.

No functional device testing done, since I don't have any
of these devices.  Let me know of any damage I might cause
here!

XXX Some of the modules affected by this commit are already
XXX broken;  see kern/56772.  This commit does not break
any additional modules (as far as I know).


To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/sys/dev/cgd.c
cvs rdiff -u -r1.111 -r1.112 src/sys/dev/fss.c
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/midi.c
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/sequencer.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/spkr.c
cvs rdiff -u -r1.284 -r1.285 src/sys/dev/vnd.c
cvs rdiff -u -r1.121 -r1.122 src/sys/dev/audio/audio.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/dm/device-mapper.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/dtv/dtv_device.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/flash/flash.c
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/gpio/gpio.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/gpio/gpiopps.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/i2c/sht3x.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/ic/scmd.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/ir/cir.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/iscsi/iscsi_main.c
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/pad/pad.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/nvme_pci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/vio9p.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/wscons/wsbell.c
cvs rdiff -u -r1.27 -r1.28 src/sys/modules/lua/lua.c
cvs rdiff -u -r1.125 -r1.126 src/sys/net/if_tap.c
cvs rdiff -u -r1.106 -r1.107 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libmd/md_component.c
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/dev/lib/libpci/pci_at_mainbus.c
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libscsipi/scsipi_component.c
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/dev/lib/libucom/ucom_at_usb.c
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libwscons/wscons_component.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/cgd.c
diff -u src/sys/dev/cgd.c:1.142 src/sys/dev/cgd.c:1.143
--- src/sys/dev/cgd.c:1.142	Mon Dec 27 22:57:19 2021
+++ src/sys/dev/cgd.c	Thu Mar 31 19:30:15 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.142 2021/12/27 22:57:19 riastradh Exp $ */
+/* $NetBSD: cgd.c,v 1.143 2022/03/31 19:30:15 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.142 2021/12/27 22:57:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.143 2022/03/31 19:30:15 pgoyette Exp $");
 
 #include 
 #include 
@@ -1723,7 +1723,7 @@ cgd_selftest(void)
 	aprint_debug("cgd: self-tests passed\n");
 }
 
-MODULE(MODULE_CLASS_DRIVER, cgd, "blowfish,des,dk_subr,bufq_fcfs");
+MODULE(MODULE_CLASS_DRIVER, cgd, "adiantum,blowfish,des,dk_subr,bufq_fcfs");
 
 #ifdef _MODULE
 CFDRIVER_DECL(cgd, DV_DISK, NULL);
@@ -1742,31 +1742,34 @@ cgd_modcmd(modcmd_t cmd, void *arg)
 		mutex_init(_spawning_mtx, MUTEX_DEFAULT, IPL_NONE);
 		cv_init(_spawning_cv, "cgspwn");
 
-		error 

CVS commit: src/sys

2022-03-31 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Mar 31 19:30:18 UTC 2022

Modified Files:
src/sys/dev: cgd.c fss.c midi.c sequencer.c spkr.c vnd.c
src/sys/dev/audio: audio.c
src/sys/dev/dm: device-mapper.c
src/sys/dev/dtv: dtv_device.c
src/sys/dev/flash: flash.c
src/sys/dev/gpio: gpio.c gpiopps.c
src/sys/dev/i2c: sht3x.c
src/sys/dev/ic: scmd.c
src/sys/dev/ir: cir.c
src/sys/dev/iscsi: iscsi_main.c
src/sys/dev/pad: pad.c
src/sys/dev/pci: nvme_pci.c vio9p.c
src/sys/dev/wscons: wsbell.c
src/sys/modules/lua: lua.c
src/sys/net: if_tap.c
src/sys/opencrypto: cryptodev.c
src/sys/rump/dev/lib/libmd: md_component.c
src/sys/rump/dev/lib/libpci: pci_at_mainbus.c
src/sys/rump/dev/lib/libscsipi: scsipi_component.c
src/sys/rump/dev/lib/libucom: ucom_at_usb.c
src/sys/rump/dev/lib/libulpt: ulpt_at_usb.c
src/sys/rump/dev/lib/libvirtio_ld: ld_at_virtio.c
src/sys/rump/dev/lib/libwscons: wscons_component.c

Log Message:
For device modules that provide both auto-config and /dev/xxx
interfaces, make sure that initialization and destruction
follow the proper sequence.  This is triggered by the recent
changes to the devsw stuff; per riastradh@ the required call
sequence is:

devsw_attach()
config_init_component() or config_cf*_attach()
...
config_fini_component() or config_cf*_detach()
devsw_detach()

While here, add a few missing calls to some of the detach
routines.

Testing of these changes has been limited to:
1. compile without build break
2. no related test failures from atf
3. modload/modunload work as well as
   before.

No functional device testing done, since I don't have any
of these devices.  Let me know of any damage I might cause
here!

XXX Some of the modules affected by this commit are already
XXX broken;  see kern/56772.  This commit does not break
any additional modules (as far as I know).


To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/sys/dev/cgd.c
cvs rdiff -u -r1.111 -r1.112 src/sys/dev/fss.c
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/midi.c
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/sequencer.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/spkr.c
cvs rdiff -u -r1.284 -r1.285 src/sys/dev/vnd.c
cvs rdiff -u -r1.121 -r1.122 src/sys/dev/audio/audio.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/dm/device-mapper.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/dtv/dtv_device.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/flash/flash.c
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/gpio/gpio.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/gpio/gpiopps.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/i2c/sht3x.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/ic/scmd.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/ir/cir.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/iscsi/iscsi_main.c
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/pad/pad.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/nvme_pci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/vio9p.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/wscons/wsbell.c
cvs rdiff -u -r1.27 -r1.28 src/sys/modules/lua/lua.c
cvs rdiff -u -r1.125 -r1.126 src/sys/net/if_tap.c
cvs rdiff -u -r1.106 -r1.107 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libmd/md_component.c
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/dev/lib/libpci/pci_at_mainbus.c
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libscsipi/scsipi_component.c
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/dev/lib/libucom/ucom_at_usb.c
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libwscons/wscons_component.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/i2c

2022-03-29 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Wed Mar 30 00:06:51 UTC 2022

Modified Files:
src/sys/dev/i2c: am2315.c dbcool.c hytp14.c scmdi2c.c sgp40.c sht3x.c
sht4x.c si70xx.c spdmem_i2c.c

Log Message:
These modules need to depend on iic, not just on i2cexec.  (They will
still recursively get i2cexec since the iic depends on it.)

Partial fix for kern/56772


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/i2c/am2315.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/i2c/dbcool.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/i2c/hytp14.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/scmdi2c.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/sgp40.c src/sys/dev/i2c/sht4x.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/i2c/sht3x.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/i2c/si70xx.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/i2c/spdmem_i2c.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/i2c/am2315.c
diff -u src/sys/dev/i2c/am2315.c:1.6 src/sys/dev/i2c/am2315.c:1.7
--- src/sys/dev/i2c/am2315.c:1.6	Tue Jun 15 04:40:13 2021
+++ src/sys/dev/i2c/am2315.c	Wed Mar 30 00:06:50 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: am2315.c,v 1.6 2021/06/15 04:40:13 mlelstv Exp $	*/
+/*	$NetBSD: am2315.c,v 1.7 2022/03/30 00:06:50 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 2017 Brad Spencer 
@@ -17,7 +17,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: am2315.c,v 1.6 2021/06/15 04:40:13 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am2315.c,v 1.7 2022/03/30 00:06:50 pgoyette Exp $");
 
 /*
  * Driver for the Aosong AM2315
@@ -475,7 +475,7 @@ am2315_detach(device_t self, int flags)
 	return 0;
 }
 
-MODULE(MODULE_CLASS_DRIVER, am2315temp, "i2cexec,sysmon_envsys");
+MODULE(MODULE_CLASS_DRIVER, am2315temp, "iic,sysmon_envsys");
 
 #ifdef _MODULE
 #include "ioconf.c"

Index: src/sys/dev/i2c/dbcool.c
diff -u src/sys/dev/i2c/dbcool.c:1.63 src/sys/dev/i2c/dbcool.c:1.64
--- src/sys/dev/i2c/dbcool.c:1.63	Mon Aug  9 20:49:09 2021
+++ src/sys/dev/i2c/dbcool.c	Wed Mar 30 00:06:50 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: dbcool.c,v 1.63 2021/08/09 20:49:09 andvar Exp $ */
+/*	$NetBSD: dbcool.c,v 1.64 2022/03/30 00:06:50 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.63 2021/08/09 20:49:09 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.64 2022/03/30 00:06:50 pgoyette Exp $");
 
 #include 
 #include 
@@ -2189,7 +2189,7 @@ dbcool_set_fan_limits(struct dbcool_soft
 	}
 }
 
-MODULE(MODULE_CLASS_DRIVER, dbcool, "i2cexec,sysmon_envsys");
+MODULE(MODULE_CLASS_DRIVER, dbcool, "iic,sysmon_envsys");
 
 #ifdef _MODULE
 #include "ioconf.c"

Index: src/sys/dev/i2c/hytp14.c
diff -u src/sys/dev/i2c/hytp14.c:1.14 src/sys/dev/i2c/hytp14.c:1.15
--- src/sys/dev/i2c/hytp14.c:1.14	Tue Jun 15 04:39:49 2021
+++ src/sys/dev/i2c/hytp14.c	Wed Mar 30 00:06:50 2022
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hytp14.c,v 1.14 2021/06/15 04:39:49 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hytp14.c,v 1.15 2022/03/30 00:06:50 pgoyette Exp $");
 
 #include 
 #include 
@@ -487,7 +487,7 @@ sysctl_hytp14_interval(SYSCTLFN_ARGS)
 	return 0;
 }
 
-MODULE(MODULE_CLASS_DRIVER, hythygtemp, "i2cexec,sysmon_envsys");
+MODULE(MODULE_CLASS_DRIVER, hythygtemp, "iic,sysmon_envsys");
 
 #ifdef _MODULE
 #include "ioconf.c"

Index: src/sys/dev/i2c/scmdi2c.c
diff -u src/sys/dev/i2c/scmdi2c.c:1.1 src/sys/dev/i2c/scmdi2c.c:1.2
--- src/sys/dev/i2c/scmdi2c.c:1.1	Tue Dec  7 17:39:54 2021
+++ src/sys/dev/i2c/scmdi2c.c	Wed Mar 30 00:06:50 2022
@@ -1,5 +1,5 @@
 
-/*	$NetBSD: scmdi2c.c,v 1.1 2021/12/07 17:39:54 brad Exp $	*/
+/*	$NetBSD: scmdi2c.c,v 1.2 2022/03/30 00:06:50 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 2021 Brad Spencer 
@@ -18,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: scmdi2c.c,v 1.1 2021/12/07 17:39:54 brad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scmdi2c.c,v 1.2 2022/03/30 00:06:50 pgoyette Exp $");
 
 /*
  * I2C driver for the Sparkfun Serial motor controller.
@@ -233,7 +233,7 @@ scmdi2c_activate(device_t self, enum dev
 	}
 }
 
-MODULE(MODULE_CLASS_DRIVER, scmdi2c, "i2cexec,scmd");
+MODULE(MODULE_CLASS_DRIVER, scmdi2c, "iic,scmd");
 
 #ifdef _MODULE
 /* Like other drivers, we do this because the scmd common

Index: src/sys/dev/i2c/sgp40.c
diff -u src/sys/dev/i2c/sgp40.c:1.2 src/sys/dev/i2c/sgp40.c:1.3
--- src/sys/dev/i2c/sgp40.c:1.2	Wed Oct 20 17:52:44 2021
+++ src/sys/dev/i2c/sgp40.c	Wed Mar 30 00:06:50 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: sgp40.c,v 1.2 2021/10/20 17:52:44 christos Exp $	*/
+/*	$NetBSD: sgp40.c,v 1.3 2022/03/30 00:06:50 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 2021 Brad Spencer 
@@ -17,7 +17,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sgp40.c,v 1.2 2021/10/20 17:52:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sgp40.c,v 1.3 2022/03/30 00:06:50 pgoyette Exp $");
 
 /*
   Driver for the Sensirion SGP40 

CVS commit: src/sys/dev/i2c

2022-03-29 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Wed Mar 30 00:06:51 UTC 2022

Modified Files:
src/sys/dev/i2c: am2315.c dbcool.c hytp14.c scmdi2c.c sgp40.c sht3x.c
sht4x.c si70xx.c spdmem_i2c.c

Log Message:
These modules need to depend on iic, not just on i2cexec.  (They will
still recursively get i2cexec since the iic depends on it.)

Partial fix for kern/56772


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/i2c/am2315.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/i2c/dbcool.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/i2c/hytp14.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/scmdi2c.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/sgp40.c src/sys/dev/i2c/sht4x.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/i2c/sht3x.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/i2c/si70xx.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/i2c/spdmem_i2c.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/gpio

2022-03-29 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Tue Mar 29 22:10:42 UTC 2022

Modified Files:
src/sys/dev/gpio: gpiopps.c

Log Message:
gpiopps module requires the gpio module to resolve several symbols


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/gpio/gpiopps.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/gpio/gpiopps.c
diff -u src/sys/dev/gpio/gpiopps.c:1.2 src/sys/dev/gpio/gpiopps.c:1.3
--- src/sys/dev/gpio/gpiopps.c:1.2	Fri Jun  1 13:42:14 2018
+++ src/sys/dev/gpio/gpiopps.c	Tue Mar 29 22:10:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: gpiopps.c,v 1.2 2018/06/01 13:42:14 thorpej Exp $ */
+/* $NetBSD: gpiopps.c,v 1.3 2022/03/29 22:10:42 pgoyette Exp $ */
 
 /*
  * Copyright (c) 2016 Brad Spencer 
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gpiopps.c,v 1.2 2018/06/01 13:42:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpiopps.c,v 1.3 2022/03/29 22:10:42 pgoyette Exp $");
 
 /*
  * GPIO interface to the pps subsystem for ntp support.
@@ -492,7 +492,7 @@ gpioppsioctl(dev_t dev, u_long cmd, void
 	return (error);
 }
 
-MODULE(MODULE_CLASS_DRIVER, gpiopps, NULL);
+MODULE(MODULE_CLASS_DRIVER, gpiopps, "gpio");
 
 #ifdef _MODULE
 #include "ioconf.c"



CVS commit: src/sys/dev/gpio

2022-03-29 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Tue Mar 29 22:10:42 UTC 2022

Modified Files:
src/sys/dev/gpio: gpiopps.c

Log Message:
gpiopps module requires the gpio module to resolve several symbols


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/gpio/gpiopps.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



Re: CVS commit: src

2022-03-19 Thread Paul Goyette

Does this impact PR/51084 at all?


On Sat, 19 Mar 2022, Roland Illig wrote:


Module Name:src
Committed By:   rillig
Date:   Sat Mar 19 14:35:13 UTC 2022

Modified Files:
src: Makefile

Log Message:
Makefile: fix location of postinstall program for MAKEVERBOSE > 2

If MAKEVERBOSE > 2, each shell command from a make target is echoed.
This resulted in two additional words ending up in the variable
_POSTINSTALL.  Noticed by Brad Harder.

Before:
$ make -v _POSTINSTALL MAKEVERBOSE=3
echo .../usr.sbin/postinstall .../usr.sbin/postinstall/postinstall ...

After:
$ make -v _POSTINSTALL MAKEVERBOSE=3
.../usr.sbin/postinstall/postinstall ...


To generate a diff of this commit:
cvs rdiff -u -r1.333 -r1.334 src/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


!DSPAM:6235ea25249971057441505!




++--+--+
| Paul Goyette   | PGP Key fingerprint: | E-mail addresses:|
| (Retired)  | FA29 0E3B 35AF E8AE 6651 | p...@whooppee.com|
| Software Developer | 0786 F758 55DE 53BA 7731 | pgoye...@netbsd.org  |
| & Network Engineer |  | pgoyett...@gmail.com |
++--+--+


CVS commit: src/lib/libc/sys

2022-02-13 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sun Feb 13 16:51:56 UTC 2022

Modified Files:
src/lib/libc/sys: kqueue.2

Log Message:
Fix typo


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/lib/libc/sys/kqueue.2

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/sys/kqueue.2
diff -u src/lib/libc/sys/kqueue.2:1.57 src/lib/libc/sys/kqueue.2:1.58
--- src/lib/libc/sys/kqueue.2:1.57	Sat Oct 23 01:28:34 2021
+++ src/lib/libc/sys/kqueue.2	Sun Feb 13 16:51:56 2022
@@ -1,4 +1,4 @@
-.\"	$NetBSD: kqueue.2,v 1.57 2021/10/23 01:28:34 thorpej Exp $
+.\"	$NetBSD: kqueue.2,v 1.58 2022/02/13 16:51:56 pgoyette Exp $
 .\"
 .\" Copyright (c) 2000 Jonathan Lemon
 .\" All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.22 2001/06/27 19:55:57 dd Exp $
 .\"
-.Dd October 22, 2021
+.Dd February 13, 2022
 .Dt KQUEUE 2
 .Os
 .Sh NAME
@@ -462,7 +462,7 @@ The file referenced by the descriptor wa
 .It Dv NOTE_LINK
 The link count on the file changed.
 .It Dv NOTE_OPEN
-The file refrenced by the descriptor was opened.
+The file referenced by the descriptor was opened.
 .It Dv NOTE_READ
 A read occurred on the file referenced by the descriptor.
 .It Dv NOTE_RENAME



CVS commit: src/lib/libc/sys

2022-02-13 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sun Feb 13 16:51:56 UTC 2022

Modified Files:
src/lib/libc/sys: kqueue.2

Log Message:
Fix typo


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/lib/libc/sys/kqueue.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/modules/ufs

2022-01-07 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Jan  8 02:00:49 UTC 2022

Modified Files:
src/sys/modules/ufs: Makefile

Log Message:
Use += for SRCS list


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/ufs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/modules/ufs

2022-01-07 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Jan  8 02:00:49 UTC 2022

Modified Files:
src/sys/modules/ufs: Makefile

Log Message:
Use += for SRCS list


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/ufs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/ufs/Makefile
diff -u src/sys/modules/ufs/Makefile:1.6 src/sys/modules/ufs/Makefile:1.7
--- src/sys/modules/ufs/Makefile:1.6	Thu Jan  6 20:41:30 2022
+++ src/sys/modules/ufs/Makefile	Sat Jan  8 02:00:49 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2022/01/06 20:41:30 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.7 2022/01/08 02:00:49 pgoyette Exp $
 
 .include "../Makefile.inc"
 
@@ -11,7 +11,7 @@ CPPFLAGS+=	-DUFS_EXTATTR -DUFS_ACL
 CWARNFLAGS.clang=	-Wno-conversion
 
 .PATH:	${S}/ufs/ufs
-SRCS=	ufs_acl.c ufs_bmap.c ufs_dirhash.c ufs_extattr.c ufs_inode.c \
+SRCS+=	ufs_acl.c ufs_bmap.c ufs_dirhash.c ufs_extattr.c ufs_inode.c \
 	ufs_lookup.c ufs_quota.c ufs_quota1.c ufs_quota2.c ufs_rename.c \
 	ufs_vfsops.c ufs_vnops.c quota1_subr.c quota2_subr.c
 



CVS commit: src/sys/modules/ffs

2022-01-07 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Jan  8 01:58:16 UTC 2022

Modified Files:
src/sys/modules/ffs: Makefile

Log Message:
Remove extra blank line


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/modules/ffs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/ffs/Makefile
diff -u src/sys/modules/ffs/Makefile:1.20 src/sys/modules/ffs/Makefile:1.21
--- src/sys/modules/ffs/Makefile:1.20	Sat Jan  8 01:50:54 2022
+++ src/sys/modules/ffs/Makefile	Sat Jan  8 01:58:16 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2022/01/08 01:50:54 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.21 2022/01/08 01:58:16 pgoyette Exp $
 
 .include "../Makefile.inc"
 
@@ -12,7 +12,6 @@ CPPFLAGS+=	-DUFS_EXTATTR -DUFS_ACL
 CWARNFLAGS.clang=	-Wno-conversion
 COPTS.ffs_appleufs.c+=   ${NO_ADDR_OF_PACKED_MEMBER}
 
-
 SRCS+=	ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_subr.c ffs_tables.c \
 	ffs_vfsops.c ffs_vnops.c ffs_snapshot.c ffs_extattr.c \
 	ffs_bswap.c ffs_wapbl.c ffs_appleufs.c ffs_quota2.c



CVS commit: src/sys/modules/ffs

2022-01-07 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Jan  8 01:58:16 UTC 2022

Modified Files:
src/sys/modules/ffs: Makefile

Log Message:
Remove extra blank line


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/modules/ffs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/modules/ffs

2022-01-07 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Jan  8 01:50:54 UTC 2022

Modified Files:
src/sys/modules/ffs: Makefile

Log Message:
Use \t for pre-comment white-space


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/modules/ffs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/ffs/Makefile
diff -u src/sys/modules/ffs/Makefile:1.19 src/sys/modules/ffs/Makefile:1.20
--- src/sys/modules/ffs/Makefile:1.19	Thu Jan  6 15:08:56 2022
+++ src/sys/modules/ffs/Makefile	Sat Jan  8 01:50:54 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2022/01/06 15:08:56 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.20 2022/01/08 01:50:54 pgoyette Exp $
 
 .include "../Makefile.inc"
 
@@ -7,7 +7,7 @@
 KMOD=	ffs
 CPPFLAGS+=	-DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
 CPPFLAGS+=	-DUFS_EXTATTR -DUFS_ACL
-#CPPFLAGS+=	-DUFS_DIRHASH # disabled - suspected of corrupting memory
+#CPPFLAGS+=	-DUFS_DIRHASH	# disabled - suspected of corrupting memory
 
 CWARNFLAGS.clang=	-Wno-conversion
 COPTS.ffs_appleufs.c+=   ${NO_ADDR_OF_PACKED_MEMBER}



CVS commit: src/sys/modules/ffs

2022-01-07 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Jan  8 01:50:54 UTC 2022

Modified Files:
src/sys/modules/ffs: Makefile

Log Message:
Use \t for pre-comment white-space


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/modules/ffs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/modules/ufs

2022-01-06 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Jan  6 20:41:31 UTC 2022

Modified Files:
src/sys/modules/ufs: Makefile

Log Message:
Fix previous and actually disable UFS_DIRHASH


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/ufs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/modules/ufs

2022-01-06 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Jan  6 20:41:31 UTC 2022

Modified Files:
src/sys/modules/ufs: Makefile

Log Message:
Fix previous and actually disable UFS_DIRHASH


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/ufs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/ufs/Makefile
diff -u src/sys/modules/ufs/Makefile:1.5 src/sys/modules/ufs/Makefile:1.6
--- src/sys/modules/ufs/Makefile:1.5	Thu Jan  6 15:08:56 2022
+++ src/sys/modules/ufs/Makefile	Thu Jan  6 20:41:30 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2022/01/06 15:08:56 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.6 2022/01/06 20:41:30 pgoyette Exp $
 
 .include "../Makefile.inc"
 
@@ -6,7 +6,7 @@ KMOD=	ufs
 
 CPPFLAGS+=	-DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
 CPPFLAGS+=	-DUFS_EXTATTR -DUFS_ACL
-CPPFLAGS+=	-DUFS_DIRHASH	# disabled - suspected of corrupting memory
+#CPPFLAGS+=	-DUFS_DIRHASH	# disabled - suspected of corrupting memory
 
 CWARNFLAGS.clang=	-Wno-conversion
 



CVS commit: src/sys/modules

2022-01-06 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Jan  6 15:08:56 UTC 2022

Modified Files:
src/sys/modules/ffs: Makefile
src/sys/modules/ufs: Makefile

Log Message:
Since UFS_DIRHASH is explicitly disabled in GENERIC kernels (due to
being suspected of memory corruption), it should not be enabled in
the default module configurations either.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/modules/ffs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/ufs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/ffs/Makefile
diff -u src/sys/modules/ffs/Makefile:1.18 src/sys/modules/ffs/Makefile:1.19
--- src/sys/modules/ffs/Makefile:1.18	Sun Oct 18 19:56:41 2020
+++ src/sys/modules/ffs/Makefile	Thu Jan  6 15:08:56 2022
@@ -1,12 +1,13 @@
-#	$NetBSD: Makefile,v 1.18 2020/10/18 19:56:41 christos Exp $
+#	$NetBSD: Makefile,v 1.19 2022/01/06 15:08:56 pgoyette Exp $
 
 .include "../Makefile.inc"
 
 .PATH:	${S}/ufs/ffs
 
 KMOD=	ffs
-CPPFLAGS+=  -DUFS_DIRHASH -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
+CPPFLAGS+=	-DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
 CPPFLAGS+=	-DUFS_EXTATTR -DUFS_ACL
+#CPPFLAGS+=	-DUFS_DIRHASH # disabled - suspected of corrupting memory
 
 CWARNFLAGS.clang=	-Wno-conversion
 COPTS.ffs_appleufs.c+=   ${NO_ADDR_OF_PACKED_MEMBER}

Index: src/sys/modules/ufs/Makefile
diff -u src/sys/modules/ufs/Makefile:1.4 src/sys/modules/ufs/Makefile:1.5
--- src/sys/modules/ufs/Makefile:1.4	Sat May 16 18:31:52 2020
+++ src/sys/modules/ufs/Makefile	Thu Jan  6 15:08:56 2022
@@ -1,11 +1,12 @@
-#	$NetBSD: Makefile,v 1.4 2020/05/16 18:31:52 christos Exp $
+#	$NetBSD: Makefile,v 1.5 2022/01/06 15:08:56 pgoyette Exp $
 
 .include "../Makefile.inc"
 
 KMOD=	ufs
 
-CPPFLAGS+=  -DUFS_DIRHASH -DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
+CPPFLAGS+=	-DFFS_EI -DWAPBL -DAPPLE_UFS -DQUOTA -DQUOTA2
 CPPFLAGS+=	-DUFS_EXTATTR -DUFS_ACL
+CPPFLAGS+=	-DUFS_DIRHASH	# disabled - suspected of corrupting memory
 
 CWARNFLAGS.clang=	-Wno-conversion
 



CVS commit: src/sys/modules

2022-01-06 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Jan  6 15:08:56 UTC 2022

Modified Files:
src/sys/modules/ffs: Makefile
src/sys/modules/ufs: Makefile

Log Message:
Since UFS_DIRHASH is explicitly disabled in GENERIC kernels (due to
being suspected of memory corruption), it should not be enabled in
the default module configurations either.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/modules/ffs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/ufs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/amd64

2021-12-30 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Fri Dec 31 04:59:16 UTC 2021

Modified Files:
src/distrib/amd64/installimage: Makefile
src/distrib/amd64/installimage-bios: Makefile

Log Message:
Still not big enough - bump some more.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/installimage-bios/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/amd64

2021-12-30 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Fri Dec 31 04:59:16 UTC 2021

Modified Files:
src/distrib/amd64/installimage: Makefile
src/distrib/amd64/installimage-bios: Makefile

Log Message:
Still not big enough - bump some more.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/installimage-bios/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/amd64/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.19 src/distrib/amd64/installimage/Makefile:1.20
--- src/distrib/amd64/installimage/Makefile:1.19	Thu Dec 30 15:01:55 2021
+++ src/distrib/amd64/installimage/Makefile	Fri Dec 31 04:59:16 2021
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.19 2021/12/30 15:01:55 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.20 2021/12/31 04:59:16 pgoyette Exp $
 
 .include 
 
 INSTIMGBASE=	NetBSD-${DISTRIBVER}-amd64-install	# gives ${IMGBASE}.img
 
-INSTIMAGEMB?=	2180			# for all installation binaries
+INSTIMAGEMB?=	2250			# for all installation binaries
 
 PRIMARY_BOOT=		bootxx_ffsv1
 SECONDARY_BOOT=		boot

Index: src/distrib/amd64/installimage-bios/Makefile
diff -u src/distrib/amd64/installimage-bios/Makefile:1.3 src/distrib/amd64/installimage-bios/Makefile:1.4
--- src/distrib/amd64/installimage-bios/Makefile:1.3	Thu Dec 30 15:01:55 2021
+++ src/distrib/amd64/installimage-bios/Makefile	Fri Dec 31 04:59:15 2021
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.3 2021/12/30 15:01:55 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.4 2021/12/31 04:59:15 pgoyette Exp $
 
 .include 
 
 INSTIMGBASE=	NetBSD-${DISTRIBVER}-amd64-bios-install	# gives ${IMGBASE}.img
 
-INSTIMAGEMB?=	2180			# for all installation binaries
+INSTIMAGEMB?=	2250			# for all installation binaries
 
 PRIMARY_BOOT=		bootxx_ffsv1
 SECONDARY_BOOT=		boot



CVS commit: src/distrib/amd64

2021-12-30 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Dec 30 15:01:56 UTC 2021

Modified Files:
src/distrib/amd64/installimage: Makefile
src/distrib/amd64/installimage-bios: Makefile

Log Message:
With recent changees to debug kernel stuff from Christos we are
once again pushing the size limit.  Bump it again.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/installimage-bios/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/distrib/amd64

2021-12-30 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Thu Dec 30 15:01:56 UTC 2021

Modified Files:
src/distrib/amd64/installimage: Makefile
src/distrib/amd64/installimage-bios: Makefile

Log Message:
With recent changees to debug kernel stuff from Christos we are
once again pushing the size limit.  Bump it again.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/installimage-bios/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/amd64/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.18 src/distrib/amd64/installimage/Makefile:1.19
--- src/distrib/amd64/installimage/Makefile:1.18	Sun Dec 26 03:07:06 2021
+++ src/distrib/amd64/installimage/Makefile	Thu Dec 30 15:01:55 2021
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.18 2021/12/26 03:07:06 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.19 2021/12/30 15:01:55 pgoyette Exp $
 
 .include 
 
 INSTIMGBASE=	NetBSD-${DISTRIBVER}-amd64-install	# gives ${IMGBASE}.img
 
-INSTIMAGEMB?=	2150			# for all installation binaries
+INSTIMAGEMB?=	2180			# for all installation binaries
 
 PRIMARY_BOOT=		bootxx_ffsv1
 SECONDARY_BOOT=		boot

Index: src/distrib/amd64/installimage-bios/Makefile
diff -u src/distrib/amd64/installimage-bios/Makefile:1.2 src/distrib/amd64/installimage-bios/Makefile:1.3
--- src/distrib/amd64/installimage-bios/Makefile:1.2	Sun Dec 26 03:07:06 2021
+++ src/distrib/amd64/installimage-bios/Makefile	Thu Dec 30 15:01:55 2021
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.2 2021/12/26 03:07:06 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.3 2021/12/30 15:01:55 pgoyette Exp $
 
 .include 
 
 INSTIMGBASE=	NetBSD-${DISTRIBVER}-amd64-bios-install	# gives ${IMGBASE}.img
 
-INSTIMAGEMB?=	2150			# for all installation binaries
+INSTIMAGEMB?=	2180			# for all installation binaries
 
 PRIMARY_BOOT=		bootxx_ffsv1
 SECONDARY_BOOT=		boot



CVS commit: src/distrib/amd64

2021-12-25 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sun Dec 26 03:07:06 UTC 2021

Modified Files:
src/distrib/amd64/installimage: Makefile
src/distrib/amd64/installimage-bios: Makefile

Log Message:
Once again things have grown, so the install image allocation size
needs to be bumped.

XXX There's gotta be a better way to maintain this!  :-)


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/installimage-bios/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/amd64/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.17 src/distrib/amd64/installimage/Makefile:1.18
--- src/distrib/amd64/installimage/Makefile:1.17	Wed Jun  2 16:07:33 2021
+++ src/distrib/amd64/installimage/Makefile	Sun Dec 26 03:07:06 2021
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.17 2021/06/02 16:07:33 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.18 2021/12/26 03:07:06 pgoyette Exp $
 
 .include 
 
 INSTIMGBASE=	NetBSD-${DISTRIBVER}-amd64-install	# gives ${IMGBASE}.img
 
-INSTIMAGEMB?=	1800			# for all installation binaries
+INSTIMAGEMB?=	2150			# for all installation binaries
 
 PRIMARY_BOOT=		bootxx_ffsv1
 SECONDARY_BOOT=		boot

Index: src/distrib/amd64/installimage-bios/Makefile
diff -u src/distrib/amd64/installimage-bios/Makefile:1.1 src/distrib/amd64/installimage-bios/Makefile:1.2
--- src/distrib/amd64/installimage-bios/Makefile:1.1	Fri Oct  8 20:24:06 2021
+++ src/distrib/amd64/installimage-bios/Makefile	Sun Dec 26 03:07:06 2021
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.1 2021/10/08 20:24:06 maya Exp $
+#	$NetBSD: Makefile,v 1.2 2021/12/26 03:07:06 pgoyette Exp $
 
 .include 
 
 INSTIMGBASE=	NetBSD-${DISTRIBVER}-amd64-bios-install	# gives ${IMGBASE}.img
 
-INSTIMAGEMB?=	1800			# for all installation binaries
+INSTIMAGEMB?=	2150			# for all installation binaries
 
 PRIMARY_BOOT=		bootxx_ffsv1
 SECONDARY_BOOT=		boot



CVS commit: src/distrib/amd64

2021-12-25 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sun Dec 26 03:07:06 UTC 2021

Modified Files:
src/distrib/amd64/installimage: Makefile
src/distrib/amd64/installimage-bios: Makefile

Log Message:
Once again things have grown, so the install image allocation size
needs to be bumped.

XXX There's gotta be a better way to maintain this!  :-)


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/installimage-bios/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



Re: CVS commit: src/sys/arch/x86/x86

2021-10-15 Thread Paul Goyette

hehehe - porn iterators - love it!


On Fri, 15 Oct 2021, Jason Thorpe wrote:


I demand this change be reverted.

(/s)


On Oct 15, 2021, at 11:12 AM, Jared D. McNeill  wrote:

Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 15 18:12:48 UTC 2021

Modified Files:
src/sys/arch/x86/x86: tsc.c

Log Message:
Fix typo in comment: "porniters" -> "pointers"


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/x86/x86/tsc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



-- thorpej


!DSPAM:6169cf82254421105921466!




++--+----------+
| Paul Goyette   | PGP Key fingerprint: | E-mail addresses:|
| (Retired)  | FA29 0E3B 35AF E8AE 6651 | p...@whooppee.com|
| Software Developer | 0786 F758 55DE 53BA 7731 | pgoye...@netbsd.org  |
| & Network Engineer |  | pgoyett...@gmail.com |
++--+--+


CVS commit: src

2021-09-11 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Sep 11 16:10:37 UTC 2021

Modified Files:
src/distrib/sets/lists/debug: module.mi
src/distrib/sets/lists/modules: mi
src/sys/modules: Makefile

Log Message:
Build and install the if_run module.  run(4) is not necessarily included
in all GENERIC kernels (as reported on libera IRC).


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/debug/module.mi
cvs rdiff -u -r1.145 -r1.146 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.254 -r1.255 src/sys/modules/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/debug/module.mi
diff -u src/distrib/sets/lists/debug/module.mi:1.11 src/distrib/sets/lists/debug/module.mi:1.12
--- src/distrib/sets/lists/debug/module.mi:1.11	Thu Aug 19 05:09:24 2021
+++ src/distrib/sets/lists/debug/module.mi	Sat Sep 11 16:10:37 2021
@@ -1,4 +1,4 @@
-# $NetBSD: module.mi,v 1.11 2021/08/19 05:09:24 christos Exp $
+# $NetBSD: module.mi,v 1.12 2021/09/11 16:10:37 pgoyette Exp $
 ./usr/libdata/debug/@MODULEDIR@	modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/accf_dataready			modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/accf_dataready/accf_dataready.kmod.debug	modules-base-kernel	kmod,debug
@@ -202,6 +202,8 @@
 ./usr/libdata/debug/@MODULEDIR@/if_ppp/if_ppp.kmod.debug		modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/if_pppoemodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/if_pppoe/if_pppoe.kmod.debug		modules-base-kernel	kmod,debug
+./usr/libdata/debug/@MODULEDIR@/if_runmodules-base-kernel	kmod,debug
+./usr/libdata/debug/@MODULEDIR@/if_run/if_run.kmod.debug	modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/if_slmodules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/if_sl/if_sl.kmod.debug			modules-base-kernel	kmod,debug
 ./usr/libdata/debug/@MODULEDIR@/if_smscmodules-base-kernel	kmod,debug

Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.145 src/distrib/sets/lists/modules/mi:1.146
--- src/distrib/sets/lists/modules/mi:1.145	Tue Aug 17 17:31:59 2021
+++ src/distrib/sets/lists/modules/mi	Sat Sep 11 16:10:37 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.145 2021/08/17 17:31:59 christos Exp $
+# $NetBSD: mi,v 1.146 2021/09/11 16:10:37 pgoyette Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -225,6 +225,8 @@
 ./@MODULEDIR@/if_ppp/if_ppp.kmod		modules-base-kernel	kmod
 ./@MODULEDIR@/if_pppoemodules-base-kernel	kmod
 ./@MODULEDIR@/if_pppoe/if_pppoe.kmod		modules-base-kernel	kmod
+./@MODULEDIR@/if_runmodules-base-kernel	kmod
+./@MODULEDIR@/if_run/if_run.kmod		modules-base-kernel	kmod
 ./@MODULEDIR@/if_slmodules-base-kernel	kmod
 ./@MODULEDIR@/if_sl/if_sl.kmod			modules-base-kernel	kmod
 ./@MODULEDIR@/if_smscmodules-base-kernel	kmod

Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.254 src/sys/modules/Makefile:1.255
--- src/sys/modules/Makefile:1.254	Wed Aug 18 09:07:07 2021
+++ src/sys/modules/Makefile	Sat Sep 11 16:10:37 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.254 2021/08/18 09:07:07 christos Exp $
+#	$NetBSD: Makefile,v 1.255 2021/09/11 16:10:37 pgoyette Exp $
 
 .include 
 
@@ -89,6 +89,7 @@ SUBDIR+=	if_mue
 SUBDIR+=	if_npflog
 SUBDIR+=	if_ppp
 SUBDIR+=	if_pppoe
+SUBDIR+=	if_run
 SUBDIR+=	if_sl
 SUBDIR+=	if_smsc
 SUBDIR+=	if_srt srt



CVS commit: src

2021-09-11 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat Sep 11 16:10:37 UTC 2021

Modified Files:
src/distrib/sets/lists/debug: module.mi
src/distrib/sets/lists/modules: mi
src/sys/modules: Makefile

Log Message:
Build and install the if_run module.  run(4) is not necessarily included
in all GENERIC kernels (as reported on libera IRC).


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/debug/module.mi
cvs rdiff -u -r1.145 -r1.146 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.254 -r1.255 src/sys/modules/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



  1   2   3   4   5   6   7   >