From mboxrd@z Thu Jan 1 00:00:00 1970 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 9F7B7C04A6A for ; Thu, 10 Aug 2023 16:36:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9A3AB6B007B; Thu, 10 Aug 2023 12:36:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 851B46B0082; Thu, 10 Aug 2023 12:36:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5B9466B0080; Thu, 10 Aug 2023 12:36:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 2F2806B0081 for ; Thu, 10 Aug 2023 12:36:37 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E2C901CA157 for ; Thu, 10 Aug 2023 16:36:36 +0000 (UTC) X-FDA: 81108748392.11.3AA5EE5 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf06.hostedemail.com (Postfix) with ESMTP id EBAFC180022 for ; Thu, 10 Aug 2023 16:36:34 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=ahOAhspP; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Cj3pdlbc; dmarc=none; spf=pass (imf06.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691685395; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0YgBKGsaXsGLSxrzXPhBkvZQSAlAP3ciKJFIHzEnvRY=; b=MAanK9BL2OgUIyQu89dqGBnsoHQ2Vvk/IQNj1/y04qLtt1j51n6kXoxjyWufe5r83AhlXo 0Xy6pmekWo7QUYqvJpGa06BvD8BLg2j76OOn5mHqvU8m0Z9IqmSR7ogEkDZtYjtht6YPLi aFLKTUPnvhP7AH4Tyiw1NqEXFQm5Dic= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=ahOAhspP; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Cj3pdlbc; dmarc=none; spf=pass (imf06.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691685395; a=rsa-sha256; cv=none; b=R+s6T3xCy2CSYqEjq5ihmp5G7CgOwmdQ7v8+M2gQ2JxDL0vCDGJLcvztHSkxO/4GuJF2D7 O1lPu3tzHLOhNsvzH13Exg8kZVCKwQtH0rRo0TO6LunIrqQ9kHOD6O3bCQwV5HxRWXN1ds MoWfNE3Yn1OohbATNOyv/kGDeAvwhuI= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 8DD541F855; Thu, 10 Aug 2023 16:36:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1691685393; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0YgBKGsaXsGLSxrzXPhBkvZQSAlAP3ciKJFIHzEnvRY=; b=ahOAhspPOh9gWRokiULaPvSVlO7+FXuxKO4tvOHBGWkFdq68YuUC556iHKh4f3O7IPBUEb 9+o7trNIK7n0OsSei8wrjxwksDOg4QP9utkyO1S6+9mIqAA9POXLcynrS+eRBvJDWA5e2u SJ68T9v+Br03Qj02Wz/h3oGxsa+KMn0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1691685393; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0YgBKGsaXsGLSxrzXPhBkvZQSAlAP3ciKJFIHzEnvRY=; b=Cj3pdlbc0C8qo51lQJTDCKqNdKlP6jg3SiLPuDNcG94XPwf5LjRYss+oyxhSePhcqfnwz9 44KQ/fhVgwG1ijAA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 63EF5138E0; Thu, 10 Aug 2023 16:36:33 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id SEF4FxES1WSEPQAAMHmgww (envelope-from ); Thu, 10 Aug 2023 16:36:33 +0000 From: Vlastimil Babka To: "Liam R. Howlett" , Matthew Wilcox , Suren Baghdasaryan , Christoph Lameter , David Rientjes , Pekka Enberg , Joonsoo Kim Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com>, Roman Gushchin , linux-mm@kvack.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Vlastimil Babka Subject: [RFC v2 6/7] maple_tree: replace preallocation with slub percpu array prefill Date: Thu, 10 Aug 2023 18:36:34 +0200 Message-ID: <20230810163627.6206-15-vbabka@suse.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230810163627.6206-9-vbabka@suse.cz> References: <20230810163627.6206-9-vbabka@suse.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EBAFC180022 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: nm8xh7hh5zbzxiuixe1gwjjkxrau7uxm X-HE-Tag: 1691685394-668329 X-HE-Meta: U2FsdGVkX1+BjuyYeyqdUvLwmAk4KtFHzwSgyF/TJ/GpIkSMUPpcf5DauxJAhFKgFdDEc+VwJuQoOnvR0+cGSoDqhhiSnEH94aqgimkqSHjuIc5JtzO6fkcoXbLTBfM/owTM7wvpSAcYQ3Vo4Eq93azb4amWwvqA5BaWvWjvvMvSqWetezX2j+Jc0I0Q2zc79CNgK+sBpMz9rtwrY3X5+8L1YiI8UScR9DjbGajaDra6EM8vQiky9PQEK2wfwcRfAs3VVGgeZXZuLpqfKjlGIr389IB2UJvyRXkeVx73pmKo45vyzs6HuCwJFUmprQIp+ETdhyUiAeUFf17wICV8BIKz5WfJ0cQe0yNKI5u9pGVSL2AM3FDeDGLClnjRI6CihnQsOIzbUp7cKU+U00upxBamC9ivdVa2XBf5TekemYeD5A1urCArQNC5ir90n7bg5qwpEcUJjfvfWghlpgYq0lLgbriONxuVfp9p2RRRuhx8NO8xR4W1QVCgrrjAnHygYi6ida/KnB/zIFjAcnbv620t6t2B9CFDPPuWAc4QODqQ47N9BGtqVHq1W/g/BKzu+CE+UUZwU1UC08iaR9H/qOW+Jnm92QaSkzisVcdoOoiHeQgxQmiRxOum3Wkg/2vJfiFic+0cM7xjuZIiJi3Q431ctKrT2dRPAp0zzoBs7bMGhSSnsXnGSOBNnCYJvU35HOtZlkC7LQFYII71AIBsdPOu0IvyWzfePqCTtBksr5sNrtXRijJOvuUR0XQZWaq+tBINBqwaXHUKKHfDghYTw/x+raQPBw7uxWORJWQhiu7SP7h+DFUDGLwbU0Be11/boLlgal/sMVbl+3jZomwQSOinEMFztznGGhkd7wI0B7RviTWi5gtRN146Z22ahpIgTqCQUjohp0oFgUGEMrO3wIEVjL6WrDllZr3Dzn0dGTxEXdjXdOPf4K5tu5KeqbFdPHsoI3An/6zVqJI9h4P NZI3JbGr Mugno9dBAgO/snNMpaYt/HEmmB+AD8WdcTpZCEfAsP0/oaEK/vDF+8tAqoOB/tPPcbDp3EkAYV17cApGCW3MO+8PkFLWUJeLNyA+CPH2k0EHjCA5t5FWMZ+xxC2HSDthvM4DzcyAP20UwL74RECfumgjv4qITEWjQLa4xs4Tzduh5j21NBPrHpeffw7is84E3MZTVcCNl0Nv9650JHI4jNH8GfhPXWJEuHFtTIFuXmYOxWLU8xCaYv2UpoMwnyHhzoc6IfVXpONNs1Oalfn6G/LuoGWEloklx64Upl5aJ0yfU6LLWwc+G7YzkJQ== 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: With the percpu array we can try not doing the preallocations in maple tree, and instead make sure the percpu array is prefilled, and using GFP_ATOMIC in places that relied on the preallocation (in case we miss or fail trylock on the array), i.e. mas_store_prealloc(). For now simply add __GFP_NOFAIL there as well. --- lib/maple_tree.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 8bd4a79537d8..304f2453fac9 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5530,7 +5530,12 @@ void mas_store_prealloc(struct ma_state *mas, void *entry) mas_wr_store_setup(&wr_mas); trace_ma_write(__func__, mas, 0, entry); + +retry: mas_wr_store_entry(&wr_mas); + if (unlikely(mas_nomem(mas, GFP_ATOMIC | __GFP_NOFAIL))) + goto retry; + MAS_WR_BUG_ON(&wr_mas, mas_is_err(mas)); mas_destroy(mas); } @@ -5545,19 +5550,12 @@ EXPORT_SYMBOL_GPL(mas_store_prealloc); */ int mas_preallocate(struct ma_state *mas, gfp_t gfp) { - int ret; + int count = 1 + mas_mt_height(mas) * 3; - mas_node_count_gfp(mas, 1 + mas_mt_height(mas) * 3, gfp); - mas->mas_flags |= MA_STATE_PREALLOC; - if (likely(!mas_is_err(mas))) - return 0; + // TODO: should probably indicate if it failed the prefill? + kmem_cache_prefill_percpu_array(maple_node_cache, count, gfp); - mas_set_alloc_req(mas, 0); - ret = xa_err(mas->node); - mas_reset(mas); - mas_destroy(mas); - mas_reset(mas); - return ret; + return 0; } EXPORT_SYMBOL_GPL(mas_preallocate); -- 2.41.0