From patchwork Sun Jun 14 12:39:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 11603287 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 98A4592A for ; Sun, 14 Jun 2020 12:39:50 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 64AF920747 for ; Sun, 14 Jun 2020 12:39:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=bytedance-com.20150623.gappssmtp.com header.i=@bytedance-com.20150623.gappssmtp.com header.b="h95l6fmd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 64AF920747 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 85F176B0028; Sun, 14 Jun 2020 08:39:49 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 80EE36B0029; Sun, 14 Jun 2020 08:39:49 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 74BC86B002A; Sun, 14 Jun 2020 08:39:49 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0085.hostedemail.com [216.40.44.85]) by kanga.kvack.org (Postfix) with ESMTP id 58D366B0028 for ; Sun, 14 Jun 2020 08:39:49 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 1B4F3181ABE8A for ; Sun, 14 Jun 2020 12:39:49 +0000 (UTC) X-FDA: 76927774098.11.verse14_5a0dcda26ded Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id 6DDE7180F8B93 for ; Sun, 14 Jun 2020 12:39:48 +0000 (UTC) X-Spam-Summary: 2,0,0,eb1818a31e979f16,d41d8cd98f00b204,songmuchun@bytedance.com,,RULES_HIT:41:355:379:541:800:960:966:968:973:988:989:1260:1311:1314:1345:1359:1437:1515:1534:1541:1711:1730:1747:1777:1792:2194:2196:2199:2200:2393:2559:2562:3138:3139:3140:3141:3142:3352:3865:3866:3867:3868:3870:4321:4384:4385:4395:5007:6261:6653:8660:10004:11026:11232:11658:11914:12043:12048:12296:12297:12438:12517:12519:12555:12895:13069:13148:13161:13229:13230:13311:13357:13894:14181:14384:14394:14721:21080:21444:21451:21627:21939:21990:30012:30054:30070,0,RBL:209.85.210.196:@bytedance.com:.lbl8.mailshell.net-62.2.0.100 66.100.201.201,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:23,LUA_SUMMARY:none X-HE-Tag: verse14_5a0dcda26ded X-Filterd-Recvd-Size: 4672 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by imf10.hostedemail.com (Postfix) with ESMTP for ; Sun, 14 Jun 2020 12:39:48 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id 64so6574454pfv.11 for ; Sun, 14 Jun 2020 05:39:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c75aG2jcBkW1YvTjsD3CcRFk1jXL3rUV/LlkBUI559A=; b=h95l6fmdF6PB08EzEVVE4kGqkNRpZ/L7cyHelT7JSCcCdG0z3dD73agIKIx3vDeTNA zs8HbhczjXPsqfp7FRkzyEOYfTOPSOSKoVpCZNppOen8av+u+y2b+VIVGBzmmi78TkPy ToXz8xtpvhiC/QNB5QQvBAezBGXnXPCMt3NpwYvOpKnB+IkaMieiK93zAawvQjrSmFM5 Db6ir2WQNsprOJis1GEYp92pH6d1ze7p3TPR1oE/RVxan5TRY2pa5YwtNdKpcTRq7epl YVd6wKZLOLSa0I9QAPSOwAnSofBQfwjQXqqJNrpQU3KLSWwXMfW9W7flb5veTctnNVWX ZfJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c75aG2jcBkW1YvTjsD3CcRFk1jXL3rUV/LlkBUI559A=; b=edR/xmUZ+4F8hk4rLp9rZ6cWdr8NZAvi42f2CDgH8j3SfMKV/X62WzP2cy8QJ5Q36W t1XznVXsBlqzSiiIo+GwKqXrkXhuNNn5yyADaGDcivGDjvVmLwFN5nxgvYL0yJuPUf65 u41RnqU3Qxu6d0falamv/r5FdypTbcqpmGOx1dCO96z/28dHjNZxTwYZ7RlZSnbMhXpZ 9rFFBrJA8f1aHAVML5eErkGO9N6iSqczoN1mwYwZJt/CGXSR08Qp91gXmEn5iwSvl0px bcahv/HN1RtN/nvkmmBQEQmjd7XcGsAX05i3GwOxn/1JGj04h1Vq7VH642thtKfyHee5 /xHg== X-Gm-Message-State: AOAM533f2Qzshh8+I/lsKGY17c1bD/ldUw5r4Ubbi1fxVyzlXUsJTprC micZGoFHn3H/nDmmDca+f7n/eg== X-Google-Smtp-Source: ABdhPJxQZ8oVwTk5ypuZDHl7oYCUphPfbB/M3h2HtMM5X79z8UpBm/aqHNasl1ppxxKSeNjgb9X8fQ== X-Received: by 2002:a63:2a8a:: with SMTP id q132mr17250492pgq.279.1592138386924; Sun, 14 Jun 2020 05:39:46 -0700 (PDT) Received: from Smcdef-MBP.lan ([103.136.221.68]) by smtp.gmail.com with ESMTPSA id hi19sm9776606pjb.49.2020.06.14.05.39.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Jun 2020 05:39:46 -0700 (PDT) From: Muchun Song To: cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Muchun Song Subject: [PATCH 2/3] mm/slub: Use node_nr_slabs() instead of slabs_node() Date: Sun, 14 Jun 2020 20:39:22 +0800 Message-Id: <20200614123923.99189-3-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20200614123923.99189-1-songmuchun@bytedance.com> References: <20200614123923.99189-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 6DDE7180F8B93 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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: In the some code, we already get the kmem_cache_node, so we can use node_nr_slabs() directly instead of slabs_node(). Check the condition of n->nr_partial can also be removed because we can get the correct result via node_nr_slabs(). Signed-off-by: Muchun Song --- mm/slub.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 1a3e6a5b7287..b73505df3de2 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3829,7 +3829,7 @@ bool __kmem_cache_empty(struct kmem_cache *s) struct kmem_cache_node *n; for_each_kmem_cache_node(s, node, n) - if (n->nr_partial || slabs_node(s, node)) + if (node_nr_slabs(n)) return false; return true; } @@ -3846,7 +3846,7 @@ int __kmem_cache_shutdown(struct kmem_cache *s) /* Attempt to free all objects */ for_each_kmem_cache_node(s, node, n) { free_partial(s, n); - if (n->nr_partial || slabs_node(s, node)) + if (node_nr_slabs(n)) return 1; } sysfs_slab_remove(s); @@ -4126,7 +4126,7 @@ int __kmem_cache_shrink(struct kmem_cache *s) list_for_each_entry_safe(page, t, &discard, slab_list) discard_slab(s, page); - if (slabs_node(s, node)) + if (node_nr_slabs(n)) ret = 1; } @@ -4201,7 +4201,7 @@ static void slab_mem_offline_callback(void *arg) * and offline_pages() function shouldn't call this * callback. So, we must fail. */ - BUG_ON(slabs_node(s, offline_node)); + BUG_ON(node_nr_slabs(n)); s->node[offline_node] = NULL; kmem_cache_free(kmem_cache_node, n);