Module Name: src
Committed By: pgoyette
Date: Sat Jun 5 22:21:15 UTC 2021
Modified Files:
src/sys/dev/mii: mii_verbose.c
src/sys/dev/scsipi: scsipi_verbose.c
Log Message:
As with usbverbose and pciverbose, these modules are not safe to be
auto-unloaded. Disable for now.
All of these need to be updated with an appropriate refcount mechanism
to ensure that the code and/or tables aren't unloaded while they are
being used.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/mii/mii_verbose.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/scsipi/scsipi_verbose.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/mii/mii_verbose.c
diff -u src/sys/dev/mii/mii_verbose.c:1.6 src/sys/dev/mii/mii_verbose.c:1.7
--- src/sys/dev/mii/mii_verbose.c:1.6 Mon Mar 25 09:46:24 2019
+++ src/sys/dev/mii/mii_verbose.c Sat Jun 5 22:21:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_verbose.c,v 1.6 2019/03/25 09:46:24 msaitoh Exp $ */
+/* $NetBSD: mii_verbose.c,v 1.7 2021/06/05 22:21:15 pgoyette Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mii_verbose.c,v 1.6 2019/03/25 09:46:24 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii_verbose.c,v 1.7 2021/06/05 22:21:15 pgoyette Exp $");
#include <sys/module.h>
#include <dev/mii/miidevs.h>
@@ -81,6 +81,8 @@ miiverbose_modcmd(modcmd_t cmd, void *ar
mii_get_descr = saved_mii_get_descr;
mii_verbose_loaded = 0;
return 0;
+ casce MODULE_CMD_AUTOUNLOAD:
+ return EBUSY;
default:
return ENOTTY;
}
Index: src/sys/dev/scsipi/scsipi_verbose.c
diff -u src/sys/dev/scsipi/scsipi_verbose.c:1.34 src/sys/dev/scsipi/scsipi_verbose.c:1.35
--- src/sys/dev/scsipi/scsipi_verbose.c:1.34 Sun Sep 16 23:20:18 2018
+++ src/sys/dev/scsipi/scsipi_verbose.c Sat Jun 5 22:21:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_verbose.c,v 1.34 2018/09/16 23:20:18 mrg Exp $ */
+/* $NetBSD: scsipi_verbose.c,v 1.35 2021/06/05 22:21:15 pgoyette Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_verbose.c,v 1.34 2018/09/16 23:20:18 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_verbose.c,v 1.35 2021/06/05 22:21:15 pgoyette Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -853,6 +853,8 @@ scsiverbose_modcmd(modcmd_t cmd, void *a
scsipi_print_sense_data = saved_print_sense_data;
scsi_verbose_loaded = 0;
return 0;
+ case MODULE_CMD_AUTOUNLOAD:
+ return EBUSY;
default:
return ENOTTY;
}
