Wed Apr 24 02:08:03 2024 UTC (15d)

vmem_init(): Ensure that the quantum is a power of 2, and that if private
tags are being used, they are added to the arena before the first span is
added.


(thorpej)

diff -r1.115 -r1.116 src/sys/kern/subr_vmem.c

--- src/sys/kern/subr_vmem.c 2023/12/03 19:34:08	1.115
+++ src/sys/kern/subr_vmem.c 2024/04/24 02:08:03	1.116

 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_vmem.c,v 1.115 2023/12/03 19:34:08 thorpej Exp $	*/
+/*	$NetBSD: subr_vmem.c,v 1.116 2024/04/24 02:08:03 thorpej Exp $	*/
 /*-
  * Copyright (c)2006,2007,2008,2009 YAMAMOTO Takashi,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -36,27 +36,27 @@
  * - 	A pool(9) is used for vmem boundary tags
  * - 	During a pool get call the global vmem_btag_refill_lock is taken,
  *	to serialize access to the allocation reserve, but no other
  *	vmem arena locks.
  * -	During pool_put calls no vmem mutexes are locked.
  * - 	pool_drain doesn't hold the pool's mutex while releasing memory to
  * 	its backing therefore no interference with any vmem mutexes.
  * -	The boundary tag pool is forced to put page headers into pool pages
  *  	(PR_PHINPAGE) and not off page to avoid pool recursion.
  *  	(due to sizeof(bt_t) it should be the case anyway)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.115 2023/12/03 19:34:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.116 2024/04/24 02:08:03 thorpej Exp $");
 #if defined(_KERNEL) && defined(_KERNEL_OPT)
 #include "opt_ddb.h"
 #endif /* defined(_KERNEL) && defined(_KERNEL_OPT) */
 #include <sys/param.h>
 #include <sys/hash.h>
 #include <sys/queue.h>
 #include <sys/bitops.h>
 #if defined(_KERNEL)
 #include <sys/systm.h>
 #include <sys/kernel.h>	/* hz */
 @@ -961,26 +961,34 @@ vmem_fit(const bt_t *bt, vmem_size_t siz
  */
 vmem_t *
 vmem_init(vmem_t *vm, const char *name,
     vmem_addr_t base, vmem_size_t size, vmem_size_t quantum,
     vmem_import_t *importfn, vmem_release_t *releasefn,
     vmem_t *arg, vmem_size_t qcache_max, vm_flag_t flags, int ipl)
+{
 	int i;
 	KASSERT((flags & (VM_SLEEP|VM_NOSLEEP)) != 0);
 	KASSERT((~flags & (VM_SLEEP|VM_NOSLEEP)) != 0);
 	KASSERT(quantum > 0);
 	KASSERT(powerof2(quantum));
 	/*
 	 * If private tags are going to be used, they must
 	 * be added to the arena before the first span is
 	 * added.
 	 */
 	KASSERT((flags & VM_PRIVTAGS) == 0 || size == 0);
 #if defined(_KERNEL)
 	/* XXX: SMP, we get called early... */
 	if (!vmem_bootstrapped) {
 		vmem_bootstrap();
+	}
 #endif /* defined(_KERNEL) */
 	if (vm == NULL) {
 		vm = xmalloc(sizeof(*vm), flags);
+	}
 	if (vm == NULL) {
 		return NULL;