mm, swap: keep hibernation swap slots out of the swap cache
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v3 Latest4 patches 5 repliesIn review 1 of 4 applied
- v24 patches 3 repliesSuperseded
- v14 patches 5 repliesSuperseded
Changes in v3 from the cover letter
- 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
Patches in v3 1 of 4 applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/4 | mm, swap: don't free a hibernation slot that is in the swap cachemm/ | +8 | 0 replies | Applied |
| 2/4 | mm, swap: only allow swapped-out slots into the swap cachemm/ | +8 | 0 replies | |
| 3/4 | mm, swap: give hibernation swap slots their own swap table entry typemm/ mm/ | +20 | 1 reply | |
| 4/4 | mm, swap: drop the swap cache guard and reclaim in swap_free_hibernation_slot()mm/ | +1 | 1 reply |
Reviews trailers per patch
All 4 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.
| Patch | Kairui Song |
|---|---|
| Series | A-b |
| 1/4 | A-b |
| 2/4 | A-b |
| 3/4 | A-b |
| 4/4 | A-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v3 0/4] 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