 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_malloc.c,v 1.134 2012/01/27 19:48:40 para Exp $	*/
+/*	$NetBSD: kern_malloc.c,v 1.135 2012/01/28 23:09:06 rmind Exp $	*/
 /*
  * Copyright (c) 1987, 1991, 1993
  *	The Regents of the University of California.  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.
 @@ -56,54 +56,50 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kern_malloc.c	8.4 (Berkeley) 5/20/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.134 2012/01/27 19:48:40 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.135 2012/01/28 23:09:06 rmind Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 #include <sys/debug.h>
 #include <sys/mutex.h>
 #include <sys/lockdebug.h>
 #include <uvm/uvm_extern.h>
 #include "opt_kmemstats.h"
 #include "opt_malloclog.h"
 #include "opt_malloc_debug.h"
 struct kmembuckets kmembuckets[MINBUCKET + 16];
 struct kmemusage *kmemusage;
 struct malloc_type *kmemstatistics;
 kmutex_t malloc_lock;
 extern void *kmem_intr_alloc(size_t, km_flag_t);
 extern void *kmem_intr_zalloc(size_t, km_flag_t);
 extern void kmem_intr_free(void *, size_t);
 struct malloc_header {
 	size_t mh_size;
 };
 /*
  * Allocate a block of memory
  */
 #ifdef MALLOCLOG
 void *
 _kern_malloc(unsigned long size, struct malloc_type *ksp, int flags,
     const char *file, long line)
 #else
 void *

 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_kmem.c,v 1.39 2012/01/27 19:48:40 para Exp $	*/
+/*	$NetBSD: subr_kmem.c,v 1.40 2012/01/28 23:09:06 rmind Exp $	*/
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * 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.
 @@ -51,48 +51,46 @@
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * allocator of kernel wired memory.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.39 2012/01/27 19:48:40 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.40 2012/01/28 23:09:06 rmind Exp $");
 #include <sys/param.h>
 #include <sys/callback.h>
 #include <sys/kmem.h>
 #include <sys/pool.h>
 #include <sys/debug.h>
 #include <sys/lockdebug.h>
 #include <sys/cpu.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_map.h>
 #include <uvm/uvm_kmguard.h>
 #include <lib/libkern/libkern.h>
-struct kmem_cache_info {
+static const struct kmem_cache_info {
-	int kc_size;
+	size_t		kc_size;
-	const char *kc_name;
+	const char *	kc_name;
-};
+} kmem_cache_sizes[] = {
 static const struct kmem_cache_info kmem_cache_sizes[] = {
 	{  8, "kmem-8" },
 	{ 16, "kmem-16" },
 	{ 24, "kmem-24" },
 	{ 32, "kmem-32" },
 	{ 40, "kmem-40" },
 	{ 48, "kmem-48" },
 	{ 56, "kmem-56" },
 	{ 64, "kmem-64" },
 	{ 80, "kmem-80" },
 	{ 96, "kmem-96" },
 	{ 112, "kmem-112" },
 	{ 128, "kmem-128" },
 	{ 160, "kmem-160" },
 @@ -101,270 +99,261 @@ static const struct kmem_cache_info kmem
 	{ 256, "kmem-256" },
 	{ 320, "kmem-320" },
 	{ 384, "kmem-384" },
 	{ 448, "kmem-448" },
 	{ 512, "kmem-512" },
 	{ 768, "kmem-768" },
 	{ 1024, "kmem-1024" },
 	{ 2048, "kmem-2048" },
 	{ 4096, "kmem-4096" },
 	{ 0, NULL }
 };
 /*
- * KMEM_ALIGN is the smalles guaranteed alignment and
+ * KMEM_ALIGN is the smallest guaranteed alignment and also the
- * also the smallest allocateable quanta.
+ * smallest allocateable quantum.  Every cache size is a multiply
- * Every cache size which is a multiply of CACHE_LINE_SIZE
+ * of CACHE_LINE_SIZE and gets CACHE_LINE_SIZE alignment.
  * gets CACHE_LINE_SIZE alignment.
  */
-#define KMEM_ALIGN	8
+#define	KMEM_ALIGN		8
-#define KMEM_SHIFT	3
+#define	KMEM_SHIFT		3
-#define KMEM_MAXSIZE	4096
+#define	KMEM_MAXSIZE		4096
 #define	KMEM_CACHE_COUNT	(KMEM_MAXSIZE >> KMEM_SHIFT)
-static pool_cache_t kmem_cache[KMEM_MAXSIZE >> KMEM_SHIFT];
+static pool_cache_t kmem_cache[KMEM_CACHE_COUNT] __cacheline_aligned;
-static size_t kmem_cache_max;
+static size_t kmem_cache_maxidx __read_mostly;
 #if defined(DEBUG)
 int kmem_guard_depth = 0;
 size_t kmem_guard_size;
 static struct uvm_kmguard kmem_guard;
 static void *kmem_freecheck;
 #define	KMEM_POISON
 #define	KMEM_REDZONE
 #define	KMEM_SIZE
 #define	KMEM_GUARD
 #endif /* defined(DEBUG) */
 #if defined(KMEM_POISON)
 static int kmem_poison_ctor(void *, void *, int);
 static void kmem_poison_fill(void *, size_t);
 static void kmem_poison_check(void *, size_t);
 #else /* defined(KMEM_POISON) */
-#define kmem_poison_fill(p, sz)		/* nothing */
+#define	kmem_poison_fill(p, sz)		/* nothing */
-#define kmem_poison_check(p, sz)		/* nothing */
+#define	kmem_poison_check(p, sz)	/* nothing */
 #endif /* defined(KMEM_POISON) */
 #if defined(KMEM_REDZONE)
 #define	REDZONE_SIZE	1
 #else /* defined(KMEM_REDZONE) */
 #define	REDZONE_SIZE	0
 #endif /* defined(KMEM_REDZONE) */
 #if defined(KMEM_SIZE)
-#define	SIZE_SIZE	(max(KMEM_ALIGN, sizeof(size_t)))
+#define	SIZE_SIZE	(MAX(KMEM_ALIGN, sizeof(size_t)))
 static void kmem_size_set(void *, size_t);
 static void kmem_size_check(void *, size_t);
 #else
 #define	SIZE_SIZE	0
 #define	kmem_size_set(p, sz)	/* nothing */
 #define	kmem_size_check(p, sz)	/* nothing */
 #endif
 CTASSERT(KM_SLEEP == PR_WAITOK);
 CTASSERT(KM_NOSLEEP == PR_NOWAIT);
 void * kmem_intr_alloc(size_t size, km_flag_t kmflags);
 void * kmem_intr_zalloc(size_t size, km_flag_t kmflags);
 void kmem_intr_free(void *, size_t size);
 void *
 kmem_intr_alloc(size_t size, km_flag_t kmflags)
+{
-	size_t index;
+	size_t allocsz, index;
 	size_t allocsz;
 	pool_cache_t pc;
 	uint8_t *p;
 	KASSERT(size > 0);
 #ifdef KMEM_GUARD
 	if (size <= kmem_guard_size) {
 		return uvm_kmguard_alloc(&kmem_guard, size,
 		    (kmflags & KM_SLEEP) != 0);
+	}
 #endif
 	allocsz = kmem_roundup_size(size) + REDZONE_SIZE + SIZE_SIZE;
-	if ((index = ((allocsz - 1) >> KMEM_SHIFT))
+	index = (allocsz - 1) >> KMEM_SHIFT;
 	    < kmem_cache_max >> KMEM_SHIFT) {
-		pc = kmem_cache[index];
+	if (index >= kmem_cache_maxidx) {
-	} else {
+		int ret = uvm_km_kmem_alloc(kmem_va_arena,
 		int rc;
 		rc = uvm_km_kmem_alloc(kmem_va_arena,
 		    (vsize_t)round_page(allocsz),
 		    ((kmflags & KM_SLEEP) ? VM_SLEEP : VM_NOSLEEP)
 		     | VM_INSTANTFIT, (vmem_addr_t *)&p);
-		return (rc != 0) ? NULL : p;
+		return ret ? NULL : p;
+	}
 	pc = kmem_cache[index];
 	p = pool_cache_get(pc, kmflags);
 	if (__predict_true(p != NULL)) {
 		kmem_poison_check(p, kmem_roundup_size(size));
 		FREECHECK_OUT(&kmem_freecheck, p);
 		kmem_size_set(p, allocsz);
+	}
 	return p;
+}
 void *
 kmem_intr_zalloc(size_t size, km_flag_t kmflags)
+{
 	void *p;
 	p = kmem_intr_alloc(size, kmflags);
 	if (p != NULL) {
 		memset(p, 0, size);
+	}
 	return p;
+}
 void
 kmem_intr_free(void *p, size_t size)
+{
-	size_t index;
+	size_t allocsz, index;
 	size_t allocsz;
 	pool_cache_t pc;
 	KASSERT(p != NULL);
 	KASSERT(size > 0);
 #ifdef KMEM_GUARD
 	if (size <= kmem_guard_size) {
 		uvm_kmguard_free(&kmem_guard, size, p);
 		return;
+	}
 #endif
 	allocsz = kmem_roundup_size(size) + REDZONE_SIZE + SIZE_SIZE;
-	if ((index = ((allocsz - 1) >> KMEM_SHIFT))
+	index = (allocsz - 1) >> KMEM_SHIFT;
 	    < kmem_cache_max >> KMEM_SHIFT) {
-		pc = kmem_cache[index];
+	if (index >= kmem_cache_maxidx) {
 	} else {
 		uvm_km_kmem_free(kmem_va_arena, (vaddr_t)p,
 		    round_page(allocsz));
 		return;
+	}
 	kmem_size_check(p, allocsz);
 	FREECHECK_IN(&kmem_freecheck, p);
 	LOCKDEBUG_MEM_CHECK(p, allocsz - (REDZONE_SIZE + SIZE_SIZE));
 	kmem_poison_check((uint8_t *)p + size, allocsz - size - SIZE_SIZE);
 	kmem_poison_fill(p, allocsz);
 	pc = kmem_cache[index];
 	pool_cache_put(pc, p);
+}
 /* ---- kmem API */
 /*
  * kmem_alloc: allocate wired memory.
  * => must not be called from interrupt context.
  */
 void *
 kmem_alloc(size_t size, km_flag_t kmflags)
+{
-	KASSERT(!cpu_intr_p());
+	KASSERTMSG((!cpu_intr_p() && !cpu_softintr_p()),
-	KASSERT(!cpu_softintr_p());
+	    "kmem(9) should not be used from the interrupt context");
 	return kmem_intr_alloc(size, kmflags);
+}
 /*
  * kmem_zalloc: allocate zeroed wired memory.
  * => must not be called from interrupt context.
  */
 void *
 kmem_zalloc(size_t size, km_flag_t kmflags)
+{
-	KASSERT(!cpu_intr_p());
+	KASSERTMSG((!cpu_intr_p() && !cpu_softintr_p()),
-	KASSERT(!cpu_softintr_p());
+	    "kmem(9) should not be used from the interrupt context");
 	return kmem_intr_zalloc(size, kmflags);
+}
 /*
  * kmem_free: free wired memory allocated by kmem_alloc.
  * => must not be called from interrupt context.
  */
 void
 kmem_free(void *p, size_t size)
+{
 	KASSERT(!cpu_intr_p());
 	KASSERT(!cpu_softintr_p());
 	kmem_intr_free(p, size);
+}
 static void
 kmem_create_caches(const struct kmem_cache_info *array,
     pool_cache_t alloc_table[], size_t maxsize)
+{
 	size_t table_unit = (1 << KMEM_SHIFT);
 	size_t size = table_unit;
 	int i;
 	for (i = 0; array[i].kc_size != 0 ; i++) {
 		const char *name = array[i].kc_name;
 		size_t cache_size = array[i].kc_size;
 		int flags = PR_NOALIGN;
 		pool_cache_t pc;
 		size_t align;
 		if ((cache_size & (CACHE_LINE_SIZE - 1)) == 0)
 			align = CACHE_LINE_SIZE;
 		else if ((cache_size & (PAGE_SIZE - 1)) == 0)
 			align = PAGE_SIZE;
 		else
 			align = KMEM_ALIGN;
 		const char *name = array[i].kc_name;
 		pool_cache_t pc;
 		int flags = PR_NOALIGN;
 		if (cache_size < CACHE_LINE_SIZE)
 			flags |= PR_NOTOUCH;
 		/* check if we reached the requested size */
-		if (cache_size > maxsize)
+		if (cache_size > maxsize) {
 			break;
+		}
-		kmem_cache_max = cache_size;
+		if ((cache_size >> KMEM_SHIFT) > kmem_cache_maxidx) {
 			kmem_cache_maxidx = cache_size >> KMEM_SHIFT;
+		}
 #if defined(KMEM_POISON)
 		pc = pool_cache_init(cache_size, align, 0, flags,
 		    name, &pool_allocator_kmem, IPL_VM, kmem_poison_ctor,
 		    NULL, (void *)cache_size);
 #else /* defined(KMEM_POISON) */
 		pc = pool_cache_init(cache_size, align, 0, flags,
 		    name, &pool_allocator_kmem, IPL_VM, NULL, NULL, NULL);
 #endif /* defined(KMEM_POISON) */
 		while (size <= cache_size) {
 			alloc_table[(size - 1) >> KMEM_SHIFT] = pc;
 			size += table_unit;
+		}
+	}
+}
 void
 kmem_init(void)
+{
 #ifdef KMEM_GUARD
 	uvm_kmguard_init(&kmem_guard, &kmem_guard_depth, &kmem_guard_size,
 		kernel_map);
 #endif
 	kmem_create_caches(kmem_cache_sizes, kmem_cache, KMEM_MAXSIZE);
+}
 size_t
 kmem_roundup_size(size_t size)
+{
 	return (size + (KMEM_ALIGN - 1)) & ~(KMEM_ALIGN - 1);
+}
 /* ---- debug */
 #if defined(KMEM_POISON)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kmem.h,v 1.7 2012/01/27 19:48:41 para Exp $	*/
+/*	$NetBSD: kmem.h,v 1.8 2012/01/28 23:09:07 rmind Exp $	*/
 /*-
  * Copyright (c)2006 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.
 @@ -23,30 +23,33 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef _SYS_KMEM_H_
 #define	_SYS_KMEM_H_
 #include <sys/types.h>
 typedef unsigned int km_flag_t;
-void *kmem_alloc(size_t, km_flag_t);
+void	kmem_init(void);
-void *kmem_zalloc(size_t, km_flag_t);
+size_t	kmem_roundup_size(size_t);
 void kmem_free(void *, size_t);
-void kmem_init(void);
+void *	kmem_alloc(size_t, km_flag_t);
-size_t kmem_roundup_size(size_t);
+void *	kmem_zalloc(size_t, km_flag_t);
 void	kmem_free(void *, size_t);
 void *	kmem_intr_alloc(size_t, km_flag_t);
 void *	kmem_intr_zalloc(size_t, km_flag_t);
 void	kmem_intr_free(void *, size_t size);
 char *	kmem_asprintf(const char *, ...) __printflike(1, 2);
 char *kmem_asprintf(const char *, ...) __printflike(1, 2);
 /*
- * km_flag_t
+ * km_flag_t values:
  * Values match [PR_WAITOK, PR_NOWAIT].
  */
 #define	KM_SLEEP	0x00000001	/* can sleep */
 #define	KM_NOSLEEP	0x00000002	/* don't sleep */
 #endif /* !_SYS_KMEM_H_ */