mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "David Hildenbrand (Arm)" <david@kernel.org>
To: 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>,
	 Baolin Wang <baolin.wang@linux.alibaba.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,
	 "David Hildenbrand (Arm)" <david@kernel.org>,
	stable@vger.kernel.org
Subject: [PATCH 16/16] mm/shmem: fix truncation of files containing only swapin-error markers
Date: Mon, 26 Oct 2026 10:40:49 +0100	[thread overview]
Message-ID: <20261026-fixes_shmem-v1-16-703206d5fa0c@kernel.org> (raw)
In-Reply-To: <20261026-fixes_shmem-v1-0-703206d5fa0c@kernel.org>

It might not be very common, but we can end up with shmem files that are
composed only of swapin-error/poison markers.

Such markers are not counted in info->alloced. Consequently,
shmem_setattr() can skip shmem_truncate_range(), leaving the markers
behind.

Truncating the file to zero and growing it again will result in reads
failing with -EIO instead of returning zeroes.

Check whether the mapping contains entries, in addition to
info->alloced, before skipping the truncation. Keep the info->alloced
check so that shmem_recalc_inode(), called at the end of
shmem_undo_range(), can fix up accounting after reclaim has emptied the
mapping.

Fixes: 6cec2b95dadf ("mm/shmem: fix infinite loop when swap in shmem error at swapoff time")
Cc: stable@vger.kernel.org
Signed-off-by: David Hildenbrand (Arm) <david@kernel.org>
---
 mm/shmem.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mm/shmem.c b/mm/shmem.c
index f5b5c9a312c53..45f6c34f161e4 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1602,7 +1602,8 @@ static int shmem_setattr(const struct mnt_idmap *idmap,
 			if (oldsize > holebegin)
 				unmap_mapping_range(inode->i_mapping,
 							holebegin, 0, 1);
-			if (info->alloced)
+			/* Swapin-error markers are not counted in alloced. */
+			if (info->alloced || !mapping_empty(inode->i_mapping))
 				shmem_truncate_range(inode,
 							newsize, (loff_t)-1);
 			/* unmap again to remove racily COWed private pages */

-- 
2.43.0


  parent reply	other threads:[~2026-10-26  9:42 UTC|newest]

Thread overview: 79+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-26  9:40 [PATCH 00/16] mm/shmem: various (urgent?) fixes David Hildenbrand (Arm)
2026-10-26  9:40 ` [PATCH 01/16] mm/mempolicy: charge shared policy nodes David Hildenbrand (Arm)
2026-10-26 13:38   ` Pedro Falcato
2026-10-26 15:44   ` Kiryl Shutsemau
2026-10-26 18:10   ` Zi Yan
2026-10-27  2:57   ` Baolin Wang
2026-10-26  9:40 ` [PATCH 02/16] tmpfs: keep the quota soft limits of an unused id David Hildenbrand (Arm)
2026-10-26 10:53   ` Jan Kara
2026-10-26 11:00     ` David Hildenbrand (Arm)
2026-10-26  9:40 ` [PATCH 03/16] tmpfs: preserve explicitly disabled quota limits David Hildenbrand (Arm)
2026-10-26 13:37   ` Jan Kara
2026-10-26  9:40 ` [PATCH 04/16] mm/shmem: honour F_SEAL_EXEC when an ACL is set David Hildenbrand (Arm)
2026-10-26 13:48   ` Pedro Falcato
2026-10-26 15:52   ` Kiryl Shutsemau
2026-10-26 19:07   ` Zi Yan
2026-10-27  3:45   ` Baolin Wang
2026-10-26  9:40 ` [PATCH 05/16] hugetlbfs: enforce F_SEAL_EXEC in setattr David Hildenbrand (Arm)
2026-10-26 13:49   ` Pedro Falcato
2026-10-26 15:55   ` Kiryl Shutsemau
2026-10-26 19:08   ` Zi Yan
2026-10-26  9:40 ` [PATCH 06/16] mm/shmem: hold off eviction in shmem_writeout() David Hildenbrand (Arm)
2026-10-26 15:14   ` Pedro Falcato
2026-10-26 18:44     ` Nhat Pham
2026-10-26 16:13   ` Kiryl Shutsemau
2026-10-27  9:53     ` David Hildenbrand (Arm)
2026-10-26 18:32   ` Nhat Pham
2026-10-27  5:44   ` Baolin Wang
2026-10-26  9:40 ` [PATCH 07/16] mm/shmem: avoid moving the truncation start backwards David Hildenbrand (Arm)
2026-10-26 16:30   ` Kiryl Shutsemau
2026-10-26 19:21   ` Zi Yan
2026-10-26 21:13     ` David Hildenbrand (Arm)
2026-10-26 22:39       ` Zi Yan
2026-10-26 23:16         ` Zi Yan
2026-10-26 23:24           ` David Hildenbrand (Arm)
2026-10-26 23:28             ` Zi Yan
2026-10-26 23:30               ` David Hildenbrand (Arm)
2026-10-26  9:40 ` [PATCH 08/16] mm/shmem: stop retrying folios that cannot be split David Hildenbrand (Arm)
2026-10-26 16:36   ` Kiryl Shutsemau
2026-10-26 17:08     ` David Hildenbrand (Arm)
2026-10-26 17:59       ` Kiryl Shutsemau
2026-10-27 10:04         ` David Hildenbrand (Arm)
2026-10-27  1:34   ` Zi Yan
2026-10-27 10:03     ` David Hildenbrand (Arm)
2026-10-26  9:40 ` [PATCH 09/16] mm/shmem: preserve data in clean folios when splitting fails David Hildenbrand (Arm)
2026-10-26 17:12   ` Kiryl Shutsemau
2026-10-27  6:35     ` Baolin Wang
2026-10-27 10:07     ` David Hildenbrand (Arm)
2026-10-27  2:00   ` Zi Yan
2026-10-26  9:40 ` [PATCH 10/16] mm/shmem: discard whole new large folios on fallocate rollback David Hildenbrand (Arm)
2026-10-26 17:15   ` Kiryl Shutsemau
2026-10-27  2:12   ` Zi Yan
2026-10-27  7:26   ` Baolin Wang
2026-10-26  9:40 ` [PATCH 11/16] mm/shmem: rescan after nonuniform folio splitting David Hildenbrand (Arm)
2026-10-26 17:26   ` Kiryl Shutsemau
2026-10-27  2:34     ` Zi Yan
2026-10-27  2:32   ` Zi Yan
2026-10-27  8:00     ` Baolin Wang
2026-10-27 10:12     ` David Hildenbrand (Arm)
2026-10-26  9:40 ` [PATCH 12/16] mm/shmem: fix truncate hang in large swap entry David Hildenbrand (Arm)
2026-10-26 17:39   ` Kiryl Shutsemau
2026-10-27  8:59   ` Baolin Wang
2026-10-27 10:14     ` David Hildenbrand (Arm)
2026-10-26  9:40 ` [PATCH 13/16] mm/shmem: preserve allocation errors when swapping in large entries David Hildenbrand (Arm)
2026-10-26 17:49   ` Kiryl Shutsemau
2026-10-27  9:18   ` Baolin Wang
2026-10-26  9:40 ` [PATCH 14/16] mm/shmem: fix truncate loop after boundary swapin failure David Hildenbrand (Arm)
2026-10-26 17:53   ` Kiryl Shutsemau
2026-10-26  9:40 ` [PATCH 15/16] mm/shmem: fix accounting of swapin-error markers David Hildenbrand (Arm)
2026-10-26  9:40 ` David Hildenbrand (Arm) [this message]
2026-10-26 11:11 ` [PATCH 00/16] mm/shmem: various (urgent?) fixes Baolin Wang
2026-10-26 12:12   ` David Hildenbrand (Arm)
2026-10-27 13:08     ` Baolin Wang
2026-10-26 13:23 ` Kairui Song
2026-10-26 20:08 ` Gregory Price
2026-10-26 21:09   ` David Hildenbrand (Arm)
2026-10-26 21:24     ` Gregory Price (Meta)
2026-10-27  9:34       ` David Hildenbrand (Arm)
2026-10-27 11:37         ` Gregory Price (Meta)
2026-10-27 12:07           ` 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=20261026-fixes_shmem-v1-16-703206d5fa0c@kernel.org \
    --to=david@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=baolin.wang@linux.alibaba.com \
    --cc=brauner@kernel.org \
    --cc=chrisl@kernel.org \
    --cc=cmaiolino@redhat.com \
    --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=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®