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 X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B531C6379D for ; Tue, 17 Nov 2020 08:55:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 94F3F2467B for ; Tue, 17 Nov 2020 08:55:47 +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="bydidUtJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 94F3F2467B 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 95C876B0068; Tue, 17 Nov 2020 03:55:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 90F816B006C; Tue, 17 Nov 2020 03:55:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7FB126B006E; Tue, 17 Nov 2020 03:55:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0233.hostedemail.com [216.40.44.233]) by kanga.kvack.org (Postfix) with ESMTP id 537766B0068 for ; Tue, 17 Nov 2020 03:55:46 -0500 (EST) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id EC924181AC9CB for ; Tue, 17 Nov 2020 08:55:45 +0000 (UTC) X-FDA: 77493302250.29.slave32_230a63327330 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id B1AB1180868D8 for ; Tue, 17 Nov 2020 08:55:45 +0000 (UTC) X-HE-Tag: slave32_230a63327330 X-Filterd-Recvd-Size: 8598 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by imf41.hostedemail.com (Postfix) with ESMTP for ; Tue, 17 Nov 2020 08:55:44 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id b63so13269260pfg.12 for ; Tue, 17 Nov 2020 00:55:44 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=UKjsS4hTKC7rV0kYBscjT3mdhWgwWmoUJLccuKRuQEw=; b=bydidUtJr91S3sSScljC6vcJ0lib651urA+Tj5lAjUxiP75EFkLgI83zQXzDtsD7cz zkGSMnE/xutkXOicIdKijRS1oCDO8824jaNUScAYoy5SD+6m2E1TeAwe43jMJqnVA9Eq a5+LisK/Zryu5/0f64GX8jZpe2vC9GewxWnb6/GUtfH87qfDRl2g/DqYgjSo7bHm6580 mT00DrXEXtyrHqeZfQ4seDdpePhplntTbDbwuyszLj4rNuRpt3esDYfB/LbfI/1b9JQQ 3jRmNfVPYSRJsAmekwRJhakVvhAPrg7c7+OigEdtPfQp2G1d/1OYn5TAI/TVCEpYblt8 vlGA== 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:mime-version :content-transfer-encoding; bh=UKjsS4hTKC7rV0kYBscjT3mdhWgwWmoUJLccuKRuQEw=; b=GRQaoemBEoVFKLa8WEdLjtnUHDpKI/jqCKKDk8Oy/xdZMIKR7xqxGh82AoYLe1bIbU vYZxKumy30ufiX7ca4jeZYkNsz+giOO865vZ7D0T09kcft3HeBTzbYuC1+6Io1eafQN6 nXuXvCFDINRExM8q4wguPgahsFCLLnXov00ug7IBt2uU3noh2gSWucWKswQQ4Go8jtji fQBLJRX7coonSqGVtpw1c3X7h5WbhY6q0jiRv2R26BQk+NAYeXCbcGyuGs+fTkVRuFoT UGaggHC/djUk3CB7TMhdkWO5zJ907zAHaiG3TqXK2BGU8mA5LTmbu1UWvGFhTFnUrCs0 qu4Q== X-Gm-Message-State: AOAM5319jSenM8Ss5bgD++Ph78ZQh1evASfKdy/+/QM2XungOZz3AU9R hkUbWboFV7Qic8PVoKYvXA7Lsw== X-Google-Smtp-Source: ABdhPJz5UobtkzqIeDYEp5tx0u0f22Gadlg1XV3iXshp2/9MbNgA+Lnw9AmynW/6yY8DzhFnQIQFkg== X-Received: by 2002:aa7:8430:0:b029:18b:b3f5:ea4b with SMTP id q16-20020aa784300000b029018bb3f5ea4bmr17174835pfn.61.1605603343548; Tue, 17 Nov 2020 00:55:43 -0800 (PST) Received: from localhost.localdomain ([103.136.220.82]) by smtp.gmail.com with ESMTPSA id f19sm20372258pfa.82.2020.11.17.00.55.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Nov 2020 00:55:42 -0800 (PST) From: Muchun Song To: hannes@cmpxchg.org, mhocko@kernel.org, vdavydov.dev@gmail.com, akpm@linux-foundation.org, shakeelb@google.com, guro@fb.com, laoar.shao@gmail.com, chris@chrisdown.name, christian.brauner@ubuntu.com, mingo@kernel.org, peterz@infradead.org, ebiederm@xmission.com, esyr@redhat.com, tglx@linutronix.de, surenb@google.com, areber@redhat.com, elver@google.com Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, Muchun Song Subject: [PATCH v2 RESEND] mm: memcg/slab: Rename *_lruvec_slab_state to *_lruvec_kmem_state Date: Tue, 17 Nov 2020 16:52:49 +0800 Message-Id: <20201117085249.24319-1-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: The *_lruvec_slab_state is also suitable for pages allocated from buddy, not just for the slab objects. But the function name seems to tell us tha= t only slab object is applicable. So we can rename the keyword of slab to kmem. Signed-off-by: Muchun Song Acked-by: Roman Gushchin Reviewed-by: Shakeel Butt --- changelog in v2: 1. Remove VM_BUG_ON suggested by Roman. include/linux/memcontrol.h | 18 +++++++++--------- kernel/fork.c | 2 +- mm/memcontrol.c | 2 +- mm/workingset.c | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index d7e339bf72dc..95807bf6be64 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -793,15 +793,15 @@ void __mod_memcg_lruvec_state(struct lruvec *lruvec= , enum node_stat_item idx, int val); void __mod_lruvec_state(struct lruvec *lruvec, enum node_stat_item idx, int val); -void __mod_lruvec_slab_state(void *p, enum node_stat_item idx, int val); +void __mod_lruvec_kmem_state(void *p, enum node_stat_item idx, int val); =20 -static inline void mod_lruvec_slab_state(void *p, enum node_stat_item id= x, +static inline void mod_lruvec_kmem_state(void *p, enum node_stat_item id= x, int val) { unsigned long flags; =20 local_irq_save(flags); - __mod_lruvec_slab_state(p, idx, val); + __mod_lruvec_kmem_state(p, idx, val); local_irq_restore(flags); } =20 @@ -1227,7 +1227,7 @@ static inline void mod_lruvec_page_state(struct pag= e *page, mod_node_page_state(page_pgdat(page), idx, val); } =20 -static inline void __mod_lruvec_slab_state(void *p, enum node_stat_item = idx, +static inline void __mod_lruvec_kmem_state(void *p, enum node_stat_item = idx, int val) { struct page *page =3D virt_to_head_page(p); @@ -1235,7 +1235,7 @@ static inline void __mod_lruvec_slab_state(void *p,= enum node_stat_item idx, __mod_node_page_state(page_pgdat(page), idx, val); } =20 -static inline void mod_lruvec_slab_state(void *p, enum node_stat_item id= x, +static inline void mod_lruvec_kmem_state(void *p, enum node_stat_item id= x, int val) { struct page *page =3D virt_to_head_page(p); @@ -1330,14 +1330,14 @@ static inline void __dec_lruvec_page_state(struct= page *page, __mod_lruvec_page_state(page, idx, -1); } =20 -static inline void __inc_lruvec_slab_state(void *p, enum node_stat_item = idx) +static inline void __inc_lruvec_kmem_state(void *p, enum node_stat_item = idx) { - __mod_lruvec_slab_state(p, idx, 1); + __mod_lruvec_kmem_state(p, idx, 1); } =20 -static inline void __dec_lruvec_slab_state(void *p, enum node_stat_item = idx) +static inline void __dec_lruvec_kmem_state(void *p, enum node_stat_item = idx) { - __mod_lruvec_slab_state(p, idx, -1); + __mod_lruvec_kmem_state(p, idx, -1); } =20 /* idx can be of type enum memcg_stat_item or node_stat_item */ diff --git a/kernel/fork.c b/kernel/fork.c index 4b328aecabb2..4fb0bbc3b041 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -384,7 +384,7 @@ static void account_kernel_stack(struct task_struct *= tsk, int account) mod_lruvec_page_state(vm->pages[0], NR_KERNEL_STACK_KB, account * (THREAD_SIZE / 1024)); else - mod_lruvec_slab_state(stack, NR_KERNEL_STACK_KB, + mod_lruvec_kmem_state(stack, NR_KERNEL_STACK_KB, account * (THREAD_SIZE / 1024)); } =20 diff --git a/mm/memcontrol.c b/mm/memcontrol.c index d9cdf899c6fc..2dde734df7d1 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -866,7 +866,7 @@ void __mod_lruvec_state(struct lruvec *lruvec, enum n= ode_stat_item idx, __mod_memcg_lruvec_state(lruvec, idx, val); } =20 -void __mod_lruvec_slab_state(void *p, enum node_stat_item idx, int val) +void __mod_lruvec_kmem_state(void *p, enum node_stat_item idx, int val) { pg_data_t *pgdat =3D page_pgdat(virt_to_page(p)); struct mem_cgroup *memcg; diff --git a/mm/workingset.c b/mm/workingset.c index 50d53f3699e4..2c707c92dd89 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -445,12 +445,12 @@ void workingset_update_node(struct xa_node *node) if (node->count && node->count =3D=3D node->nr_values) { if (list_empty(&node->private_list)) { list_lru_add(&shadow_nodes, &node->private_list); - __inc_lruvec_slab_state(node, WORKINGSET_NODES); + __inc_lruvec_kmem_state(node, WORKINGSET_NODES); } } else { if (!list_empty(&node->private_list)) { list_lru_del(&shadow_nodes, &node->private_list); - __dec_lruvec_slab_state(node, WORKINGSET_NODES); + __dec_lruvec_kmem_state(node, WORKINGSET_NODES); } } } @@ -541,7 +541,7 @@ static enum lru_status shadow_lru_isolate(struct list= _head *item, } =20 list_lru_isolate(lru, item); - __dec_lruvec_slab_state(node, WORKINGSET_NODES); + __dec_lruvec_kmem_state(node, WORKINGSET_NODES); =20 spin_unlock(lru_lock); =20 @@ -564,7 +564,7 @@ static enum lru_status shadow_lru_isolate(struct list= _head *item, * shadow entries we were tracking ... */ xas_store(&xas, NULL); - __inc_lruvec_slab_state(node, WORKINGSET_NODERECLAIM); + __inc_lruvec_kmem_state(node, WORKINGSET_NODERECLAIM); =20 out_invalid: xa_unlock_irq(&mapping->i_pages); --=20 2.20.1