From: Filipe Manana Date: Thu, 6 Feb 2025 16:19:55 +0000 (+0900) Subject: btrfs: avoid monopolizing a core when activating a swap file X-Git-Tag: v5.10.235~157 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=339ee27e19202b00886ff347b72f45dd41310b67;p=thirdparty%2Fkernel%2Fstable.git btrfs: avoid monopolizing a core when activating a swap file commit 2c8507c63f5498d4ee4af404a8e44ceae4345056 upstream. This commit re-attempts the backport of the change to the linux-5.10.y branch. Commit a1c3a19446a4 ("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@vger.kernel.org # 5.4+ Reviewed-by: Qu Wenruo Signed-off-by: Filipe Manana Signed-off-by: David Sterba Signed-off-by: Koichiro Den Signed-off-by: Greg Kroah-Hartman --- diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 45c1732a9677d..8d7ca8a21525a 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -10422,6 +10422,8 @@ static int btrfs_swap_activate(struct swap_info_struct *sis, struct file *file, } start += len; + + cond_resched(); } if (bsi.block_len)