From nobody Wed Feb 16 07:48:34 2022 X-Original-To: dev-commits-src-main@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 AE78B19C833A; Wed, 16 Feb 2022 07:48:34 +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 4Jz97Q4Vpkz4W0h; Wed, 16 Feb 2022 07:48:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644997714; 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=sXVUVdpg6HIytoOHit0kSMUeGhYSxGA08TLh/StkMJ0=; b=h2vHhgdXp6rw6Ge3eSjf4ISKxYAOohoTeJxYLOJmBUKxSkxdK8xWOLKAmFBg41KcTsIaeE GRqwjSziGyfQI47G+gje/L0dC5LFaJSCzyu73PxlWMN0rzaXRp1C3krbfATwaDbEx/gh00 LShs2eZiDeC2bnyLMC2pSA38X0geFz4JtrqVM1QJqrsXzD912e0tuUtKWrqq44b3lHG6sH tI39WdNFlSmYujXKNfjx45uug1O8bPGDOHOrH5a2QHOFMj5yZuY1rjIfWY2gLRgNYSYwAZ 8kmlQQK6RW7JsY5QUH2usAZ6vRptU0/MRL9djTbABd2nNmOPFfWvwUyayDQq0Q== 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 76394127A1; Wed, 16 Feb 2022 07:48:34 +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 21G7mYV1033031; Wed, 16 Feb 2022 07:48:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21G7mYYq033030; Wed, 16 Feb 2022 07:48:34 GMT (envelope-from git) Date: Wed, 16 Feb 2022 07:48:34 GMT Message-Id: <202202160748.21G7mYYq033030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 70439285ad9d - main - crypto: hide crypto_destroyreq behind a tunable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70439285ad9d5ec8ebdb1cf8617e8f30ea31b2e2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644997714; 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=sXVUVdpg6HIytoOHit0kSMUeGhYSxGA08TLh/StkMJ0=; b=N1zoXSd/+RQ0HfcAV0ZXzvyE7xI9v5dcqQ7ej7WHDJO6rzwGlJxdKuNEaSSqCYY1r2zUMT L4Xmf4K2UrRtWTEZsIuV4+wLvVlAp+OG6yinZLn6gs38GsZn5xyJT+EaHq/B86emGwyK52 AQv92z4gYbborbt5wAQ3j6XwYvvCWKm1hzoX8PKAVT7E8rT2VogfFP9QzfLpvPUC9yIJyf AI3ed7kjKF+25FC9yrMzaJy4OKEhEpO3WdyVnjZxUmUiDYW1r/IszTWhrBcPhGeimbuoYz FRi0ldSmV4IVTDZ1oSDxdxdMe2hS4kPJhYuumZaOnUIJfv/seS37rK+G5r3nqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644997714; a=rsa-sha256; cv=none; b=m7eFvNoET8O5ug8KY0mAc1ydLyiXLxGelrrJLarrKdkBojBD1zEMyfRnFnhYjEXmo4tib7 zmQzSBNKSMYS+uTEwuXYNcEFlraceDhPLGVgn/gxoctBHYJ6zzkmsOtqRpZFXPuhPOwYL2 c9K5v1s4bJvdWcDSE4nJviRz81MD++trbO5s06XIOmCFe95ztaPIEfb88LDpmLu8Ix12sZ mGbp6FCAPFS4rNGIILMvFUIciF3/asBIo185JkjuDzvKUCqgAdwtxKfP2nugs+FjpUTG+P NxLd8LPJ4NlR9nZyBGQwN5B/CXvp+bz4gsQn4v8V3VhNNCnKe+3AgWw+kSMwsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=70439285ad9d5ec8ebdb1cf8617e8f30ea31b2e2 commit 70439285ad9d5ec8ebdb1cf8617e8f30ea31b2e2 Author: Mateusz Guzik AuthorDate: 2022-02-16 07:45:12 +0000 Commit: Mateusz Guzik CommitDate: 2022-02-16 07:45:12 +0000 crypto: hide crypto_destroyreq behind a tunable Reviewed by: jhb, markj Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D32084 --- sys/opencrypto/crypto.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/opencrypto/crypto.c b/sys/opencrypto/crypto.c index 0b2c250a7af2..fde1316595e5 100644 --- a/sys/opencrypto/crypto.c +++ b/sys/opencrypto/crypto.c @@ -202,6 +202,13 @@ SYSCTL_INT(_kern, OID_AUTO, cryptodevallowsoft, CTLFLAG_RWTUN, "Enable/disable use of software crypto by /dev/crypto"); #endif +#ifdef DIAGNOSTIC +bool crypto_destroyreq_check; +SYSCTL_BOOL(_kern_crypto, OID_AUTO, destroyreq_check, CTLFLAG_RWTUN, + &crypto_destroyreq_check, 0, + "Enable checks when destroying a request"); +#endif + MALLOC_DEFINE(M_CRYPTO_DATA, "crypto", "crypto session records"); static void crypto_dispatch_thread(void *arg); @@ -1580,6 +1587,9 @@ crypto_destroyreq(struct cryptop *crp) struct cryptop *crp2; struct crypto_ret_worker *ret_worker; + if (!crypto_destroyreq_check) + return; + CRYPTO_Q_LOCK(); TAILQ_FOREACH(crp2, &crp_q, crp_next) { KASSERT(crp2 != crp,