Received: by 2002:a05:7412:251c:b0:e2:908c:2ebd with SMTP id w28csp286531rda; Sat, 21 Oct 2023 07:45:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE4FJuia1eLKu3sNCvgcf6VB/jMWWmMqhdbu9D0jKGyjGTEd638LEO22H8/nkYGYTsFL1nn X-Received: by 2002:a05:6a00:15c7:b0:6b4:6b8:e945 with SMTP id o7-20020a056a0015c700b006b406b8e945mr4229861pfu.15.1697899531394; Sat, 21 Oct 2023 07:45:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697899531; cv=none; d=google.com; s=arc-20160816; b=Pl9+ICWO2dvgFoC0u4uOeolEHHZRNMfOp8bBjA/Y7lgM0UPIv2B4R1xYu67h+7WJTo lJelG5veHePh9gYLC292A6fj2NmAaW3w06BkQlHZ3fj2DNWMDq60WdR1kTxKnSOy6S16 uMTXSZNmg7qwkcKKPNcZvZmfpWot5cj9kzBQfvamqGNt5liAYr7vkJID8qtRrJVq/NdL RyyLwUYX5W0KUv/RmeqGEbwsgBaOidJZQdKpvIVPx9g50CNPyKkvoDVw8uCSP03M4hXH BIdf6lSS+QTPwpzeax77ZZVHpCQruXbxVxyXnwdBfaAnFvSHOYVtoxjOFwUi/6tl0ggK nBEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tHWic5xUklM9ZxSjedPZ6GHTnBcatj0QDeFJJJdaZnI=; fh=SudcMr3Ofqd+t62q757mMk2HbWTWI1wXv43XX7ahhjA=; b=Q82cyTA+nQs9pfpurFIJjN4FDEMCUQnAJxhOO5VV3jf7gmSwMJOFy55wC19+Akjkxr rMtT+nJcQ7bCRlsY895lHhbv25bXvolfxZkTkqPfxfi70oZy7QjXHJOR90CKZzqfzEB8 smRyh6cXGqK2j4aabinoqlWokxLAwEqHWW9MggTSPlPTMVSIZffYI7xKPsHRbl1eD9XV Aj51aXnDujI+zmcOGTb0/B+MXm/XpKOLyg4inbMOOX5oc0PYvc2KrvlD2Wp57PlJS5u/ vAXUoxrBEd+CSY8mu2wlY+4Bc+Wxe45S/Ktle2QdYBlg/gx7UO6PX1BXc7/lp856lOGm bRQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=xZpLnPA5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Return-Path: Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id w17-20020a639351000000b005acffc12ae4si3591039pgm.409.2023.10.21.07.45.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 07:45:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=xZpLnPA5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 9676D8092CBF; Sat, 21 Oct 2023 07:45:26 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231476AbjJUOoi (ORCPT + 99 others); Sat, 21 Oct 2023 10:44:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231496AbjJUOog (ORCPT ); Sat, 21 Oct 2023 10:44:36 -0400 Received: from out-198.mta1.migadu.com (out-198.mta1.migadu.com [IPv6:2001:41d0:203:375::c6]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9CE310CF for ; Sat, 21 Oct 2023 07:44:27 -0700 (PDT) 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=1697899466; 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=tHWic5xUklM9ZxSjedPZ6GHTnBcatj0QDeFJJJdaZnI=; b=xZpLnPA5vle6JTPcFbJ0n67rIsmg5XrvSZmL7TRfIktWc0DANpJ7X1ziqse/jIv0Pz1dUf o7Qc3QwNW64n42WyqJ9gTrBPvWfFdigRhBwW2USYW3Yx3/zSf5l0CB9wXdlFqaxE+Px/su W+CQPFSDyncBRZEtuylakjuQDjHwMzc= 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, willy@infradead.org, pcc@google.com, tytso@mit.edu, maz@kernel.org, ruansy.fnst@fujitsu.com, vishal.moola@gmail.com, lrh2000@pku.edu.cn, hughd@google.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, chengming.zhou@linux.dev, Chengming Zhou Subject: [RFC PATCH v2 5/6] slub: Introduce get_cpu_partial() Date: Sat, 21 Oct 2023 14:43:16 +0000 Message-Id: <20231021144317.3400916-6-chengming.zhou@linux.dev> In-Reply-To: <20231021144317.3400916-1-chengming.zhou@linux.dev> References: <20231021144317.3400916-1-chengming.zhou@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Sat, 21 Oct 2023 07:45:26 -0700 (PDT) From: Chengming Zhou Since the slabs on cpu partial list are not frozen anymore, we introduce get_cpu_partial() to get a frozen slab with its freelist from cpu partial list. It's now much like getting a frozen slab with its freelist from node partial list. Another change is about get_partial(), which can return no frozen slab when all slabs are failed when acquire_slab(), but get some unfreeze slabs in its cpu partial list, so we need to check this rare case to avoid allocating a new slab. Signed-off-by: Chengming Zhou --- mm/slub.c | 87 +++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 68 insertions(+), 19 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 9f0b80fefc70..7fae959c56eb 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3055,6 +3055,68 @@ static inline void *get_freelist(struct kmem_cache *s, struct slab *slab) return freelist; } +#ifdef CONFIG_SLUB_CPU_PARTIAL + +static void *get_cpu_partial(struct kmem_cache *s, struct kmem_cache_cpu *c, + struct slab **slabptr, int node, gfp_t gfpflags) +{ + unsigned long flags; + struct slab *slab; + struct slab new; + unsigned long counters; + void *freelist; + + while (slub_percpu_partial(c)) { + local_lock_irqsave(&s->cpu_slab->lock, flags); + if (unlikely(!slub_percpu_partial(c))) { + local_unlock_irqrestore(&s->cpu_slab->lock, flags); + /* we were preempted and partial list got empty */ + return NULL; + } + + slab = slub_percpu_partial(c); + slub_set_percpu_partial(c, slab); + local_unlock_irqrestore(&s->cpu_slab->lock, flags); + stat(s, CPU_PARTIAL_ALLOC); + + if (unlikely(!node_match(slab, node) || + !pfmemalloc_match(slab, gfpflags))) { + slab->next = NULL; + __unfreeze_partials(s, slab); + continue; + } + + do { + freelist = slab->freelist; + counters = slab->counters; + + new.counters = counters; + VM_BUG_ON(new.frozen); + + new.inuse = slab->objects; + new.frozen = 1; + } while (!__slab_update_freelist(s, slab, + freelist, counters, + NULL, new.counters, + "get_cpu_partial")); + + *slabptr = slab; + return freelist; + } + + return NULL; +} + +#else /* CONFIG_SLUB_CPU_PARTIAL */ + +static void *get_cpu_partial(struct kmem_cache *s, struct kmem_cache_cpu *c, + struct slab **slabptr, int node, gfp_t gfpflags) +{ + return NULL; +} + +#endif + /* * Slow path. The lockless freelist is empty or we need to perform * debugging duties. @@ -3097,7 +3159,6 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, node = NUMA_NO_NODE; goto new_slab; } -redo: if (unlikely(!node_match(slab, node))) { /* @@ -3173,24 +3234,9 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, new_slab: - if (slub_percpu_partial(c)) { - local_lock_irqsave(&s->cpu_slab->lock, flags); - if (unlikely(c->slab)) { - local_unlock_irqrestore(&s->cpu_slab->lock, flags); - goto reread_slab; - } - if (unlikely(!slub_percpu_partial(c))) { - local_unlock_irqrestore(&s->cpu_slab->lock, flags); - /* we were preempted and partial list got empty */ - goto new_objects; - } - - slab = c->slab = slub_percpu_partial(c); - slub_set_percpu_partial(c, slab); - local_unlock_irqrestore(&s->cpu_slab->lock, flags); - stat(s, CPU_PARTIAL_ALLOC); - goto redo; - } + freelist = get_cpu_partial(s, c, &slab, node, gfpflags); + if (freelist) + goto retry_load_slab; new_objects: @@ -3201,6 +3247,9 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, if (freelist) goto check_new_slab; + if (slub_percpu_partial(c)) + goto new_slab; + slub_put_cpu_ptr(s->cpu_slab); slab = new_slab(s, gfpflags, node); c = slub_get_cpu_ptr(s->cpu_slab); -- 2.20.1