svn commit: r355720 - head/sys/vm

[Mark Johnston]

Author: markj
Date: Fri Dec 13 18:28:01 2019
New Revision: 355720
URL: https://svnweb.freebsd.org/changeset/base/355720

Log:
  Restore the reservation of boot pages for bucket zones after r355707.
  
  uma_startup2() sets booted = BOOT_BUCKETS after calling bucket_init(),
  but before that assignment, startup_alloc() will use pages from the
  reserved pool, so the bucket zones themselves are still allocated using
  startup pages.
  
  Reviewed by:	rlibby
  Reported by:	Jenkins via lwhsu
  Differential Revision:	https://reviews.freebsd.org/D22797

Modified:
  head/sys/vm/uma_core.c

Modified: head/sys/vm/uma_core.c
==============================================================================
--- head/sys/vm/uma_core.c	Fri Dec 13 18:18:14 2019	(r355719)
+++ head/sys/vm/uma_core.c	Fri Dec 13 18:28:01 2019	(r355720)
@@ -2295,10 +2295,10 @@ zone_foreach(void (*zfunc)(uma_zone_t, void *arg), voi
 /*
  * Count how many pages do we need to bootstrap.  VM supplies
  * its need in early zones in the argument, we add up our zones,
- * which consist of the UMA Slabs and UMA Hash zones. The
+ * which consist of the UMA Slabs, UMA Hash and 9 Bucket zones.  The
  * zone of zones and zone of kegs are accounted separately.
  */
-#define	UMA_BOOT_ZONES	2
+#define	UMA_BOOT_ZONES	11
 /* Zone of zones and zone of kegs have arbitrary alignment. */
 #define	UMA_BOOT_ALIGN	32
 static int zsize, ksize;