svn commit: r357463 - head/sys/vm

[Mark Johnston]

Author: markj
Date: Mon Feb  3 19:29:02 2020
New Revision: 357463
URL: https://svnweb.freebsd.org/changeset/base/357463

Log:
  Disable the smallest UMA bucket size on 32-bit platforms.
  
  With r357314, sizeof(struct uma_bucket) grew to 16 bytes on 32-bit
  platforms, so BUCKET_SIZE(4) is 0.  This resulted in the creation of a
  bucket zone for buckets with zero capacity.  A more general fix is
  planned, but for now this bandaid allows 32-bit platforms to boot again.
  
  PR:		243837
  Discussed with:	jeff
  Reported by:	pho, Jenkins via lwhsu
  Tested by:	pho
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/vm/uma_core.c

Modified: head/sys/vm/uma_core.c
==============================================================================
--- head/sys/vm/uma_core.c	Mon Feb  3 19:08:35 2020	(r357462)
+++ head/sys/vm/uma_core.c	Mon Feb  3 19:29:02 2020	(r357463)
@@ -239,7 +239,9 @@ struct uma_bucket_zone {
 #define	BUCKET_MIN	BUCKET_SIZE(4)
 
 struct uma_bucket_zone bucket_zones[] = {
+#ifndef __ILP32__
 	{ NULL, "4 Bucket", BUCKET_SIZE(4), 4096 },
+#endif
 	{ NULL, "6 Bucket", BUCKET_SIZE(6), 3072 },
 	{ NULL, "8 Bucket", BUCKET_SIZE(8), 2048 },
 	{ NULL, "12 Bucket", BUCKET_SIZE(12), 1536 },