diff options
| author | Filipe Manana <fdmanana@suse.com> | 2025-02-07 01:22:17 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-02-17 10:05:46 +0100 |
| commit | 926a16e39d8672cb57d52586e16cd67094fa6fa3 (patch) | |
| tree | 9a94b9cfd9f4f4c2c431d0b04a0a411ec74e79c5 /fs | |
| parent | 118b41e78b0ad47f257b0dfbcb7956f3b0b6cf7d (diff) | |
| download | linux-926a16e39d8672cb57d52586e16cd67094fa6fa3.tar.gz linux-926a16e39d8672cb57d52586e16cd67094fa6fa3.tar.bz2 linux-926a16e39d8672cb57d52586e16cd67094fa6fa3.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.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>
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 197ba9be9718..f7e7d864f414 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -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) |