From nobody Fri May 9 00:34:09 2025 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 4ZtqkV2JqJz5vqJT; Fri, 09 May 2025 00:34:10 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtqkT4my3z3HMH; Fri, 09 May 2025 00:34:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746750849; 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=W7tqCaUvAkbefBdrgfZNySBWa3id2m8Kso2PXWvPmUI=; b=ByauOgPYl8WLYUgCexiYAZuzvlQOzF8Y39CZV8VP3PqqIS/3X3AIvN8+lOubRvWBfwTjDT OqBNy5UU27Wkik6PZxjbshTiXc9P1j5oD33SujJPIrHoMI92eHuf7S69UX49jAD1+4BKfw 14NwzJ2upRj4LzlgcS70k/oFpDrwu0kaKCp6tS0xarDuldPR3Pm1K0Y+KS/Wk1HccpeXqM Aj9i9R1fQ6y9EPdrgJdiIFLWN7XiQ3v6BhtVoBfkSqEtJpwk4kgWM/fBJIp9wKvDZ9FHim y3LM1TrLfD6aX8pOxw2aj7ohVgtwOjqFbIZZgTA0RrNvj+grgLYwMX2WmNeOlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746750849; 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=W7tqCaUvAkbefBdrgfZNySBWa3id2m8Kso2PXWvPmUI=; b=QVk0LxKdiNFegq2Hl4A1alceVYgAjK45FLsF/q20mmMOdPhE+D16EcgCPdv2B2yzess4Ad n8DBQVqPPhdL5sH1eSFQXmJeTmK4fzzq/bn3/V5tluvJbraEx+24kv8jEWFTU1LI7AhjUx QWy363mqt7d8Zb4H3TbBY++CDQ8Egw1DSHg7OfXsCxaAPb04Y2S7WMDAkyOKcuSVYd1nRs L9BAaQK83djmEV2gYJXE1Pzbnq7qA1ItrJ6QC9VQLYQtu0gi+22lG+87k8QM6PMJN/+kEP B1a6gFXt+KGmP3lYKhcMAE0mZ2U+pTW0hk64ZwKpdSYcCcSc0pXehCNJlQw4bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746750849; a=rsa-sha256; cv=none; b=KSGpCTHthhh13JOGE2i8FelaMHd0h7ugOhhxyG7hCIGNWP1BM45ehwtRZmfnjS5HmhLObx M1uJLwf90rpVijbL2piUBbIG0bA0rIlDxvORAlZCrqUYab4VUMQWRxE9ZV8txJVbFdVLwJ pQEnWI702Lpr6rVg2kIC58Bu1/9F4NF02Nw5IxTdkKz4VhvYt8kOI/fQiXC0jLmZa61QY+ zrIphRoT0H8J55oU2ae0w5v0jyvbvDJwJjYkO2UJd8nqEVzzO4nj28hrBoBg/01H+SAHZ4 YyLG8aPxSGh57zVCkhBMV1+7hCsLyI7HY4toVMfR19P7Qf+LIXy6ANksK9Y/UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZtqkT4NWxzdmG; Fri, 09 May 2025 00:34:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5490Y9FB029922; Fri, 9 May 2025 00:34:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5490Y9xS029919; Fri, 9 May 2025 00:34:09 GMT (envelope-from git) Date: Fri, 9 May 2025 00:34:09 GMT Message-Id: <202505090034.5490Y9xS029919@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 2fa185f9bf59 - main - crypto: Remove uses of CRYPTO_F_DONE 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2fa185f9bf5948ead9c3920d452ddd6bcad8f569 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2fa185f9bf5948ead9c3920d452ddd6bcad8f569 commit 2fa185f9bf5948ead9c3920d452ddd6bcad8f569 Author: Mark Johnston AuthorDate: 2025-05-09 00:23:40 +0000 Commit: Mark Johnston CommitDate: 2025-05-09 00:29:23 +0000 crypto: Remove uses of CRYPTO_F_DONE Previously OCF set CRYPTO_F_DONE prior to invoking the completion callback, even if the request failed. This isn't particularly useful and leads to bugs when consumers retry a failed request, since OCF also asserts that CRYPTO_F_DONE is clear in crypto_dispatch(). (Really, OCF should retry requests that fail with EAGAIN, but that's a larger change.) For now, just stop setting CRYPTO_F_DONE to simplify consumers (and fix those which fail to clear the flag before retrying a request). PR: 286321 Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D50104 --- share/man/man9/crypto_request.9 | 13 +------------ sys/contrib/openzfs/module/os/freebsd/zfs/crypto_os.c | 1 - sys/kgssapi/krb5/kcrypto_aes.c | 1 - sys/opencrypto/crypto.c | 6 ------ sys/opencrypto/cryptodev.c | 2 -- sys/opencrypto/cryptodev.h | 2 +- sys/opencrypto/ktls_ocf.c | 2 -- sys/sys/param.h | 2 +- 8 files changed, 3 insertions(+), 26 deletions(-) diff --git a/share/man/man9/crypto_request.9 b/share/man/man9/crypto_request.9 index 45c3b62eea26..af62b9089561 100644 --- a/share/man/man9/crypto_request.9 +++ b/share/man/man9/crypto_request.9 @@ -28,7 +28,7 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.Dd November 2, 2022 +.Dd May 8, 2025 .Dt CRYPTO_REQUEST 9 .Os .Sh NAME @@ -466,17 +466,6 @@ Set by drivers prior to completing a request via .Fn crypto_done . .It Fa crp_flags A bitmask of flags. -The following flags are available in addition to flags discussed previously: -.Bl -tag -width CRYPTO_F_DONE -.It Dv CRYPTO_F_DONE -Set by -.Fa crypto_done -before calling -.Fa crp_callback . -This flag is not very useful and will likely be removed in the future. -It can only be safely checked from the callback routine at which point -it is always set. -.El .It Fa crp_cipher_key Pointer to a request-specific encryption key. If this value is not set, diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/crypto_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/crypto_os.c index a4bf3fb6490f..0fc2697717af 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/crypto_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/crypto_os.c @@ -196,7 +196,6 @@ zfs_crypto_dispatch(freebsd_crypt_session_t *session, struct cryptop *crp) break; } crp->crp_etype = 0; - crp->crp_flags &= ~CRYPTO_F_DONE; session->fs_done = false; } return (error); diff --git a/sys/kgssapi/krb5/kcrypto_aes.c b/sys/kgssapi/krb5/kcrypto_aes.c index 6761b7c815ad..5675b7e25b93 100644 --- a/sys/kgssapi/krb5/kcrypto_aes.c +++ b/sys/kgssapi/krb5/kcrypto_aes.c @@ -126,7 +126,6 @@ aes_crypto_cb(struct cryptop *crp) if (crp->crp_etype == EAGAIN) { crp->crp_etype = 0; - crp->crp_flags &= ~CRYPTO_F_DONE; (void)crypto_dispatch(crp); } else { mtx_lock(&as->as_lock); diff --git a/sys/opencrypto/crypto.c b/sys/opencrypto/crypto.c index 3c7299780a38..c3ae5e8a9ff8 100644 --- a/sys/opencrypto/crypto.c +++ b/sys/opencrypto/crypto.c @@ -1263,8 +1263,6 @@ crp_sanity(struct cryptop *crp) crp->crp_obuf.cb_type <= CRYPTO_BUF_LAST, ("incoming crp with invalid output buffer type")); KASSERT(crp->crp_etype == 0, ("incoming crp with error")); - KASSERT(!(crp->crp_flags & CRYPTO_F_DONE), - ("incoming crp already done")); csp = &crp->crp_session->csp; cb_sanity(&crp->crp_buf, "input"); @@ -1653,7 +1651,6 @@ crypto_clonereq(struct cryptop *crp, crypto_session_t cses, int how) { struct cryptop *new; - MPASS((crp->crp_flags & CRYPTO_F_DONE) == 0); new = crypto_getreq(cses, how); if (new == NULL) return (NULL); @@ -1669,9 +1666,6 @@ crypto_clonereq(struct cryptop *crp, crypto_session_t cses, int how) void crypto_done(struct cryptop *crp) { - KASSERT((crp->crp_flags & CRYPTO_F_DONE) == 0, - ("crypto_done: op already done, flags 0x%x", crp->crp_flags)); - crp->crp_flags |= CRYPTO_F_DONE; if (crp->crp_etype != 0) CRYPTOSTAT_INC(cs_errs); diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c index 9341dd60d47e..85b350ca2998 100644 --- a/sys/opencrypto/cryptodev.c +++ b/sys/opencrypto/cryptodev.c @@ -823,7 +823,6 @@ again: if (crp->crp_etype == EAGAIN) { crp->crp_etype = 0; - crp->crp_flags &= ~CRYPTO_F_DONE; cod->done = false; goto again; } @@ -1026,7 +1025,6 @@ again: if (crp->crp_etype == EAGAIN) { crp->crp_etype = 0; - crp->crp_flags &= ~CRYPTO_F_DONE; cod->done = false; goto again; } diff --git a/sys/opencrypto/cryptodev.h b/sys/opencrypto/cryptodev.h index 1e0024407246..71e9c5ac4c0a 100644 --- a/sys/opencrypto/cryptodev.h +++ b/sys/opencrypto/cryptodev.h @@ -433,7 +433,7 @@ struct cryptop { int crp_flags; #define CRYPTO_F_CBIMM 0x0010 /* Do callback immediately */ -#define CRYPTO_F_DONE 0x0020 /* Operation completed */ +#define CRYPTO_F_DONE 0x0020 /* Deprecated, do not use */ #define CRYPTO_F_CBIFSYNC 0x0040 /* Do CBIMM if op is synchronous */ #define CRYPTO_F_ASYNC_ORDERED 0x0100 /* Completions must happen in order */ #define CRYPTO_F_IV_SEPARATE 0x0200 /* Use crp_iv[] as IV. */ diff --git a/sys/opencrypto/ktls_ocf.c b/sys/opencrypto/ktls_ocf.c index 74b48f2366c1..ece509f5f969 100644 --- a/sys/opencrypto/ktls_ocf.c +++ b/sys/opencrypto/ktls_ocf.c @@ -224,7 +224,6 @@ ktls_ocf_dispatch(struct ktls_ocf_session *os, struct cryptop *crp) } crp->crp_etype = 0; - crp->crp_flags &= ~CRYPTO_F_DONE; oo.done = false; counter_u64_add(ocf_retries, 1); } @@ -240,7 +239,6 @@ ktls_ocf_dispatch_async_cb(struct cryptop *crp) state = crp->crp_opaque; if (crp->crp_etype == EAGAIN) { crp->crp_etype = 0; - crp->crp_flags &= ~CRYPTO_F_DONE; counter_u64_add(ocf_retries, 1); error = crypto_dispatch(crp); if (error != 0) { diff --git a/sys/sys/param.h b/sys/sys/param.h index f2dd148fcd84..88edc92e65e7 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -73,7 +73,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500041 +#define __FreeBSD_version 1500042 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,