From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794631395; b=CBTxedZU4oHcx5Aq1FwrrTU9GHAp2cP4ETEHWQkv0Sa4AToyMp4U9Y/QsXsgA5Ng0FqW X9y/rIDN4Xc7nVNByb7g6QdRWKBE4PGuaRG8cbNaXhDU+ZofZ7/7o7mA9iD6KKMa5dRfE D3i51it+4svXvSUnsl94jjiwTelTknPvuM6bMg2O0CyBzAH5iZzyDQBIOUcIB+QDBEHzE iGxACSbzivV7cAgXBPyqIZFnneJYqyajs/7vIwi8yD2Xze3GSaSXmbu4Zwbie1ezq2qmw PMxj7lCsFyfwr7JoqHVyeClWg502NkAF0i2XlyqlOyUem/MpU7hZb5qoEU56Ui0+BHg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794631395; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=7ZU7h0wlAuf8ircXlhWVxYk7TUSgoywsSbcV9zgliPo=; b=JqroBMT22SJgylooXzgoYau0Tesg/XBRpOS1h+9P6x3xz5sEZDuWz98n2KKqWjGKB/oE h/J3yj2rdSu2kbgiEd4ppS3DnXKNMEkyTSUxWcSCp87vk5tYfPMiThFv9SsqjzVUdEphr feJmamjBYB63hId5iocLI05R9RPcNU/qkbxn+JQznQxO36hNhR9pcvxsTItPDxOkEXt6e OLQJQN19TJRuPscaUoyjGJf97gnq7FLh9IHQsnHpiRyqqjxnlksXU8ZNizZefO15Fh8r/ yZmxQpkl423dG6VV39XI1KqUEyoxILxVJkC5HOOBHeLOfw8eNPBLA0CQRvdXKwiFSTg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=j0VOiQwF; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4278A606A323 for ; Sat, 14 Nov 2026 04:43:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=j0VOiQwF Received: by smtp.kernel.org (Postfix) with ESMTPSA id CAFE11F000C4; Sat, 14 Nov 2026 04:43:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794631394; bh=7ZU7h0wlAuf8ircXlhWVxYk7TUSgoywsSbcV9zgliPo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=j0VOiQwFtved8T8iMMDBzKaA6yYMxr4oBE6MrgVNtLmgHQQZSoVMQAeD9eB6JJ/pe 1+TR+l01rgB1M7UDIjxmM3tf4k/F1I1VopwuF/ooJBJ6P6p9NYir9R/SDtgXSdMcV5 QRnc//c20ledQZPpCwMOpofWlJWeBO79uPTbVBTMkAZ3+9z5yAL/4lEeihiSh3dLjl 76J7/dlwWWk0mtl+x1z9p3jxnyV1iHhZQn0Vf8WQ2oRLEotllEPFcZpazagIidn9NI LcQKoZUnEtd3iMMgdWQMot7OCGILrlglcmaB6eWr6dzB34GvMhztvFli2nsE9rWWzw 6yuxxNgtT+qXQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Josef Bacik , Rik van Riel , Muhammad Usama Anjum , Zi Yan , "David Hildenbrand (Arm)" , Sasha Levin Subject: [PATCH 6.6.y] mm/filemap: read mapping->a_ops->free_folio under i_lock Date: Fri, 13 Nov 2026 23:43:12 -0500 Message-ID: <20261114044256.2942554-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261109201130-failed-6.6-dc24e273244e@kernel.org> References: <20261109201130-failed-6.6-dc24e273244e@kernel.org> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Josef Bacik [ Upstream commit dc24e273244e9d712257d5a6c20a32c7f5ca84e6 ] memory_failure() -> ... -> filemap_remove_folio() can read mapping->a_ops after the inode has been freed. Once the folio is deleted from the pagecache it no longer pins the mapping, so after i_lock is dropped e.g., a concurrent final iput() can evict and free the inode before filemap_free_folio() looks up mapping->a_ops->free_folio. Most callers hold a reference on the inode, but not all. Documentation/filesystems/vfs.rst explicitly states that ->free_folio() must not assume the original address_space mapping still exists. Fix it by loading ->free_folio while i_lock is still held, similar to what folio_unmap_invalidate() does. Inline filemap_free_folio() into its remaining caller such that delete_from_page_cache_batch() also just loads the callback before dropping the i_lock. The bug was found by code inspection and has not been reproduced. Fix generated by an LLM and sent by Josef Bacik in private. Fixes: 59c66c5f8c4f ("mm: factor out page cache page freeing into a separate function") Cc: stable@vger.kernel.org Signed-off-by: Josef Bacik [ david: get rid of filemap_free_folio() entirely; improve patch description ] Reviewed-by: Rik van Riel Tested-by: Muhammad Usama Anjum Reviewed-by: Zi Yan Link: https://patch.msgid.link/20261031-fixes_core-v3-6-d6437171ecc3@kernel.org Signed-off-by: David Hildenbrand (Arm) [ sashal: preserved single-reference HugeTLB accounting when inlining cleanup into existing callers, including invalidate_complete_folio2() ] Signed-off-by: Sasha Levin --- mm/filemap.c | 37 ++++++++++++++++++++----------------- mm/internal.h | 1 - mm/truncate.c | 10 +++++++++- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index aec7fb85775c3..db9499f6abd3d 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -225,20 +225,6 @@ void __filemap_remove_folio(struct folio *folio, void *shadow) page_cache_delete(mapping, folio, shadow); } -void filemap_free_folio(struct address_space *mapping, struct folio *folio) -{ - void (*free_folio)(struct folio *); - int refs = 1; - - free_folio = mapping->a_ops->free_folio; - if (free_folio) - free_folio(folio); - - if (folio_test_large(folio) && !folio_test_hugetlb(folio)) - refs = folio_nr_pages(folio); - folio_put_refs(folio, refs); -} - /** * filemap_remove_folio - Remove folio from page cache. * @folio: The folio. @@ -250,6 +236,8 @@ void filemap_free_folio(struct address_space *mapping, struct folio *folio) void filemap_remove_folio(struct folio *folio) { struct address_space *mapping = folio->mapping; + void (*free_folio)(struct folio *folio); + int refs = 1; BUG_ON(!folio_test_locked(folio)); spin_lock(&mapping->host->i_lock); @@ -258,9 +246,14 @@ void filemap_remove_folio(struct folio *folio) xa_unlock_irq(&mapping->i_pages); if (mapping_shrinkable(mapping)) inode_add_lru(mapping->host); + free_folio = mapping->a_ops->free_folio; spin_unlock(&mapping->host->i_lock); - filemap_free_folio(mapping, folio); + if (free_folio) + free_folio(folio); + if (folio_test_large(folio) && !folio_test_hugetlb(folio)) + refs = folio_nr_pages(folio); + folio_put_refs(folio, refs); } /* @@ -320,6 +313,7 @@ static void page_cache_delete_batch(struct address_space *mapping, void delete_from_page_cache_batch(struct address_space *mapping, struct folio_batch *fbatch) { + void (*free_folio)(struct folio *folio); int i; if (!folio_batch_count(fbatch)) @@ -337,10 +331,19 @@ void delete_from_page_cache_batch(struct address_space *mapping, xa_unlock_irq(&mapping->i_pages); if (mapping_shrinkable(mapping)) inode_add_lru(mapping->host); + free_folio = mapping->a_ops->free_folio; spin_unlock(&mapping->host->i_lock); - for (i = 0; i < folio_batch_count(fbatch); i++) - filemap_free_folio(mapping, fbatch->folios[i]); + for (i = 0; i < folio_batch_count(fbatch); i++) { + struct folio *folio = fbatch->folios[i]; + int refs = 1; + + if (free_folio) + free_folio(folio); + if (folio_test_large(folio) && !folio_test_hugetlb(folio)) + refs = folio_nr_pages(folio); + folio_put_refs(folio, refs); + } } int filemap_check_errors(struct address_space *mapping) diff --git a/mm/internal.h b/mm/internal.h index 03cfd9f736597..a918559e57661 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -180,7 +180,6 @@ unsigned find_lock_entries(struct address_space *mapping, pgoff_t *start, pgoff_t end, struct folio_batch *fbatch, pgoff_t *indices); unsigned find_get_entries(struct address_space *mapping, pgoff_t *start, pgoff_t end, struct folio_batch *fbatch, pgoff_t *indices); -void filemap_free_folio(struct address_space *mapping, struct folio *folio); int truncate_inode_folio(struct address_space *mapping, struct folio *folio); bool truncate_inode_partial_folio(struct folio *folio, loff_t start, loff_t end); diff --git a/mm/truncate.c b/mm/truncate.c index 6a82e981b63ce..bdb7f5fc94945 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -594,6 +594,9 @@ EXPORT_SYMBOL(invalidate_mapping_pages); static int invalidate_complete_folio2(struct address_space *mapping, struct folio *folio) { + void (*free_folio)(struct folio *folio); + int refs = 1; + if (folio->mapping != mapping) return 0; @@ -610,9 +613,14 @@ static int invalidate_complete_folio2(struct address_space *mapping, xa_unlock_irq(&mapping->i_pages); if (mapping_shrinkable(mapping)) inode_add_lru(mapping->host); + free_folio = mapping->a_ops->free_folio; spin_unlock(&mapping->host->i_lock); - filemap_free_folio(mapping, folio); + if (free_folio) + free_folio(folio); + if (folio_test_large(folio) && !folio_test_hugetlb(folio)) + refs = folio_nr_pages(folio); + folio_put_refs(folio, refs); return 1; failed: xa_unlock_irq(&mapping->i_pages); -- 2.53.0