From nobody Tue Feb 15 21:16:27 2022 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 556A519CEA3B; Tue, 15 Feb 2022 21:16:27 +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 4Jyv631yYyz3HGF; Tue, 15 Feb 2022 21:16:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644959787; 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=8vwNocxh8D+EOSHD5dKEMWlLu3AGEbH25F+lJrd2F6M=; b=WDxs9sDKYqZgEFp+SrsaYvAgmou3vDPbLsbHxjugYOIAUQ89uEiCLR9MZv6US8HcajmqOm IBO/yXNrzXdUbejy8fSheDeN2z02cGG3TBjCseSuNtcF44spvcIgl50i/aA7Ym02Vl+a1w wGGFVfbdjyRgxTgKZOASOWbLiJLgtL8QuDnE8In28drtFzx9+ZRj1zDgvfLGaIhHS0xPnM O00E/jJy52IeTdQIUvXiT7qPTHZ/taKKa+1gaGUcp+yjiyFbOjnxN1JNaHVKrMWVK13m+a LoIvjX69QEGkBdBnXsljZ9Y0j+OvR28C4P7CXEswL+Dba4Q8X9fvnXDzV5Xynw== 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 20AAF17EB; Tue, 15 Feb 2022 21:16:27 +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 21FLGRAe089367; Tue, 15 Feb 2022 21:16:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21FLGR38089366; Tue, 15 Feb 2022 21:16:27 GMT (envelope-from git) Date: Tue, 15 Feb 2022 21:16:27 GMT Message-Id: <202202152116.21FLGR38089366@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "David E. O'Brien" Subject: git: 3083db58304d - stable/12 - random(4): Use ordinary sysctl definitions 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: obrien X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 3083db58304d20ad2f9f613587bb9d9efa0542af Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644959787; 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=8vwNocxh8D+EOSHD5dKEMWlLu3AGEbH25F+lJrd2F6M=; b=CL4qoTbit6Tvo1EQrp3pfBa8UHJ1hLxZn+Lk27WoZ3eGtjXItfclTrD3uDzjOIjO4WXnzw /prJUSH5a4KKdRJOskJbFeOr9wSiD9GqSKgD1nj3pCKqdrzBGV7hOD1cGD56nAxT7A12fn LsUeB2m1qdODfqwbcIpD3bStdIyhy3PWo/49s5GIjYoshKtXQLDIF8Si0Q0wPc+SYa/jF2 gOwxpT2MD8n7Y1YdvPdd1Rj85i2WaUvkLAYWgZRAyGIrK5kLRkmpZzG659RpvSQoJNWgfa mLDUzDEawukXRRdxojGC5rzKTtjhlvUbn6hXwmfhaZHpVtAC1uUIIzK1DdA/wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644959787; a=rsa-sha256; cv=none; b=YaxftiQ0B16y0Rtm5YPeFHbWHUp38p2paZ4jBxrPsVAUjymHf9FnvxzJUNw1iRe8/8GJQE rdEPqCPLbTG/x0SZ2C6APOL46z8CWIJ4yxADyzud5DKmQU5OY25yZjPjo9dsXvg5pVZcJj PHpqQEFfEJ9X1ICO1uOf+AobjZMY7V56YR6wcp3VAFnpUSJAuUYqkf6qKek6Myb/I0Gxgv kO3M+1je0hI4ZK28NmmUGQ9abQ9AcOgjFTTZZy5jsubzZAUk5Q9E8J11CYJXfN92QL1tHs 4R5YERs84x9odEciGzVIUnrEefrXXq1AfA/ONtU6AJOZQu0PsodTWl6azJ2k3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=3083db58304d20ad2f9f613587bb9d9efa0542af commit 3083db58304d20ad2f9f613587bb9d9efa0542af Author: Conrad Meyer AuthorDate: 2019-11-22 20:22:29 +0000 Commit: David E. O'Brien CommitDate: 2022-02-15 20:18:57 +0000 random(4): Use ordinary sysctl definitions There's no need to dynamically populate them; the SYSCTL_ macros take care of load/unload appropriately already (and random_harvestq is 'standard' and cannot be unloaded anyway). (cherry picked from commit d7a23f9f6b0d9757116de63a58032f29d3bc02a4) --- sys/dev/random/random_harvestq.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index f09056aa9424..0c6777ba9d0d 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -69,9 +69,6 @@ static void random_sources_feed(void); static u_int read_rate; -/* List for the dynamic sysctls */ -static struct sysctl_ctx_list random_clist; - /* * How many events to queue up. We create this many items in * an 'empty' queue, then transfer them to the 'harvest' queue with @@ -90,6 +87,9 @@ volatile int random_kthread_control; */ __read_frequently u_int hc_source_mask; +SYSCTL_NODE(_kern_random, OID_AUTO, harvest, CTLFLAG_RW, 0, + "Entropy Device Parameters"); + /* * Put all the harvest queue context stuff in one place. * this make is a bit easier to lock and protect. @@ -273,6 +273,8 @@ random_check_uint_harvestmask(SYSCTL_HANDLER_ARGS) (orig_value & RANDOM_HARVEST_PURE_MASK); return (0); } +SYSCTL_PROC(_kern_random_harvest, OID_AUTO, mask, CTLTYPE_UINT | CTLFLAG_RW, + NULL, 0, random_check_uint_harvestmask, "IU", "Entropy harvesting mask"); /* ARGSUSED */ static int @@ -291,6 +293,9 @@ random_print_harvestmask(SYSCTL_HANDLER_ARGS) } return (error); } +SYSCTL_PROC(_kern_random_harvest, OID_AUTO, mask_bin, + CTLTYPE_STRING | CTLFLAG_RD, NULL, 0, random_print_harvestmask, "A", + "Entropy harvesting mask (printable)"); static const char *random_source_descr[ENTROPYSOURCE] = { [RANDOM_CACHED] = "CACHED", @@ -348,31 +353,15 @@ random_print_harvestmask_symbolic(SYSCTL_HANDLER_ARGS) } return (error); } +SYSCTL_PROC(_kern_random_harvest, OID_AUTO, mask_symbolic, + CTLTYPE_STRING | CTLFLAG_RD, NULL, 0, random_print_harvestmask_symbolic, + "A", "Entropy harvesting mask (symbolic)"); /* ARGSUSED */ static void random_harvestq_init(void *unused __unused) { - struct sysctl_oid *random_sys_o; - - random_sys_o = SYSCTL_ADD_NODE(&random_clist, - SYSCTL_STATIC_CHILDREN(_kern_random), - OID_AUTO, "harvest", CTLFLAG_RW, 0, - "Entropy Device Parameters"); hc_source_mask = RANDOM_HARVEST_EVERYTHING_MASK; - SYSCTL_ADD_PROC(&random_clist, - SYSCTL_CHILDREN(random_sys_o), - OID_AUTO, "mask", CTLTYPE_UINT | CTLFLAG_RW, - NULL, 0, random_check_uint_harvestmask, "IU", - "Entropy harvesting mask"); - SYSCTL_ADD_PROC(&random_clist, - SYSCTL_CHILDREN(random_sys_o), - OID_AUTO, "mask_bin", CTLTYPE_STRING | CTLFLAG_RD, - NULL, 0, random_print_harvestmask, "A", "Entropy harvesting mask (printable)"); - SYSCTL_ADD_PROC(&random_clist, - SYSCTL_CHILDREN(random_sys_o), - OID_AUTO, "mask_symbolic", CTLTYPE_STRING | CTLFLAG_RD, - NULL, 0, random_print_harvestmask_symbolic, "A", "Entropy harvesting mask (symbolic)"); RANDOM_HARVEST_INIT_LOCK(); harvest_context.hc_entropy_ring.in = harvest_context.hc_entropy_ring.out = 0; } @@ -464,7 +453,6 @@ random_harvestq_deinit(void *unused __unused) random_kthread_control = 0; while (random_kthread_control >= 0) tsleep(&harvest_context.hc_kthread_proc, 0, "harvqterm", hz/5); - sysctl_ctx_free(&random_clist); } SYSUNINIT(random_device_h_init, SI_SUB_RANDOM, SI_ORDER_SECOND, random_harvestq_deinit, NULL);