From patchwork Mon Feb 3 09:28:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlastimil Babka X-Patchwork-Id: 13957130 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 AAD53C02193 for ; Mon, 3 Feb 2025 09:29:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 37B07280010; Mon, 3 Feb 2025 04:29:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3068D280002; Mon, 3 Feb 2025 04:29:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0CD5E280011; Mon, 3 Feb 2025 04:29:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id CC130280002 for ; Mon, 3 Feb 2025 04:29:32 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 7F544C2733 for ; Mon, 3 Feb 2025 09:29:32 +0000 (UTC) X-FDA: 83078110584.22.16A56CC Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf28.hostedemail.com (Postfix) with ESMTP id 4E45EC0005 for ; Mon, 3 Feb 2025 09:29:30 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=Q8duSatx; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=75aIMP8z; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=Q8duSatx; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=75aIMP8z; spf=pass (imf28.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738574970; 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:dkim-signature; bh=Yfyz0ZAEn2QjhNmCRRI5FUDzK79CGjs9vV8RXmH1IWk=; b=ZKX9wL04olIp/LrdhHc2OsbnwihCkw7lUZmkBO4takDEiTPMukm+lTQpEiFwqIqIjUhWB1 o0wA9WDdkpQJ9QN060YR/bhM54fH9zLIlwIaPrTFeK86b9PW697NhVDthtx6gtoxLxO/ku FAGi+mW5EcCSaKM1WxGN/xdO5FGj8Mc= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=Q8duSatx; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=75aIMP8z; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=Q8duSatx; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=75aIMP8z; spf=pass (imf28.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738574970; a=rsa-sha256; cv=none; b=t9e2iHYfIvNLN2ZBcsPvtvxceIBYDV5PSo+Ck4C+9ZB3sv0BFsmZvzTf9niFROpbduiaXW RllvV//+BwYiYGpGN6+lN8cFJ7uc8c6mKR8xuTeD2cujfX3pvN6dNgyEgF2uyxRdTTsw08 RH6P95yb5XLgmTRt4Ao1RjwBKYP5eIw= 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 C63E41F390; Mon, 3 Feb 2025 09:29:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1738574968; 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=Yfyz0ZAEn2QjhNmCRRI5FUDzK79CGjs9vV8RXmH1IWk=; b=Q8duSatxg/eMFbaw3usssjoF/R3s1LZQB2gmoszRjhIDJ0xARMDziQM6EfuTNx/z2V2F2a yux0ImQ7l9HmxiklfR+DfbDZYWpr682JUP0AYMmK5CFR3AV7hPA6F/J1auZ885y3NPLW84 aNKHwczb5Ljd6rU0+x+XaTTKZB+R/Co= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1738574968; 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=Yfyz0ZAEn2QjhNmCRRI5FUDzK79CGjs9vV8RXmH1IWk=; b=75aIMP8zWhDXAHwXMvr1+OC5RtRrMyfuu4vczuQ6Hpy6WEe1NPPNkqSyyZDYVJSJ6LlFOH QWQmkFsb7Aky08Dg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1738574968; 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=Yfyz0ZAEn2QjhNmCRRI5FUDzK79CGjs9vV8RXmH1IWk=; b=Q8duSatxg/eMFbaw3usssjoF/R3s1LZQB2gmoszRjhIDJ0xARMDziQM6EfuTNx/z2V2F2a yux0ImQ7l9HmxiklfR+DfbDZYWpr682JUP0AYMmK5CFR3AV7hPA6F/J1auZ885y3NPLW84 aNKHwczb5Ljd6rU0+x+XaTTKZB+R/Co= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1738574968; 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=Yfyz0ZAEn2QjhNmCRRI5FUDzK79CGjs9vV8RXmH1IWk=; b=75aIMP8zWhDXAHwXMvr1+OC5RtRrMyfuu4vczuQ6Hpy6WEe1NPPNkqSyyZDYVJSJ6LlFOH QWQmkFsb7Aky08Dg== 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 AC0B513A78; Mon, 3 Feb 2025 09:29:28 +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 IOy6KXiMoGfwYAAAD6G6ig (envelope-from ); Mon, 03 Feb 2025 09:29:28 +0000 From: Vlastimil Babka Date: Mon, 03 Feb 2025 10:28:50 +0100 Subject: [PATCH 4/4] slab: don't batch kvfree_rcu() with SLUB_TINY MIME-Version: 1.0 Message-Id: <20250203-slub-tiny-kfree_rcu-v1-4-d4428bf9a8a1@suse.cz> References: <20250203-slub-tiny-kfree_rcu-v1-0-d4428bf9a8a1@suse.cz> In-Reply-To: <20250203-slub-tiny-kfree_rcu-v1-0-d4428bf9a8a1@suse.cz> To: Christoph Lameter , David Rientjes , "Paul E. McKenney" , Joel Fernandes , Josh Triplett , Boqun Feng , Uladzislau Rezki Cc: Andrew Morton , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, linux-mm@kvack.org, Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Zqiang , rcu@vger.kernel.org, Vlastimil Babka X-Mailer: b4 0.14.2 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 4E45EC0005 X-Stat-Signature: t373crz74tenima6z1n5f4r8g3iz5cjd X-Rspam-User: X-HE-Tag: 1738574970-528366 X-HE-Meta: U2FsdGVkX1/0hBn+SKKpgvAb3bwHHEe91o/VB43oeflyUjaa9dmRN3VxeWblT2BmzQNlMc3OwVjpWRn27LG9dZ+94MKKsklGP7O/aV9bGB0Kw2XdHJCLgWmhL7j38XONw6EqxJNRZusqOforrzyDApIyxAyhARjZOBnK7FU2rG7u1k1GSF8DNl++UxSu1sx/yIo5yVRjKx4Ogwj89rxsk8mGxlLClKoSAFbd18Tpbu3UVHuxl0HTTf6sRqy+RSqV8draAYiccI/bEdsQnYx34Ab+kchdcTMps1Xm3+2cEU/1Xc4LuK8BT4VX/p+fRrQtWlaEXQWE19bGDWvwHoTo/FUBwPueC7VbuuwtHlxf8XgNEJZoSzyrGPgMNI75cAA6ALkDt0LZ7Ag7jRhnv2yV1gmErtOZYso/z1lG/E9OoPx/bbPrHJ+22ZSuLA7NYbFJ/+VUAzH/J48GgTNqd3EF0ot3Xe+XPxsY8xegtyw2kZ8rhgYeBfT0OiBHu4z7nHp64Luti5UzcZ67vGf/78chSQnSRjxjlaCDqQllC6uf5CH0VhCDrU8zJLzS8BtppMU+WGUEHAxQDWBV5cp4xtwZ9je50447RLmbTuIyC0ol4lYbzrj9zieNCqI6zVNHSybus4qLVKaCNH7V0DctBJMI3G9JIC5/Zsx8iQJzpZuU2TfavLJX+WrJc6KlfZBAgoO1rTKK7gvWJwX9w3VZsfdNjlhOqCdDtnyYY3RgQarx5RgKHj1yNJOKio7xozziB4RxLDCckd//1Og1hUolUICwR7dqKddp4kFzvKQPXRKN1rs9/Ae8qbcLRMr1MXS5DmZp8zlOmueydsSSenawKZmcBhN0eZX6iCXAUjTOP5oQUKbveHz1p0FFtFnuBQ6R8wxqncvMQW2KNxQzJDL8qkxMo3QZ+nu3e5GxCEZpNROTnGdyW0kM8bHFHjGIh2Mzg2EqX3jPyxHyiJndC3ZCyAU A9PtXMbZ j07zmv/4vkKF+zUpDOWzULnjf/Vgn0J4jaTZdlfiV+E/d/BT4HckFViXLF8wflR4gLISg6ph2Pbt//IAYZfiVFQmwJcMRjT7gAsorcigTjCVrqJCZlXGRGTE8PB7Djc1VCV0Uuxp6zDwjKVUHtCsjYEmAn12rbT9VBfSPYApaXsH9Ui1++Cquumb63jQmgO7v/RqMp5kGWWggm5DhM9VtqWDMRlXfvAvGyiezVJFCS1Cvr86a4hu3HyC7Zln1TFBeE/g89sGYeIqFpBOYkmR1C3/Ix19py6JkiBpS5eBx7nViRaOGSiciDhErHKGFuNo3FuxC6Wp/aT1LVd5zPadrxn+WYuWu0zSgn/XzWPSjtNctAmDoB60gVCSUyKVR/KIenD//0YMAYdVUPXQB1jppdLQZkL3C5vAbHPr5KhX3JLiuBuU3UZ0SNJESRnauaXYnV1JRKkeQQ+HVHYo= 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: kvfree_rcu() is batched for better performance except on TINY_RCU, which is a simple implementation for small UP systems. Similarly SLUB_TINY is an option intended for small systems, whether or not used together with TINY_RCU. In case SLUB_TINY is used with !TINY_RCU, it makes arguably sense to not do the batching and limit the memory footprint. It's also suboptimal to have RCU-specific #ifdefs in slab code. With that, add CONFIG_KVFREE_RCU_BATCHED to determine whether batching kvfree_rcu() implementation is used. It is not set by a user prompt, but enabled by default and disabled in case TINY_RCU or SLUB_TINY are enabled. Use the new config for #ifdef's in slab code and extend their scope to cover all code used by the batched kvfree_rcu(). For example there's no need to perform kvfree_rcu_init() if the batching is disabled. Reviewed-by: Uladzislau Rezki (Sony) Reviewed-by: Joel Fernandes (Google) Signed-off-by: Vlastimil Babka Reviewed-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> --- include/linux/slab.h | 2 +- mm/Kconfig | 4 ++++ mm/slab_common.c | 15 +++++++++------ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/include/linux/slab.h b/include/linux/slab.h index bcc62e5656c35c6a3f4caf26fb33d7447dead39a..7686054dd494cc65def7f58748718e03eb78e481 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -1083,7 +1083,7 @@ extern void kvfree_sensitive(const void *addr, size_t len); unsigned int kmem_cache_size(struct kmem_cache *s); -#ifdef CONFIG_TINY_RCU +#ifndef CONFIG_KVFREE_RCU_BATCHED static inline void kvfree_rcu_barrier(void) { rcu_barrier(); diff --git a/mm/Kconfig b/mm/Kconfig index 1b501db064172cf54f1b1259893dfba676473c56..0b7f4bb5cb801c110aaa484ceae3063aa7204d29 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -242,6 +242,10 @@ menu "Slab allocator options" config SLUB def_bool y +config KVFREE_RCU_BATCHED + def_bool y + depends on !SLUB_TINY && !TINY_RCU + config SLUB_TINY bool "Configure for minimal memory footprint" depends on EXPERT diff --git a/mm/slab_common.c b/mm/slab_common.c index 6438a38aa5dc2ede0b5afa04bc3fbff5a4697d87..46d0a4cd33b5982fd79c307d572f231fdea9514a 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -1284,7 +1284,7 @@ EXPORT_TRACEPOINT_SYMBOL(kmem_cache_alloc); EXPORT_TRACEPOINT_SYMBOL(kfree); EXPORT_TRACEPOINT_SYMBOL(kmem_cache_free); -#ifdef CONFIG_TINY_RCU +#ifndef CONFIG_KVFREE_RCU_BATCHED void kvfree_call_rcu(struct rcu_head *head, void *ptr) { @@ -1301,7 +1301,11 @@ void kvfree_call_rcu(struct rcu_head *head, void *ptr) } EXPORT_SYMBOL_GPL(kvfree_call_rcu); -#endif +void __init kvfree_rcu_init(void) +{ +} + +#else /* CONFIG_KVFREE_RCU_BATCHED */ /* * This rcu parameter is runtime-read-only. It reflects @@ -1879,8 +1883,6 @@ add_ptr_to_bulk_krc_lock(struct kfree_rcu_cpu **krcp, return true; } -#if !defined(CONFIG_TINY_RCU) - static enum hrtimer_restart schedule_page_work_fn(struct hrtimer *t) { @@ -2089,8 +2091,6 @@ void kvfree_rcu_barrier(void) } EXPORT_SYMBOL_GPL(kvfree_rcu_barrier); -#endif /* #if !defined(CONFIG_TINY_RCU) */ - static unsigned long kfree_rcu_shrink_count(struct shrinker *shrink, struct shrink_control *sc) { @@ -2180,3 +2180,6 @@ void __init kvfree_rcu_init(void) shrinker_register(kfree_rcu_shrinker); } + +#endif /* CONFIG_KVFREE_RCU_BATCHED */ +