From patchwork Sat Nov 4 14:03:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Shixin X-Patchwork-Id: 161586 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1635307vqu; Sat, 4 Nov 2023 06:04:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFrYpH2CeX7nhypAuP4sys3hqapKDjkz805mIEoMFfP8GdxOJoh5Dh9HwdpjCsm9kvYFtoD X-Received: by 2002:a05:6808:2202:b0:3b2:e51a:a44d with SMTP id bd2-20020a056808220200b003b2e51aa44dmr31127355oib.34.1699103091307; Sat, 04 Nov 2023 06:04:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699103091; cv=none; d=google.com; s=arc-20160816; b=GBfuNXOPqeHUyiFqn2k/A6xa+zMw5b+TatciyHOTV+4+Rmwa3/IS7yxTA39K98JVNC H1VM2am4cOAqp5aYrxuf+L7KlAdCUdwQI52BIo+zgZxlVBHre8DTS/ItQkzb87b0U06n Nz70J0TWxKrYPDEqckbwlbjYYjyMB5HD+V5VlbL//iWX0tSYRK9Un+DnvdgNnHEiqcqs +Mt+p5HHd+Sci+MSXQhAGscT2Wto6X4taVCYHYktFuvs0z+bVZ0ISScfGKj+JX/LBOff C2suQx/IdnpOmhlKByXHP9ztNStY1KL9tIEwZudJczDFILVPcG4QLithZ0kz0N9CRrUx z50A== 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=rjlctwY94DxeMmKlyQQ77dmVaqsqnZF8hbzCvUh/UQU=; fh=fpDLd387pmICRcjQLRWdh3NNt5NdlVYqbDAniWhOgjE=; b=hwWCCCaG+fL67rhLf5Eey4TApcGP7FH0In8/885N1mtOJgYXHMVx8H4+Q3KX3ZxfrT h7+nqEGe2GkCFvRW3g7BGszHygtnLzGXJwSq0udd9QBxCIvOgKNxWOtmjEUi+/5pN5SS 2rBbFz3HjTMdsrmmc2rsXLgQYPEuenWZWmoAdQm2DbusdGIW0okqBCzOsJDYGw9TmwqI cD6nS83nruLBzbPgKtAvX4NeHdno13rolA2SKjoZN2rKvjh8phR1WWCwWZeHI1T8+d7a oU9xwm6VI7LzcAsvYNBB+y+8BceeU0LcF7YIA+cfHlCX6/IsKniYcwuWSC3OoSf5GG8S zz1A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id i2-20020a544082000000b003b2e2d134b6si1442877oii.339.2023.11.04.06.04.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Nov 2023 06:04:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id 2B2F38068959; Sat, 4 Nov 2023 06:04:50 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232010AbjKDNEs (ORCPT + 35 others); Sat, 4 Nov 2023 09:04:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231473AbjKDNEr (ORCPT ); Sat, 4 Nov 2023 09:04:47 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E25AB1B2 for ; Sat, 4 Nov 2023 06:04:40 -0700 (PDT) Received: from dggpemd200004.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4SMyVj56QyzvQ1g; Sat, 4 Nov 2023 21:04:13 +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; Sat, 4 Nov 2023 21:04:17 +0800 From: Liu Shixin To: Andrew Morton , Yosry Ahmed , Huang Ying , Sachin Sant , Michal Hocko , Johannes Weiner , Kefeng Wang CC: , , Liu Shixin Subject: [PATCH v7] mm: vmscan: try to reclaim swapcache pages if no swap space Date: Sat, 4 Nov 2023 22:03:13 +0800 Message-ID: <20231104140313.3418001-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: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemd200004.china.huawei.com (7.185.36.141) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Sat, 04 Nov 2023 06:04:50 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781638723272883263 X-GMAIL-MSGID: 1781638723272883263 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 --- 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 | 36 ++++++++++++++++++++++++++++++++++-- 3 files changed, 48 insertions(+), 2 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 5b009b233ab8..29e34c06ca83 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -7584,6 +7584,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 6f13394b112e..a5e04291662f 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -137,6 +137,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; @@ -602,6 +605,12 @@ static bool can_demote(int nid, struct scan_control *sc) return true; } +static void set_swapcache_mode(struct scan_control *sc, bool swapcache_only) +{ + if (sc) + sc->swapcache_only = swapcache_only; +} + static inline bool can_reclaim_anon_pages(struct mem_cgroup *memcg, int nid, struct scan_control *sc) @@ -611,12 +620,26 @@ static inline bool can_reclaim_anon_pages(struct mem_cgroup *memcg, * For non-memcg reclaim, is there * space in any swap device? */ - if (get_nr_swap_pages() > 0) + if (get_nr_swap_pages() > 0) { + set_swapcache_mode(sc, false); return true; + } + /* Is there any swapcache pages to reclaim? */ + if (total_swapcache_pages() > 0) { + set_swapcache_mode(sc, true); + return true; + } } else { /* Is the memcg below its swap limit? */ - if (mem_cgroup_get_nr_swap_pages(memcg) > 0) + if (mem_cgroup_get_nr_swap_pages(memcg) > 0) { + set_swapcache_mode(sc, false); return true; + } + /* Is there any swapcache pages in memcg to reclaim? */ + if (mem_cgroup_get_nr_swapcache_pages(memcg) > 0) { + set_swapcache_mode(sc, true); + return true; + } } /* @@ -2342,6 +2365,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))