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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96F15C4332F for ; Sat, 11 Nov 2023 02:48:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DDADB8D0005; Fri, 10 Nov 2023 21:48:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D89788D0003; Fri, 10 Nov 2023 21:48:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C516A8D0005; Fri, 10 Nov 2023 21:48:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id B55EE8D0003 for ; Fri, 10 Nov 2023 21:48:14 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 852811A0524 for ; Sat, 11 Nov 2023 02:48:14 +0000 (UTC) X-FDA: 81444139308.18.9325DB7 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf22.hostedemail.com (Postfix) with ESMTP id 2C7B8C0015 for ; Sat, 11 Nov 2023 02:48:09 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; spf=pass (imf22.hostedemail.com: domain of liushixin2@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=liushixin2@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699670892; a=rsa-sha256; cv=none; b=jk4O/9RXxnS7CpFYQw8ZtbV3BDyo3bl5T7CWAMAn71Q1UgLLQUgCdesrRiaQfZFkyPcZrN k/JlUNU4wNqfETYUv5QMle7ql0mbzwB6UUL0B75gum43NJMaLYyNjnHkhxBGqESUTA6Zsd hg+WofAMS6SRPEcOL3gKYdutVKEXKBE= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; spf=pass (imf22.hostedemail.com: domain of liushixin2@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=liushixin2@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699670892; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lbTdbUrh+rET42mPcQcMGANo4Bh1llji4X+j7kOLKnw=; b=BlACBlzpmv1bkaJyZRyPEQOcWSDGvtVqPHN2n8zFGcZwK49VJEHul9hpmGwsOj2ZUCjdBt 7XTwnw3cZUxzZocGFNnyjNuJ5cq0/f7Zg44RFUJEnPehd+o9hhPRSA/Ju7rqVqZF0Zd9hD rO9+fJKJCkaHFUC8aqE5q0gfS3t89XU= Received: from dggpemd200004.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4SS0Pv1J6NzrTZT; Sat, 11 Nov 2023 10:44:03 +0800 (CST) Received: from [10.174.179.24] (10.174.179.24) 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, 11 Nov 2023 10:47:17 +0800 Subject: Re: [PATCH v8] mm: vmscan: try to reclaim swapcache pages if no swap space To: "Huang, Ying" References: <20231106074452.2581835-1-liushixin2@huawei.com> <87pm0nv05u.fsf@yhuang6-desk2.ccr.corp.intel.com> CC: Andrew Morton , Yosry Ahmed , Sachin Sant , Michal Hocko , Johannes Weiner , Kefeng Wang , , From: Liu Shixin Message-ID: <017e9d29-4b42-abad-384d-94117a7919eb@huawei.com> Date: Sat, 11 Nov 2023 10:47:17 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <87pm0nv05u.fsf@yhuang6-desk2.ccr.corp.intel.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.179.24] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemd200004.china.huawei.com (7.185.36.141) X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 2C7B8C0015 X-Stat-Signature: c4fk5tbrggd8zbcbpuwou5t1peymna9u X-HE-Tag: 1699670889-647258 X-HE-Meta: U2FsdGVkX1/TPz7Lgu2HONotGN1x44SoVr5OQKC2Ftp/am03PGBXawGv4ILXJtBid5lhrgxXktvaVrv/CWRbn7BjEYQm8a9xaTZRaxPO6M5XnmNTYntdLnT78EKJ0cvTbfDQuc4ZTitNWvpcbzyNeSP15A+FPmD1yEeNUZ5+lJ0aTm06lcRh5LQwMa3CT9hAbaVGaQKw+mwAaBWPLay+htqlfCOaU71YOqoXps6LPCIBWpX0mD1JCFVfrxoy2AGqQmXjx+brqKiqTKpTQeRe5MoAfsPLXsLp1WPw356G3gK37Zp2IL6MbHq+Iiqe5Oy2HQOAWqWVqEO2pv+GwzDd5xe/GUdWY9rQcAiJ8zltuGvJuUAiKbBZ/enNLKZWyzrPRF2u8ii8vPi1Ex2GvxabJj4In1cFEAz4nlpO9svgkdzQxo9hPyi4tEMV5Kr7LUnZWPe/IRn0Hz4J2QxlDiBw19yML5iIuXiAjEp/4MS1k8mjGMZMv/vSKMBSAmt63Hjhn5yPdHgnfpvQdejS+capGj+4NSDBN+TYRyKIXcq3oOQfWYBSyQ3wK9LEVBKaqD8Mw96Ubz/2glz92UjFXcIRmgzs6C/ID5aAV3c7ZrkCxwltRUWu8I5DZV6qaVb8KWSJea8C4bGtvlrkiATakHWr0YJlk8UVBcttZ18KTcAMEwM/D5n++eCC5lkEIX4iADDM2xd5ARmt+s3B1rjNIZ/NFMNfG0+EWniUpHcE0jS00unq6BURHJeghbdCppc7/hunRMdVb7cOOzN/uRC8vj9S6c7u4ytTsRqLyXHZOUEjHR/3joJJfC1foNxbCiyFyFoUjZ5PrzuBC+xLfA04GeyYI/ui/M2s3DDHvzI7o0dWUHDDxMWPF7mqBDVsnDGlSNS/23ZtWJlmzVyrwC10MN0qzZBNb4MKaLBbfKi+zETl7xDgMKVT2qsOBnrHeqGzb0aCEKd59SG1Xg8f4g7DtWo V/gAcCxm ezY1KH7b4zYVkESv5ZuDvzaUnPlJc7GgKmqoTNeYHtGqatxlNdRlXWyIc7zU64SHxkHSAcVPgiRX4urXYnm8jhB6j8fPXu+0c/J2m33ll0mhCyVNcFXb3WI3WLq+JkpSZ+1xHU6umRkPSTEg7xmyj73cCYlmlL5aMuox8gy+ekWIsFWrktDsWnDSvroECRw6t+NzOUm8sP+vkE7kzGbRi5Qk2ZyUb3CyIjVGL9hU2AU85p8Icc6dr2zbRNdDsTO06psQEzKUN/bVzZNFyxpRC+vD/nCakqSTz3b9s 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: List-Subscribe: List-Unsubscribe: On 2023/11/6 14:57, Huang, Ying wrote: > Liu Shixin writes: > >> 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 >> --- >> 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 | 27 +++++++++++++++++++++++++++ >> 3 files changed, 41 insertions(+) >> >> 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..5d5a169ec98c 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; >> >> @@ -606,6 +609,9 @@ static inline bool can_reclaim_anon_pages(struct mem_cgroup *memcg, >> int nid, >> struct scan_control *sc) >> { >> + if (sc) >> + sc->swapcache_only = 0; >> + >> if (memcg == NULL) { >> /* >> * For non-memcg reclaim, is there >> @@ -613,10 +619,22 @@ static inline bool can_reclaim_anon_pages(struct mem_cgroup *memcg, >> */ >> if (get_nr_swap_pages() > 0) >> return true; >> + /* Is there any swapcache pages to reclaim? */ >> + if (total_swapcache_pages() > 0) { >> + if (sc) >> + sc->swapcache_only = 1; >> + return true; >> + } >> } else { >> /* Is the memcg below its swap limit? */ >> if (mem_cgroup_get_nr_swap_pages(memcg) > 0) >> return true; >> + /* Is there any swapcache pages in memcg to reclaim? */ >> + if (mem_cgroup_get_nr_swapcache_pages(memcg) > 0) { >> + if (sc) >> + sc->swapcache_only = 1; >> + return true; >> + } >> } > I understand that this is only possible in theory. But if can_demote() > == true, get_nr_swap_pages() == 0, total_swapcache_pages() > 0, we will > demote only anonymous pages in swapcache. I think that this isn't > reasonable. So, swapcache pages should be checked after can_demote() > checking. > > -- > Best Regards, > Huang, Ying Thanks for your advise, that sounds more reasonable. I will modify it soon. > >> /* >> @@ -2342,6 +2360,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)) > . >