svn commit: r359992 - head/sys/powerpc/aim

[Alfredo Dal'Ava Junior]

Author: alfredo
Date: Wed Apr 15 20:33:09 2020
New Revision: 359992
URL: https://svnweb.freebsd.org/changeset/base/359992

Log:
  powerpc: autosize bpvo based on physical memory
  
  Default moea64_bpvo_pool_size 327680 was insufficient for initial
  memory mapping at boot time on systems with, for example, 64G and
  no huge pages enabled.
  
  Submitted by:	Andre Silva <afscoelho at gmail.com>
  Reviewed by:	jhibbits, alfredo
  Approved by:	jhibbits (mentor)
  Sponsored by:	Eldorado Research Institute (eldorado.org.br)
  Differential Revision:	https://reviews.freebsd.org/D24102

Modified:
  head/sys/powerpc/aim/mmu_oea64.c

Modified: head/sys/powerpc/aim/mmu_oea64.c
==============================================================================
--- head/sys/powerpc/aim/mmu_oea64.c	Wed Apr 15 20:28:20 2020	(r359991)
+++ head/sys/powerpc/aim/mmu_oea64.c	Wed Apr 15 20:33:09 2020	(r359992)
@@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/vmmeter.h>
 #include <sys/smp.h>
+#include <sys/reboot.h>
 
 #include <sys/kdb.h>
 
@@ -184,10 +185,12 @@ uma_zone_t	moea64_pvo_zone; /* zone for pvo entries */
 
 static struct	pvo_entry *moea64_bpvo_pool;
 static int	moea64_bpvo_pool_index = 0;
-static int	moea64_bpvo_pool_size = 327680;
+static int	moea64_bpvo_pool_size = 0;
 SYSCTL_INT(_machdep, OID_AUTO, moea64_allocated_bpvo_entries, CTLFLAG_RD, 
     &moea64_bpvo_pool_index, 0, "");
 
+#define	BPVO_POOL_SIZE	327680 /* Sensible historical default value */
+#define	BPVO_POOL_EXPANSION_FACTOR	3
 #define	VSID_NBPW	(sizeof(u_int32_t) * 8)
 #ifdef __powerpc64__
 #define	NVSIDS		(NPMAPS * 16)
@@ -916,6 +919,20 @@ moea64_mid_bootstrap(mmu_t mmup, vm_offset_t kernelsta
 	 * Initialise the bootstrap pvo pool.
 	 */
 	TUNABLE_INT_FETCH("machdep.moea64_bpvo_pool_size", &moea64_bpvo_pool_size);
+	if (moea64_bpvo_pool_size == 0) {
+		if (!hw_direct_map)
+			moea64_bpvo_pool_size = ((ptoa((uintmax_t)physmem) * sizeof(struct vm_page)) /
+			    (PAGE_SIZE * PAGE_SIZE)) * BPVO_POOL_EXPANSION_FACTOR;
+		else
+			moea64_bpvo_pool_size = BPVO_POOL_SIZE;
+	}
+
+	if (boothowto & RB_VERBOSE) {
+		printf("mmu_oea64: bpvo pool entries = %d, bpvo pool size = %ju MB\n",
+		    moea64_bpvo_pool_size,
+		    moea64_bpvo_pool_size*sizeof(struct pvo_entry) / 1048576);
+	}
+
 	moea64_bpvo_pool = (struct pvo_entry *)moea64_bootstrap_alloc(
 		moea64_bpvo_pool_size*sizeof(struct pvo_entry), PAGE_SIZE);
 	moea64_bpvo_pool_index = 0;