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 984DDC433E0 for ; Fri, 12 Feb 2021 17:02:30 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4F50564E39 for ; Fri, 12 Feb 2021 17:02:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4F50564E39 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 DCCDE8D0071; Fri, 12 Feb 2021 12:02:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D82778D0060; Fri, 12 Feb 2021 12:02:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C6BFA8D0071; Fri, 12 Feb 2021 12:02:29 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0052.hostedemail.com [216.40.44.52]) by kanga.kvack.org (Postfix) with ESMTP id AF0C48D0060 for ; Fri, 12 Feb 2021 12:02:29 -0500 (EST) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 62E3918209BD2 for ; Fri, 12 Feb 2021 17:02:29 +0000 (UTC) X-FDA: 77810234418.23.cry53_3609c3c27622 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin23.hostedemail.com (Postfix) with ESMTP id 4124D37608 for ; Fri, 12 Feb 2021 17:02:29 +0000 (UTC) X-HE-Tag: cry53_3609c3c27622 X-Filterd-Recvd-Size: 4112 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by imf01.hostedemail.com (Postfix) with ESMTP for ; Fri, 12 Feb 2021 17:02:28 +0000 (UTC) Received: by mail-pf1-f177.google.com with SMTP id b145so6180655pfb.4 for ; Fri, 12 Feb 2021 09:02:28 -0800 (PST) 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=7mHQ3glb31sFuwvoGcKO+DumCO9HSr0Bb7Nri9jWV50=; b=mAnF3VGeuW6pSRvu2LN2xqj+dzYyLwh/OPEDqMeHluwaz2poT5if4WhFnoBubDskRD WhemKL3Sc0cI5yOpXFf9KOI9IxspEKlb0Yx00kM0w2z3lZWpHDh9nEqUqtIJIKQPqLA5 xcpTmN54VOVH83PLYEfe7rFxnQwCu3TC8LcM+lp8sY5f2JdsTwXNHNUz/KY0RPxxBpqK ZJB6hm8JCvRjPWPpLFw2sWnkKZDw26g3HarWaEIjaNl5953EBj7UaCDr50tnWTqaScTC rvhmQZW1Vgq9yaElWbZpHKpFG09EA5M7Ga5tjZxGq+ijpVfQQ8fzo1Axg+qd6FtjiW1J 52Uw== 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=7mHQ3glb31sFuwvoGcKO+DumCO9HSr0Bb7Nri9jWV50=; b=OuSCPPv78SZfC3gJ5kgYxqv1nat8rRyIcJWPOGdWxKYYrX3YUih6UWGbBjw07uTdBt XcJihwwyvW+fLtZD4rFKpaJit7lDLPKOXGyvoCK/Gepj0qhbKKFnNoGwP5NUSk4CgNsM MPvunAjI/NORB4wzwuSczMSG56qz4BvKOM4/y3N0KsnY7d66bSSJVZ4wj0Gib29Lp+z0 rrVv3Cvp6GqW8Yg5jvXtKRciYzNR2jdQ/ann0JZjITNiPdYw0tB2y1EXa+iyaRooP3Cr mWm8jmyYYCVZJx0eWqTeYdNZvsuD5sd5gZZ2UOQIF75PbxqqiLrxdbA4AS/SAAaj6ZnZ sUeQ== X-Gm-Message-State: AOAM5325h/L3UQLkLWJAPUDpWN789ayk0mJ2L+rmwzWek6hhqYS8vvO3 BGu9GnDUezt4VE4c2wrIs/+RuQ== X-Google-Smtp-Source: ABdhPJyYIF4+lkvlNFXhM8SAayi2rNZb5rZhRBWKr/m9i+0EfQyNSsW8uvtRc94AUdYeVdY9ep214Q== X-Received: by 2002:a62:7fcb:0:b029:1da:36b1:8ac7 with SMTP id a194-20020a627fcb0000b02901da36b18ac7mr3749647pfd.13.1613149347766; Fri, 12 Feb 2021 09:02:27 -0800 (PST) Received: from localhost.bytedance.net ([139.177.225.254]) by smtp.gmail.com with ESMTPSA id e21sm9317815pgv.74.2021.02.12.09.02.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Feb 2021 09:02:27 -0800 (PST) From: Muchun Song To: hannes@cmpxchg.org, mhocko@kernel.org, vdavydov.dev@gmail.com, akpm@linux-foundation.org Cc: cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Muchun Song Subject: [PATCH 4/4] mm: memcontrol: fix swap uncharge on cgroup v2 Date: Sat, 13 Feb 2021 01:01:59 +0800 Message-Id: <20210212170159.32153-4-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210212170159.32153-1-songmuchun@bytedance.com> References: <20210212170159.32153-1-songmuchun@bytedance.com> MIME-Version: 1.0 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 swap charges the actual number of swap entries on cgroup v2. If a swap cache page is charged successful, and then we uncharge the swap counter. It is wrong on cgroup v2. Because the swap entry is not freed. Fixes: 2d1c498072de ("mm: memcontrol: make swap tracking an integral part= of memory control") Signed-off-by: Muchun Song --- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index c737c8f05992..be6bc5044150 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6753,7 +6753,7 @@ int mem_cgroup_charge(struct page *page, struct mm_= struct *mm, gfp_t gfp_mask) memcg_check_events(memcg, page); local_irq_enable(); =20 - if (PageSwapCache(page)) { + if (!cgroup_subsys_on_dfl(memory_cgrp_subsys) && PageSwapCache(page)) { swp_entry_t entry =3D { .val =3D page_private(page) }; /* * The swap entry might not get freed for a long time, --=20 2.11.0