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>,
David Hildenbrand <david@redhat.com>,
Douglas Gilbert <dgilbert@interlog.com>
Cc: Song Liu <songliubraving@fb.com>,
Davidlohr Bueso <dave@stgolabs.net>,
"Paul E . McKenney" <paulmck@kernel.org>,
Matthew Wilcox <willy@infradead.org>,
David Rientjes <rientjes@google.com>,
Axel Rasmussen <axelrasmussen@google.com>,
Suren Baghdasaryan <surenb@google.com>,
Vlastimil Babka <vbabka@suse.cz>, Rik van Riel <riel@surriel.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: [PATCH v3 04/66] radix tree test suite: Add support for slab bulk APIs
Date: Tue, 5 Oct 2021 01:30:26 +0000 [thread overview]
Message-ID: <20211005012959.1110504-5-Liam.Howlett@oracle.com> (raw)
In-Reply-To: <20211005012959.1110504-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/testing/radix-tree/linux.c | 118 +++++++++++++++++++++++++-
tools/testing/radix-tree/linux/slab.h | 4 +
2 files changed, 120 insertions(+), 2 deletions(-)
diff --git a/tools/testing/radix-tree/linux.c b/tools/testing/radix-tree/linux.c
index f95e71d65f00..3383d748c650 100644
--- a/tools/testing/radix-tree/linux.c
+++ b/tools/testing/radix-tree/linux.c
@@ -93,14 +93,13 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, int gfp)
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;
+}
+
void *kmalloc(size_t size, gfp_t gfp)
{
void *ret;
@@ -156,3 +226,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);
+
+
+}
diff --git a/tools/testing/radix-tree/linux/slab.h b/tools/testing/radix-tree/linux/slab.h
index 2958830ce4d7..d7aed1cc6978 100644
--- a/tools/testing/radix-tree/linux/slab.h
+++ b/tools/testing/radix-tree/linux/slab.h
@@ -24,4 +24,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 /* SLAB_H */
--
2.30.2
next prev parent reply other threads:[~2021-10-05 1:31 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-05 1:30 [PATCH v3 00/66] Introducing the Maple Tree Liam Howlett
2021-10-05 1:30 ` [PATCH v3 01/66] radix tree test suite: Add pr_err define Liam Howlett
2021-10-05 1:30 ` [PATCH v3 02/66] radix tree test suite: Add kmem_cache_set_non_kernel() Liam Howlett
2021-10-05 1:30 ` Liam Howlett [this message]
2021-10-05 1:30 ` [PATCH v3 03/66] radix tree test suite: Add allocation counts and size to kmem_cache Liam Howlett
2021-10-05 1:30 ` [PATCH v3 05/66] Maple Tree: Add new data structure Liam Howlett
2021-10-05 1:30 ` [PATCH v3 06/66] mm: Start tracking VMAs with maple tree Liam Howlett
2021-10-05 1:30 ` [PATCH v3 07/66] mm/mmap: Use the maple tree in find_vma() instead of the rbtree Liam Howlett
2021-10-05 1:30 ` [PATCH v3 08/66] mm/mmap: Use the maple tree for find_vma_prev() " Liam Howlett
2021-10-05 1:30 ` [PATCH v3 09/66] mm/mmap: Use maple tree for unmapped_area{_topdown} Liam Howlett
2021-10-05 1:30 ` [PATCH v3 10/66] kernel/fork: Use maple tree for dup_mmap() during forking Liam Howlett
2021-10-05 1:30 ` [PATCH v3 11/66] mm: Remove rb tree Liam Howlett
2021-10-05 1:30 ` [PATCH v3 14/66] mm: Optimize find_exact_vma() to use vma_lookup() Liam Howlett
2021-10-05 1:30 ` [PATCH v3 12/66] mmap: Change zeroing of maple tree in __vma_adjust Liam Howlett
2021-10-05 1:30 ` [PATCH v3 13/66] xen/privcmd: Optimized privcmd_ioctl_mmap() by using vma_lookup() Liam Howlett
2021-10-05 1:30 ` [PATCH v3 16/66] mm/mmap: Change do_brk_flags() to expand existing VMA and add do_brk_munmap() Liam Howlett
2021-10-05 1:30 ` [PATCH v3 15/66] mm/khugepaged: Optimize collapse_pte_mapped_thp() by using vma_lookup() Liam Howlett
2021-10-05 1:30 ` [PATCH v3 17/66] mm: Use maple tree operations for find_vma_intersection() and find_vma() Liam Howlett
2021-10-05 1:30 ` [PATCH v3 18/66] mm/mmap: Use advanced maple tree API for mmap_region() Liam Howlett
2021-10-05 1:30 ` [PATCH v3 19/66] mm: Remove vmacache Liam Howlett
2021-10-05 1:30 ` [PATCH v3 20/66] mm/mmap: Move mmap_region() below do_munmap() Liam Howlett
2021-10-05 1:30 ` [PATCH v3 21/66] mm/mmap: Convert count_vma_pages_range() to use ma_state Liam Howlett
2021-10-05 1:30 ` [PATCH v3 22/66] mm/mmap: Reorganize munmap to use maple states Liam Howlett
2021-10-05 1:30 ` [PATCH v3 24/66] mm: Introduce vma_next() and vma_prev() Liam Howlett
2021-10-05 1:30 ` [PATCH v3 23/66] mm/mmap: Change do_brk_munmap() to use do_mas_align_munmap() Liam Howlett
2021-10-05 1:30 ` [PATCH v3 25/66] arch/arm64: Remove mmap linked list from vdso Liam Howlett
2021-10-05 1:30 ` [PATCH v3 26/66] arch/parisc: Remove mmap linked list from kernel/cache Liam Howlett
2021-10-05 1:30 ` [PATCH v3 27/66] arch/powerpc: Remove mmap linked list from mm/book3s32/tlb Liam Howlett
2021-10-05 1:30 ` [PATCH v3 28/66] arch/powerpc: Remove mmap linked list from mm/book3s64/subpage_prot Liam Howlett
2021-10-05 1:30 ` [PATCH v3 29/66] arch/s390: Use maple tree iterators instead of linked list Liam Howlett
2021-10-05 1:30 ` [PATCH v3 31/66] arch/xtensa: Use maple tree iterators for unmapped area Liam Howlett
2021-10-05 1:30 ` [PATCH v3 30/66] arch/x86: Use maple tree iterators for vdso/vma Liam Howlett
2021-10-05 1:30 ` [PATCH v3 34/66] fs/binfmt_elf: Use maple tree iterators for fill_files_note() Liam Howlett
2021-10-05 1:30 ` [PATCH v3 32/66] drivers/misc/cxl: Use maple tree iterators for cxl_prefault_vma() Liam Howlett
2021-10-05 1:30 ` [PATCH v3 33/66] drivers/tee/optee: Use maple tree iterators for __check_mem_type() Liam Howlett
2021-10-05 1:30 ` [PATCH v3 35/66] fs/coredump: Use maple tree iterators in place of linked list Liam Howlett
2021-10-05 1:30 ` [PATCH v3 36/66] fs/exec: Use vma_next() instead " Liam Howlett
2021-10-05 1:30 ` [PATCH v3 37/66] fs/proc/base: Use maple tree iterators in place " Liam Howlett
2021-10-05 1:30 ` [PATCH v3 38/66] fs/proc/task_mmu: Stop using linked list and highest_vm_end Liam Howlett
2021-10-05 1:30 ` [PATCH v3 39/66] fs/userfaultfd: Stop using vma linked list Liam Howlett
2021-10-05 1:30 ` [PATCH v3 40/66] ipc/shm: Stop using the " Liam Howlett
2021-10-05 1:31 ` [PATCH v3 41/66] kernel/acct: Use maple tree iterators instead of " Liam Howlett
2021-10-05 1:31 ` [PATCH v3 43/66] kernel/events/uprobes: " Liam Howlett
2021-10-05 1:31 ` [PATCH v3 42/66] kernel/events/core: " Liam Howlett
2021-10-05 1:31 ` [PATCH v3 46/66] arch/um/kernel/tlb: Stop using " Liam Howlett
2021-10-05 1:31 ` [PATCH v3 44/66] kernel/sched/fair: Use maple tree iterators instead of " Liam Howlett
2021-10-05 1:31 ` [PATCH v3 45/66] kernel/fork: " Liam Howlett
2021-10-05 1:31 ` [PATCH v3 47/66] bpf: Remove VMA " Liam Howlett
2021-10-05 1:31 ` [PATCH v3 48/66] mm/gup: Use maple tree navigation instead of " Liam Howlett
2021-10-05 1:31 ` [PATCH v3 51/66] mm/madvise: Use vma_next instead of vma " Liam Howlett
2021-10-05 1:31 ` [PATCH v3 49/66] mm/khugepaged: Use maple tree iterators " Liam Howlett
2021-10-05 1:31 ` [PATCH v3 50/66] mm/ksm: " Liam Howlett
2021-10-05 1:31 ` [PATCH v3 52/66] mm/memcontrol: Stop using mm->highest_vm_end Liam Howlett
2021-10-05 1:31 ` [PATCH v3 53/66] mm/mempolicy: Use maple tree iterators instead of vma linked list Liam Howlett
2021-10-05 1:31 ` [PATCH v3 54/66] mm/mlock: " Liam Howlett
2021-10-05 1:31 ` [PATCH v3 56/66] mm/mremap: Use vma_next() " Liam Howlett
2021-10-05 1:31 ` [PATCH v3 55/66] mm/mprotect: Use maple tree navigation " Liam Howlett
2021-10-05 1:31 ` [PATCH v3 57/66] mm/msync: Use vma_next() " Liam Howlett
2021-10-05 1:31 ` [PATCH v3 58/66] mm/oom_kill: Use maple tree iterators " Liam Howlett
2021-10-05 1:31 ` [PATCH v3 59/66] mm/pagewalk: Use vma_next() " Liam Howlett
2021-10-05 1:31 ` [PATCH v3 61/66] damon: Change vma iterator to mas_for_each Liam Howlett
2021-10-05 1:31 ` [PATCH v3 60/66] mm/swapfile: Use maple tree iterator instead of vma linked list Liam Howlett
2021-10-05 1:31 ` [PATCH v3 63/66] s390: Use the maple tree iterator for vdso Liam Howlett
2021-10-05 1:31 ` [PATCH v3 62/66] powerpc: Use " Liam Howlett
2021-10-05 1:31 ` [PATCH v3 64/66] i915: Use the " Liam Howlett
2021-10-05 1:31 ` [PATCH v3 65/66] mm: Remove the vma linked list Liam Howlett
2021-10-05 1:31 ` [PATCH v3 66/66] mm/mmap: Drop range_has_overlap() function 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=20211005012959.1110504-5-Liam.Howlett@oracle.com \
--to=liam.howlett@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=axelrasmussen@google.com \
--cc=dave@stgolabs.net \
--cc=david@redhat.com \
--cc=dgilbert@interlog.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=maple-tree@lists.infradead.org \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=riel@surriel.com \
--cc=rientjes@google.com \
--cc=songliubraving@fb.com \
--cc=surenb@google.com \
--cc=vbabka@suse.cz \
--cc=willy@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).