diff options
| -rw-r--r-- | module/os/linux/spl/spl-kmem-cache.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/module/os/linux/spl/spl-kmem-cache.c b/module/os/linux/spl/spl-kmem-cache.c index 452625718..7dd8e8543 100644 --- a/module/os/linux/spl/spl-kmem-cache.c +++ b/module/os/linux/spl/spl-kmem-cache.c @@ -202,26 +202,8 @@ kv_alloc(spl_kmem_cache_t *skc, int size, int flags) if (skc->skc_flags & KMC_KMEM) { ASSERT(ISP2(size)); ptr = (void *)__get_free_pages(lflags, get_order(size)); - } else if (skc->skc_flags & KMC_KVMEM) { - ptr = spl_kvmalloc(size, lflags); } else { - /* - * GFP_KERNEL allocations can safely use kvmalloc which may - * improve performance by avoiding a) high latency caused by - * vmalloc's on-access allocation, b) performance loss due to - * MMU memory address mapping and c) vmalloc locking overhead. - * This has the side-effect that the slab statistics will - * incorrectly report this as a vmem allocation, but that is - * purely cosmetic. - * - * For non-GFP_KERNEL allocations we stick to __vmalloc. - */ - if ((lflags & GFP_KERNEL) == GFP_KERNEL) { - ptr = spl_kvmalloc(size, lflags); - } else { - ptr = __vmalloc(size, lflags | __GFP_HIGHMEM, - PAGE_KERNEL); - } + ptr = __vmalloc(size, lflags | __GFP_HIGHMEM, PAGE_KERNEL); } /* Resulting allocated memory will be page aligned */ @@ -249,7 +231,7 @@ kv_free(spl_kmem_cache_t *skc, void *ptr, int size) ASSERT(ISP2(size)); free_pages((unsigned long)ptr, get_order(size)); } else { - spl_kmem_free_impl(ptr, size); + vfree(ptr); } } |