From nobody Mon Oct 23 10:15:56 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 4SDWL51zjMz4xsPx; Mon, 23 Oct 2023 10:15:57 +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 4SDWL51ShWz3Kck; Mon, 23 Oct 2023 10:15:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698056157; 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=YY+UOOoO/dS22vN3npm8hNk4o5mdouuGx7MU3lhUdTE=; b=cjANQAvrVAJTfHBZD7Rvh9CYIQdYmtHNr0gEnd94UXjm+LiGNmkPMxpVpB+4+e7wvGlGdG hfcEs4H4YpA7wQTHvA82QlNjg4JpEpxwUguJrpqPoC/W10AkszJWKa9hscyn9hIeFuZQct JWRM34KI38IVY/MhGMRlongGw+qarpodqH/p+hqiDySQeccksEVSfW9KINze7bLZh11j7S mKdn4CJjQimaLu4lRyi23DP8ue2lkXFnm9bFhKLAdcs/fGC+eScDCmw8w+bJ1jNbmO3fqi AVMrMw1ogM5majf35Glr7GLgI9at9j0NWRqPx0wFywMlU+WwU6QrvWKuJshZzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698056157; a=rsa-sha256; cv=none; b=iT67ecvLKwTos4dPg+L3cJG/ikG3ErPGXIQmWVqq6cdL89CC2xnIBLSG2rQndtAVkY00Ls Nu4hmJGeCCaU8auGIATbv64QiquEZO3b+AZIUCjr2hVNQXPXQLbC39lqK9opkP66yHwAG5 R+nSakmUrxF9NwjdaYyDxrQ+CKTutIc/NPHqV804lUPN57VmG4PEgXaV12YriVQ0iKsUXX x1byUnXEguGx7x4f7I2LBPtERr8RZifr0VSyxqEjyaaZsoTm7KF8KCJ3Vx7jA3FDabbRlJ L3wDy9CsKvaFitLhXnnM4vJWpUKwBZ/tXno/WMeKEnAzmHH75ZhdOTLKZM9BwA== 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=1698056157; 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=YY+UOOoO/dS22vN3npm8hNk4o5mdouuGx7MU3lhUdTE=; b=TlT39HIiexPnsU6wcdWAcikyrJbZfThR0KfsuebSi67oQu92CKSt4GEmD4b0PKlJU+ed6v 23K4g36IUElJeJF9yePklIWhL4cSVQrXPVifC0p61qA+DdJZC8A/RkAPsGbNSeOAqM35j4 SkJVjK7yi/lYIojM2UVDY2X0P9xHEsA8LsTcQzs716SnBI3cP6sG0VrkFCuP9HR+dkLjeX ET/8v21YfEEygQbXrynkYqWpGDniL7cWni46fP+Wum8OZPguiG3viv0BHUXS1dNXH9D7fU 7nCRZE8qbF89Rg4rnxrAzHWI5ElrBySjefNMGJJlLev6NkEoPfp1ltAEDEYX9Q== 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 4SDWL50MZdzbf3; Mon, 23 Oct 2023 10:15:57 +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 39NAFu2D046684; Mon, 23 Oct 2023 10:15:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NAFuR9046681; Mon, 23 Oct 2023 10:15:56 GMT (envelope-from git) Date: Mon, 23 Oct 2023 10:15:56 GMT Message-Id: <202310231015.39NAFuR9046681@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: 16afc2a4d9c5 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 16afc2a4d9c581064aa32babc29c748ccd59863c Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=16afc2a4d9c581064aa32babc29c748ccd59863c commit 16afc2a4d9c581064aa32babc29c748ccd59863c Author: Zhenlei Huang AuthorDate: 2023-10-19 17:00:31 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-23 10:15:12 +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) (cherry picked from commit e53f8ca323e8e563d4b55883fc3544bea75aab29) --- 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 79adf395161a..f00589a75c6d 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); @@ -3030,7 +3030,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 72596d364b60..5913ea927d75 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -1005,7 +1005,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); @@ -2532,7 +2532,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 0501a0fe99a9..f85bb8d56f74 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -1067,7 +1067,7 @@ mmu_booke_init() 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);