From: Baolin Wang <baolin.wang@linux.alibaba.com>
To: "David Hildenbrand (Arm)" <david@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Gregory Price <gourry@gourry.net>, Zi Yan <ziy@nvidia.com>,
Joshua Hahn <joshua.hahnjy@gmail.com>,
Rakie Kim <rakie.kim@sk.com>,
Ying Huang <ying.huang@linux.alibaba.com>,
Johannes Weiner <hannes@cmpxchg.org>,
Vladimir Davydov <vdavydov.dev@gmail.com>,
Michal Hocko <mhocko@suse.com>, Hugh Dickins <hughd@google.com>,
Lukas Czerner <lczerner@redhat.com>,
Carlos Maiolino <cmaiolino@redhat.com>,
Christian Brauner <brauner@kernel.org>, Jan Kara <jack@suse.cz>,
Daniel Verkamp <dverkamp@chromium.org>,
Jeff Xu <jeffxu@google.com>, Muchun Song <muchun.song@linux.dev>,
Oscar Salvador <osalvador@suse.de>,
David Stevens <stevensd@chromium.org>,
"Matthew Wilcox (Oracle)" <willy@infradead.org>,
William Kucharski <william.kucharski@oracle.com>,
Chris Li <chrisl@kernel.org>, Kairui Song <kasong@tencent.com>,
Nhat Pham <nphamcs@gmail.com>, Miaohe Lin <linmiaohe@huawei.com>,
Naoya Horiguchi <nao.horiguchi@gmail.com>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org, "Kiryl Shutsemau (Meta)" <kas@kernel.org>
Subject: Re: [PATCH v2 12/14] mm/shmem: fix truncate loop after boundary swapin failure
Date: Wed, 28 Oct 2026 09:30:59 +0800 [thread overview]
Message-ID: <2d111275-e7a8-4ac5-8618-f068e87145f2@linux.alibaba.com> (raw)
In-Reply-To: <20261027-fixes_shmem-v2-12-86a00952acb9@kernel.org>
On 10/27/26 9:03 PM, David Hildenbrand (Arm) wrote:
> If swapping in a large entry at the new EOF fails, shmem_undo_range()
> leaves the entry in place. Its final scan skips the entry, then restarts
> from the same start index and finds it again. Truncation can loop forever
> while holding i_rwsem.
Right. But ...
> Advance start past the skipped entry so that a restarted scan can finish,
> as we already do for folios that cannot be split.
IIRC, we originally avoided advancing start because a concurrent swapin
fault could split the boundary large swap entry via
shmem_split_large_entry(), leaving small swap entries below the new start.
Sigh.
There doesn't seem to be a simple fix. We may need to swap in the large
entry as shmem_get_partial_folio() does, and then split the large folio.
I'll work on this as a follow-up.
> Note that this does not fix the missing zeroing when boundary swapin fails,
> it merely prevents the endless loop.
>
> Fixes: 8a1968bd997f ("mm/shmem, swap: fix race of truncate and swap entry split")
> Cc: stable@vger.kernel.org
> Acked-by: Kiryl Shutsemau (Meta) <kas@kernel.org>
> Tested-by: Gregory Price (Meta) <gourry@gourry.net>
> Signed-off-by: David Hildenbrand (Arm) <david@kernel.org>
> ---
> mm/shmem.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/mm/shmem.c b/mm/shmem.c
> index 9a11de010ed7b..4ece296a1ccf1 100644
> --- a/mm/shmem.c
> +++ b/mm/shmem.c
> @@ -1434,14 +1434,16 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, uoff_t lend,
> order = shmem_confirm_swap(mapping, indices[i],
> radix_to_swp_entry(folio));
> /*
> - * If found a large swap entry cross the end or start
> - * border, skip it as the truncate_inode_partial_folio
> - * above should have at least zerod its content once.
> + * Skip boundary entries when restarting
> + * the scan to avoid endless loops after
> + * swapin failure.
> */
> if (order > 0) {
> base = round_down(base, 1 << order);
> - if (base < start || base + (1 << order) > end)
> + if (base < start || base + (1 << order) > end) {
> + start = max(start, base + (1 << order));
> continue;
> + }
> }
> /* Swap was replaced by page or extended, retry */
> index = base;
>
next prev parent reply other threads:[~2026-10-28 1:31 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-27 13:03 [PATCH v2 00/14] mm/shmem: various (urgent?) fixes David Hildenbrand (Arm)
2026-10-27 13:03 ` [PATCH v2 01/14] mm/mempolicy: charge shared policy nodes David Hildenbrand (Arm)
2026-10-27 13:03 ` [PATCH v2 02/14] tmpfs: keep the quota soft limits of an unused id David Hildenbrand (Arm)
2026-10-27 13:03 ` [PATCH v2 03/14] tmpfs: preserve explicitly disabled quota limits David Hildenbrand (Arm)
2026-10-27 13:03 ` [PATCH v2 04/14] mm/shmem: honour F_SEAL_EXEC when an ACL is set David Hildenbrand (Arm)
2026-10-27 17:34 ` Pratyush Yadav
2026-10-27 13:03 ` [PATCH v2 05/14] hugetlbfs: enforce F_SEAL_EXEC in setattr David Hildenbrand (Arm)
2026-10-27 13:16 ` Muchun Song
2026-10-27 13:03 ` [PATCH v2 06/14] mm/shmem: stop retrying folios that cannot be split David Hildenbrand (Arm)
2026-10-27 21:06 ` Zi Yan
2026-10-27 13:03 ` [PATCH v2 07/14] mm/shmem: preserve data in clean folios when splitting fails David Hildenbrand (Arm)
2026-10-27 13:03 ` [PATCH v2 08/14] mm/shmem: discard whole new large folios on fallocate rollback David Hildenbrand (Arm)
2026-10-27 13:03 ` [PATCH v2 09/14] mm/shmem: rescan after nonuniform folio splitting David Hildenbrand (Arm)
2026-10-27 21:07 ` Zi Yan
2026-10-27 13:03 ` [PATCH v2 10/14] mm/shmem: fix truncate hang in large swap entry David Hildenbrand (Arm)
2026-10-27 13:03 ` [PATCH v2 11/14] mm/shmem: preserve allocation errors when swapping in large entries David Hildenbrand (Arm)
2026-10-27 13:03 ` [PATCH v2 12/14] mm/shmem: fix truncate loop after boundary swapin failure David Hildenbrand (Arm)
2026-10-28 1:30 ` Baolin Wang [this message]
2026-10-27 13:03 ` [PATCH v2 13/14] mm/shmem: fix accounting of swapin-error markers David Hildenbrand (Arm)
2026-10-28 2:07 ` Baolin Wang
2026-10-27 13:03 ` [PATCH v2 14/14] mm/shmem: fix truncation of files containing only " David Hildenbrand (Arm)
2026-10-28 2:19 ` Baolin Wang
2026-10-27 13:20 ` [PATCH v2 00/14] mm/shmem: various (urgent?) fixes Baolin Wang
2026-10-27 13:27 ` David Hildenbrand (Arm)
2026-10-27 13:30 ` David Hildenbrand (Arm)
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=2d111275-e7a8-4ac5-8618-f068e87145f2@linux.alibaba.com \
--to=baolin.wang@linux.alibaba.com \
--cc=akpm@linux-foundation.org \
--cc=brauner@kernel.org \
--cc=chrisl@kernel.org \
--cc=cmaiolino@redhat.com \
--cc=david@kernel.org \
--cc=dverkamp@chromium.org \
--cc=gourry@gourry.net \
--cc=hannes@cmpxchg.org \
--cc=hughd@google.com \
--cc=jack@suse.cz \
--cc=jeffxu@google.com \
--cc=joshua.hahnjy@gmail.com \
--cc=kas@kernel.org \
--cc=kasong@tencent.com \
--cc=lczerner@redhat.com \
--cc=linmiaohe@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=muchun.song@linux.dev \
--cc=nao.horiguchi@gmail.com \
--cc=nphamcs@gmail.com \
--cc=osalvador@suse.de \
--cc=rakie.kim@sk.com \
--cc=stable@vger.kernel.org \
--cc=stevensd@chromium.org \
--cc=vdavydov.dev@gmail.com \
--cc=william.kucharski@oracle.com \
--cc=willy@infradead.org \
--cc=ying.huang@linux.alibaba.com \
--cc=ziy@nvidia.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
all inboxes | Powered by JetHome®