From nobody Mon Aug 28 23:25:00 2023 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 4RZRVP0djkz4s4m2; Mon, 28 Aug 2023 23:25:01 +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 4RZRVN5mNdz4ZHG; Mon, 28 Aug 2023 23:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693265100; 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=1pDBiSk91nAFjvUE4GtSYdySVt3UDfueQxaAZY5PUHY=; b=Lky2pfgXiR8MA7NOJMnF3clf0j1+lDlzCOd/t9DSK1oFehw4MntMr/0BSAO396w7fFlXU4 BuMaipdR+1e+BcN8S66663jKOzpuOjAPC96/gasIMtM1dYHQikrQCeMSEJjafJw3393jQk ijPmgN9cpoCZ075VHo+a0sqzYliE70TlbTmQC0BsO7zdfrSN4evfGyfjhI/L4kzwwC3bcJ dyXant2vz8y4shAANqggGoGV6N0TfENokk3c0RxuS9tvkDZcklR4u34j3yT4sIcuhcU7w9 mVdq2eWgOUquI+nXEHaamerzZuGRZiltxNms3L9ozz1zd9k1JUJF8KB3l0eUvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693265100; a=rsa-sha256; cv=none; b=ciBkwfMq4YH/wu8SlD+pKSDY+canWdn2JAaeKcQofwr4Ih31Q2zIQ9xpIlpTWiiIZpBJjJ l+t74S6G4k3//CX29v83nzXEl4C0sGfykCILEnQZQByQVa7PooCLKFQRBbIpGxgTVwekVo OnL6j/rKwp4cEDlu7gBoEQoAuKAALe8FL7dVMPO5C5/L8JzLi+6mLhSrp0JXChA1RsUZLV DKSD7ZsHKt606Be0bgr6wGA1u+vXkQvRUrTodLoVF2+ECg+k73wiuz2Xg/Omg7zAHBoQQQ j4CFpzmcMg2CySq5kkaj0F4JtC+CB0fDOPCFYW2k1uXSdpTpw61VSMIPIUa7mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693265100; 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=1pDBiSk91nAFjvUE4GtSYdySVt3UDfueQxaAZY5PUHY=; b=frDwDHSWQrI7uqlieqJ/blOVGpF0AwZ+Of/KgwEGBt+HumQaYu/d4LELjqlZ3lACc8kUmV AYP9HlUo4u8aKM0PMQXRnugY2o1h0WZl2bYLtmpDTJVkMA8uG507DfWALoHaGq8npz7iOL QtP0ycEehfYq01W5rMjH+0HWxhldECse81R1jWkN7DJRZf9xmWKMXsNT7FCxTifc1zcKyI yGNXFrXemsg1bsLOrMSQ/Joo/l3IJo75GPBYIUo8fEqSClXjtYpfhy2/jgtJGj3bI9ZmHu MPravNg6gK+lsmlEuP3+v8NZW3jlcnAXMW1XUGDsF4wSp0Cn2FsfD4LysoifQQ== 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 4RZRVN4sRCzCXc; Mon, 28 Aug 2023 23:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37SNP0Q1060701; Mon, 28 Aug 2023 23:25:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37SNP0pZ060698; Mon, 28 Aug 2023 23:25:00 GMT (envelope-from git) Date: Mon, 28 Aug 2023 23:25:00 GMT Message-Id: <202308282325.37SNP0pZ060698@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 79aeecc89f5c - main - blake2: Remove dieing flag and rw lock 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79aeecc89f5c740f2a3b0c30238233d2a6bb7ec7 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=79aeecc89f5c740f2a3b0c30238233d2a6bb7ec7 commit 79aeecc89f5c740f2a3b0c30238233d2a6bb7ec7 Author: John Baldwin AuthorDate: 2023-08-28 23:24:42 +0000 Commit: John Baldwin CommitDate: 2023-08-28 23:24:42 +0000 blake2: Remove dieing flag and rw lock crypto_unregister_all already disables new sessions and waits for existing sessions to be destroyed before returning. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D41581 --- sys/crypto/blake2/blake2_cryptodev.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/sys/crypto/blake2/blake2_cryptodev.c b/sys/crypto/blake2/blake2_cryptodev.c index 755ac12c5d78..5c3ec07d7de7 100644 --- a/sys/crypto/blake2/blake2_cryptodev.c +++ b/sys/crypto/blake2/blake2_cryptodev.c @@ -29,11 +29,9 @@ #include #include #include -#include #include #include #include -#include #include #include @@ -49,9 +47,7 @@ struct blake2_session { CTASSERT((size_t)BLAKE2B_KEYBYTES > (size_t)BLAKE2S_KEYBYTES); struct blake2_softc { - bool dying; int32_t cid; - struct rwlock lock; }; static int blake2_cipher_setup(struct blake2_session *ses, @@ -84,7 +80,6 @@ blake2_attach(device_t dev) struct blake2_softc *sc; sc = device_get_softc(dev); - sc->dying = false; sc->cid = crypto_get_driverid(dev, sizeof(struct blake2_session), CRYPTOCAP_F_SOFTWARE | CRYPTOCAP_F_SYNC | @@ -94,8 +89,6 @@ blake2_attach(device_t dev) return (ENOMEM); } - rw_init(&sc->lock, "blake2_lock"); - return (0); } @@ -106,13 +99,8 @@ blake2_detach(device_t dev) sc = device_get_softc(dev); - rw_wlock(&sc->lock); - sc->dying = true; - rw_wunlock(&sc->lock); crypto_unregister_all(sc->cid); - rw_destroy(&sc->lock); - return (0); } @@ -142,21 +130,11 @@ static int blake2_newsession(device_t dev, crypto_session_t cses, const struct crypto_session_params *csp) { - struct blake2_softc *sc; struct blake2_session *ses; int error; - sc = device_get_softc(dev); - ses = crypto_get_driver_session(cses); - rw_rlock(&sc->lock); - if (sc->dying) { - rw_runlock(&sc->lock); - return (EINVAL); - } - rw_runlock(&sc->lock); - error = blake2_cipher_setup(ses, csp); if (error != 0) { CRYPTDEB("setup failed");