From patchwork Thu Nov 2 03:23:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 13443350 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 248BDC4167B for ; Thu, 2 Nov 2023 03:24:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AF2EA8E0017; Wed, 1 Nov 2023 23:24:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A7B068E0009; Wed, 1 Nov 2023 23:24:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8CE0C8E0017; Wed, 1 Nov 2023 23:24:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 73DFA8E0009 for ; Wed, 1 Nov 2023 23:24:46 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 46FEA120E03 for ; Thu, 2 Nov 2023 03:24:46 +0000 (UTC) X-FDA: 81411572172.07.0BAECA6 Received: from out-177.mta1.migadu.com (out-177.mta1.migadu.com [95.215.58.177]) by imf20.hostedemail.com (Postfix) with ESMTP id 72FC31C000F for ; Thu, 2 Nov 2023 03:24:44 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="Hb4c5/5c"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf20.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.177 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=1698895484; 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=rXE5qC66xflKju/b5K0r0xT61UeednKHJ/BZyj3zT9w=; b=aeeYG9i/v+120qC6g1Qks0g+1Y26Ml5l9x/mrMJHmvOALbwkbuBp6AxSZTM99lXpPyAl1W Ebf0RtVGztlKjKJTG1P4p4lOsS7LcZpt5+9qJXW/EMt88mSYnhdntXChAkR0oOFzZHelNd 9AxJGOljgucPUEjuBN5XVoP033c/WQ0= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="Hb4c5/5c"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf20.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.177 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698895484; a=rsa-sha256; cv=none; b=bwksTKhypGJ5OudPm6l+EYAthN8z+6EMtzaS5UspkbP00eVVr7iMoJK2KdzBcOgh6r8dzt gyy3UTQmcO5ikSq4sq11erct3nEIFYfY5ow0NCuQV0C1AW+EnY3bM0T4xv1aih8zyksjIB G8mOn9/759Y4bMQpIm/kkXV6GSLQGM4= 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=1698895483; 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=rXE5qC66xflKju/b5K0r0xT61UeednKHJ/BZyj3zT9w=; b=Hb4c5/5cMu557sfyb4Qm+N+E2afW9N5tC2dmGC7W2tqshdmHyIQi0ignzc96Sfv3lH/6v4 /pMsyHBXFmwbe/kt7UshRgo+l+u5TurmWX3zHZI3IJ9XGdtBS8AY4ZNbtEcl52hm/S2deO rdYAz7rU1LmdQ25nUsrxBo6s5PDHjlI= From: chengming.zhou@linux.dev To: vbabka@suse.cz, cl@linux.com, penberg@kernel.org Cc: rientjes@google.com, iamjoonsoo.kim@lge.com, akpm@linux-foundation.org, roman.gushchin@linux.dev, 42.hyeyoo@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, chengming.zhou@linux.dev, Chengming Zhou Subject: [PATCH v5 2/9] slub: Change get_partial() interfaces to return slab Date: Thu, 2 Nov 2023 03:23:23 +0000 Message-Id: <20231102032330.1036151-3-chengming.zhou@linux.dev> In-Reply-To: <20231102032330.1036151-1-chengming.zhou@linux.dev> References: <20231102032330.1036151-1-chengming.zhou@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Stat-Signature: 9wcyz5wg45ne1xz4jrfzip745dnqjcie X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 72FC31C000F X-HE-Tag: 1698895484-215925 X-HE-Meta: U2FsdGVkX1+d7jMI4wLqS3fxQKV5Mi7Dz1WTGIX2ovztFHZ1YYV4CXJ7NogwfmIMFfCAcs13cAz1Nolru4vSTKnI8VyNUQ64HSXBeJZjkBAqWPvXhq9sJUvNyD74EWeIITRsG7HAR32nJItRy9XtpsbXVJQjM1uCI1x5G3DLHOFnRvvgRRYwxLolW06hg+ZWnZRMz7gMO+46oFpwkqPDtv/We6eQqWNkaWt975C5I7QBIwOHKgUIuKkkC7ZBfm6S54adOjk9EzH+M30EvQ/giZZRLl5T27qcYZrVAQ4Qc7a4ivgfZc8NYPcBWPQJibZFNLrN/aejyLpG+qnJwz4KBC3jDO3XqY4eU4uGtuImJhUMYn//6WrsjFY3KDDJS9+4yut41qfnmIbiPmGp3znOA4b+d9WJHzdh+gmZo9UK5hObiOafyLYJxqukQ57OdqygGnKK2KTOjFU0Aa88ZtThwYmkjcGp2eDfmYyKu6UTSCQ1nI87HFi9ezCHw2Du2kiax3tpMYQrKB/SzPiZeRDCdyEHx0IqUg/NL4B0i3v8AJ7jZxpZuORQQXwXhm5hlOXDEYo7q5G09C/RIFjtKJ4yZ7b1CVG4+odxCGxt/KFQaSFu6s+eDPRU//0MIFSI55R9DUebW6AJQwRwMtkY7DFwbCS828Efee1DPGovE5G8aNJtpJBx5ecxTtHM1mBo3N8KGy06GNHWVWLDPKl+TNy1Xua6BBLUDCEbKE9U0KGnl+MtVBYemsepSIK6UDzkUx1z6ei6QPqgMIWQUkhz8S+84EVKjkfRwgBWemSURDkBaymq8xIQDGPBEdnLKfXb57/m4Rri+a4o+xt88l2fMWqfSzA2N+eXoS4PeRZ+CTEtuEyLyxDIzCq+aujIR8POlGxT0c4AOdBl1peMwjIc9WYcAVSotxRjvGQtEEwlMJuMvfVBDllqW3C100cH+BoKDDKQpVi1/9ZYf2gk0K42nbd O2P/XoYZ rFXqCJ0zUiOt4ojQDOpEPhrx03u3CaKSkOa/Bwdku86+YxC3gdMng4xKzYMmkyPz52kQkmjsCR5WE4ovPfzFKIIylqxy+zJuW7titzTl4EzfZIgSiDnRpc9cXgZKC7v2D8fvrUSKtxtmuGuRSwdhX6hfjoOuzj5Y7UX2HyywRV1mKsK6zFMv2GbD2ITvX5OPtHlOvWd9QVPuKIUa3VTgCG4cA5MuCqRDPcp7uLZ9hBfaz3f6D6RN5+DKTMrGChFU8V6iab16Elx5PedAtnKNmxMVITg== 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. Suggested-by: Vlastimil Babka Signed-off-by: Chengming Zhou Reviewed-by: Vlastimil Babka Tested-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Reviewed-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> --- mm/slub.c | 63 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 0b0fdc8c189f..03384cd965c5 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) @@ -2269,10 +2269,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; @@ -2288,27 +2289,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); @@ -2324,20 +2326,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; /* @@ -2372,8 +2375,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 @@ -2381,7 +2384,7 @@ static void *get_any_partial(struct kmem_cache *s, struct partial_context *pc) * between allocation and the cpuset * update */ - return object; + return slab; } } } @@ -2393,17 +2396,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); } @@ -3213,10 +3217,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 @@ -3408,12 +3412,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)) {