From: "David Hildenbrand (Arm)" <david@kernel.org>
To: mt4022@columbia.edu, Hugh Dickins <hughd@google.com>,
Baolin Wang <baolin.wang@linux.alibaba.com>,
Andrew Morton <akpm@linux-foundation.org>,
Kairui Song <kasong@tencent.com>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
tz2294@columbia.edu, Chris Li <chrisl@kernel.org>,
Kemeng Shi <shikemeng@huaweicloud.com>,
Nhat Pham <nphamcs@gmail.com>, Baoquan He <baoquan.he@linux.dev>,
Barry Song <baohua@kernel.org>,
Youngjun Park <youngjun.park@lge.com>,
stable@vger.kernel.org
Subject: Re: [PATCH] mm/shmem: fix swapin livelock on a mismatched large swap cache folio
Date: Thu, 19 Nov 2026 00:06:15 +0100 [thread overview]
Message-ID: <3c61a49f-6a0d-49eb-8682-aece4e7e7226@kernel.org> (raw)
In-Reply-To: <20261027-shmem-swapin-mismatch-v1-1-84e30aa3b9e5@columbia.edu>
On 10/27/26 21:33, Mani Tofigh via B4 Relay wrote:
> From: Mani Tofigh <mt4022@columbia.edu>
>
> On a SWP_SYNCHRONOUS_IO swap device, a large shmem folio can be left in
> the swap cache over swap slots that another file now uses. Reading
> that other file then loops forever in shmem_get_folio_gfp():
> shmem_swapin_folio() finds the large folio, rounds the index and the
> swap entry down to the folio's size, finds no matching entry in the
> file and returns -EEXIST, and the retry finds the same folio again.
> Since the task keeps the mapping locked, a munmap() of the same mapping
> waits forever.
>
> The folio is left behind when the slots are freed and reused while the
> swapin is still allocating it:
>
> Task A (reads X) Task B
> ---------------- ------
> shmem_swapin_folio()
> allocate a large folio
> for X's slots
> punch a hole in X
> /* X's slots freed */
> swap out file Y
> /* Y reuses those slots */
> add the folio to the swap
> cache over those slots
> shmem_confirm_swap() fails
> /* -EEXIST, the folio stays
> in the swap cache */
>
> Task C (reads Y)
> ----------------
> shmem_swapin_folio()
> finds the large folio
> rounds down to its start,
> where Y has no entry
> /* -EEXIST, retried forever */
>
> Before commit c246d236b18b ("mm/shmem: never bypass the swap cache for
> SWP_SYNCHRONOUS_IO"), a direct swapin that failed this way freed its
> folio instead of leaving it in the swap cache.
>
> do_swap_page() already drops a large swap cache folio that does not
> fit for anonymous memory. Do the same in shmem_swapin_folio() and on
> a -EEXIST, remove a large folio that is not
> anonymous/dirty/under-writeback from the swap cache so that the retry
> swaps in a folio that fits.
>
> The reproducer below fills a small brd swap device so that a 64K shmem
> folio and the 4K pages of another file land in the same slots, and races
> a read of the first file with a hole punch and a swapout of the second.
> This bug was identified and confirmed with the help of a deterministic
> hypervisor currently under development, but the non-deterministic C
> reproducer can typically trigger it in the 2-4s time range. With the
> fix, nothing is triggered after 600 seconds.
>
> Fixes: c246d236b18b ("mm/shmem: never bypass the swap cache for SWP_SYNCHRONOUS_IO")
> Cc: stable@vger.kernel.org
> Signed-off-by: Mani Tofigh <mt4022@columbia.edu>
> ---
> Two patches in David Hildenbrand's v2 shmem fixes series are related
> to this one. "mm/shmem: fix truncate hang in large swap entry" [1]
> makes truncation retry -EEXIST directly, so it can also loop on such a
> folio. "mm/shmem: preserve allocation errors when swapping in large
> entries" [2] fixes a different -EEXIST loop, where a failed allocation
> is reported as -EEXIST.
>
> [1] https://lore.kernel.org/all/20261027-fixes_shmem-v2-10-86a00952acb9@kernel.org/
> [2] https://lore.kernel.org/all/20261027-fixes_shmem-v2-11-86a00952acb9@kernel.org/
>
> Reproducer: https://github.com/manitofigh/files/blob/main/linux-repros/shmemloop.c
> ---
> mm/shmem.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/mm/shmem.c b/mm/shmem.c
> index 13e0786436cd..f1da8432d55c 100644
> --- a/mm/shmem.c
> +++ b/mm/shmem.c
> @@ -2568,11 +2568,14 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index,
> * and swap cache folios are never partially freed.
> */
> folio_lock(folio);
> - if (!folio_matches_swap_entry(folio, swap) ||
> - shmem_confirm_swap(mapping, index, swap) < 0) {
> + if (!folio_matches_swap_entry(folio, swap)) {
> error = -EEXIST;
> goto unlock;
> }
> + if (shmem_confirm_swap(mapping, index, swap) < 0) {
> + error = -EEXIST;
> + goto failed;
> + }
> if (!folio_test_uptodate(folio)) {
> error = -EIO;
> goto failed;
> @@ -2613,6 +2616,15 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index,
> error = -EEXIST;
> if (error == -EIO)
> shmem_set_folio_swapin_error(inode, index, folio, swap);
> + /*
> + * A large folio that does not fit the mapping, e.g. because its swap
> + * entries were freed and reused, would be found again on every retry.
> + * Drop it from the swap cache so the retry can swap in a fitting one.
> + */
> + if (error == -EEXIST && folio && folio_test_large(folio) &&
> + !folio_test_anon(folio) && !folio_test_dirty(folio) &&
> + !folio_test_writeback(folio))
> + swap_cache_del_folio(folio);
> unlock:
> if (folio)
> folio_unlock(folio);
>
> ---
I have an AI fix here:
Author: Chris Mason <mason@kernel.org>
Date: Wed Nov 11 18:44:55 2026 +0000
mm/shmem: don't drop a folio whose swap write failed
If the swap write of a large shmem folio fails while a swap-in of
another file finds that folio in the swap cache, its data can be
silently lost. A read of the file then returns whatever the swap device
holds.
"mm/shmem: fix swapin livelock on a mismatched large swap cache folio",
earlier in this series, lets shmem_swapin_folio() drop a large folio
from the swap cache, if the folio does not fit the file that is swapped
in and is neither dirty nor under writeback. A folio that does not fit
can belong to another file, with its swap write still in flight.
shmem_swapin_folio() holds the folio lock, but the code that completes a
write does not take that lock. And a failed write sets dirty before it
ends writeback. So the folio can look clean and written, although its
write has failed:
shmem_swapin_folio() swap_write_end(), failed write
==================== ==============================
folio_test_dirty() == false
folio_mark_dirty()
folio_end_writeback()
folio_test_writeback() == false
swap_cache_del_folio()
/* the only copy of the data */
The fix used here is to test writeback first, and dirty second.
Signed-off-by: Chris Mason <mason@kernel.org>
diff --git a/mm/shmem.c b/mm/shmem.c
index 915b312e14175..457a502353a9a 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2809,10 +2809,13 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index,
* A large folio that does not fit the mapping, e.g. because its swap
* entries were freed and reused, would be found again on every retry.
* Drop it from the swap cache so the retry can swap in a fitting one.
+ * A failed write sets dirty and then ends writeback, with no folio
+ * lock, so test writeback first. Both flags share folio->flags, so the
+ * order of the two loads holds.
*/
if (error == -EEXIST && folio && folio_test_large(folio) &&
- !folio_test_anon(folio) && !folio_test_dirty(folio) &&
- !folio_test_writeback(folio))
+ !folio_test_anon(folio) && !folio_test_writeback(folio) &&
+ !folio_test_dirty(folio))
swap_cache_del_folio(folio);
unlock:
if (folio)
@Mani, can you double check if that makes sense (can we actually trigger that), and
if so, send it out officially, with Fixes tag ?
Feel free to rework the patch as you please.
--
Cheers,
David
prev parent reply other threads:[~2026-11-18 23:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-27 20:33 [PATCH] mm/shmem: fix swapin livelock on a mismatched large swap cache folio Mani Tofigh via B4 Relay
2026-10-30 8:44 ` Baolin Wang
2026-11-18 23:06 ` David Hildenbrand (Arm) [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3c61a49f-6a0d-49eb-8682-aece4e7e7226@kernel.org \
--to=david@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=baohua@kernel.org \
--cc=baolin.wang@linux.alibaba.com \
--cc=baoquan.he@linux.dev \
--cc=chrisl@kernel.org \
--cc=hughd@google.com \
--cc=kasong@tencent.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mt4022@columbia.edu \
--cc=nphamcs@gmail.com \
--cc=shikemeng@huaweicloud.com \
--cc=stable@vger.kernel.org \
--cc=tz2294@columbia.edu \
--cc=youngjun.park@lge.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox