From patchwork Wed Nov 15 05:01:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Shixin X-Patchwork-Id: 165182 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:a59:b0:164:83eb:24d7 with SMTP id 25csp2375254rwb; Tue, 14 Nov 2023 20:03:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IGNdtlxR5gQ0CZLjCOc/wsUhSzmUC1Qw3brI0Gel1S0v8+4VFxPNlzaTvMm05nWbB/uI8E3 X-Received: by 2002:a17:90b:4ac8:b0:281:d84:a97e with SMTP id mh8-20020a17090b4ac800b002810d84a97emr6431721pjb.2.1700021017722; Tue, 14 Nov 2023 20:03:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700021017; cv=none; d=google.com; s=arc-20160816; b=px8URkpLWV+L9TolYDbrjvGZ+FNXYk3f+MbcVsbMF3xcrsGWFgWV56loJi5swf2Lnb RdSWmxVfKxIgdUaLCP8n5b93Jj19qCC+ZAxv5FMm9Sd6lTbgdOYfuCmqTQNp9Ux5ldOA 4a+ZOVxv+7cI6ltkvie8uRlxlEIGSV38bCVAuxeQUOmNl5jlXz5MF22275T565/XKr2b QsiOeeJysMkrvk5Gu/V2x6IfpVBv2dCLnEhsnyL//6c7lb/LCl1QIsD7/PU92YyISNXH YbgCNwe9wTaqKxMxRx2UOtkRp+867W8h5aFytTogZlb0hxP0ne7lPwPCKuQFumvjvh2q KbNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=xRRJQ1mkb2cIVAgO94fsLX4WHWLsLBXsMfevvD6Qklg=; fh=fpDLd387pmICRcjQLRWdh3NNt5NdlVYqbDAniWhOgjE=; b=hgLbn/8vz7q/wjsO/ZJcJ48yPda3x6F+xNj3orwUXxp0EYA54y638+w1RbSPTRItZu gSzx8/Yvds3nEfecocoSNJs7Zj9NzN7jew7l9UsDZMdAJOmI5q90fdVEmCA5FEwgnuv1 YWhpxQH09rABWgQZCJf3YhFPWajYNfUl4Ae/fX/HQRZ5MYSIGP1TyLC6rwUwYjXBIPIS d3aUWUioNkjFKNYQ+jDU+mEGZP2b0TKIcw9f8CiMvqa9PDpvzXJwvB5H3qSs0msNuxll 06DIQhcAJncLcvZNL8sIxJxsdTWDeJtyhd98LFdqLdLzpNEHkVVNsdYipB/pmxG68CjZ O1Lw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id o18-20020a17090ac71200b00277453e82fesi9738861pjt.87.2023.11.14.20.03.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 20:03:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 1B27280CD73E; Tue, 14 Nov 2023 20:03:35 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234421AbjKOEDG (ORCPT + 28 others); Tue, 14 Nov 2023 23:03:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229572AbjKOEDF (ORCPT ); Tue, 14 Nov 2023 23:03:05 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43504CD for ; Tue, 14 Nov 2023 20:03:00 -0800 (PST) Received: from dggpemd200004.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4SVTsp3CCwzMmn5; Wed, 15 Nov 2023 11:58:22 +0800 (CST) Received: from huawei.com (10.175.113.32) by dggpemd200004.china.huawei.com (7.185.36.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.1258.23; Wed, 15 Nov 2023 12:02:57 +0800 From: Liu Shixin To: Andrew Morton , Yosry Ahmed , Huang Ying , Sachin Sant , Michal Hocko , Johannes Weiner , Kefeng Wang CC: , , Liu Shixin Subject: [PATCH v9] mm: vmscan: try to reclaim swapcache pages if no swap space Date: Wed, 15 Nov 2023 13:01:23 +0800 Message-ID: <20231115050123.982876-1-liushixin2@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.175.113.32] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemd200004.china.huawei.com (7.185.36.141) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 14 Nov 2023 20:03:35 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782601239020803361 X-GMAIL-MSGID: 1782601239020803361 When spaces of swap devices are exhausted, only file pages can be reclaimed. But there are still some swapcache pages in anon lru list. This can lead to a premature out-of-memory. The problem is found with such step: Firstly, set a 9MB disk swap space, then create a cgroup with 10MB memory limit, then runs an program to allocates about 15MB memory. The problem occurs occasionally, which may need about 100 times [1]. Fix it by checking number of swapcache pages in can_reclaim_anon_pages(). If the number is not zero, return true and set swapcache_only to 1. When scan anon lru list in swapcache_only mode, non-swapcache pages will be skipped to isolate in order to accelerate reclaim efficiency. However, in swapcache_only mode, the scan count still increased when scan non-swapcache pages because there are large number of non-swapcache pages and rare swapcache pages in swapcache_only mode, and if the non-swapcache is skipped and do not count, the scan of pages in isolate_lru_folios() can eventually lead to hung task, just as Sachin reported [2]. By the way, since there are enough times of memory reclaim before OOM, it is not need to isolate too much swapcache pages in one times. [1]. https://lore.kernel.org/lkml/CAJD7tkZAfgncV+KbKr36=eDzMnT=9dZOT0dpMWcurHLr6Do+GA@mail.gmail.com/ [2]. https://lore.kernel.org/linux-mm/CAJD7tkafz_2XAuqE8tGLPEcpLngewhUo=5US14PAtSM9tLBUQg@mail.gmail.com/ Signed-off-by: Liu Shixin Tested-by: Yosry Ahmed Reviewed-by: "Huang, Ying" Reviewed-by: Yosry Ahmed --- v8->v9: Move the swapcache check after can_demote() and refector can_reclaim_anon_pages() a bit. v7->v8: Reset swapcache_only at the beginning of can_reclaim_anon_pages(). v6->v7: Reset swapcache_only to zero after there are swap spaces. v5->v6: Fix NULL pointing derefence and hung task problem reported by Sachin. include/linux/swap.h | 6 ++++++ mm/memcontrol.c | 8 ++++++++ mm/vmscan.c | 47 ++++++++++++++++++++++++++++++++------------ 3 files changed, 48 insertions(+), 13 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index f6dd6575b905..3ba146ae7cf5 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -659,6 +659,7 @@ static inline void mem_cgroup_uncharge_swap(swp_entry_t entry, unsigned int nr_p } extern long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg); +extern long mem_cgroup_get_nr_swapcache_pages(struct mem_cgroup *memcg); extern bool mem_cgroup_swap_full(struct folio *folio); #else static inline void mem_cgroup_swapout(struct folio *folio, swp_entry_t entry) @@ -681,6 +682,11 @@ static inline long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg) return get_nr_swap_pages(); } +static inline long mem_cgroup_get_nr_swapcache_pages(struct mem_cgroup *memcg) +{ + return total_swapcache_pages(); +} + static inline bool mem_cgroup_swap_full(struct folio *folio) { return vm_swap_full(); diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 774bd6e21e27..a76ec540d4a3 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -7865,6 +7865,14 @@ long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg) return nr_swap_pages; } +long mem_cgroup_get_nr_swapcache_pages(struct mem_cgroup *memcg) +{ + if (mem_cgroup_disabled()) + return total_swapcache_pages(); + + return memcg_page_state(memcg, NR_SWAPCACHE); +} + bool mem_cgroup_swap_full(struct folio *folio) { struct mem_cgroup *memcg; diff --git a/mm/vmscan.c b/mm/vmscan.c index 506f8220c5fe..62a1c75f74ad 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -136,6 +136,9 @@ struct scan_control { /* Always discard instead of demoting to lower tier memory */ unsigned int no_demotion:1; + /* Swap space is exhausted, only reclaim swapcache for anon LRU */ + unsigned int swapcache_only:1; + /* Allocation order */ s8 order; @@ -312,25 +315,34 @@ static inline bool can_reclaim_anon_pages(struct mem_cgroup *memcg, int nid, struct scan_control *sc) { - if (memcg == NULL) { - /* - * For non-memcg reclaim, is there - * space in any swap device? - */ - if (get_nr_swap_pages() > 0) - return true; - } else { - /* Is the memcg below its swap limit? */ - if (mem_cgroup_get_nr_swap_pages(memcg) > 0) - return true; - } + if (sc) + sc->swapcache_only = 0; + + /* + * For non-memcg reclaim, is there space in any swap device? + * Or is the memcg below its swap limit? + */ + if ((!memcg && get_nr_swap_pages() > 0) || + (memcg && mem_cgroup_get_nr_swap_pages(memcg) > 0)) + return true; /* * The page can not be swapped. * * Can it be reclaimed from this node via demotion? */ - return can_demote(nid, sc); + if (can_demote(nid, sc)) + return true; + + /* Is there any swapcache pages to reclaim? */ + if ((!memcg && total_swapcache_pages() > 0) || + (memcg && mem_cgroup_get_nr_swapcache_pages(memcg) > 0)) { + if (sc) + sc->swapcache_only = 1; + return true; + } + + return false; } /* @@ -1642,6 +1654,15 @@ static unsigned long isolate_lru_folios(unsigned long nr_to_scan, */ scan += nr_pages; + /* + * Count non-swapcache too because the swapcache pages may + * be rare and it takes too much times here if not count + * the non-swapcache pages. + */ + if (unlikely(sc->swapcache_only && !is_file_lru(lru) && + !folio_test_swapcache(folio))) + goto move; + if (!folio_test_lru(folio)) goto move; if (!sc->may_unmap && folio_mapped(folio))