From: Filipe Manana <fdmanana@xxxxxxxx>
commit 2c8507c63f5498d4ee4af404a8e44ceae4345056 upstream.
This commit re-attempts the backport of the change to the linux-6.12.y
branch. Commit 9f372e86b9bd ("btrfs: avoid monopolizing a core when
activating a swap file") on this branch was reverted.
During swap activation we iterate over the extents of a file and we can
have many thousands of them, so we can end up in a busy loop monopolizing
a core. Avoid this by doing a voluntary reschedule after processing each
extent.
CC: stable@xxxxxxxxxxxxxxx # 5.4+
Reviewed-by: Qu Wenruo <wqu@xxxxxxxx>
Signed-off-by: Filipe Manana <fdmanana@xxxxxxxx>
Signed-off-by: David Sterba <dsterba@xxxxxxxx>
Signed-off-by: Koichiro Den <koichiro.den@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/btrfs/inode.c | 2 ++
1 file changed, 2 insertions(+)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -10142,6 +10142,8 @@ static int btrfs_swap_activate(struct sw
ret = -EINTR;
goto out;
}
+
+ cond_resched();
}
if (bsi.block_len)
Patches currently in stable-queue which might be from koichiro.den@xxxxxxxxxxxxx are
queue-6.12/revert-btrfs-avoid-monopolizing-a-core-when-activating-a-swap-file.patch
queue-6.12/btrfs-avoid-monopolizing-a-core-when-activating-a-swap-file.patch
queue-6.12/gpio-sim-lock-hog-configfs-items-if-present.patch
