Skip to contentSkip to conversation

mm, swap: keep hibernation swap slots out of the swap cache

PATCH In review Youngjun Park 3 participants 10 messages Aug 11 – Aug 12

Subsystems (3)
lore
Share & tools
lore

Youngjun Park

author reviewer
#0 lore raw

v3 cover mm, swap: keep hibernation swap slots out of the swap cache

Cluster readahead walks a raw page_cluster sized window of offsets around the faulting entry. A hibernation slot looks like an ordinary swapped out slot, so __swap_cache_add_check() lets it in. Readahead reads the offset off the device into a folio and puts that folio in the swap table where the hibernation entry was. This has been possible for a long time. It only wasted a folio and a read.

That changed with commit 0d6af9bcf383 ("mm, swap: use the swap table to track the swap count"). A slot with a folio in the swap cache should only be freed when the folio leaves the cache. swap_put_entries_cluster() still does that, but the conversion left swap_free_hibernation_slot() freeing the slot either way. Nothing points at the folio after that, and when reclaim drops it later, it writes to the table entry at the old offset, which someone else may own by then.

Patch 1 is the fix and the only patch for stable. It puts the missing check back, so both free paths behave the same again.

The rest removes the cause. Readahead should not touch these slots at all, so patch 2 lets only swapped out slots into the swap cache, which also puts back a bad slot check the swap cache rework dropped, patch 3 gives hibernation slots their own swap table entry type so that check covers them too, and patch 4 drops the guard and the reclaim, since no such folio can exist any more.

For any of this a task has to hold hibernation slots while the system is still running. The in kernel path does not, it allocates, writes and frees the slots with everything frozen. Userspace hibernation is different. The process writing the image is not frozen, and SNAPSHOT_ALLOC_SWAP_PAGE does not check that anything is frozen. The swap device must also not be SWP_SYNCHRONOUS_IO, or swapin takes the direct path and never reaches cluster readahead.

Tested with a debug patch generated by AI that counts hibernation slots through the swap cache paths. virtio-blk swap, page-cluster 3, SNAPSHOT_ALLOC_SWAP_PAGE interleaved with MADV_PAGEOUT of a shmem region so the hibernation slots land in the readahead windows.

unpatched +patch 1 patches 1-4

  hibernation slots allocated       2732       2732         2732
  readahead landed on the slot      2731       2731         2731
  admitted to the swap cache        2731       2731            0
  reclaim found the folio              0       2731            -
  slot left unfreed                    0          0            0
  VM_WARN in the free path          2731          0            0

The VM_WARN is the existing assertion in __swap_cluster_free_entries(), not something the debug patch adds.

v2: https://lore.kernel.org/linux-mm/[email protected]/
v1: https://lore.kernel.org/linux-mm/[email protected]/

Changes since v2:

- Give the large folio walk in __swap_cache_add_check() the same shadow test, pointed at by the AI review Andrew linked. No bad slot can be in that range, but a slot freed and then taken by hibernation could trip the countable assertion there
- Picked up Kairui's ack on patch 2, given before the walk change
- Rebased onto mm-new

Youngjun Park (4):
mm, swap: don't free a hibernation slot that is in the swap cache mm, swap: only allow swapped-out slots into the swap cache mm, swap: give hibernation swap slots their own swap table entry type mm, swap: drop the swap cache guard and reclaim in
swap_free_hibernation_slot()

 mm/swap_state.c | 11 ++++++++---
 mm/swap_table.h | 13 +++++++++++++
 mm/swapfile.c   | 16 +++++++---------
 3 files changed, 28 insertions(+), 12 deletions(-)

base-commit: 480a31230b426efb005b6e71a14ef80f405f18b6

Signature · 1 line
2.48.1
author reviewer
#1 lore raw

PATCH v3 1/4 mm, swap: don't free a hibernation slot that is in the swap cache

A slot with a folio in the swap cache is freed when the folio leaves the cache, not when its count drops. swap_put_entries_cluster() follows that rule. swap_free_hibernation_slot() does not, it calls __swap_cluster_free_entries() whether or not a folio sits on the slot.

Cluster readahead can put one there. It walks a raw page_cluster sized window of offsets around the faulting entry, and a hibernation slot passes __swap_cache_add_check() because it is not a folio and its count is not zero. Freeing the slot then clears the entry under that folio.

The folio is now unreachable from the swap table, and the offset goes back to the allocator. The folio is still on the LRU though, so reclaim can pick it up later. It then takes the old offset out of folio->swap and overwrites the table entry there, which by then may belong to someone else.

Check for a cached folio before freeing. The slot is then left in the ordinary state where only the swap cache holds it, and it is freed when the folio leaves the cache, either through the reclaim below or through normal reclaim later.

Fixes 0d6af9bcf383 ("mm, swap: use the swap table to track the swap count")
---
 mm/swapfile.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
mm/swapfile.c +8 -1
index dea2d3b36e06..f5dfc7e59191 100644
@@ -2202,7 +2202,14 @@ void swap_free_hibernation_slot(swp_entry_t entry)
 
 	ci = swap_cluster_lock(si, offset);
 	__swap_cluster_put_entry(ci, offset % SWAPFILE_CLUSTER);
-	__swap_cluster_free_entries(si, ci, offset % SWAPFILE_CLUSTER, 1);
+	/*
+	 * A slot with a folio in the swap cache is freed when the folio
+	 * leaves the cache, the same rule swap_put_entries_cluster() follows.
+	 * Readahead can put a folio here, and freeing the slot now would
+	 * leave that folio with no entry behind it.
+	 */
+	if (!swp_tb_is_folio(__swap_table_get(ci, offset % SWAPFILE_CLUSTER)))
+		__swap_cluster_free_entries(si, ci, offset % SWAPFILE_CLUSTER, 1);
 	swap_cluster_unlock(ci);
 
 	/* In theory readahead might add it to the swap cache by accident */
Signature · 1 line
2.48.1
author reviewer
#2 lore raw

PATCH v3 2/4 mm, swap: only allow swapped-out slots into the swap cache

In reply to Youngjun Park

__swap_cache_add_check() turns away folio entries and slots with no count and lets everything else in. That is safe only when the caller owns the slot. Cluster readahead owns nothing, it walks a raw page_cluster sized window of offsets around the faulting entry, so it can land on any slot.

A bad slot gets in. The check reads the count with __swp_tb_get_count(), which shifts the count bits out without looking at the type, and SWP_TB_BAD has all of them set, so the slot reads as SWP_TB_COUNT_MAX. Readahead then allocates a folio and reads the offset off the device for a slot nothing will ever swap in, and the folio entry that replaces it drops the bad marker.

Readahead used to be guarded by swap_entry_swapped(), which goes through swp_tb_get_count() and gets -EINVAL for a bad slot. That call went away when the swap cache checks moved into __swap_cache_add_check(), and the raw accessor there does not do the same type test.

Require a shadow entry instead. A slot dropped from the swap cache always gets one, empty if there is no workingset value. The type test runs first, so the count is only read off a countable entry, and the check as a whole runs before the folio allocation in __swap_cache_alloc().

The large folio walk in the same function does the same raw reads. A bad slot cannot be in its range, but the range is not pinned, so a slot freed and then taken by hibernation still trips the countable assertion there. Give the walk the same shadow test, the folio check folds into it.

Reproduced with a badpages list written into the swap header by hand. Readahead took over four bad slots before this patch and none after. It needs a crafted header, so a normal setup will not hit it.

Fixes e1e6750df3b4 ("mm, swap: add support for stable large allocation in swap cache directly")
---
 mm/swap_state.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
mm/swap_state.c +8 -3
index b76eb3d876fd..6341f1bfffa2 100644
@@ -181,9 +181,14 @@ static int __swap_cache_add_check(struct swap_cluster_info *ci,
 	old_tb = __swap_table_get(ci, ci_off);
 	if (swp_tb_is_folio(old_tb))
 		return -EEXIST;
-	if (!__swp_tb_get_count(old_tb))
+	/*
+	 * Only a swapped-out slot may be brought into the swap cache.
+	 * Cluster readahead walks raw offset ranges, so it can land on
+	 * slots that are free, bad, or owned by hibernation.
+	 */
+	if (!swp_tb_is_shadow(old_tb) || !__swp_tb_get_count(old_tb))
 		return -ENOENT;
-	if (shadowp && swp_tb_is_shadow(old_tb))
+	if (shadowp)
 		*shadowp = swp_tb_to_shadow(old_tb);
 	if (memcg_id)
 		*memcg_id = __swap_cgroup_get(ci, ci_off);
@@ -196,7 +201,7 @@ static int __swap_cache_add_check(struct swap_cluster_info *ci,
 	ci_end = ci_off + nr;
 	do {
 		old_tb = __swap_table_get(ci, ci_off);
-		if (unlikely(swp_tb_is_folio(old_tb) ||
+		if (unlikely(!swp_tb_is_shadow(old_tb) ||
 			     !__swp_tb_get_count(old_tb) ||
 			     is_zero != __swap_table_test_zero(ci, ci_off) ||
 			     (memcg_id && *memcg_id != __swap_cgroup_get(ci, ci_off))))
Signature · 1 line
2.48.1
author reviewer
#3 lore raw

PATCH v3 3/4 mm, swap: give hibernation swap slots their own swap table entry type

In reply to Youngjun Park

swap_alloc_hibernation_slot() stores a fake shadow in the slot it hands out. An anon slot swapped out with no workingset shadow looks exactly the same, so nothing in mm can tell the two apart.

Give hibernation slots their own type. Bit 4 and every bit above it are set, except the count field, which stays 0. Bits 0 to 3 are taken by the shadow, PFN, pointer and bad marks, so bit 4 is the first free one. The type holds no data, so the value alone says what it is.

The entry has no swap count. Hibernation only allocates and frees a slot, so a count would never change. swap_free_hibernation_slot() frees the slot directly, there is no count to put first.

The slot is no longer a shadow, so the previous patch keeps it out of the swap cache. The count field stays 0 as well, so code that reads the count without checking the type sees an unused slot instead of one at SWP_TB_COUNT_MAX, and a wrong put is caught by the existing underflow check.

---
 mm/swap_table.h | 13 +++++++++++++
 mm/swapfile.c   | 13 +++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)
mm/swap_table.h +13 -0
index e6613e62f8d0..b916a6493521 100644
@@ -30,6 +30,7 @@ struct swap_memcg_table {
  * PFN:      |SWAP_COUNT|Z|------ PFN -------|10| - Cached slot
  * Pointer:  |----------- Pointer ----------|100| - (Unused)
  * Bad:      |------------- 1 -------------|1000| - Bad slot
+ * Hibern:   |    0     |------- 1 -------|10000| - Hibernation slot
  *
  * COUNT is `SWP_TB_COUNT_BITS` long, Z is the `SWP_TB_ZERO_FLAG` bit,
  * and together they form the `SWP_TB_FLAGS_BITS` wide flags field.
@@ -54,6 +55,10 @@ struct swap_memcg_table {
  *   aligned pointers.
  *
  * - Bad: Swap slot is reserved, protects swap header or holes on swap devices.
+ *
+ * - Hibern: Swap slot is reserved by hibernation for the suspend image, and
+ *   must never enter the swap cache. The count field is kept 0 so it never
+ *   reads as a slot in use.
  */
 
 /* NULL Entry, all 0 */
@@ -81,6 +86,9 @@ struct swap_memcg_table {
 /* Bad slot: ends with 0b1000 and rests of bits are all 1 */
 #define SWP_TB_BAD		((~0UL) << 3)
 
+/* Hibernation slot: ends with 0b10000, no count, rests of bits are all 1 */
+#define SWP_TB_HIB		(((~0UL) << 4) & ~SWP_TB_COUNT_MASK)
+
 /* Macro for shadow offset calculation */
 #define SWAP_COUNT_SHIFT	SWP_TB_FLAGS_BITS
 
@@ -166,6 +174,11 @@ static inline bool swp_tb_is_bad(unsigned long swp_tb)
 	return swp_tb == SWP_TB_BAD;
 }
 
+static inline bool swp_tb_is_hibernation(unsigned long swp_tb)
+{
+	return swp_tb == SWP_TB_HIB;
+}
+
 static inline bool swp_tb_is_countable(unsigned long swp_tb)
 {
 	return (swp_tb_is_shadow(swp_tb) || swp_tb_is_folio(swp_tb) ||
mm/swapfile.c +7 -6
index f5dfc7e59191..a337387f7431 100644
@@ -928,7 +928,7 @@ static bool __swap_cluster_alloc_entries(struct swap_info_struct *si,
 	 * upon folio unmap.
 	 *
 	 * Else, it's a exclusive order 0 allocation for hibernation.
-	 * The slot starts with count == 1 and never increases.
+	 * The slot carries no swap count and is freed by offset.
 	 */
 	if (likely(folio)) {
 		order = folio_order(folio);
@@ -940,8 +940,8 @@ static bool __swap_cluster_alloc_entries(struct swap_info_struct *si,
 		order = 0;
 		nr_pages = 1;
 		swap_cluster_assert_empty(ci, ci_off, 1, false);
-		/* Fake shadow placeholder with no flag, hibernation does not use the zeromap */
-		__swap_table_set(ci, ci_off, __swp_tb_mk_count(shadow_to_swp_tb(NULL, 0), 1));
+		/* Exclusively owned by hibernation, must never enter the swap cache */
+		__swap_table_set(ci, ci_off, SWP_TB_HIB);
 	} else {
 		/* Allocation without folio is only possible with hibernation */
 		WARN_ON_ONCE(1);
@@ -1929,9 +1929,11 @@ void __swap_cluster_free_entries(struct swap_info_struct *si,
 		old_tb = __swap_table_get(ci, ci_off);
 		/*
 		 * Freeing is done after release of the last swap count
-		 * ref, or after swap cache is dropped
+		 * ref, or after swap cache is dropped. A hibernation slot
+		 * has no count and is freed directly by its owner.
 		 */
-		VM_WARN_ON(!swp_tb_is_shadow(old_tb) || __swp_tb_get_count(old_tb) > 1);
+		VM_WARN_ON(!swp_tb_is_hibernation(old_tb) &&
+			   (!swp_tb_is_shadow(old_tb) || __swp_tb_get_count(old_tb) > 1));
 
 		/* Resetting the slot to NULL also clears the inline flags. */
 		__swap_table_set(ci, ci_off, null_to_swp_tb());
@@ -2201,7 +2203,6 @@ void swap_free_hibernation_slot(swp_entry_t entry)
 	pgoff_t offset = swp_offset(entry);
 
 	ci = swap_cluster_lock(si, offset);
-	__swap_cluster_put_entry(ci, offset % SWAPFILE_CLUSTER);
 	/*
 	 * A slot with a folio in the swap cache is freed when the folio
 	 * leaves the cache, the same rule swap_put_entries_cluster() follows.
Signature · 1 line
2.48.1
Acked-by on v3 3/4
#4 lore raw

Re: [PATCH v3 3/4] mm, swap: give hibernation swap slots their own swap table entry type

Quoted 32 lines · Youngjun Park

swap_alloc_hibernation_slot() stores a fake shadow in the slot it hands out. An anon slot swapped out with no workingset shadow looks exactly the same, so nothing in mm can tell the two apart.

Give hibernation slots their own type. Bit 4 and every bit above it are set, except the count field, which stays 0. Bits 0 to 3 are taken by the shadow, PFN, pointer and bad marks, so bit 4 is the first free one. The type holds no data, so the value alone says what it is.

The entry has no swap count. Hibernation only allocates and frees a slot, so a count would never change. swap_free_hibernation_slot() frees the slot directly, there is no count to put first.

The slot is no longer a shadow, so the previous patch keeps it out of the swap cache. The count field stays 0 as well, so code that reads the count without checking the type sees an unused slot instead of one at SWP_TB_COUNT_MAX, and a wrong put is caught by the existing underflow check.

---
 mm/swap_table.h | 13 +++++++++++++
 mm/swapfile.c   | 13 +++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)
mm/swap_table.h +0 -0
index e6613e62f8d0..b916a6493521 100644

mm/swap_table.h struct swap_memcg_table { · line 33

Quoted 4 lines
mm/swap_table.h +1 -0
@@ -30,6 +30,7 @@ struct swap_memcg_table {
  * PFN:      |SWAP_COUNT|Z|------ PFN -------|10| - Cached slot
  * Pointer:  |----------- Pointer ----------|100| - (Unused)
  * Bad:      |------------- 1 -------------|1000| - Bad slot
+ * Hibern:   |    0     |------- 1 -------|10000| - Hibernation slot

Hibern is a odd name, but I don't have better idea for this... Maybe just HIB, match the macro name?

mm/swap_table.h struct swap_memcg_table { · line 61

Quoted 11 lines
mm/swap_table.h +4 -0
  *
  * COUNT is `SWP_TB_COUNT_BITS` long, Z is the `SWP_TB_ZERO_FLAG` bit,
  * and together they form the `SWP_TB_FLAGS_BITS` wide flags field.
@@ -54,6 +55,10 @@ struct swap_memcg_table {
  *   aligned pointers.
  *
  * - Bad: Swap slot is reserved, protects swap header or holes on swap devices.
+ *
+ * - Hibern: Swap slot is reserved by hibernation for the suspend image, and
+ *   must never enter the swap cache. The count field is kept 0 so it never
+ *   reads as a slot in use.

Not sure if the comment is a bit misleading. The slot is treated as in use by allocator since it is not a NULL slot, kind of like a special pin, just like swap cache pin, which also has a count == 0, until folio_dup_swap is called. We can never dup a hibernate slot though, which is expected. And we never add it to swap cache.

mm/swap_table.h void swap_free_hibernation_slot(swp_entry_t entry) · line 2204

Quoted 5 lines
mm/swap_table.h +0 -1
@@ -2201,7 +2203,6 @@ void swap_free_hibernation_slot(swp_entry_t entry)
 	pgoff_t offset = swp_offset(entry);
 
 	ci = swap_cluster_lock(si, offset);
-	__swap_cluster_put_entry(ci, offset % SWAPFILE_CLUSTER);

Nice! We can free it directly now.

Quoted 6 lines
mm/swap_table.h +0 -0
 	/*
 	 * A slot with a folio in the swap cache is freed when the folio
 	 * leaves the cache, the same rule swap_put_entries_cluster() follows.
Signature · 1 line
2.48.1

Just two trivial nit picks on doc, feel free to ignore, code looks good to me, Thanks!

author reviewer
#5 lore raw

PATCH v3 4/4 mm, swap: drop the swap cache guard and reclaim in swap_free_hibernation_slot()

In reply to Youngjun Park

Both are there for a folio that readahead might have put on the slot. A hibernation entry is not a shadow and has no swap count, so the swap cache turns it away and no such folio can exist.

---
 mm/swapfile.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
mm/swapfile.c +1 -11
index a337387f7431..4fba1770ce61 100644
@@ -2203,18 +2203,8 @@ void swap_free_hibernation_slot(swp_entry_t entry)
 	pgoff_t offset = swp_offset(entry);
 
 	ci = swap_cluster_lock(si, offset);
-	/*
-	 * A slot with a folio in the swap cache is freed when the folio
-	 * leaves the cache, the same rule swap_put_entries_cluster() follows.
-	 * Readahead can put a folio here, and freeing the slot now would
-	 * leave that folio with no entry behind it.
-	 */
-	if (!swp_tb_is_folio(__swap_table_get(ci, offset % SWAPFILE_CLUSTER)))
-		__swap_cluster_free_entries(si, ci, offset % SWAPFILE_CLUSTER, 1);
+	__swap_cluster_free_entries(si, ci, offset % SWAPFILE_CLUSTER, 1);
 	swap_cluster_unlock(ci);
-
-	/* In theory readahead might add it to the swap cache by accident */
-	__try_to_reclaim_swap(si, offset, TTRS_ANYWAY);
 }
 
 static int __find_hibernation_swap_type(dev_t device, sector_t offset)
Signature · 1 line
2.48.1
Acked-by on v3 4/4
#6 lore raw

Re: [PATCH v3 4/4] mm, swap: drop the swap cache guard and reclaim in swap_free_hibernation_slot()

Quoted 20 lines · Youngjun Park

Both are there for a folio that readahead might have put on the slot. A hibernation entry is not a shadow and has no swap count, so the swap cache turns it away and no such folio can exist.

---
 mm/swapfile.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
mm/swapfile.c +0 -3
index a337387f7431..4fba1770ce61 100644
@@ -2203,18 +2203,8 @@ void swap_free_hibernation_slot(swp_entry_t entry)
 	pgoff_t offset = swp_offset(entry);
 
 	ci = swap_cluster_lock(si, offset);
-	/*
-	 * A slot with a folio in the swap cache is freed when the folio
-	 * leaves the cache, the same rule swap_put_entries_cluster() follows.

mm/swapfile.c void swap_free_hibernation_slot(swp_entry_t entry) · line 2217

Quoted 10 lines
mm/swapfile.c +1 -8
-	 * Readahead can put a folio here, and freeing the slot now would
-	 * leave that folio with no entry behind it.
-	 */
-	if (!swp_tb_is_folio(__swap_table_get(ci, offset % SWAPFILE_CLUSTER)))
-		__swap_cluster_free_entries(si, ci, offset % SWAPFILE_CLUSTER, 1);
+	__swap_cluster_free_entries(si, ci, offset % SWAPFILE_CLUSTER, 1);
 	swap_cluster_unlock(ci);
-
-	/* In theory readahead might add it to the swap cache by accident */
-	__try_to_reclaim_swap(si, offset, TTRS_ANYWAY);

Nice to see this gets cleaned up.

maintainer
#7 lore raw
In reply to Youngjun Park
Quoted 15 lines · On Tue, 11 Aug 2026 22:22:05 +0900 Youngjun Park <[email protected]> wrote:

Cluster readahead walks a raw page_cluster sized window of offsets around the faulting entry. A hibernation slot looks like an ordinary swapped out slot, so __swap_cache_add_check() lets it in. Readahead reads the offset off the device into a folio and puts that folio in the swap table where the hibernation entry was. This has been possible for a long time. It only wasted a folio and a read.

That changed with commit 0d6af9bcf383 ("mm, swap: use the swap table to track the swap count"). A slot with a folio in the swap cache should only be freed when the folio leaves the cache. swap_put_entries_cluster() still does that, but the conversion left swap_free_hibernation_slot() freeing the slot either way. Nothing points at the folio after that, and when reclaim drops it later, it writes to the table entry at the old offset, which someone else may own by then.

Quoted 2 lines

Patch 1 is the fix and the only patch for stable. It puts the missing check back, so both free paths behave the same again.

Thanks.

When fixing things, please always take care to describe the userspace-visible runtime effects of the bug, particularly when proposing a -stable backport.

For [1/4] Gemini tells me "At a high level, this bug triggers silent memory corruption, process crashes, or data instability across completely unrelated userspace applications - typically occurring after a system resumes from hibernation (suspend-to-disk)." Which is what I figured too.

Do we have any reports of this? Reported-by/Closes?

I'd like to grab [1/4] only, and defer the other three until 7.3-rc1. This might be mistaken, but from a quick read, it's not clear what benefit those three patches offer our users.

And there's value in merging the backportable fix alone, to avoid the risk that the other three patches accidentally fix misbehavior in [1/4].

author reviewer
#8 lore raw
Quoted 3 lines · Andrew Morton

When fixing things, please always take care to describe the userspace-visible runtime effects of the bug, particularly when proposing a -stable backport.

Thank you for the advice and sorry for it.
I will make sure future patches describe the userspace-visible effects clearly!

Quoted 5 lines

For [1/4] Gemini tells me "At a high level, this bug triggers silent memory corruption, process crashes, or data instability across completely unrelated userspace applications - typically occurring after a system resumes from hibernation (suspend-to-disk)." Which is what I figured too.

That is right, with one small correction. this can happen with uswsusp while the hibernation image is being created, not at resume time. Memory corruption, process crashes, or data instability across completely unrelated userspace applications can occur there.

Quoted 1 line

Do we have any reports of this? Reported-by/Closes?

I found this while working on giving hibernation slots their own marker in the swap table, which I had discussed with Kairui.
(https://lore.kernel.org/linux-mm/abp7aDgYLrxF3Me8@KASONG-MC4/)
As far as I know there are no reports, so there is no Reported-by/Closes to add.

Quoted 3 lines

I'd like to grab [1/4] only, and defer the other three until 7.3-rc1. This might be mistaken, but from a quick read, it's not clear what benefit those three patches offer our users.

Simply put, they are close to cleanups that remove unneeded work. (with a some little optimization.)

Patch 2 keeps bad slots out of the swap cache, so readahead no longer wastes a folio on them.

Patch 3 keeps hibernation slots out of the swap cache, with the same effect. no wasted folio at readahead time.

Patch 4 removes dead code.

Thanks,
Youngjun Park

maintainer Acked-by Kairui Song
#9 lore raw
Quoted 7 lines · On Wed, 12 Aug 2026 21:13:37 +0900 Youngjun Park <[email protected]> wrote:
Quoted 3 lines · Andrew Morton

When fixing things, please always take care to describe the userspace-visible runtime effects of the bug, particularly when proposing a -stable backport.

Thank you for the advice and sorry for it.
I will make sure future patches describe the userspace-visible effects clearly!

It's common, trust me ;)

Quoted 10 lines
Quoted 5 lines

For [1/4] Gemini tells me "At a high level, this bug triggers silent memory corruption, process crashes, or data instability across completely unrelated userspace applications - typically occurring after a system resumes from hibernation (suspend-to-disk)." Which is what I figured too.

That is right, with one small correction. this can happen with uswsusp while the hibernation image is being created, not at resume time. Memory corruption, process crashes, or data instability across completely unrelated userspace applications can occur there.

OK.

Quoted 7 lines
Quoted 1 line

Do we have any reports of this? Reported-by/Closes?

I found this while working on giving hibernation slots their own marker in the swap table, which I had discussed with Kairui.
(https://lore.kernel.org/linux-mm/abp7aDgYLrxF3Me8@KASONG-MC4/)
As far as I know there are no reports, so there is no Reported-by/Closes to add.

OK.

Quoted 7 lines
Quoted 3 lines

I'd like to grab [1/4] only, and defer the other three until 7.3-rc1. This might be mistaken, but from a quick read, it's not clear what benefit those three patches offer our users.

Simply put, they are close to cleanups that remove unneeded work. (with a some little optimization.)

Quoted 7 lines

Patch 2 keeps bad slots out of the swap cache, so readahead no longer wastes a folio on them.

Patch 3 keeps hibernation slots out of the swap cache, with the same effect. no wasted folio at readahead time.

Patch 4 removes dead code.

So I'll retain [1/4] with the below changelog. Please plan on sending out the other patches after 7.3-rc1.

From: Youngjun Park <[email protected]>
Subject: mm, swap: don't free a hibernation slot that is in the swap cache
Date: Tue, 11 Aug 2026 22:22:06 +0900

A slot with a folio in the swap cache is freed when the folio leaves the cache, not when its count drops. swap_put_entries_cluster() follows that rule. swap_free_hibernation_slot() does not, it calls __swap_cluster_free_entries() whether or not a folio sits on the slot.

Cluster readahead can put one there. It walks a raw page_cluster sized window of offsets around the faulting entry, and a hibernation slot passes __swap_cache_add_check() because it is not a folio and its count is not zero. Freeing the slot then clears the entry under that folio.

The folio is now unreachable from the swap table, and the offset goes back to the allocator. The folio is still on the LRU though, so reclaim can pick it up later. It then takes the old offset out of folio->swap and overwrites the table entry there, which by then may belong to someone else.

This bug can trigger silent memory corruption, process crashes, or data instability across completely unrelated userspace applications - typically occurring when uswsusp is preparing the hibernation image.

I found this while working on giving hibernation slots their own marker in the swap table, which I had discussed with Kairui.
(https://lore.kernel.org/linux-mm/abp7aDgYLrxF3Me8@KASONG-MC4/) As far as I know there are no reports, so there is no Reported-by/Closes to add.

Check for a cached folio before freeing. The slot is then left in the ordinary state where only the swap cache holds it, and it is freed when the folio leaves the cache, either through the reclaim below or through normal reclaim later.

Fixes 0d6af9bcf383 ("mm, swap: use the swap table to track the swap count")
Cc Baoquan He <[email protected]>
Cc Barry Song <[email protected]>
Cc Chris Li <[email protected]>
Cc Kemeng Shi <[email protected]>
Cc Nhat Pham <[email protected]>

---

 mm/swapfile.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
mm/swapfile.c renamed from mm/swapfile.c~mm-swap-dont-free-a-hibernation-slot-that-is-in-the-swap-cache +8 -1
@@ -2196,7 +2196,14 @@ void swap_free_hibernation_slot(swp_entr
 
 	ci = swap_cluster_lock(si, offset);
 	__swap_cluster_put_entry(ci, offset % SWAPFILE_CLUSTER);
-	__swap_cluster_free_entries(si, ci, offset % SWAPFILE_CLUSTER, 1);
+	/*
+	 * A slot with a folio in the swap cache is freed when the folio
+	 * leaves the cache, the same rule swap_put_entries_cluster() follows.
+	 * Readahead can put a folio here, and freeing the slot now would
+	 * leave that folio with no entry behind it.
+	 */
+	if (!swp_tb_is_folio(__swap_table_get(ci, offset % SWAPFILE_CLUSTER)))
+		__swap_cluster_free_entries(si, ci, offset % SWAPFILE_CLUSTER, 1);
 	swap_cluster_unlock(ci);
 
 	/* In theory readahead might add it to the swap cache by accident */

_