From patchwork Tue Oct 24 09:33:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 13434155 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 8DC59C00A8F for ; Tue, 24 Oct 2023 09:34:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 297016B01FF; Tue, 24 Oct 2023 05:34:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2209E6B0200; Tue, 24 Oct 2023 05:34:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 072276B0201; Tue, 24 Oct 2023 05:34:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id E46876B01FF for ; Tue, 24 Oct 2023 05:34:06 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id BE421A05D2 for ; Tue, 24 Oct 2023 09:34:06 +0000 (UTC) X-FDA: 81379843692.22.703C69E Received: from out-197.mta0.migadu.com (out-197.mta0.migadu.com [91.218.175.197]) by imf13.hostedemail.com (Postfix) with ESMTP id 0CD9C20016 for ; Tue, 24 Oct 2023 09:34:04 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=V5gwmpkG; spf=pass (imf13.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.197 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698140045; 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=nZerFoAj8INaI6ZSxOyjE3BeTDGPig5MeJKjJh1pMQ8=; b=d7UdEFVT4GhkFB1yPvThpnrsiDX8z9ilU61PMNOx08qHNF0ziiGkANO0vDGMpIpv0vxyhq t5UsF0OknY7Qp+sx/MOBy6C9Qk7jCPC0XCPvXUIBtzGuzXjyb0LOzTRXlU7NmPMQ85jwmc 8OZ7unHBC569O6XVJOMDoQ4Z1EkQWnI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698140045; a=rsa-sha256; cv=none; b=CM7KQq5JngpLI8S+ALsA2CjrYum5SDadkNKj0BDUg4AmWos49nX5/ZaT88816qAJax/06r 20m56H1ARgrpEC4WFxuGelgrra/sRSY1wRrV984xvzJKXEb3ki6NP17/EAc02AIkSvKsic RKCYrgbwV194s8oyh3OT5kTuthwTn3k= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=V5gwmpkG; spf=pass (imf13.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.197 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev 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=1698140042; 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=nZerFoAj8INaI6ZSxOyjE3BeTDGPig5MeJKjJh1pMQ8=; b=V5gwmpkG8243Dq0GOsqzdIUFu+jgwdS+wsU2S/1oNpANH7Jiro5jaQ+wSigcoAXTIwUHR0 tz233Wke1fEJVMWATf22pDzMl0BDfdcprGotQ76eoP2bW65VEb0nau30v/bz1ONYQ7C1iq uidyW/b1k2Vm8H6knFM73iZoGZXo8uc= 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 3/7] slub: Reflow ___slab_alloc() Date: Tue, 24 Oct 2023 09:33:41 +0000 Message-Id: <20231024093345.3676493-4-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-Rspamd-Queue-Id: 0CD9C20016 X-Rspam-User: X-Stat-Signature: qrrcrhqgcfszxoddti1eu66agbaa3enw X-Rspamd-Server: rspam03 X-HE-Tag: 1698140044-91290 X-HE-Meta: U2FsdGVkX1+dBYAheOwi1PkoeSXifNA6aNwsJsEunfhWj9EbBBA4WpiAJR76nrXYTnMawmmyY2bToRZzC40GidKO2QPKOVOu8WKOtTVtWPUFUUwVIbhRfunpuRR9zKJLYl3Pvp2m31574sQv/vO3v9ptkihUNmslWXA72arInbWYa+adSWXhRF+MkouDlcMcSBcCM4FfRAfhgUZwmOVzR6XWc3VDCLEsMHJ6rpR/VAMhBUEbHbjtSW6kn/xztXZxqT2eG+Vqz5gFFvaqv6FvqmEf7Wn0RYLuUszKXK84FZmBU+yCJxkepgYVeUtsuPjjato7dXhd7Q8Z+7UryYA2FyhNeTnwqCV3C0tBbs3p8ro4y2KRKcqFIfr6PqGnkwBR02/ZkLfBx4hkqeR2btRzX+OrTnx6a2eeXQ86gzphech58XUCWNm8J3O0uyGvQhinSuRgF4V6kkJpMqfSSPJcsdpuxIwvjJh6ZK56cWLLZLIzVmND6sRNzn/RNtTvboP40dp3Dl1FQ0Rqzfe/kGdm9ZGNcLG5brGna4cLv+QMT9+NTT0oE7+pHwakFU/Bd3wg51VYR2/PcnU8HebGZfCJh38Rqy1StwBKso9IN+9tf9bLLM4/ZN6bE4Gi+omXXwEwLwxt/oiUwbH7Kzim8LzL1aRgTPel/gX2lj7fhBLAU66IHRLj1N9rsDI9PkQYQ8Jnu2/AgLAHZ7zDWZxit7PU9RRShavWgYK/xQ79KK5rA6EryehgvLFnW038nbSF/dkb0bZGEJNW/PeOd2s2qoOHhny7VcnEN9DH8hHJfTvpS20E9QT5suzYtV5C0yzHmHEQYAqTCbTOGM47VYekplPRQfjat3lLa5QLq/7mf9hPV7lCw/fRg+ngO+73Mx3NgeJHYiaE0V/q7UTSkrQ/R3NcKaPgbkkRmL+l7m0wBhr3Y/lx34Q+jHCVOo+TFLO1LS3cKZ0UhYLAHtFkboTUUKh UQm5RTWR 7RbhDuKs1zgBEdsW+uDm6+jz1RLDSVCaKYy6gG8N7tK3oigEihH6VmUPcbK/qGXH8j17npDL44BzghUEO9It801zOSKOTVFtO7Yu4zkPNb7AcVw3KJUptl8jmqw3drlDuz5wSWv5d034NV/qnD9zYC5hykpDIyIfVmIvKx8TWQVDQ8iKnEXLQFKvsM2S9CveGkbwp4nmzzQp21bHA+uyb0pXgOwietI114w8ZKl/er0nYZIeqJJ3qpdb+YeIdY3zGcZFn 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 The get_partial() interface used in ___slab_alloc() may return a single object in the "kmem_cache_debug(s)" case, in which we will just return the "freelist" object. Move this handling up to prepare for later changes. And the "pfmemalloc_match()" part is not needed for node partial slab, since we already check this in the get_partial_node(). Signed-off-by: Chengming Zhou --- mm/slub.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index f568a32d7332..cd8aa68c156e 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3218,8 +3218,21 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, pc.slab = &slab; pc.orig_size = orig_size; freelist = get_partial(s, node, &pc); - if (freelist) - goto check_new_slab; + if (freelist) { + if (kmem_cache_debug(s)) { + /* + * For debug caches here we had to go through + * alloc_single_from_partial() so just store the + * tracking info and return the object. + */ + if (s->flags & SLAB_STORE_USER) + set_track(s, freelist, TRACK_ALLOC, addr); + + return freelist; + } + + goto retry_load_slab; + } slub_put_cpu_ptr(s->cpu_slab); slab = new_slab(s, gfpflags, node); @@ -3255,20 +3268,6 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, inc_slabs_node(s, slab_nid(slab), slab->objects); -check_new_slab: - - if (kmem_cache_debug(s)) { - /* - * For debug caches here we had to go through - * alloc_single_from_partial() so just store the tracking info - * and return the object - */ - if (s->flags & SLAB_STORE_USER) - set_track(s, freelist, TRACK_ALLOC, addr); - - return freelist; - } - if (unlikely(!pfmemalloc_match(slab, gfpflags))) { /* * For !pfmemalloc_match() case we don't load freelist so that