From nobody Mon Feb 9 08:55:50 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 473A676906 for ; Tue, 20 Feb 2024 16:58:46 +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=1708448330; cv=none; b=FYjTzrJGuIEDM+uCopIZVxkBZSfCMnlyciMzvhlshcvvnsgsYY+yzxGRULy7a4lXMeQl5dfzfWXvUEE901MWkSU8w14okwoS/l70A1MVxfDpLu1QzAwBmfPJvhZJICU/AJTHIypF1M3vDWfbKf+HZ4XueWGvA6084hpwJTorK4A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708448330; c=relaxed/simple; bh=QNJRHlmDrZynn1U8943ItQzMzlmVSA/ls2WuKXFCGgI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Y8N++RrlOfKBvQHWKluli6LiXCDym9L8EYQe4PTxE2BVzI1HcyVUOuwU2avNctIsNiOYoVF6NdBvgs4EKU85NzpGq41cC8unuGJ0msUASwIrASbPqC2jY13oLfb3WUho5jQ4o8UjxXkuvUhhKLzGnRhRD8FiUqxr3+I97eOhs1Q= 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=uUF45UK4; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b=OFqlH8t9; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b=uUF45UK4; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b=OFqlH8t9; 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="uUF45UK4"; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b="OFqlH8t9"; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b="uUF45UK4"; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b="OFqlH8t9" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [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 5A1831F8AB; Tue, 20 Feb 2024 16:58:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1708448325; 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=sZ+8lSmxyKMz7aX7YkStMli4RcGBfBcmvqFztfMzFZc=; b=uUF45UK4Gg0LF+iJE/VcP7egXwqgT9qiIRxcdAKOPbnKBMHr5e0Kc6KbsY0AADOvwtoseX 8bqbKM62R19Io+mgv3AC8zKACBOnh+ucIdm9sKv734diu8FSMMcfBXmAZx8zgeRmnp+3AC kBzONf6JMFdnjZAp4mpKVa3NNCfjdjY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1708448325; 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=sZ+8lSmxyKMz7aX7YkStMli4RcGBfBcmvqFztfMzFZc=; b=OFqlH8t9pKEKJdK2N0I8c7Lb3NLXdlRGvN6eB+34GXU9VHPADtBLvFszaOhIkIU4LDVOTV 3ivEka8pFYPbwLBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1708448325; 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=sZ+8lSmxyKMz7aX7YkStMli4RcGBfBcmvqFztfMzFZc=; b=uUF45UK4Gg0LF+iJE/VcP7egXwqgT9qiIRxcdAKOPbnKBMHr5e0Kc6KbsY0AADOvwtoseX 8bqbKM62R19Io+mgv3AC8zKACBOnh+ucIdm9sKv734diu8FSMMcfBXmAZx8zgeRmnp+3AC kBzONf6JMFdnjZAp4mpKVa3NNCfjdjY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1708448325; 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=sZ+8lSmxyKMz7aX7YkStMli4RcGBfBcmvqFztfMzFZc=; b=OFqlH8t9pKEKJdK2N0I8c7Lb3NLXdlRGvN6eB+34GXU9VHPADtBLvFszaOhIkIU4LDVOTV 3ivEka8pFYPbwLBw== 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 3A49B13A94; Tue, 20 Feb 2024 16:58:45 +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 SA77DUXa1GVKXQAAD6G6ig (envelope-from ); Tue, 20 Feb 2024 16:58:45 +0000 From: Vlastimil Babka Date: Tue, 20 Feb 2024 17:58:26 +0100 Subject: [PATCH 2/3] mm, slab: use an enum to define SLAB_ cache creation flags 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: <20240220-slab-cleanup-flags-v1-2-e657e373944a@suse.cz> References: <20240220-slab-cleanup-flags-v1-0-e657e373944a@suse.cz> In-Reply-To: <20240220-slab-cleanup-flags-v1-0-e657e373944a@suse.cz> To: Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino Cc: Zheng Yejian , Xiongwei Song , Chengming Zhou , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, Vlastimil Babka X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=6508; i=vbabka@suse.cz; h=from:subject:message-id; bh=QNJRHlmDrZynn1U8943ItQzMzlmVSA/ls2WuKXFCGgI=; b=owEBbQGS/pANAwAIAbvgsHXSRYiaAcsmYgBl1No/ygsO500Ssb9XAkmAz2HhpQIKGfJtG4YPQ qOlBzr+WcWJATMEAAEIAB0WIQR7u8hBFZkjSJZITfG74LB10kWImgUCZdTaPwAKCRC74LB10kWI mr1zCACerO93/YH+0xXf3hmj9+Ly4RkBTkbOhSmsHedvITBcHdJXKdDsWBSKDvHBhaBrbYG/yw4 ETY87JH94vda42AmV7XJhgJazaGSBZrOXYqc7+p6AXMPbIakyeejJaZC3auz5lG1smlQTfkCyzw UguX8Eka+Rs2SfLGYJnTUeWJPVbI1IV3yoymNc2ee2+E53VoW8WEHLnfawSrp9nF54jEEM9kL5r 3RrsKEiI2lbguKI8+3HzLF+PPT5Ufm46y2zTqlcQkchaGnx/pL3wvZRKgiUrvKXLxjXnlsvx83f X+J/gmD8lECXksKyAhTcae7i21y5P2kZEg7iHI6844Z8mnqI X-Developer-Key: i=vbabka@suse.cz; a=openpgp; fpr=A940D434992C2E8E99103D50224FA7E7CC82A664 Authentication-Results: smtp-out2.suse.de; none X-Spamd-Result: default: False [-5.60 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; R_RATELIMIT(0.00)[to_ip_from(RLqdadssyy1w6u3twx3pq4jyny)]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; RCPT_COUNT_TWELVE(0.00)[19]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.cz:email]; FREEMAIL_TO(0.00)[linux.com,kernel.org,google.com,lge.com,linux-foundation.org,linux.dev,gmail.com,arm.com]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; SUSPICIOUS_RECIPS(1.50)[] X-Spam-Level: X-Spam-Flag: NO X-Spam-Score: -5.60 The values of SLAB_ cache creation flagsare defined by hand, which is tedious and error-prone. Use an enum to assign the bit number and a __SF_BIT() macro to #define the final flags. This renumbers the flag values, which is OK as they are only used internally. Signed-off-by: Vlastimil Babka Reviewed-by: Chengming Zhou Reviewed-by: Roman Gushchin --- include/linux/slab.h | 81 ++++++++++++++++++++++++++++++++++++++----------= ---- mm/slub.c | 6 ++-- 2 files changed, 63 insertions(+), 24 deletions(-) diff --git a/include/linux/slab.h b/include/linux/slab.h index 6252f44115c2..f893a132dd5a 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -21,29 +21,68 @@ #include #include =20 +enum _slab_flag_bits { + _SLAB_CONSISTENCY_CHECKS, + _SLAB_RED_ZONE, + _SLAB_POISON, + _SLAB_KMALLOC, + _SLAB_HWCACHE_ALIGN, + _SLAB_CACHE_DMA, + _SLAB_CACHE_DMA32, + _SLAB_STORE_USER, + _SLAB_PANIC, + _SLAB_TYPESAFE_BY_RCU, + _SLAB_TRACE, +#ifdef CONFIG_DEBUG_OBJECTS + _SLAB_DEBUG_OBJECTS, +#endif + _SLAB_NOLEAKTRACE, + _SLAB_NO_MERGE, +#ifdef CONFIG_FAILSLAB + _SLAB_FAILSLAB, +#endif +#ifdef CONFIG_MEMCG_KMEM + _SLAB_ACCOUNT, +#endif +#ifdef CONFIG_KASAN_GENERIC + _SLAB_KASAN, +#endif + _SLAB_NO_USER_FLAGS, +#ifdef CONFIG_KFENCE + _SLAB_SKIP_KFENCE, +#endif +#ifndef CONFIG_SLUB_TINY + _SLAB_RECLAIM_ACCOUNT, +#endif + _SLAB_OBJECT_POISON, + _SLAB_CMPXCHG_DOUBLE, + _SLAB_FLAGS_LAST_BIT +}; + +#define __SF_BIT(nr) ((slab_flags_t __force)(1U << (nr))) =20 /* * Flags to pass to kmem_cache_create(). * The ones marked DEBUG need CONFIG_SLUB_DEBUG enabled, otherwise are no-= op */ /* DEBUG: Perform (expensive) checks on alloc/free */ -#define SLAB_CONSISTENCY_CHECKS ((slab_flags_t __force)0x00000100U) +#define SLAB_CONSISTENCY_CHECKS __SF_BIT(_SLAB_CONSISTENCY_CHECKS) /* DEBUG: Red zone objs in a cache */ -#define SLAB_RED_ZONE ((slab_flags_t __force)0x00000400U) +#define SLAB_RED_ZONE __SF_BIT(_SLAB_RED_ZONE) /* DEBUG: Poison objects */ -#define SLAB_POISON ((slab_flags_t __force)0x00000800U) +#define SLAB_POISON __SF_BIT(_SLAB_POISON) /* Indicate a kmalloc slab */ -#define SLAB_KMALLOC ((slab_flags_t __force)0x00001000U) +#define SLAB_KMALLOC __SF_BIT(_SLAB_KMALLOC) /* Align objs on cache lines */ -#define SLAB_HWCACHE_ALIGN ((slab_flags_t __force)0x00002000U) +#define SLAB_HWCACHE_ALIGN __SF_BIT(_SLAB_HWCACHE_ALIGN) /* Use GFP_DMA memory */ -#define SLAB_CACHE_DMA ((slab_flags_t __force)0x00004000U) +#define SLAB_CACHE_DMA __SF_BIT(_SLAB_CACHE_DMA) /* Use GFP_DMA32 memory */ -#define SLAB_CACHE_DMA32 ((slab_flags_t __force)0x00008000U) +#define SLAB_CACHE_DMA32 __SF_BIT(_SLAB_CACHE_DMA32) /* DEBUG: Store the last owner for bug hunting */ -#define SLAB_STORE_USER ((slab_flags_t __force)0x00010000U) +#define SLAB_STORE_USER __SF_BIT(_SLAB_STORE_USER) /* Panic if kmem_cache_create() fails */ -#define SLAB_PANIC ((slab_flags_t __force)0x00040000U) +#define SLAB_PANIC __SF_BIT(_SLAB_PANIC) /* * SLAB_TYPESAFE_BY_RCU - **WARNING** READ THIS! * @@ -95,19 +134,19 @@ * Note that SLAB_TYPESAFE_BY_RCU was originally named SLAB_DESTROY_BY_RCU. */ /* Defer freeing slabs to RCU */ -#define SLAB_TYPESAFE_BY_RCU ((slab_flags_t __force)0x00080000U) +#define SLAB_TYPESAFE_BY_RCU __SF_BIT(_SLAB_TYPESAFE_BY_RCU) /* Trace allocations and frees */ -#define SLAB_TRACE ((slab_flags_t __force)0x00200000U) +#define SLAB_TRACE __SF_BIT(_SLAB_TRACE) =20 /* Flag to prevent checks on free */ #ifdef CONFIG_DEBUG_OBJECTS -# define SLAB_DEBUG_OBJECTS ((slab_flags_t __force)0x00400000U) +# define SLAB_DEBUG_OBJECTS __SF_BIT(_SLAB_DEBUG_OBJECTS) #else # define SLAB_DEBUG_OBJECTS 0 #endif =20 /* Avoid kmemleak tracing */ -#define SLAB_NOLEAKTRACE ((slab_flags_t __force)0x00800000U) +#define SLAB_NOLEAKTRACE __SF_BIT(_SLAB_NOLEAKTRACE) =20 /* * Prevent merging with compatible kmem caches. This flag should be used @@ -119,23 +158,23 @@ * - performance critical caches, should be very rare and consulted with s= lab * maintainers, and not used together with CONFIG_SLUB_TINY */ -#define SLAB_NO_MERGE ((slab_flags_t __force)0x01000000U) +#define SLAB_NO_MERGE __SF_BIT(_SLAB_NO_MERGE) =20 /* Fault injection mark */ #ifdef CONFIG_FAILSLAB -# define SLAB_FAILSLAB ((slab_flags_t __force)0x02000000U) +# define SLAB_FAILSLAB __SF_BIT(_SLAB_FAILSLAB) #else # define SLAB_FAILSLAB 0 #endif /* Account to memcg */ #ifdef CONFIG_MEMCG_KMEM -# define SLAB_ACCOUNT ((slab_flags_t __force)0x04000000U) +# define SLAB_ACCOUNT __SF_BIT(_SLAB_ACCOUNT) #else # define SLAB_ACCOUNT 0 #endif =20 #ifdef CONFIG_KASAN_GENERIC -#define SLAB_KASAN ((slab_flags_t __force)0x08000000U) +#define SLAB_KASAN __SF_BIT(_SLAB_KASAN) #else #define SLAB_KASAN 0 #endif @@ -145,10 +184,10 @@ * Intended for caches created for self-tests so they have only flags * specified in the code and other flags are ignored. */ -#define SLAB_NO_USER_FLAGS ((slab_flags_t __force)0x10000000U) +#define SLAB_NO_USER_FLAGS __SF_BIT(_SLAB_NO_USER_FLAGS) =20 #ifdef CONFIG_KFENCE -#define SLAB_SKIP_KFENCE ((slab_flags_t __force)0x20000000U) +#define SLAB_SKIP_KFENCE __SF_BIT(_SLAB_SKIP_KFENCE) #else #define SLAB_SKIP_KFENCE 0 #endif @@ -156,9 +195,9 @@ /* The following flags affect the page allocator grouping pages by mobilit= y */ /* Objects are reclaimable */ #ifndef CONFIG_SLUB_TINY -#define SLAB_RECLAIM_ACCOUNT ((slab_flags_t __force)0x00020000U) +#define SLAB_RECLAIM_ACCOUNT __SF_BIT(_SLAB_RECLAIM_ACCOUNT) #else -#define SLAB_RECLAIM_ACCOUNT ((slab_flags_t __force)0) +#define SLAB_RECLAIM_ACCOUNT 0 #endif #define SLAB_TEMPORARY SLAB_RECLAIM_ACCOUNT /* Objects are short-lived */ =20 diff --git a/mm/slub.c b/mm/slub.c index 2ef88bbf56a3..a93c5a17cbbb 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -306,13 +306,13 @@ static inline bool kmem_cache_has_cpu_partial(struct = kmem_cache *s) =20 /* Internal SLUB flags */ /* Poison object */ -#define __OBJECT_POISON ((slab_flags_t __force)0x80000000U) +#define __OBJECT_POISON __SF_BIT(_SLAB_OBJECT_POISON) /* Use cmpxchg_double */ =20 #ifdef system_has_freelist_aba -#define __CMPXCHG_DOUBLE ((slab_flags_t __force)0x40000000U) +#define __CMPXCHG_DOUBLE __SF_BIT(_SLAB_CMPXCHG_DOUBLE) #else -#define __CMPXCHG_DOUBLE ((slab_flags_t __force)0U) +#define __CMPXCHG_DOUBLE 0 #endif =20 /* --=20 2.43.1