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 8753BC54788 for ; Thu, 22 Feb 2024 13:03:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EB2056B007B; Thu, 22 Feb 2024 08:03:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E613B6B0082; Thu, 22 Feb 2024 08:03:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D293C6B0083; Thu, 22 Feb 2024 08:03:12 -0500 (EST) 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 C37956B007B for ; Thu, 22 Feb 2024 08:03:12 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 73805140DEE for ; Thu, 22 Feb 2024 13:03:12 +0000 (UTC) X-FDA: 81819455424.05.E5EF131 Received: from out-182.mta1.migadu.com (out-182.mta1.migadu.com [95.215.58.182]) by imf01.hostedemail.com (Postfix) with ESMTP id A33DA4003D for ; Thu, 22 Feb 2024 13:03:08 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=fOrUDGkk; spf=pass (imf01.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.182 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708606989; a=rsa-sha256; cv=none; b=Eq90BGGxjOlXpsPOL8yvUSMoacCfwJ0rZmxVd7zocPGOUWup8zTghHeCWjQu22s5rsezS9 iNTYy2Aft5PueatewQkoQV0dmGVJcX9JMy7xgWBSGhaMN21Ox+BdG1N54Bjqskv2abjLiT 6fDAbmrWZybOWA467w+tO4AsBdMJlzI= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=fOrUDGkk; spf=pass (imf01.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.182 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=1708606989; 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:references:dkim-signature; bh=IDulxroE9ikP839kUNCu1ABivghSCv1a1QMz7sde4n4=; b=IQliLI0o//46GHokjJV93Z4805NyDA1WHznf08XGWRriSXcrzHoq18qud0kP40L/D5TBg+ zxRf9ttT4e+gz3aojpRVu2klgGDNBmYQEZL4ft0z7QaiNCIfOY+WkjDJwNISWL229qOsF4 SG795AkzmSry0fav5XtC2gBkxeLSB5k= 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=1708606985; 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; bh=IDulxroE9ikP839kUNCu1ABivghSCv1a1QMz7sde4n4=; b=fOrUDGkk1lp2vm3txHxBJ5StMHBBYoXpFBOz2bCJg65nm+ucWy3mlMyi4W0RPaFF7wtx5U rgVxHY6vd/SOiSK7lTlJy0pSb0L92bsLzlm/2KPhYjihS4Hfj2zdVAnyKKfrwGqlEm5pDo EUog2L0gJV2Qlxfm4Aui8nW36E8nJNw= From: chengming.zhou@linux.dev To: vbabka@suse.cz, cl@linux.com Cc: penberg@kernel.org, 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 Subject: [PATCH] mm, slab: remove the corner case of inc_slabs_node() Date: Thu, 22 Feb 2024 13:02:33 +0000 Message-Id: <20240222130233.2880176-1-chengming.zhou@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: A33DA4003D X-Stat-Signature: as4wxfhqzmu6disf444seccwj8uy8z73 X-Rspam-User: X-HE-Tag: 1708606988-726260 X-HE-Meta: U2FsdGVkX19YlCXj/3lO/cNHFwaZWhNaz399CpNfq3oX9Eg92unROs3Z72ZSYmqwcVg5/zMPOEIJzhFkl5AC1mktRgc/5aZXxPNTSZWJ2dGheANGxDZz+ntZdiWkT9g+s6tzGNNRyVrI9UDH8editge/JIfKc7kH7CVHHK5UK8vptV8EaJqzrynrcipEwBe0QS77cyoFtM/UR2B3tvypz3bGccjBmOhgh2N6VISOYc+d3gTUiRmRh72C4vjsF4a/0zXC4VytGHKSkGras7Q2hjVOq9ttczm8dHwu/qVmj1P6VLGUYaVx+ghssKBgLjj3PLEHP7rMrBGHdFDktFmRiauCI9eIMRsU31jmrElcyA5/GXTZMxhjjJzlf7ZcpuE1FFr2UXa0qhtjg0D+ABSSZ5juiAMjowh7XRdpobLzza3Htl3a6Ir/e+QqpIvXxREylWL+Aptm80mqwsA63tp7ifhofp8sVuVdPUMYXd2GnZ457UvTz8l/ud78kYPIGv6mTiRgciPYSlwpyFMROVV8Y5T9x/vqoM/Iu8NOJDKZ6GLfb0cUBfRGKP30Uo+FX8gRs6UJ34Sd7+Lbu9AEkEASNaVLJ34cf4hvlp1vzK4PN9Fb1VAnu96sSyL5hY0/4Wd5/Tg22U/GRbhFJr9RhfNvpBBSk8MBnazNuJvMBv41EIJiAK3p0bn1BuvXy9xpZR48o1qv+MdzMbRHktCBU7LUHU7OqlN6BAIZMCVxwSU9eGeJ2ziYUgFvaw2i2/sIRVfT3knJ0/FHnabbESl6DkKE4wcIRsAX1JbQwm1MMH8zKvbUvgrLRJeN9Nv4LXmWjBn1eMLWyS9WYBKt+wAY9cCXWiInM+EOcNHlQniiCHTN00QEhMTnJXIoL6iZH4Fu2mhtqrbKw2gz4E+AUIKS5LgzkBF/HqXU2X2F7/BeJ+CChOuWjrHwR3NBP7yW7qKt7r6f5NulU2jygCM= 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 already have the inc_slabs_node() after kmem_cache_node->node[node] initialized in early_kmem_cache_node_alloc(), this special case of inc_slabs_node() can be removed. Then we don't need to consider the existence of kmem_cache_node in inc_slabs_node() anymore. Signed-off-by: Chengming Zhou --- mm/slub.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 284b751b3b64..3f413e5e1415 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1500,16 +1500,8 @@ static inline void inc_slabs_node(struct kmem_cache *s, int node, int objects) { struct kmem_cache_node *n = get_node(s, node); - /* - * May be called early in order to allocate a slab for the - * kmem_cache_node structure. Solve the chicken-egg - * dilemma by deferring the increment of the count during - * bootstrap (see early_kmem_cache_node_alloc). - */ - if (likely(n)) { - atomic_long_inc(&n->nr_slabs); - atomic_long_add(objects, &n->total_objects); - } + atomic_long_inc(&n->nr_slabs); + atomic_long_add(objects, &n->total_objects); } static inline void dec_slabs_node(struct kmem_cache *s, int node, int objects) { @@ -4877,7 +4869,6 @@ static void early_kmem_cache_node_alloc(int node) slab = new_slab(kmem_cache_node, GFP_NOWAIT, node); BUG_ON(!slab); - inc_slabs_node(kmem_cache_node, slab_nid(slab), slab->objects); if (slab_nid(slab) != node) { pr_err("SLUB: Unable to allocate memory from node %d\n", node); pr_err("SLUB: Allocating a useless per node structure in order to be able to continue\n"); -- 2.40.1