From nobody Sat Feb 7 15:22:01 2026 Received: from out-174.mta0.migadu.com (out-174.mta0.migadu.com [91.218.175.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 486C64D13B for ; Wed, 21 Feb 2024 12:13:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708517595; cv=none; b=Ex30YzcKIVTXE485KnV8QtDoaK+Ez75ic0Oi9o9ZX32fvS33FvB6jB4R0Ig7StRMMFCnYIPZuWsMD9eh31W5MAov/HMS6QatZBRp2ZBd0CYzwfn9FAHJjAUmxbr6JZU+qRixYFys2R2SGomsDi+USGZwx+9V4b58wgzz9QEnxgs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708517595; c=relaxed/simple; bh=nk9RpluGr0tF6v2tluYj3gtiA6vjGhoHRasqnmMVpqo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ib+ieLw0FqYVaelIZf5VQTh846mQwKoCI7ag9nEcsQdzlUcyFiUtjozjpMBRqym+SuxFC0dxR/xCCqcy/Ij+6qlYgUQZXmI9D/EINnrcG/jYUj6ji2wbofs3oxzNxP8KrGbH4UasKAZTAWSwXjbaO57wSkKLkCno+joBYPUx3Wc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=CpeiNZrZ; arc=none smtp.client-ip=91.218.175.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="CpeiNZrZ" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1708517591; h=from:from: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=Bz0cGVE6WLA7e0c4EkbAqLj7Vrv2Vyq9GZ8uOCbwj1A=; b=CpeiNZrZjiLtxn4Z3YUU5MaXkCDTRZld89DR18NlWJCzgwcmoiU5JeeHp9r8ObETMn3otk eTpYeU1WSTuDozM9Idjqi+S6QnWvwPCXGrumeo8uKgQ0IugTfladj4nkro5cnq7Q/xO9x7 UMTqigC7MoVqBL7Auc87Oul3z9zJuxI= From: Chengming Zhou Date: Wed, 21 Feb 2024 12:12:53 +0000 Subject: [PATCH 1/2] mm, slab: remove unused object_size parameter in kmem_cache_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: <20240221-slab-cleanup-v1-1-63382f41d699@linux.dev> References: <20240221-slab-cleanup-v1-0-63382f41d699@linux.dev> In-Reply-To: <20240221-slab-cleanup-v1-0-63382f41d699@linux.dev> To: Pekka Enberg , Joonsoo Kim , Andrew Morton , David Rientjes , Christoph Lameter , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Vlastimil Babka , Roman Gushchin Cc: Chengming Zhou , linux-mm@kvack.org, linux-kernel@vger.kernel.org X-Developer-Signature: v=1; a=ed25519-sha256; t=1708517585; l=2862; i=chengming.zhou@linux.dev; s=20240220; h=from:subject:message-id; bh=nk9RpluGr0tF6v2tluYj3gtiA6vjGhoHRasqnmMVpqo=; b=Vxbg1J2RwEx3Y/a5Ivg5HMPbt0xZi3xKziMxqbb5re7o+KxAFmvs+ke8YVeB6B6zuUoMssnAF D4gzuY3tfmrA8fYBTtMNySrGukRjESuSPIx1SroYlU+GZ9XiSc7H28A X-Developer-Key: i=chengming.zhou@linux.dev; a=ed25519; pk=5+68Wfci+T30FoQos5RH+hfToF6SlC+S9LMPSPBFWuw= X-Migadu-Flow: FLOW_OUT We don't need the object_size parameter in kmem_cache_flags(), so just remove it. Signed-off-by: Chengming Zhou --- mm/slab.h | 3 +-- mm/slab_common.c | 2 +- mm/slub.c | 9 +++------ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/mm/slab.h b/mm/slab.h index 54deeb0428c6..161a3fe5d573 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -435,8 +435,7 @@ 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(unsigned int object_size, - slab_flags_t flags, const char *name); +slab_flags_t kmem_cache_flags(slab_flags_t flags, const char *name); =20 static inline bool is_kmalloc_cache(struct kmem_cache *s) { diff --git a/mm/slab_common.c b/mm/slab_common.c index 238293b1dbe1..e86557397a61 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -172,7 +172,7 @@ struct kmem_cache *find_mergeable(unsigned int size, un= signed int align, size =3D ALIGN(size, sizeof(void *)); align =3D calculate_alignment(flags, align, size); size =3D ALIGN(size, align); - flags =3D kmem_cache_flags(size, flags, name); + flags =3D kmem_cache_flags(flags, name); =20 if (flags & SLAB_NEVER_MERGE) return NULL; diff --git a/mm/slub.c b/mm/slub.c index 2ef88bbf56a3..95700f2b17ae 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1764,7 +1764,6 @@ __setup("slub_debug", setup_slub_debug); =20 /* * kmem_cache_flags - apply debugging options to the cache - * @object_size: the size of an object without meta data * @flags: flags to set * @name: name of the cache * @@ -1773,8 +1772,7 @@ __setup("slub_debug", setup_slub_debug); * slub_debug=3D,, ... * then only the select slabs will receive the debug option(s). */ -slab_flags_t kmem_cache_flags(unsigned int object_size, - slab_flags_t flags, const char *name) +slab_flags_t kmem_cache_flags(slab_flags_t flags, const char *name) { char *iter; size_t len; @@ -1850,8 +1848,7 @@ static inline void add_full(struct kmem_cache *s, str= uct kmem_cache_node *n, struct slab *slab) {} static inline void remove_full(struct kmem_cache *s, struct kmem_cache_nod= e *n, struct slab *slab) {} -slab_flags_t kmem_cache_flags(unsigned int object_size, - slab_flags_t flags, const char *name) +slab_flags_t kmem_cache_flags(slab_flags_t flags, const char *name) { return flags; } @@ -5104,7 +5101,7 @@ static int calculate_sizes(struct kmem_cache *s) =20 static int kmem_cache_open(struct kmem_cache *s, slab_flags_t flags) { - s->flags =3D kmem_cache_flags(s->size, flags, s->name); + s->flags =3D kmem_cache_flags(flags, s->name); #ifdef CONFIG_SLAB_FREELIST_HARDENED s->random =3D get_random_long(); #endif --=20 b4 0.10.1 From nobody Sat Feb 7 15:22:01 2026 Received: from out-185.mta0.migadu.com (out-185.mta0.migadu.com [91.218.175.185]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 717194F894 for ; Wed, 21 Feb 2024 12:13:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.185 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708517598; cv=none; b=lq8zwqOZpQ86AcsCtRAS/AaBH3aOiNy2+4gNONNJzvUDUMiv1IQHtFtknKKfCsvcqc1mpTu6IOdAEMoICic4askzwPcxBflOvgrhfwkUh3en7/b18hKqomRmWTcbePE3F4iWIQscSvNpjSOSh7U0AfPlkEH7YCn1eEMZjPkEbTc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708517598; c=relaxed/simple; bh=ofDIzQwuszXOaZHAYe8/D7AxU3OQRgHCtFquTvgqqfY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YoXgD/LJ4+bbM5MUYwhkYhcF6QcDbKNIj66rd+PbssmNiS0quTH9FRSPZvo3XPBnX4xQKNqy6GvxA/OHJuKAJhlAZAgm2rOGeLH+hh19snJVk1fdSsPllUzfEGagcSTGaol+jtiBWNgIUILLJzp+yekSQ4xNCJNeBjCjstSk268= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=mteirsb+; arc=none smtp.client-ip=91.218.175.185 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="mteirsb+" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1708517594; h=from:from: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=qhS11vlbSRPVjtePx2vj2SfRKzyV/eHJgrhw6EiukQI=; b=mteirsb+AwFzqqexC55Jbjfm6efaZXq7mGfkk8IMH14fHRl1HuaJkF4MVDThAb1urEtC/4 BTrNOQrySCuH5Xei2D2GZSWyUWkUztG/0JdZBft/y7yHadlE6Vxw9e7zYsisbcduj/GOix ObbyANIoXE4b16ue/uDg/afpdLYdq6k= From: Chengming Zhou Date: Wed, 21 Feb 2024 12:12:54 +0000 Subject: [PATCH 2/2] mm, slab: fix the comment 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: <20240221-slab-cleanup-v1-2-63382f41d699@linux.dev> References: <20240221-slab-cleanup-v1-0-63382f41d699@linux.dev> In-Reply-To: <20240221-slab-cleanup-v1-0-63382f41d699@linux.dev> To: Pekka Enberg , Joonsoo Kim , Andrew Morton , David Rientjes , Christoph Lameter , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Vlastimil Babka , Roman Gushchin Cc: Chengming Zhou , linux-mm@kvack.org, linux-kernel@vger.kernel.org X-Developer-Signature: v=1; a=ed25519-sha256; t=1708517585; l=780; i=chengming.zhou@linux.dev; s=20240220; h=from:subject:message-id; bh=ofDIzQwuszXOaZHAYe8/D7AxU3OQRgHCtFquTvgqqfY=; b=9SVMJ2TH7SmFMqZ6TgcaMs/Z/nVtEURX7uP3QgENgkurJ8/77EOzV8658D0efom6qkPkGuVqp kp/Iejh0mjvAiWCJXNazK9Uny3roCoOMjFtYej0VrI0+uCtwsertYQi X-Developer-Key: i=chengming.zhou@linux.dev; a=ed25519; pk=5+68Wfci+T30FoQos5RH+hfToF6SlC+S9LMPSPBFWuw= X-Migadu-Flow: FLOW_OUT The partial slabs on cpu partial list are not frozen after the commit 8cd3fa428b56 ("slub: Delay freezing of partial slabs") merged. So fix the comment. Signed-off-by: Chengming Zhou --- mm/slub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/slub.c b/mm/slub.c index 95700f2b17ae..d5ca58e65053 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -391,7 +391,7 @@ struct kmem_cache_cpu { }; struct slab *slab; /* The slab from which we are allocating */ #ifdef CONFIG_SLUB_CPU_PARTIAL - struct slab *partial; /* Partially allocated frozen slabs */ + struct slab *partial; /* Partially allocated slabs */ #endif local_lock_t lock; /* Protects the fields above */ #ifdef CONFIG_SLUB_STATS --=20 b4 0.10.1