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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 5FDB8C433ED for ; Fri, 16 Apr 2021 05:15:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CB7DD610FB for ; Fri, 16 Apr 2021 05:15:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CB7DD610FB 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 1B1056B0070; Fri, 16 Apr 2021 01:15:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 15E2B6B0072; Fri, 16 Apr 2021 01:15:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EFE5D6B0071; Fri, 16 Apr 2021 01:15:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0065.hostedemail.com [216.40.44.65]) by kanga.kvack.org (Postfix) with ESMTP id D1B806B0036 for ; Fri, 16 Apr 2021 01:15:45 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 969C61F1B for ; Fri, 16 Apr 2021 05:15:45 +0000 (UTC) X-FDA: 78037067850.16.CE92A06 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by imf18.hostedemail.com (Postfix) with ESMTP id 4023F2000254 for ; Fri, 16 Apr 2021 05:15:46 +0000 (UTC) Received: by mail-pg1-f171.google.com with SMTP id t22so18479786pgu.0 for ; Thu, 15 Apr 2021 22:15:44 -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=8k6YXYK85mvc31ajI7k2coqgwaOfr7Ej3V6vhYCGVRI=; b=efWsErrRy6Y+q7AbkIPIOy5Upya1t/n2SZE33fPb3OfiCt8/AoLJQ8+y3xKWrG3giU /ufhSnUuwyEPh9AXrW1YrV1mDst07Js6C7JCixrgEMisbo+cOfQEAS3csT9k4iKIxQxB MlQ92g9HdhU7uf7ItfpepWKimxH+L7RVtrvC4bbC9xr+PAgkSgdVvMna7FXQ2CtBuOar hRpDe7r7VPNd/d4DlGDeGMwhHK+jpovUERNHZtSxPOu4z1WWMgp2J5DDsMQZ2XuL+PLs r45bBJPkpvHKzN+U+a6SsByLwC/ijypTht26AWuoHyInoGpG/6fG3hlXiq77OGnPtmUt raNA== 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=8k6YXYK85mvc31ajI7k2coqgwaOfr7Ej3V6vhYCGVRI=; b=X2y+lsbp34vRUIJmQ6w88ynQ/NqCdOlHxJSXrpfd6jXGFr2XjrOJlzvGbV2Z6equ5g 7J7fvwmqrqtwZmDw4n5Mq3aXrGJAKKvbdthYtHXouaSuka3EALV/jf7o5EBD5w0w2UIn +AKE6Lo9KmmnG3omnZOadGc2Cj8/yfFptwogSaWFBUEERLbilZ5ho2CujA10125rZk47 pn06z0I6J4ffxZ74NrCeCbcyA4B3x0bDOw700+qz7rXNJJ/c7OXgdCctcCzyWfBdiNm4 cUx+Z6E/NOMovcLrcOnSb2aDhgHOVihICDNC8ZqQkZ/ZNKVW/EurQ8p1f0H7Xg6x/jhc KQAA== X-Gm-Message-State: AOAM530TmXFgaMVnXBdugEVCNQ+hnIYvb/1RqRQwmBkGAJlPVpRNEZCB uROBOwTmtVQC8geGnT0xdyfd5el5WtXC0Pid X-Google-Smtp-Source: ABdhPJypRzf2gPZt+cnsgCnfpajGcfQTSzsxaz5LpZts4H35QQ/kLfNwffTKJXeXBHRxNEagMZVCfQ== X-Received: by 2002:a63:5857:: with SMTP id i23mr6629207pgm.152.1618550144354; Thu, 15 Apr 2021 22:15:44 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.235]) by smtp.gmail.com with ESMTPSA id j7sm3518540pfd.129.2021.04.15.22.15.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Apr 2021 22:15:44 -0700 (PDT) From: Muchun Song To: guro@fb.com, hannes@cmpxchg.org, mhocko@kernel.org, akpm@linux-foundation.org, shakeelb@google.com, vdavydov.dev@gmail.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, duanxiongchun@bytedance.com, Muchun Song , Michal Hocko Subject: [PATCH v2 1/8] mm: memcontrol: fix page charging in page replacement Date: Fri, 16 Apr 2021 13:14:00 +0800 Message-Id: <20210416051407.54878-2-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210416051407.54878-1-songmuchun@bytedance.com> References: <20210416051407.54878-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 4023F2000254 X-Stat-Signature: q6p6hc1qad3z1yqf45ybx3tq7rsrrd54 Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf18; identity=mailfrom; envelope-from=""; helo=mail-pg1-f171.google.com; client-ip=209.85.215.171 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618550146-41510 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 pages aren't accounted at the root level, so do not charge the page to the root memcg in page replacement. Although we do not display the value (mem_cgroup_usage) so there shouldn't be any actual problem, but there is a WARN_ON_ONCE in the page_counter_cancel(). Who knows if it will trigger? So it is better to fix it. Signed-off-by: Muchun Song Acked-by: Johannes Weiner Reviewed-by: Shakeel Butt Acked-by: Roman Gushchin Acked-by: Michal Hocko --- mm/memcontrol.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 64ada9e650a5..f229de925aa5 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6806,9 +6806,11 @@ void mem_cgroup_migrate(struct page *oldpage, stru= ct page *newpage) /* Force-charge the new page. The old one will be freed soon */ nr_pages =3D thp_nr_pages(newpage); =20 - page_counter_charge(&memcg->memory, nr_pages); - if (do_memsw_account()) - page_counter_charge(&memcg->memsw, nr_pages); + if (!mem_cgroup_is_root(memcg)) { + page_counter_charge(&memcg->memory, nr_pages); + if (do_memsw_account()) + page_counter_charge(&memcg->memsw, nr_pages); + } =20 css_get(&memcg->css); commit_charge(newpage, memcg); --=20 2.11.0