> On Oct 20, 2023, at 1:01 AM, Zhenlei Huang <z...@freebsd.org> wrote:
>
> The branch main has been updated by zlei:
>
> URL:
> https://cgit.FreeBSD.org/src/commit/?id=02320f64209563e35fa371fc5eac94067f688f7f
>
> commit 02320f64209563e35fa371fc5eac94067f688f7f
> Author: Zhenlei Huang <z...@freebsd.org>
> AuthorDate: 2023-10-19 17:00:31 +0000
> Commit: Zhenlei Huang <z...@freebsd.org>
> CommitDate: 2023-10-19 17:00:31 +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
The 'system environment' is misleading. I meant 'kernel environment' .
Sorry for fast commit.
> 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
> ---
> 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 6b839484e6c5..967ad48de460 100644
> --- a/sys/i386/i386/pmap.c
> +++ b/sys/i386/i386/pmap.c
> @@ -998,7 +998,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);
>
> @@ -2519,7 +2519,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);
