From patchwork Mon Mar 17 14:33:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 14019363 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51A43C35FF3 for ; Mon, 17 Mar 2025 14:34:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 64DEB280006; Mon, 17 Mar 2025 10:33:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5AD30280009; Mon, 17 Mar 2025 10:33:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3DFE4280006; Mon, 17 Mar 2025 10:33:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 0EF06280009 for ; Mon, 17 Mar 2025 10:33:56 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 155BD80144 for ; Mon, 17 Mar 2025 14:33:57 +0000 (UTC) X-FDA: 83231287314.24.3AAB2A3 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf16.hostedemail.com (Postfix) with ESMTP id DB74518001F for ; Mon, 17 Mar 2025 14:33:54 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf16.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742222035; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f5Y/0p6XTRiY/I4+H+0+/372Ye8GUt19XbL4l3nstEM=; b=Xv2I/ou+3rQgx3KUpbmw5GjOC3t40bgz0/ISESl0tDyyEASmpi+vh1gmQSrqhJMPc3GR8A h8ERGwsUwopeyakmnAVgX0WAvUUB6NrDjtU6DVCdSWTMl2lYJich0157mtjWLwzpcNU7GO 0SXNk93KYwhTdcBBhW6kA9NlLvTpFDE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742222035; a=rsa-sha256; cv=none; b=0J4AGHweVwF1gcYbCxklT8sp3h3/ay/A/rTrUccZMBP9TGvnpXgfMDiac1j1/v/O3vCuIM kPsWHW6zoO3vUlxlxq8iTj/vLtecqE8aoBPf8ZNc9Oe7WvUzyegNpQA/sIr1gji1vXYyXN iqAZKxweyPcGVNsy1Yk+U33RJ/oVFz8= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf16.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 233BA1F823; Mon, 17 Mar 2025 14:33:34 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 0ED5313A2C; Mon, 17 Mar 2025 14:33:34 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id qPFTA74y2GcycQAAD6G6ig (envelope-from ); Mon, 17 Mar 2025 14:33:34 +0000 From: Vlastimil Babka Date: Mon, 17 Mar 2025 15:33:07 +0100 Subject: [PATCH RFC v3 6/8] tools: Add testing support for changes to rcu and slab for sheaves MIME-Version: 1.0 Message-Id: <20250317-slub-percpu-caches-v3-6-9d9884d8b643@suse.cz> References: <20250317-slub-percpu-caches-v3-0-9d9884d8b643@suse.cz> In-Reply-To: <20250317-slub-percpu-caches-v3-0-9d9884d8b643@suse.cz> To: Suren Baghdasaryan , "Liam R. Howlett" , Christoph Lameter , David Rientjes Cc: Roman Gushchin , Harry Yoo , Uladzislau Rezki , linux-mm@kvack.org, linux-kernel@vger.kernel.org, rcu@vger.kernel.org, maple-tree@lists.infradead.org, vbabka@suse.cz, "Liam R. Howlett" X-Mailer: b4 0.14.2 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Action: no action X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: DB74518001F X-Stat-Signature: wx9q7nyaxa9akotujsw99pocentfw768 X-HE-Tag: 1742222034-810244 X-HE-Meta: U2FsdGVkX18CijlaEqwuA/UdjTM2k4bIN+4sHFc3Wu3yvwidFi0kEMv7Umi9jKD6fjCINXqTpRW2sK6AOtK+WOB+56Pn2SHohIwAitGrR9z04047PbHPgkmDRo2PF0AaAou4EdheusQD6Dh/GWYZZojIFhQ9LAjNY/GH+UTTRGZMKeZIZBcWBa3zMYg6hlua1EkYYqqmeEgtA438En6AHNg5DDMTLr4/ADQgLKO8USxT4pFWhKf816Gg61yiXSfBFAF8CLDwUPCpDGPMtYHZyv1pqpthTcWePztkuUWmD1c1ILvFYnPBZ4utF0ncx5nifvqtev7GlwWwTM6c7zgDKA6cNpZPhOc+AV3+a4Q9wNeBLNDplRcIJJ1bFkP2g4mE87tWPbMyMrP9den6JFUHavQekCof2w/MluwahQA9bqkvCsmYbif9wVYdgPDh2CoctvD5hSwIUiJEyB7ZcEBsbMFaCeRDuMP1lYv1enRsBPTB8knGY5MZ3t6XeEfHKmRmaAWawUUdLM/kNVUJIkB3jp0az7NvLmkof5FRUyWW2nSR/jafg5WdIOyudsbzJeJchn1UyliddJA7oAlrCbxeHr7m0hjqUXW5wydRXwxDJloGhya/rMQsW+Jh8yXdpQ6lSPLAGWTGAU/kZcMhPXBk9DEYPn23LPCxC3Iv7vqodlX8nkwZgEFJjhCl1f6+Igh+oX2uYKBMq/WA3QNs7ShoDQrOt/tscvlqomnX2dsnVKV5k11GIMWY+ogpUvmlU7m/zvBCSxaJX+smtBlVJYBKxxPrkSA1dcvve5fE7J3L7SU+RCs3z48bev0mRTxQ2G0E1zhbPUfFUHylxp22PxctuVGITwajYNuZXQo1MpfXR6uEmag7Ga8t15tOqkUtG3g6ZOm6PIgDtSOasGlb9rKxRhrb0qzG/qYGKErgJKgkcJvk7v0afQS5WHCUyDvQWGgJaE+T1PT8QBVqvxArJyZ ITf4zBpk V/CkUEYiNZkuiJ6+WcVucAIOTGTfkP+etLUSSr0G89CBSTSjoI1VPSctsxJi6j53IZC0u90QGy2G/BeGYLXDMOxCGXMU+fFd2WUd8LUAqco5nYyYT92F8ihSCykIH64k04oD75BLL5Dn2Pll7kTG9g0q9zNDt7u9Be3TbX37akSQrDrg= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: "Liam R. Howlett" Make testing work for the slab and rcu changes that have come in with the sheaves work. This only works with one kmem_cache, and only the first one used. Subsequent setting of kmem_cache will not update the active kmem_cache and will be silently dropped because there are other tests which happen after the kmem_cache of interest is set. The saved active kmem_cache is used in the rcu callback, which passes the object to be freed. The rcu call takes the rcu_head, which is passed in as the field in the struct (in this case rcu in the maple tree node), which is calculated by pointer math. The offset of which is saved (in a global variable) for restoring the node pointer on the callback after the rcu grace period expires. Don't use any of this outside of testing, please. Signed-off-by: Liam R. Howlett --- tools/include/linux/slab.h | 41 ++++++++++++++++++++++++++++++++--- tools/testing/shared/linux.c | 24 ++++++++++++++++---- tools/testing/shared/linux/rcupdate.h | 22 +++++++++++++++++++ 3 files changed, 80 insertions(+), 7 deletions(-) diff --git a/tools/include/linux/slab.h b/tools/include/linux/slab.h index 51b25e9c4ec7b66bdf4c68cc1353c6faf1ca7bb8..a475364cfd9fcdb10db252aab18ea3a620326b6b 100644 --- a/tools/include/linux/slab.h +++ b/tools/include/linux/slab.h @@ -22,6 +22,12 @@ enum slab_state { FULL }; +struct kmem_cache_args { + unsigned int align; + unsigned int sheaf_capacity; + void (*ctor)(void *); +}; + static inline void *kzalloc(size_t size, gfp_t gfp) { return kmalloc(size, gfp | __GFP_ZERO); @@ -36,9 +42,38 @@ static inline void *kmem_cache_alloc(struct kmem_cache *cachep, int flags) } void kmem_cache_free(struct kmem_cache *cachep, void *objp); -struct kmem_cache *kmem_cache_create(const char *name, unsigned int size, - unsigned int align, unsigned int flags, - void (*ctor)(void *)); + +struct kmem_cache * +__kmem_cache_create_args(const char *name, unsigned int size, + struct kmem_cache_args *args, unsigned int flags); + +/* If NULL is passed for @args, use this variant with default arguments. */ +static inline struct kmem_cache * +__kmem_cache_default_args(const char *name, unsigned int size, + struct kmem_cache_args *args, unsigned int flags) +{ + struct kmem_cache_args kmem_default_args = {}; + + return __kmem_cache_create_args(name, size, &kmem_default_args, flags); +} + +static inline struct kmem_cache * +__kmem_cache_create(const char *name, unsigned int size, unsigned int align, + unsigned int flags, void (*ctor)(void *)) +{ + struct kmem_cache_args kmem_args = { + .align = align, + .ctor = ctor, + }; + + return __kmem_cache_create_args(name, size, &kmem_args, flags); +} + +#define kmem_cache_create(__name, __object_size, __args, ...) \ + _Generic((__args), \ + struct kmem_cache_args *: __kmem_cache_create_args, \ + void *: __kmem_cache_default_args, \ + default: __kmem_cache_create)(__name, __object_size, __args, __VA_ARGS__) 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, diff --git a/tools/testing/shared/linux.c b/tools/testing/shared/linux.c index 66dbb362385f3c3d923233448cc591adfe6dc9e7..9f5fd722f27f1d3877be8927be30409cd74ab3c3 100644 --- a/tools/testing/shared/linux.c +++ b/tools/testing/shared/linux.c @@ -20,6 +20,7 @@ struct kmem_cache { pthread_mutex_t lock; unsigned int size; unsigned int align; + unsigned int sheaf_capacity; int nr_objs; void *objs; void (*ctor)(void *); @@ -31,6 +32,8 @@ struct kmem_cache { void *private; }; +static struct kmem_cache *kmem_active = NULL; + void kmem_cache_set_callback(struct kmem_cache *cachep, void (*callback)(void *)) { cachep->callback = callback; @@ -147,6 +150,14 @@ void kmem_cache_free(struct kmem_cache *cachep, void *objp) pthread_mutex_unlock(&cachep->lock); } +void kmem_cache_free_active(void *objp) +{ + if (!kmem_active) + printf("WARNING: No active kmem_cache\n"); + + kmem_cache_free(kmem_active, objp); +} + void kmem_cache_free_bulk(struct kmem_cache *cachep, size_t size, void **list) { if (kmalloc_verbose) @@ -234,23 +245,28 @@ int kmem_cache_alloc_bulk(struct kmem_cache *cachep, gfp_t gfp, size_t size, } struct kmem_cache * -kmem_cache_create(const char *name, unsigned int size, unsigned int align, - unsigned int flags, void (*ctor)(void *)) +__kmem_cache_create_args(const char *name, unsigned int size, + struct kmem_cache_args *args, + unsigned int flags) { struct kmem_cache *ret = malloc(sizeof(*ret)); pthread_mutex_init(&ret->lock, NULL); ret->size = size; - ret->align = align; + ret->align = args->align; + ret->sheaf_capacity = args->sheaf_capacity; ret->nr_objs = 0; ret->nr_allocated = 0; ret->nr_tallocated = 0; ret->objs = NULL; - ret->ctor = ctor; + ret->ctor = args->ctor; ret->non_kernel = 0; ret->exec_callback = false; ret->callback = NULL; ret->private = NULL; + if (!kmem_active) + kmem_active = ret; + return ret; } diff --git a/tools/testing/shared/linux/rcupdate.h b/tools/testing/shared/linux/rcupdate.h index fed468fb0c78db6f33fb1900c7110ab5f3c19c65..c95e2f0bbd93798e544d7d34e0823ed68414f924 100644 --- a/tools/testing/shared/linux/rcupdate.h +++ b/tools/testing/shared/linux/rcupdate.h @@ -9,4 +9,26 @@ #define rcu_dereference_check(p, cond) rcu_dereference(p) #define RCU_INIT_POINTER(p, v) do { (p) = (v); } while (0) +void kmem_cache_free_active(void *objp); +static unsigned long kfree_cb_offset = 0; + +static inline void kfree_rcu_cb(struct rcu_head *head) +{ + void *objp = (void *) ((unsigned long)head - kfree_cb_offset); + + kmem_cache_free_active(objp); +} + +#ifndef offsetof +#define offsetof(TYPE, MEMBER) __builtin_offsetof(TYPE, MEMBER) +#endif + +#define kfree_rcu(ptr, rhv) \ +do { \ + if (!kfree_cb_offset) \ + kfree_cb_offset = offsetof(typeof(*(ptr)), rhv); \ + \ + call_rcu(&ptr->rhv, kfree_rcu_cb); \ +} while (0) + #endif