]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
btrfs: avoid monopolizing a core when activating a swap file
authorFilipe Manana <fdmanana@suse.com>
Thu, 6 Feb 2025 16:22:17 +0000 (01:22 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Feb 2025 09:05:46 +0000 (10:05 +0100)
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@vger.kernel.org # 5.4+
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Koichiro Den <koichiro.den@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/btrfs/inode.c

index 197ba9be9718719fa69799f2eee8033cbac2f2dd..f7e7d864f41440d0442c0f00b3c31e8239c209d3 100644 (file)
@@ -10142,6 +10142,8 @@ static int btrfs_swap_activate(struct swap_info_struct *sis, struct file *file,
                        ret = -EINTR;
                        goto out;
                }
+
+               cond_resched();
        }
 
        if (bsi.block_len)