diff options
| author | Filipe Manana <fdmanana@suse.com> | 2025-02-07 01:20:55 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-02-21 13:49:55 +0100 |
| commit | 0c7ba1d65c291b6e28b3a6fce196677c7b2b4817 (patch) | |
| tree | 6a4207f93eeea6ed44594287ac4b77dcfb46a24c /fs/btrfs | |
| parent | 8c481939fb1db8fcbafef19cee330bbd898075d7 (diff) | |
| download | linux-0c7ba1d65c291b6e28b3a6fce196677c7b2b4817.tar.gz linux-0c7ba1d65c291b6e28b3a6fce196677c7b2b4817.tar.bz2 linux-0c7ba1d65c291b6e28b3a6fce196677c7b2b4817.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.1.y
branch. Commit bb8e287f596b ("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/btrfs')
| -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 f4a754d62bf4..a13ab3abef12 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -11368,6 +11368,8 @@ static int btrfs_swap_activate(struct swap_info_struct *sis, struct file *file, } start += len; + + cond_resched(); } if (bsi.block_len) |