From nobody Fri Dec 29 23:09:01 2023 X-Original-To: dev-commits-src-branches@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 4T21KB00FTz55TJ6; Fri, 29 Dec 2023 23:09:02 +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 4T21K9452Mz4H30; Fri, 29 Dec 2023 23:09:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703891341; 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=AZg8siVBVHxV8cq2hdIg/QfbqCwkgGtF5fUeeFvrrZ4=; b=trqDg3qr9S8TpwAnZ/YOyz6dR7Vror0ssP+6/L7XCzrCu9wfi+SU+rsn2yPBJ0XmM/trP5 zNNLEGQmc9exxQ6NwmTTXNZ7LBQAZoFnDz7kSvmZ44FCqo6plMOG0qM4AsvfYdN8Tg5NK3 BRhY/AXV9AXvweOV5E56oiuUuS3ABpRga6cdOP3ov4pqgS4/9YutlcB6K1vpe76NLB+4uk LY00ogADK52/yZ1S7evEsdq8mvsG+JBW2HeymM8hnHPdtlptgys2ADm9Ks3rpoaVRB66Fa moKLx3ZJ2J+N/nF0Ky49sTdv1M0RLwVPghkyY69pulBo0xxi4tc/6h3HbM7Gbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703891341; a=rsa-sha256; cv=none; b=rmF36X5f/gerHhqog2fwOxGsGkDNJPBSPS0v+Eg0ypVJgMJKqNaorHfftlQEJ4py28Lf5S +5yPaeNVOEv4tBSFAfYzFHPsVwLjXQaM/jfdUuP++VauhMlmDFCo4OaV5wzJXqY6W4B13C xveu8fTvj0KfdLB/bYMV5gQBneFGDzLuAHxf5JeYOw/M7g5rwmpuhJR5SVZ5VxUkzpGWeD MxXC5LPXv773JP85iC56pXdh6Swwf6jHjh8hJfAr9fMP12usMlsUJut/Tj+2Q1ctsSRb6q JKvwxvTuze1mSDVt5fEjmfUh0rFOdsMmm3LRL9v/KG8bJITJZfA+pRMNtMyFcw== 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=1703891341; 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=AZg8siVBVHxV8cq2hdIg/QfbqCwkgGtF5fUeeFvrrZ4=; b=G5jln9FWy4sPG249P7htmt2o3HBCyXvCjUeA1H/qZ2WDPtFhSwwhBe9e9FBJ8zPSoxQOOM PaqSs+l8g66VDqPKfyIw97DokD4ZsthBWgqvcizKJH93gtNOhuJmoBJ8mt4yexmnTiT3Wo Wv1bJp3lzjUKRaD2CNWz2C8NpmWpic63y40CqJZ5gVXFQWc3+Hvd3OXHFGF1R49M0W4XCU 5rQCHb/bfmX89H+ue9X3mOD+Buh70QY/gCI9nwO19uSOsxULLnlAIE8yo4bbmxgQeCX5+a Lqj+CANKRQp1DQdK0UqmZGKMQHEIqJGyy4+I8ToLqMLg4iHCOf5zgVUuf1baWw== 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 4T21K927t7zB7j; Fri, 29 Dec 2023 23:09:01 +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 3BTN91t4075776; Fri, 29 Dec 2023 23:09:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BTN91pD075773; Fri, 29 Dec 2023 23:09:01 GMT (envelope-from git) Date: Fri, 29 Dec 2023 23:09:01 GMT Message-Id: <202312292309.3BTN91pD075773@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 13d39efedb32 - stable/14 - blake2: Remove dieing flag and rw lock List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 13d39efedb32b31a49d4d1f1176200e993708124 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=13d39efedb32b31a49d4d1f1176200e993708124 commit 13d39efedb32b31a49d4d1f1176200e993708124 Author: John Baldwin AuthorDate: 2023-08-28 23:24:42 +0000 Commit: John Baldwin CommitDate: 2023-12-29 21:49: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 (cherry picked from commit 79aeecc89f5c740f2a3b0c30238233d2a6bb7ec7) --- 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");