From nobody Thu Jul 3 17:35:50 2025 X-Original-To: dev-commits-src-main@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 4bY3nz2LRnz61T8V; Thu, 03 Jul 2025 17:35:51 +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 4bY3ny37qGz3Zs2; Thu, 03 Jul 2025 17:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751564150; 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=LO0lR/ZZvfJwl0t6QcPaeGPLb7IksuS9ZNa6w/yHPOo=; b=ZELLvfnxTSvd6WWfhzpQD4Lj2SdhMZ7sz20j/3OckyKisD8juFmdNl8KNwTlKsmE6NhCRP Ar2/VC3h/orRL8rnxCoh7wPZz6iDLkVkfFcn6CfoWfLJUV1KXbX+Gf2eJOkykp00UyY+N0 oESiQOK0CqmpCCowfc7yaPZoA8boyi0LVMvzLEWpIGak408LSyw5xJCUBOk20w1clEZe1F ekU/eGFb9yP4sb4CGQLAkdXIaPWtOlzDWENKwDxCB37aKaBH7bDvati/crTH6GWHrZYzVw kqfwQ8wt5d3PB5i4vq+PSTGrKBjSiON7O4A/do5HQ/BAE+fHMbhkY65NJN0SIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751564150; 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=LO0lR/ZZvfJwl0t6QcPaeGPLb7IksuS9ZNa6w/yHPOo=; b=M/kdt4b0K8K9KonbU3fJf9X2Kfmg40Fhhf4GxaFMkVlUJwnyas+bf9iEnSxmEyuA+wxSy+ YU9eK2CpkTs/zWrBiKU2uMjCGiEABSznlM3LquZ/dGkK/DhRIyqcT4xBY60JgW+mMhPmzL bbyIBauVpNb/4dBm4e0eJb9LhB4bdvUbkIw0ZRZvWh7fviw2qre614Ja6IHZz9ZZ7c8yyz HRoyl7Ro8nTaEfloIDuDxiZR/tHnyGJ/Il3NIpSOS8ncg6PduEHdEqK2dvQME7SJe/56L7 KBGrI5no3FmY3+TdDpyfInV2uuMCAOjuq4c3+iS0kFcEtWOpyvVckqo/5MiD/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751564150; a=rsa-sha256; cv=none; b=ouzELR2v48MU8Yw3QEM6OFfbMqf2/MQtqBaSRzCsMu4NIjEOuQqw6IIxkrD8G4z+MYuIY/ OC45Z7of5LqDl3jjTdrblDK8d0kDyVuH1OL6INHUEO6Zv32UjaTaIiPwpX6kQep48TtOXX YbjGE+EEIvhZVtd5tIMF35x+hbRUVaK7ajNb3GZidKCqh+gAQReDFx4vwJealG+6fJf7lW iqP1/I9p/5L4TQLSxSc2R94Sn618pH23KV078gkrwY7M9A/NaDl/INVBHAWduUL+lG2u8q N1W5NAbmfMK8/qvcf22J/syQJRiXIGccipg5m+s4rWT5pNzGjPJOXttEpjHnSA== 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 4bY3ny2TKJzJ9; Thu, 03 Jul 2025 17:35:50 +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 563HZoVM076099; Thu, 3 Jul 2025 17:35:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 563HZo3n076096; Thu, 3 Jul 2025 17:35:50 GMT (envelope-from git) Date: Thu, 3 Jul 2025 17:35:50 GMT Message-Id: <202507031735.563HZo3n076096@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 4b8b872a9c55 - main - random: Move entropy harvest queue lock macros to random_harvestq.c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 4b8b872a9c55c040eb83f917fc8fd2bf908b96a9 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4b8b872a9c55c040eb83f917fc8fd2bf908b96a9 commit 4b8b872a9c55c040eb83f917fc8fd2bf908b96a9 Author: Mark Johnston AuthorDate: 2025-07-03 17:21:37 +0000 Commit: Mark Johnston CommitDate: 2025-07-03 17:21:37 +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 --- 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 ccc66019e8ff..1a8cbd9dcad7 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -161,6 +161,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 */