git: 0ceaf5d46282 - stable/12 - pmap: Prefer consistent naming for loader tunable

The branch stable/12 has been updated by zlei:

URL: https://cgit.FreeBSD.org/src/commit/?id=0ceaf5d4628210226d0bafc2650b494a07ca9aaf

commit 0ceaf5d4628210226d0bafc2650b494a07ca9aaf
Author:     Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2023-10-19 17:00:31 +0000
Commit:     Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2023-10-23 10:17:44 +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)
    (cherry picked from commit 16afc2a4d9c581064aa32babc29c748ccd59863c)
---
 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 11c2ba658b82..c94232f1c04b 100644
--- a/sys/arm/arm/pmap-v6.c
+++ b/sys/arm/arm/pmap-v6.c
@@ -1752,7 +1752,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);
 
@@ -3035,7 +3035,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 611bfb414cb3..f1b1b9f3d0ca 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -974,7 +974,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);
 
@@ -2590,7 +2590,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 79e774b33bf4..4c3e0754c010 100644
--- a/sys/powerpc/booke/pmap.c
+++ b/sys/powerpc/booke/pmap.c
@@ -2156,7 +2156,7 @@ mmu_booke_init(mmu_t mmu)
 	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);