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.6 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,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 5F699C433DB for ; Tue, 23 Mar 2021 15:04:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D958E619B4 for ; Tue, 23 Mar 2021 15:04:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D958E619B4 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 257D66B0201; Tue, 23 Mar 2021 11:04:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 208436B0202; Tue, 23 Mar 2021 11:04:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 069EB6B0204; Tue, 23 Mar 2021 11:04:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0107.hostedemail.com [216.40.44.107]) by kanga.kvack.org (Postfix) with ESMTP id E00EF6B0201 for ; Tue, 23 Mar 2021 11:04:40 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 9A59B18092E05 for ; Tue, 23 Mar 2021 15:04:40 +0000 (UTC) X-FDA: 77951460720.12.1FDC090 Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by imf13.hostedemail.com (Postfix) with ESMTP id 235A8E005F26 for ; Tue, 23 Mar 2021 15:04:36 +0000 (UTC) Received: by mail-pg1-f175.google.com with SMTP id n11so11982918pgm.12 for ; Tue, 23 Mar 2021 08:04:35 -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:mime-version :content-transfer-encoding; bh=MA6xbw4+r8K+wq0zQny62MlNgzy94Yz5IxA7fznNkvI=; b=bjsLkDqYNs6Nimr2YkIoa0MqhhaWRwuXycLjgACzZ23PSATVqBtlI2HfmXoU9Pfzfc 1wC9SYV5Rz1O3qgwI5WbdJFPnbYg7W1Sf+net5S8GinMRw5Pmyvt8WrHZgvR94FqpHRR Ha1u2jwXPjsEeaf3EVVWkZUssMKFJto3S99CknnBU50iccwrUU88WJ9XDZcJUP5RFtx1 lQpVZdIiNlcSyIE4kcHqIE70/GzlmPSCANHYTTm0+qeLzUoFRNosqlLZ3nhOvizRxfp8 NXC5KAR8vUspWHG9Zwh8DIQl9o2havE0KnYLXRFbELlZ7G25gLmgf5WKnpRprqCQK7pp c7iw== 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:mime-version :content-transfer-encoding; bh=MA6xbw4+r8K+wq0zQny62MlNgzy94Yz5IxA7fznNkvI=; b=G7F50ZswgR9K/ycprkFyC0PVoJ08dv77X/BlqS5le/B46Bvj/RC1K0IzO/L6t+RwPZ KIxmHE2A2QM9PCbB/KDGzeoKWdfz+8YqkYWwgT1sKT2vb3dV/c13oqa/khNPMc/H2bHh 1gI+RRThA/4aYb4/zVYrvOd0I76WQC6p3X030o+/XkXPdtO+4VPxGOyddsDYziCwxSpu cJ2elPcumourYL3LQNS/GCfOvxP8XsuzDKT1pv4zEDvD4QV9cWaq2tYACdIj3XNeuh1Q EOEiqksKoUEV1vU1z2udMh9mTokiUmIYwhvpGqhUxxz5b/V0niF9b+WWQrLDUnX7hBi/ 3ysQ== X-Gm-Message-State: AOAM533h/ZxSD705QYZZwYd2p01crim1xjxmyEgUynlxNwTn0kbIWA2Y GYVHgsAIlc+4Yq2jPwBvBY96FA== X-Google-Smtp-Source: ABdhPJzwv9I7nq+ty6tFP/gu93RhNIET/zLYJFLrYl9HVXoilh9y17OjemBwBDL4sl71xlthRzQIMQ== X-Received: by 2002:a17:902:bcc8:b029:e6:f010:aa15 with SMTP id o8-20020a170902bcc8b02900e6f010aa15mr4950803pls.55.1616511874786; Tue, 23 Mar 2021 08:04:34 -0700 (PDT) Received: from localhost.bytedance.net ([139.177.225.234]) by smtp.gmail.com with ESMTPSA id 132sm17234595pfu.158.2021.03.23.08.04.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Mar 2021 08:04:34 -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 Subject: [PATCH] mm: memcontrol: fix memsw uncharge for root_mem_cgroup Date: Tue, 23 Mar 2021 22:56:53 +0800 Message-Id: <20210323145653.25684-1-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 235A8E005F26 X-Stat-Signature: 58x79sz51n3r1zxfxeuci49gyfp93oz5 Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf13; identity=mailfrom; envelope-from=""; helo=mail-pg1-f175.google.com; client-ip=209.85.215.175 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1616511876-685922 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 we cannot uncharge the page to the memsw counter for the root memcg. Fix this. Fixes: 1f47b61fb407 ("mm: memcontrol: fix swap counter leak on swapout fr= om offline cgroup") Signed-off-by: Muchun Song --- mm/memcontrol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 533b4b31b464..7d765a106684 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -7155,7 +7155,8 @@ void mem_cgroup_swapout(struct page *page, swp_entr= y_t entry) if (!cgroup_memory_noswap && memcg !=3D swap_memcg) { if (!mem_cgroup_is_root(swap_memcg)) page_counter_charge(&swap_memcg->memsw, nr_entries); - page_counter_uncharge(&memcg->memsw, nr_entries); + if (!mem_cgroup_is_root(memcg)) + page_counter_uncharge(&memcg->memsw, nr_entries); } =20 /* --=20 2.11.0