From patchwork Sat Apr 17 04:35:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 12209523 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 D9D37C433B4 for ; Sat, 17 Apr 2021 04:38:04 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6BCC0611AC for ; Sat, 17 Apr 2021 04:38:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6BCC0611AC 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 0B9B96B006E; Sat, 17 Apr 2021 00:38:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0918E6B0070; Sat, 17 Apr 2021 00:38:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E9A786B0071; Sat, 17 Apr 2021 00:38:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0072.hostedemail.com [216.40.44.72]) by kanga.kvack.org (Postfix) with ESMTP id D27E76B006E for ; Sat, 17 Apr 2021 00:38:03 -0400 (EDT) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 8E24C8248047 for ; Sat, 17 Apr 2021 04:38:03 +0000 (UTC) X-FDA: 78040601646.27.510DD7F Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf07.hostedemail.com (Postfix) with ESMTP id 04345A0000FF for ; Sat, 17 Apr 2021 04:38:02 +0000 (UTC) Received: by mail-pl1-f176.google.com with SMTP id o16so1395167plg.5 for ; Fri, 16 Apr 2021 21:38:03 -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=ps1+a0+z21qwgsRdYo2hIYK2avotOHkYx3BP4oOagRnFhl/blcLB1v1fiGfsYeWwjB r+HCFHxNBDPj/n5UF3SbNMRjYnh5N1VDtGH+FAZcThLFwwbBbCyEj9jUE0E1TwBndNWY iIdiA/YDNmAIyMyySRsHmmSWSAMHEIk5RmAZPMs1NC0Zd/UkbQAFbHUFs1bqFBmx3c4Z AnjWuaxinOTVY2me31a3RJ2F8XmoQh1VHiiXbLZoNBdUm39+DG/dTRxIKzhC3PqabIpV SvcijOy+eHbybeP/SLVydbxRl2iZhP2NuurrjBs9JenKG1CRMKQgqP4z+s89SCieg+DB zHSQ== 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=EPs3zUtIxd5y6dE9bZwUX77nvxIElkd5LFN3+tb56PjjRl4cbiDBkLfUeuu9QdJXn+ QoP21090B2VPVcLCzpkbm4+po4xlMKsnllKifrEYADWuHAABvKkFCEAgoJd0Rcw0mxjS gGKpedz46Oi729BY0bxoHOTKIhhv9QJxoKKtVt6noFCbaVEuuDnydAQ/d9thCvX+BAiT ZZ1klhVTG5SHwjc9QC9qDZVRFWKzWYhUqIXWXpPgyWlf8b4OGVCDsJ1W+/NVPA8yWXG+ WtrSw9TDEagSryNSy5WgEDF1JjUV07wMDydg7O4rPuZGjTyFWt98cAIq10aYoLYHqlS5 kC8Q== X-Gm-Message-State: AOAM530PN57lgnIMt/E8JvE5u2OsIdmxBc+tHZh4iwp1RhKVboYRRQDy s5WChUcI5toSmE6NDTXk2SJOeg== X-Google-Smtp-Source: ABdhPJxf0T3t8Wb69/tbGsZ2lpLCfYMfOgx16Q4hD5OSt32utfReq+PsYCafvJR3TPaUnVvUlqb2zw== X-Received: by 2002:a17:902:264:b029:eb:3d3a:a09c with SMTP id 91-20020a1709020264b02900eb3d3aa09cmr12795807plc.0.1618634282457; Fri, 16 Apr 2021 21:38:02 -0700 (PDT) Received: from localhost.bytedance.net ([139.177.225.228]) by smtp.gmail.com with ESMTPSA id w21sm7064775pjy.21.2021.04.16.21.37.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Apr 2021 21:38:02 -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 v3 1/8] mm: memcontrol: fix page charging in page replacement Date: Sat, 17 Apr 2021 12:35:31 +0800 Message-Id: <20210417043538.9793-2-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210417043538.9793-1-songmuchun@bytedance.com> References: <20210417043538.9793-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 04345A0000FF X-Stat-Signature: krr88be7m6iakdszq7cqopae6s1wdxyt Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf07; identity=mailfrom; envelope-from=""; helo=mail-pl1-f176.google.com; client-ip=209.85.214.176 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618634282-446791 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, struct page *newpage) /* Force-charge the new page. The old one will be freed soon */ nr_pages = thp_nr_pages(newpage); - 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); + } css_get(&memcg->css); commit_charge(newpage, memcg);