svn commit: r328692 - in stable/11/sys: conf dev/nvme

[Alexander Motin]

Author: mav
Date: Thu Feb  1 16:53:08 2018
New Revision: 328692
URL: https://svnweb.freebsd.org/changeset/base/328692

Log:
  MFC r322995 (by imp):
  Add new compile-time option NVME_USE_NVD that sets the default value
  of the runtime hw.nvme.use_vnd tunable. We still default to nvd unless
  otherwise requested.

Modified:
  stable/11/sys/conf/options
  stable/11/sys/dev/nvme/nvme_sysctl.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/conf/options
==============================================================================
--- stable/11/sys/conf/options	Thu Feb  1 16:52:03 2018	(r328691)
+++ stable/11/sys/conf/options	Thu Feb  1 16:53:08 2018	(r328692)
@@ -1001,3 +1001,6 @@ UINPUT_DEBUG	opt_evdev.h
 
 # Hyper-V network driver
 HN_DEBUG	opt_hn.h
+
+# NVME options
+NVME_USE_NVD	opt_nvme.h

Modified: stable/11/sys/dev/nvme/nvme_sysctl.c
==============================================================================
--- stable/11/sys/dev/nvme/nvme_sysctl.c	Thu Feb  1 16:52:03 2018	(r328691)
+++ stable/11/sys/dev/nvme/nvme_sysctl.c	Thu Feb  1 16:53:08 2018	(r328692)
@@ -27,13 +27,19 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_nvme.h"
+
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/sysctl.h>
 
 #include "nvme_private.h"
 
-int nvme_use_nvd = 1;
+#ifndef NVME_USE_NVD
+#define NVME_USE_NVD 1
+#endif
+
+int nvme_use_nvd = NVME_USE_NVD;
 
 SYSCTL_NODE(_hw, OID_AUTO, nvme, CTLFLAG_RD, 0, "NVMe sysctl tunables");
 SYSCTL_INT(_hw_nvme, OID_AUTO, use_nvd, CTLFLAG_RDTUN,