From nobody Tue Nov 23 23:13:01 2021 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 5D03918A2040; Tue, 23 Nov 2021 23:13:07 +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 4HzKgM11v1z3vqH; Tue, 23 Nov 2021 23:13:03 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 350FF1F4F7; Tue, 23 Nov 2021 23:13:01 +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 1ANND1Sj037837; Tue, 23 Nov 2021 23:13:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ANND11M037836; Tue, 23 Nov 2021 23:13:01 GMT (envelope-from git) Date: Tue, 23 Nov 2021 23:13:01 GMT Message-Id: <202111232313.1ANND11M037836@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: aa7aa23171c8 - stable/13 - crypto: Cleanup mtx_init() calls. 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/13 X-Git-Reftype: branch X-Git-Commit: aa7aa23171c86d0f05a90cef646ae6d1a3d1200e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637709186; 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=fq+5/oqZGNw1CPHfK0Mmksyf0nkpuzNbdI8tPiFCT/8=; b=Ji7rTsv4D16S7PqYmcxPERwU+n8a5WYFUVd7cR8XCXTuBxX2Dh0UMk5yfSuiwgac/3kArU Ub1quiNuFYLjFFN0EtXxvbvXVwz73rg1PQW6b44KYpPajt/v1/L8GFlqUVmZY29RcNMD73 ft6W3gjUflaSSuR2vmdMTHY/cnWV+07J1IYSzn2Z52t0BGcuSJCoNp1Yipt4GRpIqJAO/8 UTj/0lMrTMhQ3jntrXXP38ROiKCeRg24NWWahfnDNsyMOZqQ4CHTR+RCvukmm1iw6kzwvy xAyiuKpPR16ioosaj6y4wjPNYZ2j+gKulhhVfnDfE2UxqsXPApkegqig+R9sBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637709186; a=rsa-sha256; cv=none; b=lABt/mAdBDn8ZS3rVoyDh8NuJN4MF/jPOy5FG7yHZNTIWTQArkfjGsC3OavQo5OBP5FbJB joXYlJXg9wEtPRnshIi0bQKRWV3qEp39g3+VFOkvnftfQw7npH3rYYFN4LkEDzf2wdFjtE uqFocqBBGs0hM+ocCuwgMcmtMorBaTPsy4tsLLghBIWWbSfqdRlta/BO2TifNDNlu2j5N7 jUOAhPOKY2ABE+qQPYUJ8rtiabsseOx70jPh6wsjFbjdMusR2Z0LBZmD6mqFNGQkGkdfDa QUJnOhk5JtxxHA/gXIoTLn17wO+3t+GhL5VNvgJ6m3mj6dghtbilk8feWwnfsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=aa7aa23171c86d0f05a90cef646ae6d1a3d1200e commit aa7aa23171c86d0f05a90cef646ae6d1a3d1200e Author: John Baldwin AuthorDate: 2021-11-02 18:27:20 +0000 Commit: John Baldwin CommitDate: 2021-11-23 23:11:49 +0000 crypto: Cleanup mtx_init() calls. Don't pass the same name to multiple mutexes while using unique types for WITNESS. Just use the unique types as the mutex names. Reviewed by: markj Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D32740 (cherry picked from commit 4e057806cf56b238a0a3ef7af140f447d7b67ab5) --- sys/opencrypto/crypto.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/opencrypto/crypto.c b/sys/opencrypto/crypto.c index a151ee21dce7..576382406d88 100644 --- a/sys/opencrypto/crypto.c +++ b/sys/opencrypto/crypto.c @@ -327,12 +327,11 @@ crypto_init(void) struct proc *p; int error; - mtx_init(&crypto_drivers_mtx, "crypto", "crypto driver table", - MTX_DEF|MTX_QUIET); + mtx_init(&crypto_drivers_mtx, "crypto driver table", NULL, MTX_DEF); TAILQ_INIT(&crp_q); TAILQ_INIT(&crp_kq); - mtx_init(&crypto_q_mtx, "crypto", "crypto op queues", MTX_DEF); + mtx_init(&crypto_q_mtx, "crypto op queues", NULL, MTX_DEF); cryptop_zone = uma_zcreate("cryptop", sizeof(struct cryptop), NULL, NULL, NULL, NULL, @@ -371,7 +370,8 @@ crypto_init(void) ret_worker->reorder_ops = 0; ret_worker->reorder_cur_seq = 0; - mtx_init(&ret_worker->crypto_ret_mtx, "crypto", "crypto return queues", MTX_DEF); + mtx_init(&ret_worker->crypto_ret_mtx, "crypto return queues", + NULL, MTX_DEF); error = kthread_add(crypto_ret_thread, ret_worker, p, &ret_worker->td, 0, 0, "crypto returns %td",