From: Liam Howlett <liam.howlett@oracle.com>
To: "maple-tree@lists.infradead.org" <maple-tree@lists.infradead.org>,
"linux-mm@kvack.org" <linux-mm@kvack.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH v7 04/70] radix tree test suite: Add support for slab bulk APIs
Date: Mon, 4 Apr 2022 14:35:29 +0000 [thread overview]
Message-ID: <20220404143501.2016403-5-Liam.Howlett@oracle.com> (raw)
In-Reply-To: <20220404143501.2016403-1-Liam.Howlett@oracle.com>
From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>
Add support for kmem_cache_free_bulk() and kmem_cache_alloc_bulk() to
the radix tree test suite.
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
---
tools/include/linux/slab.h | 4 ++
tools/testing/radix-tree/linux.c | 118 ++++++++++++++++++++++++++++++-
2 files changed, 120 insertions(+), 2 deletions(-)
diff --git a/tools/include/linux/slab.h b/tools/include/linux/slab.h
index 0616409513eb..311759ea25e9 100644
--- a/tools/include/linux/slab.h
+++ b/tools/include/linux/slab.h
@@ -41,4 +41,8 @@ struct kmem_cache *kmem_cache_create(const char *name, unsigned int size,
unsigned int align, unsigned int flags,
void (*ctor)(void *));
+void kmem_cache_free_bulk(struct kmem_cache *cachep, size_t size, void **list);
+int kmem_cache_alloc_bulk(struct kmem_cache *cachep, gfp_t gfp, size_t size,
+ void **list);
+
#endif /* _TOOLS_SLAB_H */
diff --git a/tools/testing/radix-tree/linux.c b/tools/testing/radix-tree/linux.c
index f20529ae4dbe..2048d12c31df 100644
--- a/tools/testing/radix-tree/linux.c
+++ b/tools/testing/radix-tree/linux.c
@@ -93,14 +93,13 @@ void *kmem_cache_alloc_lru(struct kmem_cache *cachep, struct list_lru *lru,
return p;
}
-void kmem_cache_free(struct kmem_cache *cachep, void *objp)
+void kmem_cache_free_locked(struct kmem_cache *cachep, void *objp)
{
assert(objp);
uatomic_dec(&nr_allocated);
uatomic_dec(&cachep->nr_allocated);
if (kmalloc_verbose)
printf("Freeing %p to slab\n", objp);
- pthread_mutex_lock(&cachep->lock);
if (cachep->nr_objs > 10 || cachep->align) {
memset(objp, POISON_FREE, cachep->size);
free(objp);
@@ -110,9 +109,80 @@ void kmem_cache_free(struct kmem_cache *cachep, void *objp)
node->parent = cachep->objs;
cachep->objs = node;
}
+}
+
+void kmem_cache_free(struct kmem_cache *cachep, void *objp)
+{
+ pthread_mutex_lock(&cachep->lock);
+ kmem_cache_free_locked(cachep, objp);
pthread_mutex_unlock(&cachep->lock);
}
+void kmem_cache_free_bulk(struct kmem_cache *cachep, size_t size, void **list)
+{
+ if (kmalloc_verbose)
+ pr_debug("Bulk free %p[0-%lu]\n", list, size - 1);
+
+ pthread_mutex_lock(&cachep->lock);
+ for (int i = 0; i < size; i++)
+ kmem_cache_free_locked(cachep, list[i]);
+ pthread_mutex_unlock(&cachep->lock);
+}
+
+int kmem_cache_alloc_bulk(struct kmem_cache *cachep, gfp_t gfp, size_t size,
+ void **p)
+{
+ size_t i;
+
+ if (kmalloc_verbose)
+ pr_debug("Bulk alloc %lu\n", size);
+
+ if (!(gfp & __GFP_DIRECT_RECLAIM)) {
+ if (cachep->non_kernel < size)
+ return 0;
+
+ cachep->non_kernel -= size;
+ }
+
+ pthread_mutex_lock(&cachep->lock);
+ if (cachep->nr_objs >= size) {
+ struct radix_tree_node *node;
+
+ for (i = 0; i < size; i++) {
+ node = cachep->objs;
+ cachep->nr_objs--;
+ cachep->objs = node->parent;
+ p[i] = node;
+ node->parent = NULL;
+ }
+ pthread_mutex_unlock(&cachep->lock);
+ } else {
+ pthread_mutex_unlock(&cachep->lock);
+ for (i = 0; i < size; i++) {
+ if (cachep->align) {
+ posix_memalign(&p[i], cachep->align,
+ cachep->size * size);
+ } else {
+ p[i] = malloc(cachep->size * size);
+ }
+ if (cachep->ctor)
+ cachep->ctor(p[i]);
+ else if (gfp & __GFP_ZERO)
+ memset(p[i], 0, cachep->size);
+ }
+ }
+
+ for (i = 0; i < size; i++) {
+ uatomic_inc(&nr_allocated);
+ uatomic_inc(&cachep->nr_allocated);
+ uatomic_inc(&cachep->nr_tallocated);
+ if (kmalloc_verbose)
+ printf("Allocating %p from slab\n", p[i]);
+ }
+
+ return size;
+}
+
struct kmem_cache *
kmem_cache_create(const char *name, unsigned int size, unsigned int align,
unsigned int flags, void (*ctor)(void *))
@@ -130,3 +200,47 @@ kmem_cache_create(const char *name, unsigned int size, unsigned int align,
ret->non_kernel = 0;
return ret;
}
+
+/*
+ * Test the test infrastructure for kem_cache_alloc/free and bulk counterparts.
+ */
+void test_kmem_cache_bulk(void)
+{
+ int i;
+ void *list[12];
+ static struct kmem_cache *test_cache, *test_cache2;
+
+ /*
+ * Testing the bulk allocators without aligned kmem_cache to force the
+ * bulk alloc/free to reuse
+ */
+ test_cache = kmem_cache_create("test_cache", 256, 0, SLAB_PANIC, NULL);
+
+ for (i = 0; i < 5; i++)
+ list[i] = kmem_cache_alloc(test_cache, __GFP_DIRECT_RECLAIM);
+
+ for (i = 0; i < 5; i++)
+ kmem_cache_free(test_cache, list[i]);
+ assert(test_cache->nr_objs == 5);
+
+ kmem_cache_alloc_bulk(test_cache, __GFP_DIRECT_RECLAIM, 5, list);
+ kmem_cache_free_bulk(test_cache, 5, list);
+
+ for (i = 0; i < 12 ; i++)
+ list[i] = kmem_cache_alloc(test_cache, __GFP_DIRECT_RECLAIM);
+
+ for (i = 0; i < 12; i++)
+ kmem_cache_free(test_cache, list[i]);
+
+ /* The last free will not be kept around */
+ assert(test_cache->nr_objs == 11);
+
+ /* Aligned caches will immediately free */
+ test_cache2 = kmem_cache_create("test_cache2", 128, 128, SLAB_PANIC, NULL);
+
+ kmem_cache_alloc_bulk(test_cache2, __GFP_DIRECT_RECLAIM, 10, list);
+ kmem_cache_free_bulk(test_cache2, 10, list);
+ assert(!test_cache2->nr_objs);
+
+
+}
--
2.34.1
next prev parent reply other threads:[~2022-04-04 14:36 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-04 14:35 [PATCH v7 00/70] Introducing the Maple Tree Liam Howlett
2022-04-04 14:35 ` [PATCH v7 01/70] radix tree test suite: Add pr_err define Liam Howlett
2022-04-04 14:35 ` [PATCH v7 02/70] radix tree test suite: Add kmem_cache_set_non_kernel() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 03/70] radix tree test suite: Add allocation counts and size to kmem_cache Liam Howlett
2022-04-04 14:35 ` [PATCH v7 05/70] radix tree test suite: Add lockdep_is_held to header Liam Howlett
2022-04-04 14:35 ` Liam Howlett [this message]
2022-04-04 14:35 ` [PATCH v7 06/70] mips: Rename mt_init to mips_mt_init Liam Howlett
2022-04-04 14:35 ` [PATCH v7 07/70] Maple Tree: Add new data structure Liam Howlett
2022-04-20 13:47 ` Liam Howlett
2022-04-04 14:35 ` [PATCH v7 08/70] lib/test_maple_tree: Add testing for maple tree Liam Howlett
2022-04-04 14:35 ` [PATCH v7 11/70] arch/arm64: Remove the merge workaround for VMA_ITERATOR Liam Howlett
2022-04-05 9:24 ` Will Deacon
2022-04-05 14:12 ` Liam Howlett
2022-04-04 14:35 ` [PATCH v7 09/70] mm: Start tracking VMAs with maple tree Liam Howlett
2022-04-04 14:35 ` [PATCH v7 10/70] mm: Add VMA iterator Liam Howlett
2022-04-04 14:35 ` [PATCH v7 13/70] mm/mmap: Use the maple tree in find_vma() instead of the rbtree Liam Howlett
2022-04-04 14:35 ` [PATCH v7 12/70] mmap: Use the VMA iterator in count_vma_pages_range() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 15/70] mm/mmap: Use maple tree for unmapped_area{_topdown} Liam Howlett
2022-04-04 14:35 ` [PATCH v7 14/70] mm/mmap: Use the maple tree for find_vma_prev() instead of the rbtree Liam Howlett
2022-04-04 14:35 ` [PATCH v7 16/70] kernel/fork: Use maple tree for dup_mmap() during forking Liam Howlett
2022-04-04 14:35 ` [PATCH v7 17/70] damon: Convert __damon_va_three_regions to use the VMA iterator Liam Howlett
2022-04-04 14:35 ` [PATCH v7 18/70] proc: Remove VMA rbtree use from nommu Liam Howlett
2022-04-04 14:35 ` [PATCH v7 19/70] mm: Remove rb tree Liam Howlett
2022-04-04 14:35 ` [PATCH v7 20/70] mmap: Change zeroing of maple tree in __vma_adjust() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 22/70] mm: Optimize find_exact_vma() to use vma_lookup() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 21/70] xen: Use vma_lookup() in privcmd_ioctl_mmap() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 23/70] mm/khugepaged: Optimize collapse_pte_mapped_thp() by using vma_lookup() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 24/70] mm/mmap: Change do_brk_flags() to expand existing VMA and add do_brk_munmap() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 25/70] mm: Use maple tree operations for find_vma_intersection() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 26/70] mm/mmap: Use advanced maple tree API for mmap_region() Liam Howlett
2022-04-14 6:51 ` Andrew Morton
2022-04-19 17:57 ` Liam Howlett
2022-04-04 14:35 ` [PATCH v7 27/70] mm: Remove vmacache Liam Howlett
2022-04-04 14:35 ` [PATCH v7 29/70] mm/mmap: Move mmap_region() below do_munmap() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 28/70] mm: Convert vma_lookup() to use mtree_load() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 30/70] mm/mmap: Reorganize munmap to use maple states Liam Howlett
2022-04-04 14:35 ` [PATCH v7 32/70] arm64: Remove mmap linked list from vdso Liam Howlett
2022-04-04 14:35 ` [PATCH v7 31/70] mm/mmap: Change do_brk_munmap() to use do_mas_align_munmap() Liam Howlett
2022-04-04 14:35 ` [PATCH v7 33/70] parisc: Remove mmap linked list from cache handling Liam Howlett
2022-04-04 14:35 ` [PATCH v7 34/70] powerpc: Remove mmap linked list walks Liam Howlett
2022-04-04 14:35 ` [PATCH v7 36/70] x86: Remove vma " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 37/70] xtensa: " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 35/70] s390: " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 39/70] optee: Remove vma linked list walk Liam Howlett
2022-04-04 14:35 ` [PATCH v7 38/70] cxl: " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 40/70] um: " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 42/70] exec: Use VMA iterator instead of linked list Liam Howlett
2022-04-04 14:35 ` [PATCH v7 41/70] coredump: Remove vma linked list walk Liam Howlett
2022-04-04 14:35 ` [PATCH v7 43/70] fs/proc/base: Use maple tree iterators in place of linked list Liam Howlett
2022-04-04 14:35 ` [PATCH v7 45/70] userfaultfd: Use maple tree iterator to iterate VMAs Liam Howlett
2022-04-04 14:35 ` [PATCH v7 44/70] fs/proc/task_mmu: Stop using linked list and highest_vm_end Liam Howlett
2022-04-04 14:35 ` [PATCH v7 46/70] ipc/shm: Use VMA iterator instead of linked list Liam Howlett
2022-04-04 14:35 ` [PATCH v7 48/70] perf: Use VMA iterator Liam Howlett
2022-04-04 14:35 ` [PATCH v7 47/70] acct: Use VMA iterator instead of linked list Liam Howlett
2022-04-04 14:35 ` [PATCH v7 51/70] bpf: Remove VMA " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 50/70] fork: Use VMA iterator Liam Howlett
2022-04-04 14:35 ` [PATCH v7 49/70] sched: Use maple tree iterator to walk VMAs Liam Howlett
2022-04-04 14:35 ` [PATCH v7 52/70] mm/gup: Use maple tree navigation instead of linked list Liam Howlett
2022-04-04 14:35 ` [PATCH v7 53/70] mm/khugepaged: Stop using vma " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 54/70] mm/ksm: Use vma iterators instead of " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 55/70] mm/madvise: Use vma_find() " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 57/70] mm/mempolicy: Use vma iterator & maple state " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 56/70] mm/memcontrol: Stop using mm->highest_vm_end Liam Howlett
2022-04-04 14:35 ` [PATCH v7 59/70] mm/mprotect: Use maple tree navigation instead of vma linked list Liam Howlett
2022-04-04 14:35 ` [PATCH v7 58/70] mm/mlock: Use vma iterator and " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 61/70] mm/msync: Use vma_find() " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 62/70] mm/oom_kill: Use maple tree iterators " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 60/70] mm/mremap: Use vma_find_intersection() " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 63/70] mm/pagewalk: Use vma_find() " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 65/70] i915: Use the VMA iterator Liam Howlett
2022-04-04 14:35 ` [PATCH v7 64/70] mm/swapfile: Use vma iterator instead of vma linked list Liam Howlett
2022-04-04 14:35 ` [PATCH v7 66/70] nommu: Remove uses of VMA " Liam Howlett
2022-04-04 14:35 ` [PATCH v7 67/70] riscv: Use vma iterator for vdso Liam Howlett
2022-04-04 14:35 ` [PATCH v7 69/70] mm/mmap: Drop range_has_overlap() function Liam Howlett
2022-04-04 14:35 ` [PATCH v7 68/70] mm: Remove the vma linked list Liam Howlett
2022-04-04 14:35 ` [PATCH v7 70/70] mm/mmap.c: Pass in mapping to __vma_link_file() Liam Howlett
2022-04-14 6:50 ` [PATCH v7 00/70] Introducing the Maple Tree Andrew Morton
2022-04-14 7:39 ` Yu Zhao
2022-04-14 13:55 ` Matthew Wilcox
2022-04-14 13:57 ` Liam Howlett
2022-04-14 16:42 ` Liam Howlett
2022-04-14 16:57 ` Yu Zhao
2022-04-14 17:15 ` Liam Howlett
2022-04-14 19:19 ` Andrew Morton
2022-04-15 7:11 ` Yu Zhao
2022-04-16 1:03 ` Liam Howlett
2022-04-16 4:10 ` Yu Zhao
2022-04-16 15:19 ` Liam Howlett
2022-04-16 19:30 ` Yu Zhao
2022-04-19 15:51 ` Liam Howlett
2022-04-19 21:58 ` Yu Zhao
2022-04-19 23:18 ` Liam Howlett
2022-04-19 23:22 ` Yu Zhao
2022-04-20 13:43 ` Liam Howlett
2022-04-25 18:05 ` Yu Zhao
2022-04-25 19:58 ` Liam Howlett
2022-04-25 20:01 ` Yu Zhao
2022-04-19 19:22 ` Liam Howlett
2022-04-19 17:50 ` Liam Howlett
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220404143501.2016403-5-Liam.Howlett@oracle.com \
--to=liam.howlett@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=maple-tree@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).