diff options
| author | Filipe Manana <fdmanana@suse.com> | 2025-02-07 01:21:31 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-02-17 09:40:42 +0100 |
| commit | 893b28374aba25f78a34befb184624eebb468ab6 (patch) | |
| tree | 6a82bec86cec3016d4d73a7842409e32e9df5020 /fs | |
| parent | b4e355e70e12aac855950323eb9f45f1586a5e5e (diff) | |
| download | linux-893b28374aba25f78a34befb184624eebb468ab6.tar.gz linux-893b28374aba25f78a34befb184624eebb468ab6.tar.bz2 linux-893b28374aba25f78a34befb184624eebb468ab6.zip | |
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-6.6.y
branch. Commit 6e1a82259307 ("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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/inode.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 49c927e8a807..cedffa567a75 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -10833,6 +10833,8 @@ static int btrfs_swap_activate(struct swap_info_struct *sis, struct file *file, } start += len; + + cond_resched(); } if (bsi.block_len) |