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.6 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 675EDC388F9 for ; Tue, 27 Oct 2020 08:03:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D809820829 for ; Tue, 27 Oct 2020 08:03:40 +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="ldzMtw/9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D809820829 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 714AD6B006E; Tue, 27 Oct 2020 04:03:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6EBAF6B0070; Tue, 27 Oct 2020 04:03:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6018C6B0071; Tue, 27 Oct 2020 04:03:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0187.hostedemail.com [216.40.44.187]) by kanga.kvack.org (Postfix) with ESMTP id 333AF6B006E for ; Tue, 27 Oct 2020 04:03:40 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id BBBE21EE6 for ; Tue, 27 Oct 2020 08:03:39 +0000 (UTC) X-FDA: 77416966158.17.price00_480c5b72727a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id 9BC7B180D0185 for ; Tue, 27 Oct 2020 08:03:39 +0000 (UTC) X-HE-Tag: price00_480c5b72727a X-Filterd-Recvd-Size: 8781 Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by imf45.hostedemail.com (Postfix) with ESMTP for ; Tue, 27 Oct 2020 08:03:38 +0000 (UTC) Received: by mail-pl1-f196.google.com with SMTP id b19so353680pld.0 for ; Tue, 27 Oct 2020 01:03:38 -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=CcP1qCO+NxV4ZfTtTYq+9NLHwEqCtxnTam0h3E0eXoY=; b=ldzMtw/9aoBNu1NB1gYXBiySt/fmyfIdYqovv3lB+Khh/+hI0IBXFQUEpvIN9McZNz z1OfclFxVWOlxOv6eyKxiYNP84Z9/k53WzIkHOOme5HItxqZrw3poX87ZcKT8BZmcXny 0zD6i8b9iYMQ31vz6dwG6zVXvOPpaH8S9UENtwmf/O2j+K+FpzKEk9npn8NYZratmrwO LJzA3fHzBoQMJTjxFr23ghu7QjOY9FLRtF2VjKfAREtrrWeNputyCME8katlLf0A0pL4 EXQ9aU6tuyu1SqHU0tYDKNI8b2paDbWhksM/SCbkTCuz2LAGj+Hq3jiafOpvIgCGHbMi QhvQ== 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=CcP1qCO+NxV4ZfTtTYq+9NLHwEqCtxnTam0h3E0eXoY=; b=e/K0vDiHY1mF/Q1GYLGz3etay8EyE3peIL1AXGtyTW8OTutuEG6H65cWoYumotfwsc 6QZmbmM5Rp7P6fXNWMFA0ZIDRqcaD6oVvbRuWIxw6lBA2MkdQexXpNkXQy+7jXj0xxlD 3oFAyD67J/kg77i9ejkmPSoC4f2aK7OUoLGoiKSlMMhxCRXLreuQIShL+lVeTKLwHXfm wROLvSwyJIW3kZ9xwS0+KcgZKop8FKNs54PvUtSvQmvHonMOnBvVfLS/bqLZC+YbjoVk uR60B4wyY8n9bnBTl+kR2Acw+QXsJHJOHaidg/85wonHwdPpCaJp3ak1Glf9SCDuOW9u K4nQ== X-Gm-Message-State: AOAM530d3ztKBWfIjDzU2fRjCnGNCRCqog8gj4Y8FY88MHfZ8Drq4OQa IaoSAq8oBirpEnzoyycvOBDVnA== X-Google-Smtp-Source: ABdhPJwcAbffc6htWbV7MxS/83vNzm6AujW6V0vE+GjnoU5Zb2sPH+c74AGETf8TVykW/jNgYO3VLw== X-Received: by 2002:a17:90a:a008:: with SMTP id q8mr914987pjp.211.1603785818068; Tue, 27 Oct 2020 01:03:38 -0700 (PDT) Received: from Smcdef-MBP.local.net ([103.136.220.89]) by smtp.gmail.com with ESMTPSA id p8sm1039580pgs.34.2020.10.27.01.03.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Oct 2020 01:03:37 -0700 (PDT) From: Muchun Song To: hannes@cmpxchg.org, mhocko@kernel.org, vdavydov.dev@gmail.com, akpm@linux-foundation.org, shakeelb@google.com, guro@fb.com, iamjoonsoo.kim@lge.com, laoar.shao@gmail.com, chris@chrisdown.name, christian.brauner@ubuntu.com, peterz@infradead.org, mingo@kernel.org, keescook@chromium.org, tglx@linutronix.de, esyr@redhat.com, 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 3/5] mm: memcg/slab: Rename *_lruvec_slab_state to *_lruvec_kmem_state Date: Tue, 27 Oct 2020 16:02:54 +0800 Message-Id: <20201027080256.76497-4-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20201027080256.76497-1-songmuchun@bytedance.com> References: <20201027080256.76497-1-songmuchun@bytedance.com> 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 --- include/linux/memcontrol.h | 18 +++++++++--------- kernel/fork.c | 2 +- mm/memcontrol.c | 3 ++- mm/workingset.c | 8 ++++---- 4 files changed, 16 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 c0c27bee23ad..22b4fb941b54 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; @@ -2920,6 +2920,7 @@ struct mem_cgroup *mem_cgroup_from_obj(void *p) if (mem_cgroup_disabled()) return NULL; =20 + VM_BUG_ON(!virt_addr_valid(p)); page =3D virt_to_head_page(p); =20 /* 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