From nobody Thu Oct 19 14:02:51 2023 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 4SB8Yl34cSz4xTWR; Thu, 19 Oct 2023 14:02: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SB8Yl2bQBz4SCn; Thu, 19 Oct 2023 14:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697724171; 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=GJ+Eu5UrtqpkEoI7ERuVY89yMFwYnFUcQZx0liz+g1I=; b=hEqg/QoaBcqKY3L0EOoTrEzvfm1IrkPeGEtRUaoEjtS5VN5YrKsqOCvldTGcJyqjSXRw5s lGMDkUd92MJl7VR+2djp1iM1tsVLmOmnBFjE310rIUbwGClI51qFh4BiVDaK5OC4EKLuaT Qnuz9/7DuoduxsmPnzZUrItoirRfJVzpIrCA6pMeZSPxqClk4X1T+eliOO23yW6C2mEcVX +5RCX5fk5G+xF5TSuNeuDY4QvSxh8bGEutVmU0F/0uqxGpdTvl52YThR9jKIoQbZjGf/Fk 08jZ5DDjPTiihwQVCUPp89UA/iSgBtnMuQIoXmKKDnjFCRCh3W9zdWixm8RZwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697724171; a=rsa-sha256; cv=none; b=WH4jol9TvfIFZygR2/GJldrVfoMYMiysLJV3NM/UkjBv9yzrvMhxfhsmnLgaOIkkYg/QZS e14FCFTQHPfA5ytiWhlKXjwawIOuGqIe1B0J2e+19XVvTPOcQM3kzNlVWX/1EdUUlDIBPP XeB6dmNJlIPoRrwMHo2SFsS+2PKEFwEJRVeS38HVoycbw0bhUZ4mC33Ar+CEcNTBkSG+o6 kSoYUUoh6q1J4ensWCqhjek8mIDng+G0qWHAoHK0MNbvaWgvkVZLabOHFwcGTeXjmnHMpM XBA1palSZ5jdJ/sZRJMhRXSoLGvOGqaVMay3PKOS/D7Jr2qzNh58clYR8aKn0Q== 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=1697724171; 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=GJ+Eu5UrtqpkEoI7ERuVY89yMFwYnFUcQZx0liz+g1I=; b=P6WShYIkfD81/a2xg7ApjN+jj4di30mP1WTdWJyGKD21NPytWDvAsDHTw6NRBnMGB1E9ur djFKf5gbr85GGfWF5RWfFKQ1lEx+D6VmM44HpIkfXdW0yCZhBKLXOTAMgVFPRDURR1LBXI /ewYisTDlLM0hyED7GgTGdEN3BsET+p0340EO4/L81ZiA2VTRVko5V0yra7rpBG7pTLvem UMW42NHpZW0uWokDAG171sejeAeHqZzNHFsOxPoRlFhr0LsC3OKjw+iqFOD5F4djL55OpB OxBXTInrP7SlqvTgf32Lg6zeXTtJzQXZpe5KTuZaU8Jy7psMhBjWgc+B8C+J/Q== 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 4SB8Yl1hXbzsfm; Thu, 19 Oct 2023 14:02:51 +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 39JE2pBo044962; Thu, 19 Oct 2023 14:02:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JE2poN044959; Thu, 19 Oct 2023 14:02:51 GMT (envelope-from git) Date: Thu, 19 Oct 2023 14:02:51 GMT Message-Id: <202310191402.39JE2poN044959@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: e26b7e8d02f6 - stable/14 - vm_phys: Add corresponding sysctl knob for loader tunable 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e26b7e8d02f648623ad343016533487634a16698 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e26b7e8d02f648623ad343016533487634a16698 commit e26b7e8d02f648623ad343016533487634a16698 Author: Zhenlei Huang AuthorDate: 2023-10-12 10:14:49 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-19 14:00:57 +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) --- 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 108297caac49..bc992bdfc58b 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -76,6 +76,12 @@ _Static_assert(sizeof(long long) >= sizeof(vm_paddr_t), #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; @@ -627,15 +633,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) {