From nobody Thu Oct 19 14:19:34 2023 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 4SB8x24zfwz4xTxG; Thu, 19 Oct 2023 14:19:34 +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 4SB8x24RB5z4VB3; Thu, 19 Oct 2023 14:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697725174; 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=wOO+h4ehi+LumZFTE3GVmX5JkK37BQ0wYps68XFOEKs=; b=ihTmQwWArcMF/GWFh30gr743SvNP05rSYjf9tiN0M1pQRKWRVyh19GCrCCZOaQbeV5rbzb nkppsmTASFEUw2mMbSS0lkYlihAukrNTF4uKT+szi2eBiG2AIZcBN+YCqEHVuLkQa5mKb1 1Im4TocGh2Uls1vcpBWWcwh6ppRX41a0a5o1rqNIauj+XB60t4x3n0E6W3NogbtQ/0Bq/I cHIi9N/ECOgFCiYVErytaQvnrubpar8ygwimqzZeJUOTHMSZpcO6cPrejzBpXSs5LERS+5 8lnxeMBSRbwl/D8mTBoEFkWK2LPM61yEBDcQP8YdL3si+2N1Lz6JwvzxylvKTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697725174; a=rsa-sha256; cv=none; b=FQ5LLlHqYtRzqtEPUmaIkJyU4fEYCh9EaKyqNlhKHDRQLdz49dpu3bqyoQ6l7fh3U5nHGV i03W+A4PG3pmi2PMeTUsxiir+8Rc3rx0ao9EFpJv/L8JJwV/EV/Vha1UQZ3yCw7cJlSc83 Ia7K2U8MlcchBxCEwbqctr8M6z6/Zwup25xtAK0ZP+ZHxy9ov5LlgM0UvUPZlPCRGRLwpI Ba4Y8yvCx+i5JEZHFDsCdo5cHnmGQ6JQe+fj9Rt0O0Q7fPv2jyqK5NtrmOo+rCGp8Z3fvk SXNGI9BtKnC+4XVkxV3Lw+NrVzKZxHgxsD8+9Q0aqjy/hDV/hvdsMo7sNql95Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697725174; 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=wOO+h4ehi+LumZFTE3GVmX5JkK37BQ0wYps68XFOEKs=; b=C+kjUzu4d509VnSd8E0I/gpVAvyGBSG/lvLgpYiGodRuvTv6BVuqXj2gtvnUs5BrnUoaVY WzAWAw8jiaFhUseeWpjMFkV4bfQIurmdKBH7ISF9k+d+YogdmnL/tpL8H2WYSY/9gU3nQz Ekrwth8sHZhSgVb3/bV+MG19MVx7rNJ+TtfXjxhoHwtFv51SrTFNIpZHK/lGhJ+RY/t+P+ 32WEJK7nZVA3EBn0wclzltPGjiV+gOEdTj/tMWYL/ziQ/Noy2Omh4iOgple1i13iFGw+ek WCKU4vAlAPV7WBLKl+0UzLAuWumpopBgHiSNToTh5DX35pS7jdQJXzpCSJrm7g== 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 4SB8x23Rv9zsq0; Thu, 19 Oct 2023 14:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JEJYd5062360; Thu, 19 Oct 2023 14:19:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JEJYgC062357; Thu, 19 Oct 2023 14:19:34 GMT (envelope-from git) Date: Thu, 19 Oct 2023 14:19:34 GMT Message-Id: <202310191419.39JEJYgC062357@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: b180f0040f95 - stable/13 - vm_phys: Add corresponding sysctl knob for loader tunable 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b180f0040f95973a30fa26f5435e4bbab1197e80 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=b180f0040f95973a30fa26f5435e4bbab1197e80 commit b180f0040f95973a30fa26f5435e4bbab1197e80 Author: Zhenlei Huang AuthorDate: 2023-10-12 10:14:49 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-19 14:17:30 +0000 vm_phys: Add corresponding sysctl knob for loader tunable The loader tunable 'vm.numa.disabled' does not have corresponding sysctl MIB entry. Add it so that it can be retrieved, and `sysctl -T` will also report it correctly. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42138 (cherry picked from commit c415cfc8be1b732a80f1ada6d52091e08eeb9ab5) (cherry picked from commit e26b7e8d02f648623ad343016533487634a16698) --- sys/vm/vm_phys.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index 0c51bfc3e5c2..6894040cbefd 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -74,6 +74,12 @@ _Static_assert(sizeof(long) * NBBY >= VM_PHYSSEG_MAX, #ifdef NUMA struct mem_affinity __read_mostly *mem_affinity; int __read_mostly *mem_locality; + +static int numa_disabled; +static SYSCTL_NODE(_vm, OID_AUTO, numa, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, + "NUMA options"); +SYSCTL_INT(_vm_numa, OID_AUTO, disabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, + &numa_disabled, 0, "NUMA-awareness in the allocators is disabled"); #endif int __read_mostly vm_ndomains = 1; @@ -622,15 +628,14 @@ vm_phys_register_domains(int ndomains, struct mem_affinity *affinity, int *locality) { #ifdef NUMA - int d, i; + int i; /* * For now the only override value that we support is 1, which * effectively disables NUMA-awareness in the allocators. */ - d = 0; - TUNABLE_INT_FETCH("vm.numa.disabled", &d); - if (d) + TUNABLE_INT_FETCH("vm.numa.disabled", &numa_disabled); + if (numa_disabled) ndomains = 1; if (ndomains > 1) {