mm-swap-hold-a-reference-during-scan-and-cleanup-flag-usage.patch removed from -mm tree
The quilt patch titled
Subject: mm, swap: hold a reference during scan and cleanup flag usage
has been removed from the -mm tree. Its filename was
mm-swap-hold-a-reference-during-scan-and-cleanup-flag-usage.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Kairui Song <[email protected]>
Subject: mm, swap: hold a reference during scan and cleanup flag usage
Date: Tue, 14 Jan 2025 01:57:26 +0800
The flag SWP_SCANNING was used as an indicator of whether a device is being scanned for allocation, and prevents swapoff. Combined with SWP_WRITEOK, they work as a set of barriers for a clean swapoff:
1. Swapoff clears SWP_WRITEOK, allocation requests will see ~SWP_WRITEOK and abort as it's serialized by si->lock.
2. Swapoff unuses all allocated entries.
3. Swapoff waits for SWP_SCANNING flag to be cleared, so ongoing allocations will stop, preventing UAF.
4. Now swapoff can free everything safely.
This will make the allocation path have a hard dependency on si->lock. Allocation always have to acquire si->lock first for setting SWP_SCANNING and checking SWP_WRITEOK.
This commit removes this flag, and just uses the existing per-CPU refcount instead to prevent UAF in step 3, which serves well for such usage without dependency on si->lock, and scales very well too. Just hold a reference during the whole scan and allocation process. Swapoff will kill and wait for the counter.
And for preventing any allocation from happening after step 1 so the unuse in step 2 can ensure all slots are free, swapoff will acquire the ci->lock of each cluster one by one to ensure all allocations see ~SWP_WRITEOK and abort.
This way these dependences on si->lock are gone. And worth noting we can't kill the refcount as the first step for swapoff as the unuse process have to acquire the refcount.
---
include/linux/swap.h | 1 mm/swapfile.c | 90 +++++++++++++++++++++++++---------------- 2 files changed, 57 insertions(+), 34 deletions(-)
include/linux/swap.h renamed from include/linux/swap.h~mm-swap-hold-a-reference-during-scan-and-cleanup-flag-usage +0 -1
@@ -219,7 +219,6 @@ enum {SWP_STABLE_WRITES = (1 <<11 ),/* no overwrite PG_writeback pages */ SWP_SYNCHRONOUS_IO = (1 << 12), /* synchronous IO is efficient */ /* add others here before... */ - SWP_SCANNING = (1 << 14), /* refcount in scan_swap_map */ };#define SWAP_CLUSTER_MAX 32UL
mm/swapfile.c renamed from mm/swapfile.c~mm-swap-hold-a-reference-during-scan-and-cleanup-flag-usage +57 -33
151 lines not on this page · raw message
_
Patches currently in -mm which might be from [email protected] are