From nobody Mon Oct 23 10:13:02 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 4SDWGk6qSpz4xs58; Mon, 23 Oct 2023 10:13:02 +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 4SDWGk63NTz3JXF; Mon, 23 Oct 2023 10:13:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698055982; 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=+tVO3r0rFuP5lp76kAvmKSXzni5iqrs+dA2f7lkAkDc=; b=kgsjveDSMaLMAbaDohqmR6tekY5J9EkHpvRlPDrGA0HMypDIQh75rQLJuvbNd8HqVttPvb 9UVvSETmsud9TVNT1KVvO2xZTYe2br3LnBacXjGALRTrld7JLQoYXaeoN67yBIN3TQK+3L T/TIj39332G75RJaFmhnMf6gJ07WBPVYsKrPjbTHOOSHOi9+50HSqiqzqQTrQmRvcSX0hk N8mszpx80a8U1xVMD/tMRWfA/NVR0bxOT9FZlHmWoM/346gwyyhGBy5DYyTgxkmnR1tmjj BgjbxVKCPCsj7lMPesC1tNoy+l9kCXajUoyCQj6tzL4f4jqiHxJEsrWfdU//bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698055982; a=rsa-sha256; cv=none; b=MHRoGnpuJP4x6QqaSTHqnQybo+mcmnwAH09iQhFRSimTBR+KslTWmX6MvBxdUsniHEYszg ASMzKcGlhBBJOUcR5g+lClalb6SZYcxp9h9LH6JjhAELbIXzNNEIM1xb0o/pOjyqSa17qw Fd9SGhuv+69o5wnONDceYgupErbK8FYatzs0Da0Hj13N/guAHQh2M8xR5F/YmpfAUt3Dp7 Iuq+L9nzRK4eGavzAqjQ2LFY6YXa5VVreTZVEj5o4GE/l+wobC4Iv7A8F1Ak08eEgJ4N96 TQDenVZS1xzDjRNNcABJ6qXXO5IZ+zHTpi/hj47QnHwYBqs2naZE9EwEsHwpVQ== 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=1698055982; 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=+tVO3r0rFuP5lp76kAvmKSXzni5iqrs+dA2f7lkAkDc=; b=KqEdSYEFqM+h0alYcU4VxZnH/rLn/BnHGCWFDaY1u9bbc5HrgecesgbFNbN33CE9UrjfQ4 R6hXjrR0KT+eXXTpK8QV9QFyFeHUv3QC2WGEe5oOvrY2+WMO1RhHsCyYd6B0jefjQLShjL fmCAFJfokBtM5bZROVNsnLJ9vBIxxq/vwlyVULPqpmOxJfHkPY8BLGeMgGCKZYesrP0O4X TvJY9q+GHz4UB8Exyql7X4ODFvkupGB7RpQLP2ZONb2+F2jxWQATlEsKt9KDiD+YIczKYA 26cpM6ggxkZpzdHQI5KDtJY+GNKRQqCjTLWZcM0lfrMbcr9ZiNxl8QGfFVrQug== 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 4SDWGk4nsbzbhc; Mon, 23 Oct 2023 10:13:02 +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 39NAD2R7046040; Mon, 23 Oct 2023 10:13:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NAD20V046037; Mon, 23 Oct 2023 10:13:02 GMT (envelope-from git) Date: Mon, 23 Oct 2023 10:13:02 GMT Message-Id: <202310231013.39NAD20V046037@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: e53f8ca323e8 - stable/14 - pmap: Prefer consistent naming 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/14 X-Git-Reftype: branch X-Git-Commit: e53f8ca323e8e563d4b55883fc3544bea75aab29 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e53f8ca323e8e563d4b55883fc3544bea75aab29 commit e53f8ca323e8e563d4b55883fc3544bea75aab29 Author: Zhenlei Huang AuthorDate: 2023-10-19 17:00:31 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-23 10:12:21 +0000 pmap: Prefer consistent naming for loader tunable The sysctl knob 'vm.pmap.pv_entry_max' becomes a loader tunable since 7ff48af7040f (Allow a specific setting for pv entries) but is fetched from system environment 'vm.pmap.pv_entries'. That is inconsistent and obscure. This reverts 36e1b9702e21 (Correct the tunable name in the message). PR: 231577 Reviewed by: jhibbits, alc, kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42274 (cherry picked from commit 02320f64209563e35fa371fc5eac94067f688f7f) --- sys/arm/arm/pmap-v6.c | 4 ++-- sys/i386/i386/pmap.c | 4 ++-- sys/powerpc/booke/pmap.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index 719851432203..92e992a4b25e 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -1750,7 +1750,7 @@ pmap_init(void) */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_max = roundup(pv_entry_max, _NPCPV); pv_entry_high_water = 9 * (pv_entry_max / 10); @@ -3012,7 +3012,7 @@ get_pv_entry(pmap_t pmap, boolean_t try) if (ratecheck(&lastprint, &printinterval)) printf("Approaching the limit on PV entries, consider " "increasing either the vm.pmap.shpgperproc or the " - "vm.pmap.pv_entries tunable.\n"); + "vm.pmap.pv_entry_max tunable.\n"); retry: pc = TAILQ_FIRST(&pmap->pm_pvchunk); if (pc != NULL) { diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 4198849b1a5a..67810700e6ef 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -1006,7 +1006,7 @@ __CONCAT(PMTYPE, init)(void) */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_max = roundup(pv_entry_max, _NPCPV); pv_entry_high_water = 9 * (pv_entry_max / 10); @@ -2515,7 +2515,7 @@ get_pv_entry(pmap_t pmap, boolean_t try) if (ratecheck(&lastprint, &printinterval)) printf("Approaching the limit on PV entries, consider " "increasing either the vm.pmap.shpgperproc or the " - "vm.pmap.pv_entries tunable.\n"); + "vm.pmap.pv_entry_max tunable.\n"); retry: pc = TAILQ_FIRST(&pmap->pm_pvchunk); if (pc != NULL) { diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index fe6b95eda085..f41ea24cd30c 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -1069,7 +1069,7 @@ mmu_booke_init(void) TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_high_water = 9 * (pv_entry_max / 10); uma_zone_reserve_kva(pvzone, pv_entry_max);