From patchwork Tue Apr 13 06:51:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 12199453 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,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 0471AC433B4 for ; Tue, 13 Apr 2021 06:57:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8193A60FDB for ; Tue, 13 Apr 2021 06:57:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8193A60FDB 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 19FA46B0096; Tue, 13 Apr 2021 02:57:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 17BDA6B0099; Tue, 13 Apr 2021 02:57:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 016B86B009A; Tue, 13 Apr 2021 02:57:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0096.hostedemail.com [216.40.44.96]) by kanga.kvack.org (Postfix) with ESMTP id DAAFD6B0096 for ; Tue, 13 Apr 2021 02:57:40 -0400 (EDT) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 90AA28249980 for ; Tue, 13 Apr 2021 06:57:40 +0000 (UTC) X-FDA: 78026438280.05.9E2F46B Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by imf18.hostedemail.com (Postfix) with ESMTP id D3B972000250 for ; Tue, 13 Apr 2021 06:57:40 +0000 (UTC) Received: by mail-pj1-f50.google.com with SMTP id s14so3125151pjl.5 for ; Mon, 12 Apr 2021 23:57:39 -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=Nm2qLQR55IXL2VTvCCbc055js3zSget/PmvTRGcIhzI=; b=SYDc5NQqBBJ4brJ6Ss8Q9ZO0pgg43LtamF9vVa3EBuNPT/+gjwy/G/AyELJxGFwXAZ P8ZoSUANNh/NKhe0oVZet49FfHqNcp3lSalETQA3VvfLMOShFa/dNhJizgaodB3smwlT Yp0bD/F0tizefNn6OwzwrwfvOKsY545GxAw+69nhxUzKyXCjumko+Dr+0tfMGL/AHFm+ eeezTgw0hdZDv3842+nD+mZSyZJGiEWp3N3/1EWr2KpISZnXDOXScBZPXtLo0YuMX3SE 1ZIytNcS8hN5jQODYw5YG0fSX/sSRYtMYIAWvqZZcRzY6M5WBlNHjibnjzEatgSzUUus Wqbw== 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=Nm2qLQR55IXL2VTvCCbc055js3zSget/PmvTRGcIhzI=; b=QDmxhH9/JdT3H4K7JWxgJ2gGdEM4URXFH6A/w9foFR6sNCSKabYz9Nuwet2720D/Cc S374kQ/wkpYx1Kwwya05Wt2uNImci1dgcmQkFdxV9J6V0pKnWO1r/HnPcn5+4PU29Ach 7JOV4Ld4e5bAEVZBHbVhDWFIN3x+IGdMECxFxcIZ64U+upgRKxo+uvTIUcM6YeLzndx8 ZN1KqbGTEN4e3bZ5JK/6m2No2veDJjjBMq8NEXYFh6Gu+ReVY2xXaPX5HzSe/ZJwgQcn gdq1JD9FQce3Hak9nPdckGrlh9R5+gVzd34bp4pRJwpOm73r0XXr3uOgddwzLdM+K1Ll bmnw== X-Gm-Message-State: AOAM533EokBtIeHJXtkkVvZ15cHDa5VDiEyU73qpEv4kJDHq7161p3Rh 7MebtN1aWLU0bCwvW2eIlWA+2h8YccdLUCUj X-Google-Smtp-Source: ABdhPJzLAqcpFJPdGm9ND1hLM45nc0Xm5wg7mCzjWEcmGLjSKdPWnXxuyar0Nueum0yIyWvj2cuUbg== X-Received: by 2002:a17:902:8e89:b029:e9:a576:886e with SMTP id bg9-20020a1709028e89b02900e9a576886emr22954128plb.65.1618297059217; Mon, 12 Apr 2021 23:57:39 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.241]) by smtp.gmail.com with ESMTPSA id 78sm11508562pfu.40.2021.04.12.23.57.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Apr 2021 23:57:38 -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, fam.zheng@bytedance.com, Muchun Song Subject: [PATCH 1/7] mm: memcontrol: fix page charging in page replacement Date: Tue, 13 Apr 2021 14:51:47 +0800 Message-Id: <20210413065153.63431-2-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210413065153.63431-1-songmuchun@bytedance.com> References: <20210413065153.63431-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: D3B972000250 X-Stat-Signature: hfap5ny463txtswb1rtjhkjcwrugwi8r Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf18; identity=mailfrom; envelope-from=""; helo=mail-pj1-f50.google.com; client-ip=209.85.216.50 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618297060-681632 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);