From patchwork Tue Oct 24 09:33:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 13434156 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 83F2CC25B47 for ; Tue, 24 Oct 2023 09:34:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 46C836B0200; Tue, 24 Oct 2023 05:34:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 41C0F6B0201; Tue, 24 Oct 2023 05:34:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2E2786B0202; Tue, 24 Oct 2023 05:34:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 18EFE6B0200 for ; Tue, 24 Oct 2023 05:34:08 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B59D51A0E83 for ; Tue, 24 Oct 2023 09:34:07 +0000 (UTC) X-FDA: 81379843734.09.68B2FEE Received: from out-206.mta0.migadu.com (out-206.mta0.migadu.com [91.218.175.206]) by imf17.hostedemail.com (Postfix) with ESMTP id 0211340019 for ; Tue, 24 Oct 2023 09:34:05 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="qe+5aC/P"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf17.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.206 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698140046; a=rsa-sha256; cv=none; b=KTUeyrLKa44wIkibrenRftIGC1FAIKaHR2cQSWTET83zkzlNUQpGt28q/o17WCPHKGdzgR nUaGDddhV6XAUZ29DdWhImFK784N04QROiyZTKuRMcSaYAEgtncE87M6ZlrCNTjckLXkar iWayMfxSTuZqRKMaXv3T/8P+ocNMTd0= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="qe+5aC/P"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf17.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.206 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698140046; 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=M0oaaQjRtsggr60xf/TcRhISey4PmiC9GN3ZTwclV0I=; b=nAkSObhasF0N6CXZ5LfpwENUjdm6mIvPqwE9k3xsqAb0MIoCnoawOayU6oZYY4kZdnFMqy 1/NcBIw9+yRlRzs7OxJaD4I+ALDF80nF/Oe1dE8LKSnhm17Ahigokv+Wi8a1NlS6x9B2Dv S36Ojmih0OAyIBekLXRm2JIsLY6XlJs= 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=1698140044; h=from:from:reply-to:subject:subject: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=M0oaaQjRtsggr60xf/TcRhISey4PmiC9GN3ZTwclV0I=; b=qe+5aC/P6zRu1TdKIHVLvCkRJ0utMiqJQbaCAMAjQVzHN5g58p3EkWiMWER0AdEMI6PKuU X/FgD2Z340OUYybYcb2S1udN+T5kspyS4qlvEyxH5DfTOIwhkqfb34by37jVV286bVVgXe Fb/uzGHTjVq7WYepvR7yMsyzuEjRMHI= From: chengming.zhou@linux.dev To: cl@linux.com, penberg@kernel.org Cc: rientjes@google.com, iamjoonsoo.kim@lge.com, akpm@linux-foundation.org, vbabka@suse.cz, roman.gushchin@linux.dev, 42.hyeyoo@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, chengming.zhou@linux.dev, Chengming Zhou Subject: [RFC PATCH v3 4/7] slub: Change get_partial() interfaces to return slab Date: Tue, 24 Oct 2023 09:33:42 +0000 Message-Id: <20231024093345.3676493-5-chengming.zhou@linux.dev> In-Reply-To: <20231024093345.3676493-1-chengming.zhou@linux.dev> References: <20231024093345.3676493-1-chengming.zhou@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 0211340019 X-Stat-Signature: wrgfhhebee9f5nncsecei5d1dpo7gyse X-HE-Tag: 1698140045-537041 X-HE-Meta: U2FsdGVkX199Jfm8jzuyQ/nWIX5Zy4n6fwXmCn9O1Xs7Sv9J3IpgjfAPUKSJAYR5i0Q0Gj6G7MfOzA7nM5N2UIqT1v06W/fPDhJVuhxqWqqLPWsEEvvPeAw2J/LcLEqCALgesHlBY23dzsZfUrh8SE4ARkmRjE3WXRwT62phrMgdTBmqRGJhc4xs33yL99XPCPEnmp7rZ0seZlXm6yZeQcmcwN2Q3Fg4O0yq6jF6prnwrZTV+KFF0UI/syK39upUy77E8tLg6VkgtS/qaWIi5Ih7JGcIEmGXD2rW3wRprMnccuv7IhzHHatbiAapkHzw8Wor4b9x5V2fp1OzywkBLiQk2jgG+t8V2/WQGUVaIa5jIwsgl408Ab6p2JFjp2gzp5x7mVTW5KXcBDNRNsXJurLu+TIjs4Qv8e57A967G1FouJXu9cXWqRsjpaXsg3LJmzXVqooMJDEXgv/SA1eQdUo7EtYpaiPquaSC1aSOC5Pq2qfdM+06mfn/XFaJHhh7yXx+3eGX5NZpX5LhYyquMw3IMcuzj3Ol9HrgC8ZmqUchi4mht6Zc/m8RZXyfXRDLyc0EwqYa3bNlMsROgI9rbwApKoXSrrWZl18R7yjvIBypu8IyVg6h1SnHND3cpcTYt4RrpXSvDsMoxcSYVixlukaV6TW5UthyknThmA4qMdYRG/FDnLpSUaFjJ8Mhx3g3jsR3D9Fc2SPQC5vc99ritIA0k2DkML3zvy8PlRHK64hyzMzzhUGkB25W8WTM0ubQWprCOuWUsERKhCF8wc3ao349tEX3SIYtB30f9OY1vD723Tv+dTnj0GA2OVWXctxQZBxG8BORoFU1vHsFAS93xqOocxHBQBTGhw60Q+Hkb7h/H5nR2GHVkGquumHG837/7dMM6AJ961bvR6PfvNa4/LNKWBHcy5c7iu63Py3nMhtkrb/d/kgExVg8dajaIYqk4VGj8N6EGLoNSvHcsUq bW36U6VP C3yDhwAwV5xBIXXekGipPagh2p83oZcv1ul003nyl3+sARgy4CO9ZpgLzBxkHI6hQbJg/z0z0vvNhmMxnwSJQyoPsZcwERwen8Xn8PgLS8hATgefi3VSbfYNZc7VsJBWi89RmjiouKA4X0a9aEhCcCBmbiitL6J0XLg75oeQbcp7lIqOCseqEvcT5M3KBZwP7yDlV7SOePp20I2UlRMZ/tSuj2G7Cy0fNfGE7DICh5nCsqcutUSJ9wDfjag== 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: From: Chengming Zhou We need all get_partial() related interfaces to return a slab, instead of returning the freelist (or object). Use the partial_context.object to return back freelist or object for now. This patch shouldn't have any functional changes. Signed-off-by: Chengming Zhou Reviewed-by: Vlastimil Babka --- mm/slub.c | 63 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index cd8aa68c156e..7d0234bffad3 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -204,9 +204,9 @@ DEFINE_STATIC_KEY_FALSE(slub_debug_enabled); /* Structure holding parameters for get_partial() call chain */ struct partial_context { - struct slab **slab; gfp_t flags; unsigned int orig_size; + void *object; }; static inline bool kmem_cache_debug(struct kmem_cache *s) @@ -2271,10 +2271,11 @@ static inline bool pfmemalloc_match(struct slab *slab, gfp_t gfpflags); /* * Try to allocate a partial slab from a specific node. */ -static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n, - struct partial_context *pc) +static struct slab *get_partial_node(struct kmem_cache *s, + struct kmem_cache_node *n, + struct partial_context *pc) { - struct slab *slab, *slab2; + struct slab *slab, *slab2, *partial = NULL; void *object = NULL; unsigned long flags; unsigned int partial_slabs = 0; @@ -2290,27 +2291,28 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n, spin_lock_irqsave(&n->list_lock, flags); list_for_each_entry_safe(slab, slab2, &n->partial, slab_list) { - void *t; - if (!pfmemalloc_match(slab, pc->flags)) continue; if (IS_ENABLED(CONFIG_SLUB_TINY) || kmem_cache_debug(s)) { object = alloc_single_from_partial(s, n, slab, pc->orig_size); - if (object) + if (object) { + partial = slab; + pc->object = object; break; + } continue; } - t = acquire_slab(s, n, slab, object == NULL); - if (!t) + object = acquire_slab(s, n, slab, object == NULL); + if (!object) break; - if (!object) { - *pc->slab = slab; + if (!partial) { + partial = slab; + pc->object = object; stat(s, ALLOC_FROM_PARTIAL); - object = t; } else { put_cpu_partial(s, slab, 0); stat(s, CPU_PARTIAL_NODE); @@ -2326,20 +2328,21 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n, } spin_unlock_irqrestore(&n->list_lock, flags); - return object; + return partial; } /* * Get a slab from somewhere. Search in increasing NUMA distances. */ -static void *get_any_partial(struct kmem_cache *s, struct partial_context *pc) +static struct slab *get_any_partial(struct kmem_cache *s, + struct partial_context *pc) { #ifdef CONFIG_NUMA struct zonelist *zonelist; struct zoneref *z; struct zone *zone; enum zone_type highest_zoneidx = gfp_zone(pc->flags); - void *object; + struct slab *slab; unsigned int cpuset_mems_cookie; /* @@ -2374,8 +2377,8 @@ static void *get_any_partial(struct kmem_cache *s, struct partial_context *pc) if (n && cpuset_zone_allowed(zone, pc->flags) && n->nr_partial > s->min_partial) { - object = get_partial_node(s, n, pc); - if (object) { + slab = get_partial_node(s, n, pc); + if (slab) { /* * Don't check read_mems_allowed_retry() * here - if mems_allowed was updated in @@ -2383,7 +2386,7 @@ static void *get_any_partial(struct kmem_cache *s, struct partial_context *pc) * between allocation and the cpuset * update */ - return object; + return slab; } } } @@ -2395,17 +2398,18 @@ static void *get_any_partial(struct kmem_cache *s, struct partial_context *pc) /* * Get a partial slab, lock it and return it. */ -static void *get_partial(struct kmem_cache *s, int node, struct partial_context *pc) +static struct slab *get_partial(struct kmem_cache *s, int node, + struct partial_context *pc) { - void *object; + struct slab *slab; int searchnode = node; if (node == NUMA_NO_NODE) searchnode = numa_mem_id(); - object = get_partial_node(s, get_node(s, searchnode), pc); - if (object || node != NUMA_NO_NODE) - return object; + slab = get_partial_node(s, get_node(s, searchnode), pc); + if (slab || node != NUMA_NO_NODE) + return slab; return get_any_partial(s, pc); } @@ -3215,10 +3219,10 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, new_objects: pc.flags = gfpflags; - pc.slab = &slab; pc.orig_size = orig_size; - freelist = get_partial(s, node, &pc); - if (freelist) { + slab = get_partial(s, node, &pc); + if (slab) { + freelist = pc.object; if (kmem_cache_debug(s)) { /* * For debug caches here we had to go through @@ -3410,12 +3414,11 @@ static void *__slab_alloc_node(struct kmem_cache *s, void *object; pc.flags = gfpflags; - pc.slab = &slab; pc.orig_size = orig_size; - object = get_partial(s, node, &pc); + slab = get_partial(s, node, &pc); - if (object) - return object; + if (slab) + return pc.object; slab = new_slab(s, gfpflags, node); if (unlikely(!slab)) {