Page MenuHomeFreeBSD
Files F159558960

D11825.diff
No OneTemporary
Actions

D11825.diff
View Options

Index: head/sys/conf/files
===================================================================
--- head/sys/conf/files
+++ head/sys/conf/files
@@ -86,9 +86,9 @@
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
Index: head/sys/conf/files.amd64
===================================================================
--- head/sys/conf/files.amd64
+++ head/sys/conf/files.amd64
@@ -341,7 +341,7 @@
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
Index: head/sys/dev/nvd/nvd.c
===================================================================
--- head/sys/dev/nvd/nvd.c
+++ head/sys/dev/nvd/nvd.c
@@ -134,6 +134,8 @@
static int
nvd_load()
{
+ if (!nvme_use_nvd)
+ return 0;
TAILQ_INIT(&ctrlr_head);
TAILQ_INIT(&disk_head);
@@ -149,6 +151,9 @@
{
struct nvd_controller *ctrlr;
struct nvd_disk *disk;
+
+ if (!nvme_use_nvd)
+ return;
while (!TAILQ_EMPTY(&ctrlr_head)) {
ctrlr = TAILQ_FIRST(&ctrlr_head);
Index: head/sys/dev/nvme/nvme.h
===================================================================
--- head/sys/dev/nvme/nvme.h
+++ head/sys/dev/nvme/nvme.h
@@ -1003,6 +1003,8 @@
cmd->cdw11 = NVME_DSM_ATTR_DEALLOCATE;
}
+extern int nvme_use_nvd;
+
#endif /* _KERNEL */
#endif /* __NVME_H__ */
Index: head/sys/dev/nvme/nvme_sim.c
===================================================================
--- head/sys/dev/nvme/nvme_sim.c
+++ head/sys/dev/nvme/nvme_sim.c
@@ -371,6 +371,8 @@
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 @@
static void
nvme_sim_uninit(void)
{
+ if (nvme_use_nvd)
+ return;
/* XXX Cleanup */
nvme_unregister_consumer(consumer_cookie);
Index: head/sys/dev/nvme/nvme_sysctl.c
===================================================================
--- head/sys/dev/nvme/nvme_sysctl.c
+++ head/sys/dev/nvme/nvme_sysctl.c
@@ -33,6 +33,12 @@
#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

File Metadata

Mime Type
text/plain
Expires
Tue, Jun 16, 5:17 PM (18 h, 43 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33994829
Default Alt Text
D11825.diff (2 KB)

Event Timeline