From nobody Tue Jul 19 14:09:27 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LnLLJ3ctjz4XP1W; Tue, 19 Jul 2022 14:09:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LnLLJ1dnVz3ZCm; Tue, 19 Jul 2022 14:09:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658239768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qrIxn3/RyC6fK9FaHDkdOB4eGTVtDsGfFsuB+UTHZ60=; b=Z29fsJIxDRt43MRfvMRIS0Mi6GXQtqgOH1f0QXEAtLKd2jOIU7Iqos3v+E4LYRN+0JyxDJ 8ZZ8foCZBxifASAr1W4sCPHVrSzqR82UprS+PFOe2rC0aMpp8a8h6m118ubpvaRHdYO0MT S0qg40J5dJE3Cs9+hZZmA9ukm7MqZJSgw067vaCWUXpOK9VRo+cGHHjQDSd/pWcDaAcAPE 6yMAbq8v5OeYFV08U0tquvaInKoP97WTr2ceZdDqrcJ+5a53LdR3sRaYylOy1Gw1RWLMez 7eGmLHeZ8qzOfANlciuqWcWUJDxPuvkrexf13EtrAdxdEfzqj/HazvRunL+R7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LnLLJ0S6rzLWL; Tue, 19 Jul 2022 14:09:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26JE9Rss052014; Tue, 19 Jul 2022 14:09:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26JE9RnS052013; Tue, 19 Jul 2022 14:09:27 GMT (envelope-from git) Date: Tue, 19 Jul 2022 14:09:27 GMT Message-Id: <202207191409.26JE9RnS052013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b2e2412d150c - stable/13 - geli: Add a chicken switch for unmapped I/O List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b2e2412d150c848e256f31f4e87f640bdcc9c016 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658239768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qrIxn3/RyC6fK9FaHDkdOB4eGTVtDsGfFsuB+UTHZ60=; b=jLhxYd5WzUePXaCSd7W6S2VsvfV9y4RUnfYB+6kixfVgBiJBLBPSVGTWG9cLthvZwQTQUD iZ1Xxm/ntmg46PjMX1GiiOArpQvJRoZlO4FAFp/eOUrmejasMS/LpFOjtS/A+4DMTktb5D 84tzyvGgGAgieYSWNECeiYJSEa129Uxu06JhvH/ovwl2wwqv3L4ncH963aSczLyqhVva/M 44s5IDQPIyWWTeqyLnamazYRvCrbztKEu4dUG4r64jRyXAIcIdbc9qmbQbirUC+v9zWg1K YYkI4LkSYgzGygZqphAd83I9VoQOVZGtMjwPatmE+b6wPQjjSgckOonpIQWSLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658239768; a=rsa-sha256; cv=none; b=SbLjWQ18y3w9CrHEKPV44IE66XstSEVHV8wPbLoN9csIswHxK1jWSPaAUEGACQ6Tov1Q+A xiyGQisxDGcKej7SJCE/CPHX3xOEpZh1y2PJEdVQwhSHmeqQbjpUithfWlHE1+FqJozq8P X4T7XBxxEAF0ih50BU63CQnrkOHORAMy5mKAaOVdNlgPksUPSbif0lMKmYO9+Z08XMJfZc XvyCsgsVPV5koX+W1vu2m6fnfdJ8Fj9kttFM3V+u5kEn+x9OtrQcFPorV+SSMUfPOqqEN6 R080IKMnJD18TiVx4xI5WtgDekh3l2OP0JlDZQEHnPDFQJPxzUFYh60KrAXRKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b2e2412d150c848e256f31f4e87f640bdcc9c016 commit b2e2412d150c848e256f31f4e87f640bdcc9c016 Author: Mark Johnston AuthorDate: 2022-04-18 21:16:10 +0000 Commit: Mark Johnston CommitDate: 2022-07-19 13:52:00 +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 Sponsored by: The FreeBSD Foundation (cherry picked from commit 081b4452a758dd81dcdc68ffb6f7bad901d53e3d) --- lib/geom/eli/geli.8 | 8 +++++++- sys/geom/eli/g_eli.c | 5 ++++- 2 files changed, 11 insertions(+), 2 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 24b61d9f6d8e..2493fd31c7de 100644 --- a/sys/geom/eli/g_eli.c +++ b/sys/geom/eli/g_eli.c @@ -90,6 +90,9 @@ SYSCTL_UINT(_kern_geom_eli, OID_AUTO, threads, CTLFLAG_RWTUN, &g_eli_threads, 0, u_int g_eli_batch = 0; SYSCTL_UINT(_kern_geom_eli, OID_AUTO, batch, CTLFLAG_RWTUN, &g_eli_batch, 0, "Use crypto operations batching"); +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"); /* * Passphrase cached during boot, in order to be more user-friendly if @@ -973,7 +976,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