diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h index 1027e7215feb..a32848941557 100644 --- a/include/sys/zfs_context.h +++ b/include/sys/zfs_context.h @@ -329,6 +329,8 @@ extern void kstat_delete(kstat_t *); #define KM_NOSLEEP UMEM_DEFAULT #define KM_NODEBUG 0x0 #define KMC_NODEBUG UMC_NODEBUG +#define KMC_KMEM 0x0 +#define KMC_VMEM 0x0 #define kmem_alloc(_s, _f) umem_alloc(_s, _f) #define kmem_zalloc(_s, _f) umem_zalloc(_s, _f) #define kmem_free(_b, _s) umem_free(_b, _s) diff --git a/module/zfs/dnode.c b/module/zfs/dnode.c index 9889c3c36524..5438f60d0003 100644 --- a/module/zfs/dnode.c +++ b/module/zfs/dnode.c @@ -171,9 +171,8 @@ void dnode_init(void) { ASSERT(dnode_cache == NULL); - dnode_cache = kmem_cache_create("dnode_t", - sizeof (dnode_t), - 0, dnode_cons, dnode_dest, NULL, NULL, NULL, 0); + dnode_cache = kmem_cache_create("dnode_t", sizeof (dnode_t), + 0, dnode_cons, dnode_dest, NULL, NULL, NULL, KMC_KMEM); kmem_cache_set_move(dnode_cache, dnode_move); } diff --git a/module/zfs/zio.c b/module/zfs/zio.c index 0022c64cc5c0..6b03be6f3bbf 100644 --- a/module/zfs/zio.c +++ b/module/zfs/zio.c @@ -108,9 +108,9 @@ zio_init(void) data_alloc_arena = zio_alloc_arena; #endif zio_cache = kmem_cache_create("zio_cache", - sizeof (zio_t), 0, NULL, NULL, NULL, NULL, NULL, 0); + sizeof (zio_t), 0, NULL, NULL, NULL, NULL, NULL, KMC_KMEM); zio_link_cache = kmem_cache_create("zio_link_cache", - sizeof (zio_link_t), 0, NULL, NULL, NULL, NULL, NULL, 0); + sizeof (zio_link_t), 0, NULL, NULL, NULL, NULL, NULL, KMC_KMEM); /* * For small buffers, we want a cache for each multiple of @@ -136,17 +136,27 @@ zio_init(void) if (align != 0) { char name[36]; + int flags = zio_bulk_flags; + + /* + * The smallest buffers (512b) are heavily used and + * experience a lot of churn. The slabs allocated + * for them are also relatively small (32K). Thus + * in over to avoid expensive calls to vmalloc() we + * make an exception to the usual slab allocation + * policy and force these buffers to be kmem backed. + */ + if (size == (1 << SPA_MINBLOCKSHIFT)) + flags |= KMC_KMEM; + (void) sprintf(name, "zio_buf_%lu", (ulong_t)size); zio_buf_cache[c] = kmem_cache_create(name, size, - align, NULL, NULL, NULL, NULL, NULL, - (size > zio_buf_debug_limit ? KMC_NODEBUG : 0) | - zio_bulk_flags); + align, NULL, NULL, NULL, NULL, NULL, flags); (void) sprintf(name, "zio_data_buf_%lu", (ulong_t)size); zio_data_buf_cache[c] = kmem_cache_create(name, size, - align, NULL, NULL, NULL, NULL, data_alloc_arena, - (size > zio_buf_debug_limit ? KMC_NODEBUG : 0) | - zio_bulk_flags); + align, NULL, NULL, NULL, NULL, + data_alloc_arena, flags); } }