svn commit: r322036 - in head/sys: conf dev/nvd dev/nvme

[Warner Losh]

Author: imp
Date: Fri Aug  4 03:40:01 2017
New Revision: 322036
URL: https://svnweb.freebsd.org/changeset/base/322036

Log:
  Make nvd vs nda choice boot-time rather than build-time
  
  Introduce hw.nvme.use_nvd tunable. This tunable allows both nvd and
  nda to be installed in the kernel, while allowing only one of them to
  create devices. This is an all-or-nothing setting, and you can't
  change it after boot-time. However, it will allow easier A/B testing.
  
  Differential Revision: https://reviews.freebsd.org/D11825

Modified:
  head/sys/conf/files
  head/sys/conf/files.amd64
  head/sys/dev/nvd/nvd.c
  head/sys/dev/nvme/nvme.h
  head/sys/dev/nvme/nvme_sim.c
  head/sys/dev/nvme/nvme_sysctl.c

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Fri Aug  4 03:20:01 2017	(r322035)
+++ head/sys/conf/files	Fri Aug  4 03:40:01 2017	(r322036)
@@ -86,9 +86,9 @@ cam/cam_xpt.c			optional scbus
 cam/ata/ata_all.c		optional scbus
 cam/ata/ata_xpt.c		optional scbus
 cam/ata/ata_pmp.c		optional scbus
-cam/nvme/nvme_all.c		optional scbus nvme !nvd
-cam/nvme/nvme_da.c		optional scbus nvme da !nvd
-cam/nvme/nvme_xpt.c		optional scbus nvme !nvd
+cam/nvme/nvme_all.c		optional scbus nvme
+cam/nvme/nvme_da.c		optional scbus nvme da
+cam/nvme/nvme_xpt.c		optional scbus nvme
 cam/scsi/scsi_xpt.c		optional scbus
 cam/scsi/scsi_all.c		optional scbus
 cam/scsi/scsi_cd.c		optional cd

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Fri Aug  4 03:20:01 2017	(r322035)
+++ head/sys/conf/files.amd64	Fri Aug  4 03:40:01 2017	(r322036)
@@ -341,7 +341,7 @@ dev/nvme/nvme_ctrlr_cmd.c	optional	nvme
 dev/nvme/nvme_ns.c		optional	nvme
 dev/nvme/nvme_ns_cmd.c		optional	nvme
 dev/nvme/nvme_qpair.c		optional	nvme
-dev/nvme/nvme_sim.c		optional	nvme scbus !nvd
+dev/nvme/nvme_sim.c		optional	nvme scbus
 dev/nvme/nvme_sysctl.c		optional	nvme
 dev/nvme/nvme_test.c		optional	nvme
 dev/nvme/nvme_util.c		optional	nvme

Modified: head/sys/dev/nvd/nvd.c
==============================================================================
--- head/sys/dev/nvd/nvd.c	Fri Aug  4 03:20:01 2017	(r322035)
+++ head/sys/dev/nvd/nvd.c	Fri Aug  4 03:40:01 2017	(r322036)
@@ -134,6 +134,8 @@ MODULE_DEPEND(nvd, nvme, 1, 1, 1);
 static int
 nvd_load()
 {
+	if (!nvme_use_nvd)
+		return 0;
 
 	TAILQ_INIT(&ctrlr_head);
 	TAILQ_INIT(&disk_head);
@@ -149,6 +151,9 @@ nvd_unload()
 {
 	struct nvd_controller	*ctrlr;
 	struct nvd_disk		*disk;
+
+	if (!nvme_use_nvd)
+		return;
 
 	while (!TAILQ_EMPTY(&ctrlr_head)) {
 		ctrlr = TAILQ_FIRST(&ctrlr_head);

Modified: head/sys/dev/nvme/nvme.h
==============================================================================
--- head/sys/dev/nvme/nvme.h	Fri Aug  4 03:20:01 2017	(r322035)
+++ head/sys/dev/nvme/nvme.h	Fri Aug  4 03:40:01 2017	(r322036)
@@ -1003,6 +1003,8 @@ void	nvme_ns_trim_cmd(struct nvme_command *cmd, uint16
 	cmd->cdw11 = NVME_DSM_ATTR_DEALLOCATE;
 }
 
+extern int nvme_use_nvd;
+
 #endif /* _KERNEL */
 
 #endif /* __NVME_H__ */

Modified: head/sys/dev/nvme/nvme_sim.c
==============================================================================
--- head/sys/dev/nvme/nvme_sim.c	Fri Aug  4 03:20:01 2017	(r322035)
+++ head/sys/dev/nvme/nvme_sim.c	Fri Aug  4 03:40:01 2017	(r322036)
@@ -371,6 +371,8 @@ struct nvme_consumer *consumer_cookie;
 static void
 nvme_sim_init(void)
 {
+	if (nvme_use_nvd)
+		return;
 
 	consumer_cookie = nvme_register_consumer(nvme_sim_new_ns,
 	    nvme_sim_new_controller, NULL, nvme_sim_controller_fail);
@@ -382,6 +384,8 @@ SYSINIT(nvme_sim_register, SI_SUB_DRIVERS, SI_ORDER_AN
 static void
 nvme_sim_uninit(void)
 {
+	if (nvme_use_nvd)
+		return;
 	/* XXX Cleanup */
 
 	nvme_unregister_consumer(consumer_cookie);

Modified: head/sys/dev/nvme/nvme_sysctl.c
==============================================================================
--- head/sys/dev/nvme/nvme_sysctl.c	Fri Aug  4 03:20:01 2017	(r322035)
+++ head/sys/dev/nvme/nvme_sysctl.c	Fri Aug  4 03:40:01 2017	(r322036)
@@ -33,6 +33,12 @@ __FBSDID("$FreeBSD$");
 
 #include "nvme_private.h"
 
+int nvme_use_nvd = 1;
+
+SYSCTL_NODE(_hw, OID_AUTO, nvme, CTLFLAG_RD, 0, "NVMe sysctl tunables");
+SYSCTL_INT(_hw_nvme, OID_AUTO, use_nvd, CTLFLAG_RDTUN,
+    &nvme_use_nvd, 1, "1 = Create NVD devices, 0 = Create NDA devices");
+
 /*
  * CTLTYPE_S64 and sysctl_handle_64 were added in r217616.  Define these
  *  explicitly here for older kernels that don't include the r217616