From nobody Mon Apr 11 02:07:36 2022 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 C124E1A9235D; Mon, 11 Apr 2022 02:07:36 +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 4KcC143XM6z3LDN; Mon, 11 Apr 2022 02:07:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649642856; 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=2T4yslEvn5/0G8qU+0iW4xGZdEXXWMGDc1EuUSS4XVM=; b=ONucx7evPomjQcNe2df0ERaGZBzsX1VQsacvnca3n7FOcz8/qqW9gCscT5QA35ifHi/45z iG7tq2S+VlIvtjrmuH55HxjWD+yOu2PN8lBiirqJ9+qElXyByMjjuNgjUofzgH1PUQNB7I kiIZqUHfZrFpCc0bpCCbYh8XFjjy1FFErAVPNPs05j/VBoTJwghAVwLVoZXuwBDJCC8RiO /yvsj2aZBSKw7FqqT7m+4DHLv2cz7iRW3EMdrCJfL1iXNHUp4OMJD7s0zk6zN8v6guWFff 8G9nGYrLgu9HHfLnEbBFkON72tRXNc8VQ4OvaD97D2j84HFOc0e3SsiJGd03Aw== 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 5A5DF1A420; Mon, 11 Apr 2022 02:07:36 +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 23B27anX086151; Mon, 11 Apr 2022 02:07:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23B27axt086150; Mon, 11 Apr 2022 02:07:36 GMT (envelope-from git) Date: Mon, 11 Apr 2022 02:07:36 GMT Message-Id: <202204110207.23B27axt086150@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 567378cc0796 - main - Fix OID format for `vm.swap_reserved` and `vm.swap_total` 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 567378cc0796c12f5d4bac79e639e22adf42b12f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649642856; 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=2T4yslEvn5/0G8qU+0iW4xGZdEXXWMGDc1EuUSS4XVM=; b=ExxL0j+WHebU9HltOWb1bu+XrEhCsO74wdBh4279rN4pzSRynFWv8FvlPvia9cKZKrmgtp BwAxx4sOJha+JG5GnnYhYu/0NhwXZUQYMKmhVeqVrq3bGZRGotrwoQhYgmD0HHBtFvZoQE Wt/RusPO9BVCoIMOIliC0z5WnGt2TKVtvscG/+xU4O+HdhC5HU1MX04l+g4qtRFVPOcY4U 6fVPLlurLKcW1n9dPxIlZ+BfspuNCApnXL7TuBDTEZxXfASjx+1X58HSnUzXe/NL2GPX4C S+HHyuCBEhpuagQVaMm5g3QZ+ZZlUFOW6kydDcD6jACXCD+vQx+5Sy6s8YB6eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649642856; a=rsa-sha256; cv=none; b=CxAYNvSQksJ6SbMk8BpK0po03mD8SSGOU75tSOC+lkpJEf6IC1q5oRuvWYBBz2cz4eUsvR RnNKW4EbK5zbLvXh4zoSn/ziOHn9zgRW0F26UkWP+20xP/EYriAdSQdqnSNaWjN9hKheYZ cR6+5mbsFe5IR6xzgb4cD+4QIoiV8652pf3zsxfk3XnAZ4oRAuRvEYv4LTh8I5zpnUFben T0IXDJBMCaN+MIYJPdZ/Zx3H2zNVAe7ESRaVNqAzYVeLU9aTdzYEnNHW+4sUQh+NqUo52/ Ps4J45mtnUjODG1S8mE/NAQ73lVauz54MZcJh9TkCtdKurihEF9M+mOfH9zfIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=567378cc0796c12f5d4bac79e639e22adf42b12f commit 567378cc0796c12f5d4bac79e639e22adf42b12f Author: Enji Cooper AuthorDate: 2022-04-11 01:17:09 +0000 Commit: Enji Cooper CommitDate: 2022-04-11 01:17:09 +0000 Fix OID format for `vm.swap_reserved` and `vm.swap_total` The correct OID format for CTLTYPE_U64 is `QU` (`uquad_t`), not `A` (text expressed via `char *`). This issue was noticed while doing an sysctl tree walk using a sysctl(9) consumer that relies on the OID format to intuit what the type should be for a given sysctl. MFC after: 1 month Sponsored by: DellEMC Isilon Differential Revision: https://reviews.freebsd.org/D34877 --- sys/vm/swap_pager.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 515b758fc244..ef126ee5fdf3 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -163,10 +163,10 @@ static SYSCTL_NODE(_vm_stats, OID_AUTO, swap, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "VM swap stats"); SYSCTL_PROC(_vm, OID_AUTO, swap_reserved, CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_MPSAFE, - &swap_reserved, 0, sysctl_page_shift, "A", + &swap_reserved, 0, sysctl_page_shift, "QU", "Amount of swap storage needed to back all allocated anonymous memory."); SYSCTL_PROC(_vm, OID_AUTO, swap_total, CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_MPSAFE, - &swap_total, 0, sysctl_page_shift, "A", + &swap_total, 0, sysctl_page_shift, "QU", "Total amount of available swap storage."); static int overcommit = 0;