git: 081b4452a758 - main - geli: Add a chicken switch for unmapped I/O

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=081b4452a758dd81dcdc68ffb6f7bad901d53e3d

commit 081b4452a758dd81dcdc68ffb6f7bad901d53e3d
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2022-04-18 21:16:10 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2022-04-18 21:55:24 +0000

    geli: Add a chicken switch for unmapped I/O
    
    We have a report of a panic in GELI that appears to go away when
    unmapped I/O is disabled.  Add a tunable to make such investigations
    easier in the future.  No functional change intended.
    
    PR:             262894
    Reviewed by:    asomers
    MFC after:      1 week
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D34944
---
 lib/geom/eli/geli.8  |  8 +++++++-
 sys/geom/eli/g_eli.c | 12 ++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/geom/eli/geli.8 b/lib/geom/eli/geli.8
index 68018e8022cd..1ad0c684642b 100644
--- a/lib/geom/eli/geli.8
+++ b/lib/geom/eli/geli.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 15, 2020
+.Dd April 18, 2022
 .Dt GELI 8
 .Os
 .Sh NAME
@@ -886,6 +886,12 @@ Reports how many times we were looking up a Data Key and it was not in cache.
 This sysctl is not updated for providers that need fewer Data Keys than the limit
 specified in
 .Va kern.geom.eli.key_cache_limit .
+.Va kern.geom.eli.unmapped_io
+Enable support for unmapped I/O buffers, currently implemented only on 64-bit
+platforms.
+This is an optimization which reduces the overhead of I/O processing.
+This variable is intended for debugging purposes and must be set in
+.Pa /boot/loader.conf .
 .El
 .Sh EXIT STATUS
 Exit status is 0 on success, and 1 if the command fails.
diff --git a/sys/geom/eli/g_eli.c b/sys/geom/eli/g_eli.c
index 74dd5de3dc83..ac25be604932 100644
--- a/sys/geom/eli/g_eli.c
+++ b/sys/geom/eli/g_eli.c
@@ -97,15 +97,19 @@ static int sysctl_g_eli_minbufs(SYSCTL_HANDLER_ARGS);
 SYSCTL_PROC(_kern_geom_eli, OID_AUTO, minbufs, CTLTYPE_UINT | CTLFLAG_RW |
     CTLFLAG_MPSAFE, NULL, 0, sysctl_g_eli_minbufs, "IU",
     "Number of GELI bufs reserved for swap transactions");
+static bool g_eli_blocking_malloc = false;
+SYSCTL_BOOL(_kern_geom_eli, OID_AUTO, blocking_malloc, CTLFLAG_RWTUN,
+    &g_eli_blocking_malloc, 0, "Use blocking malloc calls for GELI buffers");
+static bool g_eli_unmapped_io = true;
+SYSCTL_BOOL(_kern_geom_eli, OID_AUTO, unmapped_io, CTLFLAG_RDTUN,
+    &g_eli_unmapped_io, 0, "Enable support for unmapped I/O");
+
 static struct sx g_eli_umalock;	/* Controls changes to UMA zone. */
 SX_SYSINIT(g_eli_umalock, &g_eli_umalock, "GELI UMA");
 static uma_zone_t g_eli_uma = NULL;
 static int g_eli_alloc_sz;
 static volatile int g_eli_umaoutstanding;
 static volatile int g_eli_devs;
-static bool g_eli_blocking_malloc = false;
-SYSCTL_BOOL(_kern_geom_eli, OID_AUTO, blocking_malloc, CTLFLAG_RWTUN,
-    &g_eli_blocking_malloc, 0, "Use blocking malloc calls for GELI buffers");
 
 /*
  * Control the number of reserved entries in the GELI zone.
@@ -1137,7 +1141,7 @@ g_eli_create(struct gctl_req *req, struct g_class *mp, struct g_provider *bpp,
 	 */
 	pp = g_new_providerf(gp, "%s%s", bpp->name, G_ELI_SUFFIX);
 	pp->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE;
-	if (CRYPTO_HAS_VMPAGE) {
+	if (g_eli_unmapped_io && CRYPTO_HAS_VMPAGE) {
 		/*
 		 * On DMAP architectures we can use unmapped I/O.  But don't
 		 * use it with data integrity verification.  That code hasn't