From owner-svn-src-head@freebsd.org  Mon Aug 28 23:54:27 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 231EDE16729;
 Mon, 28 Aug 2017 23:54:27 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DF55F6A35C;
 Mon, 28 Aug 2017 23:54:26 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7SNsPdp012886;
 Mon, 28 Aug 2017 23:54:25 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7SNsPWb012884;
 Mon, 28 Aug 2017 23:54:25 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201708282354.v7SNsPWb012884@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 28 Aug 2017 23:54:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r322995 - in head/sys: conf dev/nvme
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: in head/sys: conf dev/nvme
X-SVN-Commit-Revision: 322995
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Aug 2017 23:54:27 -0000

Author: imp
Date: Mon Aug 28 23:54:25 2017
New Revision: 322995
URL: https://svnweb.freebsd.org/changeset/base/322995

Log:
  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.
  
  Sponsored by: Netflix

Modified:
  head/sys/conf/options
  head/sys/dev/nvme/nvme_sysctl.c

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Mon Aug 28 23:54:20 2017	(r322994)
+++ head/sys/conf/options	Mon Aug 28 23:54:25 2017	(r322995)
@@ -998,3 +998,6 @@ HN_DEBUG	opt_hn.h
 MMCCAM
 # Encrypted kernel crash dumps
 EKCD		opt_ekcd.h
+
+# NVME options
+NVME_USE_NVD	opt_nvme.h

Modified: head/sys/dev/nvme/nvme_sysctl.c
==============================================================================
--- head/sys/dev/nvme/nvme_sysctl.c	Mon Aug 28 23:54:20 2017	(r322994)
+++ head/sys/dev/nvme/nvme_sysctl.c	Mon Aug 28 23:54:25 2017	(r322995)
@@ -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,