From nobody Mon Jun 8 23:59:15 2026 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [160.30.148.34]) (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 F129C33F5AF for ; Mon, 25 May 2026 13:10:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=160.30.148.34 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779714614; cv=none; b=bzveZRdB8ov/0XMABasWn4KNaSZ1vFyfKu48aKnHaHeQpceY4Py1Ei8XoxWKDcEswZsIOkpVC3PUe9ZkDiMJP6bQI0P1YQh5yQRqml3Sqid5GrwwrxoIpcn0fXgr0oT5satZx9GkPKhKABLrCdVZi8b6Hn8lLKFRyJC7H+UGWuk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779714614; c=relaxed/simple; bh=AyB3Jo7/w0D/RPZBxx3P9V2ZAnXTA2AuZ4wD0NdP3gM=; h=Message-ID:Date:Mime-Version:From:To:Cc:Subject:Content-Type; b=tsUPGly5jyjPnorSYZT1yiebdk5CrnJKy44VxR+BDtj3/6Kjl5pTusboP2EooO0uskT3WkJDunfsR3j0f9pMun3SuslrTw7wWkFsm1NI1vGVJGE2L/c96PadbS7xQxtQwiKB/YZE/JnWfg/oqHRZ8E8k7ob02qvdatjF/jIbu6A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=zte.com.cn; spf=pass smtp.mailfrom=zte.com.cn; arc=none smtp.client-ip=160.30.148.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=zte.com.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=zte.com.cn Received: from mse-fl1.zte.com.cn (unknown [10.5.228.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4gPGSx62Nsz5B108; Mon, 25 May 2026 21:10:09 +0800 (CST) Received: from xaxapp05.zte.com.cn ([10.99.98.109]) by mse-fl1.zte.com.cn with SMTP id 64PD9vPR077828; Mon, 25 May 2026 21:09:57 +0800 (+08) (envelope-from hu.shengming@zte.com.cn) Received: from mapi (xaxapp01[null]) by mapi (Zmail) with MAPI id mid32; Mon, 25 May 2026 21:10:00 +0800 (CST) X-Zmail-TransId: 2af96a144a28f0e-b7461 X-Mailer: Zmail v1.0 Message-ID: <20260525211000387LYqTHmxYL900XIB8qwV3h@zte.com.cn> Date: Mon, 25 May 2026 21:10:00 +0800 (CST) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 From: To: , , Cc: , , , , , , , Subject: =?UTF-8?B?W1BBVENIIHYzXSBtbS9zbHViOiBmcmVlIHByZWZpbGxlZCBlbXB0eSBzaGVhdmVzIGNvbnNpc3RlbnRseQ==?= X-MAIL: mse-fl1.zte.com.cn 64PD9vPR077828 X-TLS: YES X-SPF-DOMAIN: zte.com.cn X-ENVELOPE-SENDER: hu.shengming@zte.com.cn X-SPF: None X-SOURCE-IP: 10.5.228.132 unknown Mon, 25 May 2026 21:10:09 +0800 X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 6A144A31.002/4gPGSx62Nsz5B108 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Shengming Hu Empty sheaves allocated by alloc_empty_sheaf() should be released with free_empty_sheaf(). Move the empty-sheaf capacity initialization into __alloc_empty_sheaf() and use it for oversized prefilled sheaves as well. This keeps the prefill paths consistent: after flushing an oversized or pfmemalloc sheaf, release the now-empty sheaf through free_empty_sheaf() instead of kfree(). Signed-off-by: Shengming Hu --- Changes in v2: - Rework the change as suggested by Harry. - Teach __alloc_empty_sheaf() to initialize capacity and pfmemalloc. - Allocate oversized prefilled sheaves through __alloc_empty_sheaf(). - Free flushed oversized and pfmemalloc sheaves through free_empty_sheaf(). - Link to v1: https://lore.kernel.org/all/20260521195015105Y4zvKHj0TfPZEuji= xy9Vo@zte.com.cn/ Changes in v3: - Address Hao's comments: - Drop the redundant `pfmemalloc` initialization in __alloc_empty_sheaf(). - Keep initializing `capacity` and `pfmemalloc` in the normal-sized prefill path, since the sheaf may be reused rather than freshly allocated. - Link to v2: https://lore.kernel.org/all/20260522145900248m-nBcy07_SCDk2AT= DWfmg@zte.com.cn/ --- mm/slub.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 04692a6f9128..f4c06bf43f2d 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2782,6 +2782,7 @@ static struct slab_sheaf *__alloc_empty_sheaf(struct = kmem_cache *s, gfp_t gfp, return NULL; sheaf->cache =3D s; + sheaf->capacity =3D capacity; stat(s, SHEAF_ALLOC); @@ -5015,21 +5016,15 @@ kmem_cache_prefill_sheaf(struct kmem_cache *s, gfp_= t gfp, unsigned int size) if (unlikely(size > s->sheaf_capacity)) { - sheaf =3D kzalloc_flex(*sheaf, objects, size, gfp); + sheaf =3D __alloc_empty_sheaf(s, gfp, size); if (!sheaf) return NULL; stat(s, SHEAF_PREFILL_OVERSIZE); - sheaf->cache =3D s; - sheaf->capacity =3D size; - /* - * we do not need to care about pfmemalloc here because oversize - * sheaves area always flushed and freed when returned - */ if (!__kmem_cache_alloc_bulk(s, gfp, size, &sheaf->objects[0])) { - kfree(sheaf); + free_empty_sheaf(s, sheaf); return NULL; } @@ -5097,7 +5092,7 @@ void kmem_cache_return_sheaf(struct kmem_cache *s, gf= p_t gfp, if (unlikely((sheaf->capacity !=3D s->sheaf_capacity) || sheaf->pfmemalloc)) { sheaf_flush_unused(s, sheaf); - kfree(sheaf); + free_empty_sheaf(s, sheaf); return; } --=20 2.25.1