From nobody Thu Jul 10 20:06:44 2025 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 4bdQpr6yd7z61Tv1; Thu, 10 Jul 2025 20:06:44 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bdQpr621Yz3Wbp; Thu, 10 Jul 2025 20:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752178004; 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=iGOH43g1OvKTWEd86G9iX40FgXaTMsm3feLJU1a6lns=; b=VsolSk8Z++2GoLDd/CQiUaX9cShe6j0Q2GL6MJXzSDCtfmmTRTM2nSi7T2RTz6TQOG6cbS M9C1p79SewEw3a2eXuf78LJVF2BmqWxdG+LlJcEogU1W7q5CN11oXZdtqehbCXcMk3jg68 Kx6feCvV3ctGZFPyIkPaBAszKROApirZFH8Tf7P5EIsoiY35jnwO77cjBrgRRNp3+hO/kU h3FJV3hcb7HhqssmrA0VU5dzCrr93TjNZrqdwpb9X3FciB4ZYbYDl7j4m2qHkgQ+LdTUaf p2iKUr/25q4OlZipYPqhBHYMifJmvw79tf8//hFgRQiUbYe1iL1KtPZjcxhGNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752178004; 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=iGOH43g1OvKTWEd86G9iX40FgXaTMsm3feLJU1a6lns=; b=YwOGg5L28MYDy2bwfH+6uNiRwrJvsQWqRgltQ9hq9xW3wbXSnDbGBkRenGsqmUOdH4S3p1 OAoau0vivSgdcbd6qn3pu/6TEoD8MBylgNnrdfk6VHsFln9GpsTjQ+PR/g3EHSjyMgqAqP eyJ+NWwH8raKedEStthhTW93vzdDvYwhOPnaoFbKkwWgJ3SJfNVQ6rZta/2Vy8Rwpt97Op Xvn9kzbJ/ZEuVCDS9iCHJdorhrmgSebrVmrA1K8Aan8xcAx5WnJ9YHw6HUKZyxsJgCcD/P Rrierb8lP7zrs4HwEqknUPAvaMKjTqwwtr3xDd069P3UlX0ua88cPV7nrUoMSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752178004; a=rsa-sha256; cv=none; b=CeQ4cywkS+j9kDMnVV6Z3PAX+nYq44823BJ/wHLpe/E7JXH76YreSOTzCb5aDRz1bEJKK2 AGMXJhWTcLjFxT7tC1G3xZj1J5Mcz+fIDvmBSFx8WW78KhDRgAxgxPyjE0WpwPefb9ghEb cxonQTQuWru76UFhRjSqxMSmrsgsMl94QHYqXWCDftxGu4pduiaV29/zZGZ+5nLHbfvDh7 5YNuwGXk5HmY6VosYhFEm8yMaLpf5W2zzTcU0kvv7ufu5Z6AxjqHLf4pmY8oYUgQ/hg16S 8ozoTuTTurMDQ1BlR1a9lUliMRy6qAG1ABna0pR0/Nvex78eL1fUpYc6S2UvCQ== 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 4bdQpr4TS7z1LHm; Thu, 10 Jul 2025 20:06:44 +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 56AK6i06016631; Thu, 10 Jul 2025 20:06:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56AK6iSH016628; Thu, 10 Jul 2025 20:06:44 GMT (envelope-from git) Date: Thu, 10 Jul 2025 20:06:44 GMT Message-Id: <202507102006.56AK6iSH016628@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 11d1a5c57900 - stable/14 - random: Move entropy harvest queue lock macros to random_harvestq.c 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 11d1a5c57900b9cc77c6b56516c7be3fda4ecc0e Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=11d1a5c57900b9cc77c6b56516c7be3fda4ecc0e commit 11d1a5c57900b9cc77c6b56516c7be3fda4ecc0e Author: Mark Johnston AuthorDate: 2025-07-03 17:21:37 +0000 Commit: Mark Johnston CommitDate: 2025-07-10 13:51:41 +0000 random: Move entropy harvest queue lock macros to random_harvestq.c They can't be used externally, so it makes no sense to have them in a header. No functional change intended. Reviewed by: cem MFC after: 1 week Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51111 (cherry picked from commit 4b8b872a9c55c040eb83f917fc8fd2bf908b96a9) --- sys/dev/random/random_harvestq.c | 5 +++++ sys/dev/random/random_harvestq.h | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index 92af14446e9c..b5e733dcb8e3 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -162,6 +162,11 @@ static struct harvest_context { } hc_entropy_fast_accumulator; } harvest_context; +#define RANDOM_HARVEST_INIT_LOCK() mtx_init(&harvest_context.hc_mtx, \ + "entropy harvest mutex", NULL, MTX_SPIN) +#define RANDOM_HARVEST_LOCK() mtx_lock_spin(&harvest_context.hc_mtx) +#define RANDOM_HARVEST_UNLOCK() mtx_unlock_spin(&harvest_context.hc_mtx) + static struct kproc_desc random_proc_kp = { "rand_harvestq", random_kthread, diff --git a/sys/dev/random/random_harvestq.h b/sys/dev/random/random_harvestq.h index 69a9dfabd44a..edeb4ff7a17f 100644 --- a/sys/dev/random/random_harvestq.h +++ b/sys/dev/random/random_harvestq.h @@ -40,8 +40,4 @@ struct harvest_event { uint8_t he_source; /* origin of the entropy */ }; -#define RANDOM_HARVEST_INIT_LOCK(x) mtx_init(&harvest_context.hc_mtx, "entropy harvest mutex", NULL, MTX_SPIN) -#define RANDOM_HARVEST_LOCK(x) mtx_lock_spin(&harvest_context.hc_mtx) -#define RANDOM_HARVEST_UNLOCK(x) mtx_unlock_spin(&harvest_context.hc_mtx) - #endif /* SYS_DEV_RANDOM_RANDOM_HARVESTQ_H_INCLUDED */