From nobody Tue Feb 10 09:57:39 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9C2AF339871 for ; Fri, 23 Jan 2026 06:53:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769151200; cv=none; b=Lx+inh/pLdknFJvVSyRNCcxHAE/R/KaRhPCx1ERZiaHSK2yd5rOyuZ8yMxBnwOljmPVqsUMwbxryQs9nsKeXbIx1q89ttO1Hu8IuJVYldOw1Ojg0gTe6vks8ilYzZ8q77dP/L1cP2rTX/K6MvG2jM6Qu1WWBIGm1S7YNWJpW63E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769151200; c=relaxed/simple; bh=WkfudilBBXZ9M4qWbJXwi0PYceEX4C8/DqEkSHvjEEY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lA8JQmGChLvJ/SUWyPEdOaL4Gf75Bzwz2OBGfFvIE+l/RlL01HfY8HRjNRYO+3KxErUt7IA/FtojQC0lomHzzZwYe5ya5udMQWfzpHLdRi4JmfTdYG+RYQZrdej4z/Ni1CmUuVtFV2ykxnKWf+SW0sjzR63bgTQI690PftQZKgI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz; spf=pass smtp.mailfrom=suse.cz; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b=LnxYZGzr; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b=f5V8qRMe; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b=oW6Bsr69; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b=ZlJuK/Q8; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.cz Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b="LnxYZGzr"; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b="f5V8qRMe"; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b="oW6Bsr69"; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b="ZlJuK/Q8" Received: from imap1.dmz-prg2.suse.org (unknown [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 A2C565BCCE; Fri, 23 Jan 2026 06:53:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1769151190; h=from:from:reply-to: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=UkJZc9VVDwbCOE5N88ecWISWdsb2/cOXldbaYOteozg=; b=LnxYZGzrptkCsiSyPVbbUsSb0aPBRpWYY63pa5i9GzQr/0kWbbsqgglfJXQoBjEP08GU7O SwcIK/aPkcDvv/8GcTwWycnQe+y2/thJtIu/7NVOiECeLCSnb6r6qanZyDmdMNh6ekhQZ0 PoMyeM0Rb2mJEIBzgr7EEwF7EIMl5Pg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1769151190; h=from:from:reply-to: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=UkJZc9VVDwbCOE5N88ecWISWdsb2/cOXldbaYOteozg=; b=f5V8qRMepjktCByLkxQJHJPmVw56oDDSlLdjzL0DNrLOJKv3kSwq+YyMH5koTXc+B/DlDZ DM+KOze4M8yN95Cg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1769151189; h=from:from:reply-to: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=UkJZc9VVDwbCOE5N88ecWISWdsb2/cOXldbaYOteozg=; b=oW6Bsr697b230juFpxKrMJ5DXruKdLELNWZ5BQj8E4nBwoGGtacKIokf0ME1leGKco0m8H fjV/D2WG9RgfKMbh+MNlW/dPL2ZeqWcFqzQG3bWEURZeyUk0jiMxp3MWufEkie64FIK/iG AHENluaMEj5z6QrK37LCFsGyznAm/w8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1769151189; h=from:from:reply-to: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=UkJZc9VVDwbCOE5N88ecWISWdsb2/cOXldbaYOteozg=; b=ZlJuK/Q8UZyUbtl5OrmdzJw3m82QpZQClCaZVIa/VpaK7HLKcQnJTJfAfthDtKUKLyWG5c jKDg8N7njGahNQDA== 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 7CF5D139EB; Fri, 23 Jan 2026 06:53:09 +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 aBk4HtUac2k4YgAAD6G6ig (envelope-from ); Fri, 23 Jan 2026 06:53:09 +0000 From: Vlastimil Babka Date: Fri, 23 Jan 2026 07:52:42 +0100 Subject: [PATCH v4 04/22] mm/slab: move and refactor __kmem_cache_alias() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260123-sheaves-for-all-v4-4-041323d506f7@suse.cz> References: <20260123-sheaves-for-all-v4-0-041323d506f7@suse.cz> In-Reply-To: <20260123-sheaves-for-all-v4-0-041323d506f7@suse.cz> To: Harry Yoo , Petr Tesarik , Christoph Lameter , David Rientjes , Roman Gushchin Cc: Hao Li , Andrew Morton , Uladzislau Rezki , "Liam R. Howlett" , Suren Baghdasaryan , Sebastian Andrzej Siewior , Alexei Starovoitov , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev, bpf@vger.kernel.org, kasan-dev@googlegroups.com, Vlastimil Babka X-Mailer: b4 0.14.3 X-Spamd-Result: default: False [-8.30 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCPT_COUNT_TWELVE(0.00)[18]; ARC_NA(0.00)[]; RCVD_TLS_ALL(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; R_RATELIMIT(0.00)[to_ip_from(RLwn5r54y1cp81no5tmbbew5oc)]; FROM_HAS_DN(0.00)[]; FREEMAIL_CC(0.00)[linux.dev,linux-foundation.org,gmail.com,oracle.com,google.com,linutronix.de,kernel.org,kvack.org,vger.kernel.org,lists.linux.dev,googlegroups.com,suse.cz]; MID_RHS_MATCH_FROM(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[oracle.com:email,imap1.dmz-prg2.suse.org:helo,suse.cz:mid,suse.cz:email] X-Spam-Flag: NO X-Spam-Score: -8.30 X-Spam-Level: Move __kmem_cache_alias() to slab_common.c since it's called by __kmem_cache_create_args() and calls find_mergeable() that both are in this file. We can remove two slab.h declarations and make them static. Instead declare sysfs_slab_alias() from slub.c so that __kmem_cache_alias() can keep calling it. Add args parameter to __kmem_cache_alias() and find_mergeable() instead of align and ctor. With that we can also move the checks for usersize and sheaf_capacity there from __kmem_cache_create_args() and make the result more symmetric with slab_unmergeable(). No functional changes intended. Reviewed-by: Harry Yoo Reviewed-by: Suren Baghdasaryan Signed-off-by: Vlastimil Babka Reviewed-by: Liam R. Howlett --- mm/slab.h | 8 +++----- mm/slab_common.c | 44 +++++++++++++++++++++++++++++++++++++------- mm/slub.c | 30 +----------------------------- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/mm/slab.h b/mm/slab.h index e767aa7e91b0..cb48ce5014ba 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -281,9 +281,12 @@ struct kmem_cache { #define SLAB_SUPPORTS_SYSFS 1 void sysfs_slab_unlink(struct kmem_cache *s); void sysfs_slab_release(struct kmem_cache *s); +int sysfs_slab_alias(struct kmem_cache *, const char *); #else static inline void sysfs_slab_unlink(struct kmem_cache *s) { } static inline void sysfs_slab_release(struct kmem_cache *s) { } +static inline int sysfs_slab_alias(struct kmem_cache *s, const char *p) + { return 0; } #endif =20 void *fixup_red_left(struct kmem_cache *s, void *p); @@ -400,11 +403,6 @@ extern void create_boot_cache(struct kmem_cache *, con= st char *name, unsigned int useroffset, unsigned int usersize); =20 int slab_unmergeable(struct kmem_cache *s); -struct kmem_cache *find_mergeable(unsigned size, unsigned align, - slab_flags_t flags, const char *name, void (*ctor)(void *)); -struct kmem_cache * -__kmem_cache_alias(const char *name, unsigned int size, unsigned int align, - slab_flags_t flags, void (*ctor)(void *)); =20 slab_flags_t kmem_cache_flags(slab_flags_t flags, const char *name); =20 diff --git a/mm/slab_common.c b/mm/slab_common.c index e691ede0e6a8..ee245a880603 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -174,15 +174,22 @@ int slab_unmergeable(struct kmem_cache *s) return 0; } =20 -struct kmem_cache *find_mergeable(unsigned int size, unsigned int align, - slab_flags_t flags, const char *name, void (*ctor)(void *)) +static struct kmem_cache *find_mergeable(unsigned int size, slab_flags_t f= lags, + const char *name, struct kmem_cache_args *args) { struct kmem_cache *s; + unsigned int align; =20 if (slab_nomerge) return NULL; =20 - if (ctor) + if (args->ctor) + return NULL; + + if (IS_ENABLED(CONFIG_HARDENED_USERCOPY) && args->usersize) + return NULL; + + if (args->sheaf_capacity) return NULL; =20 flags =3D kmem_cache_flags(flags, name); @@ -191,7 +198,7 @@ struct kmem_cache *find_mergeable(unsigned int size, un= signed int align, return NULL; =20 size =3D ALIGN(size, sizeof(void *)); - align =3D calculate_alignment(flags, align, size); + align =3D calculate_alignment(flags, args->align, size); size =3D ALIGN(size, align); =20 list_for_each_entry_reverse(s, &slab_caches, list) { @@ -252,6 +259,31 @@ static struct kmem_cache *create_cache(const char *nam= e, return ERR_PTR(err); } =20 +static struct kmem_cache * +__kmem_cache_alias(const char *name, unsigned int size, slab_flags_t flags, + struct kmem_cache_args *args) +{ + struct kmem_cache *s; + + s =3D find_mergeable(size, flags, name, args); + if (s) { + if (sysfs_slab_alias(s, name)) + pr_err("SLUB: Unable to add cache alias %s to sysfs\n", + name); + + s->refcount++; + + /* + * Adjust the object sizes so that we clear + * the complete object on kzalloc. + */ + s->object_size =3D max(s->object_size, size); + s->inuse =3D max(s->inuse, ALIGN(size, sizeof(void *))); + } + + return s; +} + /** * __kmem_cache_create_args - Create a kmem cache. * @name: A string which is used in /proc/slabinfo to identify this cache. @@ -323,9 +355,7 @@ struct kmem_cache *__kmem_cache_create_args(const char = *name, object_size - args->usersize < args->useroffset)) args->usersize =3D args->useroffset =3D 0; =20 - if (!args->usersize && !args->sheaf_capacity) - s =3D __kmem_cache_alias(name, object_size, args->align, flags, - args->ctor); + s =3D __kmem_cache_alias(name, object_size, flags, args); if (s) goto out_unlock; =20 diff --git a/mm/slub.c b/mm/slub.c index 4eb60e99abd7..9d86c0505dcd 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -350,11 +350,8 @@ enum track_item { TRACK_ALLOC, TRACK_FREE }; =20 #ifdef SLAB_SUPPORTS_SYSFS static int sysfs_slab_add(struct kmem_cache *); -static int sysfs_slab_alias(struct kmem_cache *, const char *); #else static inline int sysfs_slab_add(struct kmem_cache *s) { return 0; } -static inline int sysfs_slab_alias(struct kmem_cache *s, const char *p) - { return 0; } #endif =20 #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_SLUB_DEBUG) @@ -8570,31 +8567,6 @@ void __init kmem_cache_init_late(void) WARN_ON(!flushwq); } =20 -struct kmem_cache * -__kmem_cache_alias(const char *name, unsigned int size, unsigned int align, - slab_flags_t flags, void (*ctor)(void *)) -{ - struct kmem_cache *s; - - s =3D find_mergeable(size, align, flags, name, ctor); - if (s) { - if (sysfs_slab_alias(s, name)) - pr_err("SLUB: Unable to add cache alias %s to sysfs\n", - name); - - s->refcount++; - - /* - * Adjust the object sizes so that we clear - * the complete object on kzalloc. - */ - s->object_size =3D max(s->object_size, size); - s->inuse =3D max(s->inuse, ALIGN(size, sizeof(void *))); - } - - return s; -} - int do_kmem_cache_create(struct kmem_cache *s, const char *name, unsigned int size, struct kmem_cache_args *args, slab_flags_t flags) @@ -9827,7 +9799,7 @@ struct saved_alias { =20 static struct saved_alias *alias_list; =20 -static int sysfs_slab_alias(struct kmem_cache *s, const char *name) +int sysfs_slab_alias(struct kmem_cache *s, const char *name) { struct saved_alias *al; =20 --=20 2.52.0