diff options
| author | Luca Stefani <luca.stefani.ge1@gmail.com> | 2024-09-17 22:33:05 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2024-10-07 23:21:56 +0200 |
| commit | 69313850dce33ce8c24b38576a279421f4c60996 (patch) | |
| tree | 018fa34b1d6dc82cc1379a9b3c76b3c2f6e018ae /fs/btrfs/extent-tree.c | |
| parent | a99fcb0158978ed332009449b484e5f3ca2d7df4 (diff) | |
| download | linux-69313850dce33ce8c24b38576a279421f4c60996.tar.gz linux-69313850dce33ce8c24b38576a279421f4c60996.tar.bz2 linux-69313850dce33ce8c24b38576a279421f4c60996.zip | |
btrfs: add cancellation points to trim loops
There are reports that system cannot suspend due to running trim because
the task responsible for trimming the device isn't able to finish in
time, especially since we have a free extent discarding phase, which can
trim a lot of unallocated space. There are no limits on the trim size
(unlike the block group part).
Since trime isn't a critical call it can be interrupted at any time,
in such cases we stop the trim, report the amount of discarded bytes and
return an error.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=219180
Link: https://bugzilla.suse.com/show_bug.cgi?id=1229737
CC: stable@vger.kernel.org # 5.15+
Signed-off-by: Luca Stefani <luca.stefani.ge1@gmail.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index ad70548d1f72..d9f511babd89 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -1316,6 +1316,11 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len, start += bytes_to_discard; bytes_left -= bytes_to_discard; *discarded_bytes += bytes_to_discard; + + if (btrfs_trim_interrupted()) { + ret = -ERESTARTSYS; + break; + } } return ret; @@ -6470,7 +6475,7 @@ static int btrfs_trim_free_extents(struct btrfs_device *device, u64 *trimmed) start += len; *trimmed += bytes; - if (fatal_signal_pending(current)) { + if (btrfs_trim_interrupted()) { ret = -ERESTARTSYS; break; } |