From nobody Mon Aug 28 23:24:58 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 4RZRVL4WDqz4s4mK; Mon, 28 Aug 2023 23:24:58 +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 4RZRVL3sWcz4Yjy; Mon, 28 Aug 2023 23:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693265098; 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=aw+pyfp9bUhO3yKHWM2Zm2taseMKRf/pHscM3OL4yfo=; b=oNYoUGysN7gnNr+LwipqztnL6xPLP7MlI4nfnJyQuGQXfETEPZi4UNIW2TKvJTxLhRuR2T ZoxtfkXHlTlGhMmK9Hk6WXX29n2vuE+0fBOeB/3jSJ7vOPtiFjvvL+85wHM5Cv3fAD5EIx yjJS2K084ahIxAMhNNY3fnVWXqoChEpquyMkvnU7tpPf/PVBhwmnu+5cA9IRNKFaotrZKF om2Im3KSGIDrUYX5Q8ahw8ksuY5Zuar/8ILVxNPSIuWo05lkyoMuH7WL7kK4d0wYw+rS26 lvpFjgq6tsDRYW1GeG4WUSZQw4dQeBYrru5SfUjFgn/thl0v3oJRVPe6kYxWVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693265098; a=rsa-sha256; cv=none; b=NkDQ2tg6E4PlyKLH90I0ZwBsGd1qDZE6w5muMaV4rn2Ix00uxM8owxCIE5m/saYNnioTS6 LJkL5m+7U2u/HmcHaCvDnqRK4id/iNls8+hR251FZBOMSrVWoghB6qnyd80U8AaUAyw501 3ax/gZyilXGrxKP+i65vAI45jdtKCI8jLSY9kxF7olvxNMMFJR4WHE3Z/+tJWmtvCihhG8 vzJ1XY5Og8i/QeKGKaRdFJKyKKxmDR57BPkoWeLAPVB4N1uYV7v46bhMu9rkDdDpaMNHuS F2l+QiMzkVidq2IWsgc+rwMPEhdo3ddFAQaFiEwbDyd4wpsi0VQt2BBTIYCK+Q== 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=1693265098; 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=aw+pyfp9bUhO3yKHWM2Zm2taseMKRf/pHscM3OL4yfo=; b=eCH8GnqX99xSy8iqTCig8oK9IAi2SHVSpqsZaO7PyqQvixwk1EeFs7I7dk3f/fAemvkNMO BapWanr+QkhXZQsDwwXrpnNStEgyd0FYBDJLDMghv+8DgO6u0VfJ+AIpIvIXHpylIGp8Tx YASBFhmDtZAtnUmOOk/W6FSOD/1mkzF1QUS+2M0+Cnu67O+CftO+3N2K1CKp+NeOdRXV1u jWNA62oLxQ06iRa8lkpASRW/SoGFYpXPgtkZOWcYkqP6ThiOEMOMs5gXazKaE80uxAZXGC R8yjKU/suNDVJCwzeo3Mw2gPYQzrO2yDmJEoh4SKBTeYwub4+bxGM3tex0t/pg== 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 4RZRVL2yJ8zCyR; Mon, 28 Aug 2023 23:24:58 +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 37SNOwJX060584; Mon, 28 Aug 2023 23:24:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37SNOwfK060581; Mon, 28 Aug 2023 23:24:58 GMT (envelope-from git) Date: Mon, 28 Aug 2023 23:24:58 GMT Message-Id: <202308282324.37SNOwfK060581@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: fdd51760c278 - main - armv8_crypto: 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: fdd51760c278302773edbd2466d35b35b865f5d9 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fdd51760c278302773edbd2466d35b35b865f5d9 commit fdd51760c278302773edbd2466d35b35b865f5d9 Author: John Baldwin AuthorDate: 2023-08-28 23:23:43 +0000 Commit: John Baldwin CommitDate: 2023-08-28 23:23:43 +0000 armv8_crypto: 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/D41579 --- sys/crypto/armv8/armv8_crypto.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/sys/crypto/armv8/armv8_crypto.c b/sys/crypto/armv8/armv8_crypto.c index a8d88c31edc0..fd1d845c29b0 100644 --- a/sys/crypto/armv8/armv8_crypto.c +++ b/sys/crypto/armv8/armv8_crypto.c @@ -44,12 +44,10 @@ #include #include #include -#include #include #include #include #include -#include #include #include @@ -62,9 +60,7 @@ #include struct armv8_crypto_softc { - int dieing; int32_t cid; - struct rwlock lock; bool has_pmul; }; @@ -119,7 +115,6 @@ armv8_crypto_attach(device_t dev) uint64_t reg; sc = device_get_softc(dev); - sc->dieing = 0; reg = READ_SPECIALREG(id_aa64isar0_el1); @@ -133,8 +128,6 @@ armv8_crypto_attach(device_t dev) return (ENOMEM); } - rw_init(&sc->lock, "armv8crypto"); - return (0); } @@ -145,13 +138,8 @@ armv8_crypto_detach(device_t dev) sc = device_get_softc(dev); - rw_wlock(&sc->lock); - sc->dieing = 1; - rw_wunlock(&sc->lock); crypto_unregister_all(sc->cid); - rw_destroy(&sc->lock); - return (0); } @@ -273,21 +261,12 @@ static int armv8_crypto_newsession(device_t dev, crypto_session_t cses, const struct crypto_session_params *csp) { - struct armv8_crypto_softc *sc; struct armv8_crypto_session *ses; int error; - sc = device_get_softc(dev); - rw_wlock(&sc->lock); - if (sc->dieing) { - rw_wunlock(&sc->lock); - return (EINVAL); - } - ses = crypto_get_driver_session(cses); error = armv8_crypto_cipher_setup(ses, csp, csp->csp_cipher_key, csp->csp_cipher_klen); - rw_wunlock(&sc->lock); return (error); }