From mboxrd@z Thu Jan 1 00:00:00 1970 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 7EBA7C369C2 for ; Fri, 25 Apr 2025 08:28:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B959A6B007B; Fri, 25 Apr 2025 04:28:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A81F96B0032; Fri, 25 Apr 2025 04:28:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 861C16B0083; Fri, 25 Apr 2025 04:28:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 6811F6B0032 for ; Fri, 25 Apr 2025 04:28:06 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 5ED5E1603A1 for ; Fri, 25 Apr 2025 08:28:08 +0000 (UTC) X-FDA: 83371888656.30.1E36FC4 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf18.hostedemail.com (Postfix) with ESMTP id 379891C0002 for ; Fri, 25 Apr 2025 08:28:05 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf18.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745569686; a=rsa-sha256; cv=none; b=zsZLSAnDZ+tnJ29ya8BeX6WdeXMwKtCtJ0MMK8TY/WZpH7SfAEIKv6zWXTss9FSfGUdXdr fBXbo5wDKOOCov3NQL55+48SsAYhWxGlKRmM8+3p1perYXabJeF9I7729oePyhhXrEpFhR OCsboKnPcj6V7ip0ullmzP3QA6jMoaQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745569686; 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=WyDFWFsr+ZXkgQFLbIV6VbN5eG8p0kwNY1IJvqpio04=; b=uyRuZnMeslLEkVETOBHDg3Y6mC+Q7LxjkPGxywev9qWr7T/dpM3G6Y1rDZLhujiudwFBGy TTNL4cCabHLc9o/eB9slXZaLoxBZpVQ3APzCH/sLPKAq4xk5PmfUJC3Y8XzRtOVnSewOPe Z8tzFIsu7nWhp2D6hbvAdJVIEtXxDfA= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf18.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 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-out1.suse.de (Postfix) with ESMTPS id 1A6CC21168; Fri, 25 Apr 2025 08:27:53 +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 034EC13A8B; Fri, 25 Apr 2025 08:27:53 +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 SMqDAIlHC2htfwAAD6G6ig (envelope-from ); Fri, 25 Apr 2025 08:27:53 +0000 From: Vlastimil Babka Date: Fri, 25 Apr 2025 10:27:25 +0200 Subject: [PATCH v4 5/9] tools: Add testing support for changes to rcu and slab for sheaves MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250425-slub-percpu-caches-v4-5-8a636982b4a4@suse.cz> References: <20250425-slub-percpu-caches-v4-0-8a636982b4a4@suse.cz> In-Reply-To: <20250425-slub-percpu-caches-v4-0-8a636982b4a4@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-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 379891C0002 X-Stat-Signature: 5cyubruzjp1h719tx9caymobjnd4h4do X-Rspam-User: X-HE-Tag: 1745569685-39514 X-HE-Meta: U2FsdGVkX18nsZ5Es6d6o22UzNYtVlSigA6Jafyy0POm5wbu7PtvSYbk1SmHXNyPBC+8Z0FIS1fFWiUJtfOgK3JiUwwKHiX9FDrDItkZgzSo20MwvwaZQwHfACkAieP1f35gpYVDEtjkCVrYhelnU+BXgoG9h5uDqOi0skpzKPWUMCGlWUN4xxe38xb+PtbLkxG5TfVQZt0EsYwV7Esy01L7OppuW4MInmZI5KPHk/3aFTJZQo2EHF0IPDYyEPsUOnR4OwaDt3aZc/vNNYXa02OWCiWKECexvf/F6ajC1Vhsr716Oc/hHx92/es/Kf2CdJHpqmp6LAzYihiHbbo9nTJMlQC9JGj5wDXYcPm0Ju55Ej4GuQEe6OacX/iwV1otGplcRrz1kOm/QSsQ1Ezy2YmctO9T5z2NF9L5JcWJ0kTbboBIWqTwHsLBxr7uo/MOz5kWjq2p2kBctbmhk89ZNVyDDT5TyuFUfDuPlB8MUFQmiD7C708bByPE4VmzmRUkafCTikV0jhPQRcYWvuASG2WeeFO/0Mx5/XT4swNDrpcjnmqPRuzTYEJ599HNCsQcBCJ19MTGmLAyw0lnV8/I/Re92UXiu1qlvbSPJbIPi615La3zkv8luGFGPVaOPGUnKd8y++hmQJk1Fct/5NO6C6Gy28QchO6WRokPCoWgVJacomPlXIepk3U6eR4SH94W3dw9YeMrp/UA9WidPskuR0IM8yjhZ5McfWB1POwqB5Tp+xZ44AgAuQeMzdVYehLsAeEBjGmDqc4V9fPTC9vuZShw40Mw71irh5dp+hFhTe3B5FyKZYXbEe6snmAlxECoW5VrSkxM8cR2DFxAUcarc6OFT5q86r/kHRyOcO4B4BHlHrxcF9IeFcK7C3k1rw8Qn8LC0wn3JVnzNYdO4JiHkzwEFazP6NEwi9J4xJ6cDvk8ZWN8eQ950Yp8nK7B0sVaAgsLKtsXqxzgOIvUw1m IEPAWtZa ZpTHK9u8cjaZDWIWUYoGnv8EEUdieGykBQJGNXwzQW1vuyYI+kWfq+iTvGcjRpHdW4HORWa13f5bulGFisHt9XM+v3tugOU9Kdwlw9wpYxcC0ppKRt5NxgSuTewTDMgyAcqGe0YK3A8aXmTHtm1ewbWFxbisFd5JpeMcJshyZuYPNTy8= 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 c87051e2b26f5a7fee0362697fae067076b8e84d..d1444e79f2685edb828adbce8b3fbb500c0f8844 100644 --- a/tools/include/linux/slab.h +++ b/tools/include/linux/slab.h @@ -23,6 +23,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); @@ -37,9 +43,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 0f97fb0d19e19c327aa4843a35b45cc086f4f366..f998555a1b2af4a899a468a652b04622df459ed3 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 -- 2.49.0