From mboxrd@z Thu Jan 1 00:00:00 1970 From: Muchun Song Subject: [PATCH 2/9] mm: memcontrol: fix NR_ANON_THPS account Date: Sun, 6 Dec 2020 16:23:01 +0800 Message-ID: <20201206082318.11532-5-songmuchun@bytedance.com> References: <20201206082318.11532-1-songmuchun@bytedance.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: 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=JLGZC7sv5nAUpuhCShqzZAhxLbvYoPKLszNPrb+RhvY=; b=kiHdmCDIlr4NkTd1dvaUQ6aOss/IHgJnkituhfu1gcpJQgbf7Gnh47zFIIuLjAn5WF HrQvfe9hmrfB147HA91725LflAnp+r6nObX1wa3n+L8aI+Z4QW5BjHzWcYmakrYhzATf 1GcX6bmCmkh/BfjUn2POt7kPfjIVxmGUXCRD8/ixacwPB8i4XjAoNPg9ONLbEbwO+LfU AtDDTKPHv02yb4GBFy5fRF2n+UwO/ynMPO84tCnj5ndtad7Hf6q/B66EMzaUp8LKShkI Y6Z4v+8AAdczX96Fg5AiiwHncBAKMiKWMN5gfa7lyufOZKCylkoSol6Uj314+ZpYWLOf R31Q== In-Reply-To: <20201206082318.11532-1-songmuchun@bytedance.com> List-ID: Content-Type: text/plain; charset="us-ascii" To: gregkh@linuxfoundation.org, rafael@kernel.org, adobriyan@gmail.com, akpm@linux-foundation.org, hannes@cmpxchg.org, mhocko@kernel.org, vdavydov.dev@gmail.com, hughd@google.com, will@kernel.org, guro@fb.com, rppt@kernel.org, tglx@linutronix.de, esyr@redhat.com, peterx@redhat.com, krisman@collabora.com, surenb@google.com, avagin@openvz.org, elver@google.com, rdunlap@infradead.org, iamjoonsoo.kim@lge.com Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, Muchun Song The unit of NR_ANON_THPS is HPAGE_PMD_NR already. So it should inc/dec by one rather than nr_pages. Fixes: 468c398233da ("mm: memcontrol: switch to native NR_ANON_THPS counter") Signed-off-by: Muchun Song --- mm/memcontrol.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 22d9bd688d6d..695dedf8687a 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5634,10 +5634,8 @@ static int mem_cgroup_move_account(struct page *page, __mod_lruvec_state(from_vec, NR_ANON_MAPPED, -nr_pages); __mod_lruvec_state(to_vec, NR_ANON_MAPPED, nr_pages); if (PageTransHuge(page)) { - __mod_lruvec_state(from_vec, NR_ANON_THPS, - -nr_pages); - __mod_lruvec_state(to_vec, NR_ANON_THPS, - nr_pages); + __dec_lruvec_state(from_vec, NR_ANON_THPS); + __inc_lruvec_state(to_vec, NR_ANON_THPS); } } -- 2.11.0