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 4EDA2C3ABDA for ; Wed, 14 May 2025 20:19:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 92EC66B00B3; Wed, 14 May 2025 16:19:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8B5116B00B4; Wed, 14 May 2025 16:19:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 714366B00B5; Wed, 14 May 2025 16:19:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 4BFD66B00B3 for ; Wed, 14 May 2025 16:19:16 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 428DEC0212 for ; Wed, 14 May 2025 20:19:16 +0000 (UTC) X-FDA: 83442627912.29.B3C640F Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by imf01.hostedemail.com (Postfix) with ESMTP id 4251D40015 for ; Wed, 14 May 2025 20:19:14 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=hmHIIMSh; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf01.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.216.52 as permitted sender) smtp.mailfrom=ryncsn@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747253954; a=rsa-sha256; cv=none; b=1lThopWoqyaFyp0cxLZGDS2YZ2V0OZdmr5xYKpomhm5wq3EVdzRbUnMv9HFBMfOZ0jo5Kz ZcVVRpDelMGsFD9ctaXw4RlID6e840Ko1KjiPEkziq1+jOuklWvhwgSp/IqWzX/tUiSq8G sKTfYPIEnZGbDQ1pFbjJt4PgCt/c7gA= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=hmHIIMSh; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf01.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.216.52 as permitted sender) smtp.mailfrom=ryncsn@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747253954; h=from:from:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=UvmaxbsPM6qyK/MiHoJQD413Xxi7HR6Fgym3PRJ3v+c=; b=EaiPcOghuQINujnUfR9APeDsjubnxbz3eKTHp9/KmTgjrGIW8voQeel3nvyPU+mri0ZUZr JgICYgWZrqz+REUAAfpNb/yYQiFuS7bOtwkF4Txgkrqz5CH+H07/w/+TXclYqJI0U/9OfR zya9WO3WhKEbiRUs8v5WGTd+5lBjvI4= Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-30a9cd61159so252541a91.1 for ; Wed, 14 May 2025 13:19:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747253952; x=1747858752; darn=kvack.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=UvmaxbsPM6qyK/MiHoJQD413Xxi7HR6Fgym3PRJ3v+c=; b=hmHIIMShbMbg8jQRP+HukDo7JfrP5XudOwRSmDV4Os2ut/QpztTZt4hBCC23gI2aAc Kk7+f6Ol8RA9iU1vyMwIlrxlHq59T6LeoGJhtrBflQ6Ia08sWPxjgoqS5TefYsE46oCd jNFY4AK2siztELtCklf5iPy81RpymgptddRNWU0LGzfUXZamLIiXEIHBgs45qYeA6Rx/ roOCMcKIJYuR7CAIjlyz/lkc5mJmtdy1NTZ0lgbhnEsx+Kqr4WnfR5dDqME6UzDtb+Vi z6wbfwf8cB2oBlm9yoLEGtvaAvnnE2cNtKfc2O87PxKJwcn7c27wcJs4jHd+Yhvly0fa yFfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747253952; x=1747858752; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=UvmaxbsPM6qyK/MiHoJQD413Xxi7HR6Fgym3PRJ3v+c=; b=C9GJ9d+aO5OTCy/fgOOYUnwhejQuQCxhgcWIdp9H07allE3KczcWgfzzVHt9nSVtsM Pk+yZUKEs35e5M8bFQk7ZHn0iWtNZu07iK5sjYDZ+FpQ2KLHKuKLxqC5Ly4JadCrJsOg PRLCYcFNWYR4Q/uQo8vi5HBi4N0lYsRw6dDUmPhVXdz1qeyX7srYpQ+JhLC4qlyZDaVc oCZurUjWchCRcZlMQJm/As+iRqkH5MNbQUZrdLOtclJ/dmFqh1bV1TEYXgfoI8hS72kI p5B8MnV/M7IlJCMktpbztvwR1Xi3F7k8zvEO5EJuieAxIDD+kxVu0IXNaJe169d57ygO aAEA== X-Gm-Message-State: AOJu0YxG6kAMlZ5FXFu4f3tm+1iBs29DFUWxODH3JXhY1R9Q9jW786ef XILDRD7y68I5vshC9G4fygDtQN4tDJPcM45cNVRyfyFKGBdqzzPPkKeKfv+NZKo= X-Gm-Gg: ASbGncuUJyj6yVv08jBQjN6t6DoxCapdNh11m5eHZQojkncnxxUfPkLXdqExgyUrzKK H/s0uDD3Mk4L8KDEL+RR+Uslpz2EJggPX2yIYTa04xe0cOoRjfj4GQtyOFZqoF+aQ5EOdWFSuv2 oxasr6MYZK3bwC9u0cR3gYqXzy6aIe0aFqE9nXIxWwP6nhldkj/ceOuyFqMVtBq8tB6WTY6XFq/ Ldf9kv9IBwNEkVXc3YQEFgq2nOO1UpXmjaOUENYfJxWtXtiqboRFHCBgTrhcpgu1IDAvPFdHh45 goMen8JgnO60fF+Dt3lf6jSHvHb8AnadPT+GcQqf+kTUTIk02PA60xGXMpenn26/gh0lWoKm X-Google-Smtp-Source: AGHT+IGo6fZOY9gD9/a6oJ7A/qen0iR8c9NVCuv0m4jHSlVjCl2c3TmOEpL+9XDYNMKoEDGonGxBrg== X-Received: by 2002:a17:90b:50c4:b0:30a:9cd5:5932 with SMTP id 98e67ed59e1d1-30e4db6c453mr1350875a91.13.1747253952529; Wed, 14 May 2025 13:19:12 -0700 (PDT) Received: from KASONG-MC4.tencent.com ([101.32.222.185]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30e33401934sm2003692a91.9.2025.05.14.13.19.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 14 May 2025 13:19:11 -0700 (PDT) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , Matthew Wilcox , Hugh Dickins , Chris Li , David Hildenbrand , Yosry Ahmed , "Huang, Ying" , Nhat Pham , Johannes Weiner , Baolin Wang , Baoquan He , Barry Song , Kalesh Singh , Kemeng Shi , Tim Chen , Ryan Roberts , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH 18/28] mm, swap: rename and introduce folio_free_swap_cache Date: Thu, 15 May 2025 04:17:18 +0800 Message-ID: <20250514201729.48420-19-ryncsn@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250514201729.48420-1-ryncsn@gmail.com> References: <20250514201729.48420-1-ryncsn@gmail.com> Reply-To: Kairui Song MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 4251D40015 X-Stat-Signature: s5aou5iyyow7q98o4osm4bceqo9tiagw X-HE-Tag: 1747253954-255650 X-HE-Meta: U2FsdGVkX1/hne2zYlbAuJ6/sprjuFuXE3hOvYyg9SSlAmUdXWoT19m6MuU+4CCmYZUGM+gmSirQo9b+M5RKdyRccVZKOJcUgQSDtjhrR1+cXVCcsYOyK8yHF1fwSC4Fdpvd9RLi9oAN1gIeETHrsIlLWP2oj36RlmIvyyzOQmYRheSGh59k6XuZ14J3sEqpjjbEfNSpfjC5EVGVfgNT+d2DTVJUGeUNl/Aa8OnmFfRgYDQA++0yBicACMjjpjE9DKszENZaod6fpYtbrX26dBYMMN3zMKCmi9KRaBGYHYTf2mnVbHAWzIxdiHbcmekFPH6OTI8ivs2fPW5ktwdR/jI92zfEJ44CxRNvIyUck5tCUwKQ04///1ft8mbZUE5KWf8xRIGdsT8bH8Xlem+uhXBhcfwmEcqEjGmHo6DxbjEFR+BY9qUyVdgbRor5/V3VWNwJKPW1z/XQvIIXyGINIdrP9XaAR21jbUHzWGYJ8p1kAcxPE0HispOKE2pscpJtEr+YWYkFd4RM3LVaOh63fGii8ddxD66MWSzXQMnoekdQ/43aT/3q/98t3G9pd+lTEQ7cADnCLXRF8jYBkHkU5TevcwhXHVEzWCo1Q/38FuKBm2QN9jsx2waXQ2kIS2jrZ9bJJW8KGK6Q008vqP+zT8vGNz9HIudrpht76+mh5JutOqL32U3LQCUIvXPdvhIMDPWQbXe+RMetolswyjsQf6URoJSJ94inN5UZDegUc/fbsaPAVWGQjepoLcxL5VK7lNHadoNslG16nOp2/mP8Q4hCoXzFfjrr3lGSQvQqA4C3Lgo+TpK2I6W87lKdG1LBhA9MSOrwP5uT7z7usWV9Qm67XWZyzXcXMygt80TRqBIha2ZlpJbRatcvTLuq4eD4YTkCJry93Sc5PA5kIiF9bJrzvSmhevmEzyTR8UgtwfdWNFG4DVrGxn2YskaWnJoWQvstIa+deQ5xFeXS8rm JS0U7G3l UQf8a9eRd1ZOJNZ+EjBENvcIWhbnrNjNVhh/asrHvGDU4IuOjpQ22g65ocxh359kw+oO+EuIUl5ffi1a6jnGmCxX3YgcmTLAs1qIa92EJBUoMOj67zZbd6PQde9y05xMHIzfe4/26f8POSw8fBwqTuGLdVchW2isgsg8rjiYnx79tO8a+9Z17E8mPu/gEW1dk5X0kZesN8c9Lp7BZJh8HvFH2MztyWqgxTKNMQe1EgfAjfisvEO2/XXRPNLcXTV3qJuKtErpIV3n0PUipp1Mt86frLyvYrbD+fFI0IdUR0RcRprZqFgIu02eKFazU+OgiO7nnBrdocfC79rX6QoXRua77IsM0Z9k5U0jgUuyZ2/PQAfJD56HFmge640CGwwUY2CD5q/zEuXhSHxPIfroi0jIkjukQzZOkW6fVj8tdc+xKgRkaZIx565BJ4fRR+HLTHv0eswvg80x9Lz3dUaIruBuyaAI2O7MGuUOnZ2Aele3+ti8BmQzdISZTidLkP/uv78hFoRY+RgwmhENov5dCEJ9lU0C88nfShufoiheG3Teihokl0wv96g03ifhEmJ5MfN+dszDNldueQJysJObg6aFkFKiwxCZOGlUEFt/peLB4oRc= 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: From: Kairui Song We now have folio_alloc_swap, folio_dup_swap, folio_put_swap, and folio_free_swap (which is actually try to free). Also rename delete_from_swap_cache to folio_free_swap_cache, because swap cache will always be the last reference of a folio bounded entry now. Freeing the swap cache will also attempt to free the swap entries. Signed-off-by: Kairui Song --- mm/memory-failure.c | 2 +- mm/memory.c | 2 +- mm/shmem.c | 4 ++-- mm/swap.h | 14 +++++++++----- mm/swap_state.c | 12 ------------ mm/swapfile.c | 23 +++++++++++++++++++++-- mm/zswap.c | 2 +- 7 files changed, 35 insertions(+), 24 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index b91a33fb6c69..ba96aaf96e83 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1185,7 +1185,7 @@ static int me_swapcache_clean(struct page_state *ps, struct page *p) struct folio *folio = page_folio(p); int ret; - delete_from_swap_cache(folio); + folio_free_swap_cache(folio); ret = delete_from_lru_cache(folio) ? MF_FAILED : MF_RECOVERED; folio_unlock(folio); diff --git a/mm/memory.c b/mm/memory.c index c000e39b3eb2..a70624a55aa2 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4727,7 +4727,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) */ if (!folio_test_anon(folio)) { WARN_ON_ONCE(folio_test_dirty(folio)); - delete_from_swap_cache(folio); + folio_free_swap_cache(folio); goto out_nomap; } } diff --git a/mm/shmem.c b/mm/shmem.c index 0d23c1c12204..c7475629365c 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2123,7 +2123,7 @@ static void shmem_set_folio_swapin_error(struct inode *inode, pgoff_t index, nr_pages = folio_nr_pages(folio); folio_wait_writeback(folio); folio_put_swap(folio, NULL); - delete_from_swap_cache(folio); + folio_free_swap_cache(folio); /* * Don't treat swapin error folio as alloced. Otherwise inode->i_blocks * won't be 0 when inode is released and thus trigger WARN_ON(i_blocks) @@ -2365,7 +2365,7 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, folio_mark_accessed(folio); folio_put_swap(folio, NULL); - delete_from_swap_cache(folio); + folio_free_swap_cache(folio); folio_mark_dirty(folio); put_swap_device(si); diff --git a/mm/swap.h b/mm/swap.h index 4c4a71081895..467996dafbae 100644 --- a/mm/swap.h +++ b/mm/swap.h @@ -151,10 +151,15 @@ extern void __swap_cache_put_entries(struct swap_info_struct *si, * * Swap in maps a folio in swap cache and decrease the swap table entry * count with folio_put_swap. + * + * Swap uses lazy free, so a folio may stay in swap cache for a long time + * and pin the swap entry. folio_free_swap_cache and folio_free_swap can + * be used to reclaim the swap cache. */ int folio_alloc_swap(struct folio *folio, gfp_t gfp_mask); int folio_dup_swap(struct folio *folio, struct page *subpage); void folio_put_swap(struct folio *folio, struct page *subpage); +void folio_free_swap_cache(struct folio *folio); /* linux/mm/page_io.c */ int sio_pool_init(void); @@ -226,7 +231,6 @@ static inline bool folio_swap_contains(struct folio *folio, swp_entry_t entry) } void show_swap_cache_info(void); -void delete_from_swap_cache(struct folio *folio); void swapcache_clear(struct swap_info_struct *si, swp_entry_t entry, int nr); struct folio *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, struct vm_area_struct *vma, unsigned long addr, @@ -300,6 +304,10 @@ static inline void folio_put_swap(struct folio *folio, struct page *page) { } +static inline void folio_free_swap_cache(struct folio *folio) +{ +} + static inline void swap_read_folio(struct folio *folio, struct swap_iocb **plug) { } @@ -387,10 +395,6 @@ static inline void *swap_cache_get_shadow(swp_entry_t end) return NULL; } -static inline void delete_from_swap_cache(struct folio *folio) -{ -} - static inline unsigned int folio_swap_flags(struct folio *folio) { return 0; diff --git a/mm/swap_state.c b/mm/swap_state.c index 715aff5aca57..c8bb16835612 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -216,18 +216,6 @@ void __swap_cache_del_folio(swp_entry_t entry, __swap_cache_put_entries(si, ci, entry, nr_pages); } -void delete_from_swap_cache(struct folio *folio) -{ - struct swap_cluster_info *ci; - swp_entry_t entry = folio->swap; - - ci = swap_lock_cluster(swp_info(entry), swp_offset(entry)); - __swap_cache_del_folio(entry, folio, NULL); - swap_unlock_cluster(ci); - - folio_ref_sub(folio, folio_nr_pages(folio)); -} - /* * Caller must hold a reference on the swap device, and check if the * returned folio is still valid after locking it (e.g. folio_swap_contains). diff --git a/mm/swapfile.c b/mm/swapfile.c index daf7810bcb28..0a8b36ecbf08 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -273,7 +273,7 @@ static int __try_to_reclaim_swap(struct swap_info_struct *si, if (!need_reclaim) goto out_unlock; - delete_from_swap_cache(folio); + folio_free_swap_cache(folio); folio_set_dirty(folio); ret = nr_pages; out_unlock: @@ -1354,6 +1354,25 @@ void folio_put_swap(struct folio *folio, struct page *subpage) swap_entries_put_map(swp_info(entry), entry, nr_pages); } +/* + * folio_free_swap_cache() - Remove the folio from swap cache, and free + * all entires with zero count. + * + * NOTE: if the folio is dirty and any of its swap entries' count is not + * zero, freeing the swap cache without write back may cause data loss. + */ +void folio_free_swap_cache(struct folio *folio) +{ + struct swap_cluster_info *ci; + swp_entry_t entry = folio->swap; + + ci = swap_lock_cluster(swp_info(entry), swp_offset(entry)); + __swap_cache_del_folio(entry, folio, NULL); + swap_unlock_cluster(ci); + + folio_ref_sub(folio, folio_nr_pages(folio)); +} + static struct swap_info_struct *_swap_info_get(swp_entry_t entry) { struct swap_info_struct *si; @@ -1787,7 +1806,7 @@ bool folio_free_swap(struct folio *folio) if (folio_swapped(folio)) return false; - delete_from_swap_cache(folio); + folio_free_swap_cache(folio); folio_set_dirty(folio); return true; } diff --git a/mm/zswap.c b/mm/zswap.c index 65c1aff5c4a4..6bac50bc2bf5 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -1141,7 +1141,7 @@ static int zswap_writeback_entry(struct zswap_entry *entry, out: if (ret && ret != -EEXIST) { - delete_from_swap_cache(folio); + folio_free_swap_cache(folio); folio_unlock(folio); } folio_put(folio); -- 2.49.0