Skip to content

Commit

Permalink
btrfs: interrupt long running operations if the current process is fr…
Browse files Browse the repository at this point in the history
…eezing

[BUG]
There is a bug report that running fstrim will prevent the system from
hibernation, result the following dmesg:

 PM: suspend entry (deep)
 Filesystems sync: 0.060 seconds
 Freezing user space processes
 Freezing user space processes failed after 20.007 seconds (1 tasks refusing to freeze, wq_busy=0):
 task:fstrim          state:D stack:0     pid:15564 tgid:15564 ppid:1      flags:0x00004006
 Call Trace:
  <TASK>
  __schedule+0x381/0x1540
  schedule+0x24/0xb0
  schedule_timeout+0x1ea/0x2a0
  io_schedule_timeout+0x19/0x50
  wait_for_completion_io+0x78/0x140
  submit_bio_wait+0xaa/0xc0
  blkdev_issue_discard+0x65/0xb0
  btrfs_issue_discard+0xcf/0x160 [btrfs 7ab35b9b86062a46f6ff578bb32d55ecf8e6bf82]
  btrfs_discard_extent+0x120/0x2a0 [btrfs 7ab35b9b86062a46f6ff578bb32d55ecf8e6bf82]
  do_trimming+0xd4/0x220 [btrfs 7ab35b9b86062a46f6ff578bb32d55ecf8e6bf82]
  trim_bitmaps+0x418/0x520 [btrfs 7ab35b9b86062a46f6ff578bb32d55ecf8e6bf82]
  btrfs_trim_block_group+0xcb/0x130 [btrfs 7ab35b9b86062a46f6ff578bb32d55ecf8e6bf82]
  btrfs_trim_fs+0x119/0x460 [btrfs 7ab35b9b86062a46f6ff578bb32d55ecf8e6bf82]
  btrfs_ioctl_fitrim+0xfb/0x160 [btrfs 7ab35b9b86062a46f6ff578bb32d55ecf8e6bf82]
  btrfs_ioctl+0x11cc/0x29f0 [btrfs 7ab35b9b86062a46f6ff578bb32d55ecf8e6bf82]
  __x64_sys_ioctl+0x92/0xd0
  do_syscall_64+0x5b/0x80
  entry_SYSCALL_64_after_hwframe+0x7c/0xe6
 RIP: 0033:0x7f5f3b529f9b
 RSP: 002b:00007fff279ebc20 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
 RAX: ffffffffffffffda RBX: 00007fff279ebd60 RCX: 00007f5f3b529f9b
 RDX: 00007fff279ebc90 RSI: 00000000c0185879 RDI: 0000000000000003
 RBP: 000055748718b2d0 R08: 00005574871899e8 R09: 00007fff279eb010
 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000003
 R13: 000055748718ac40 R14: 000055748718b290 R15: 000055748718b290
  </TASK>
 OOM killer enabled.
 Restarting tasks ... done.
 random: crng reseeded on system resumption
 PM: suspend exit
 PM: suspend entry (s2idle)
 Filesystems sync: 0.047 seconds

[CAUSE]
PM code is freezing all user space processes before entering
hibernation/suspension, but if a user space process is trapping into the
kernel for a long running operation, it will not be frozen since it's
still inside kernel.

Normally those long running operations check for fatal signals and exit
early, but freezing user space processes is not done by signals but a
different infrastructure.

Unfortunately btrfs only checks fatal signals but not if the current
task is being frozen.

[FIX]
Introduce a helper, btrfs_task_interrupted(), to check both fatal signals
and freezing status, and apply to all long running operations, with
dedicated error code:

- reflink (-EINTR)
- fstrim (-ERESTARTSYS)
- relocation (-ECANCELD)
- llseek (-EINTR)
- defrag (-EAGAIN)
- fiemap (-EINTR)

Reported-by: Rolf Wentland <[email protected]>
Link: https://bugzilla.suse.com/show_bug.cgi?id=1229737
Reviewed-by: Josef Bacik <[email protected]>
Signed-off-by: Qu Wenruo <[email protected]>
  • Loading branch information
adam900710 authored and kdave committed Aug 29, 2024
1 parent e325b02 commit 00782aa
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 10 deletions.
3 changes: 2 additions & 1 deletion fs/btrfs/defrag.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#include <linux/types.h>
#include <linux/compiler_types.h>
#include "misc.h"

struct inode;
struct file_ra_state;
Expand All @@ -25,7 +26,7 @@ int btrfs_defrag_root(struct btrfs_root *root);

static inline int btrfs_defrag_cancelled(struct btrfs_fs_info *fs_info)
{
return signal_pending(current);
return signal_pending(current) || btrfs_task_interrupted();
}

#endif
3 changes: 1 addition & 2 deletions fs/btrfs/extent-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
*/

#include <linux/sched.h>
#include <linux/sched/signal.h>
#include <linux/pagemap.h>
#include <linux/writeback.h>
#include <linux/blkdev.h>
Expand Down Expand Up @@ -6459,7 +6458,7 @@ static int btrfs_trim_free_extents(struct btrfs_device *device, u64 *trimmed)
start += len;
*trimmed += bytes;

if (fatal_signal_pending(current)) {
if (btrfs_task_interrupted()) {
ret = -ERESTARTSYS;
break;
}
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/fiemap.c
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ static int extent_fiemap(struct btrfs_inode *inode,

prev_extent_end = extent_end;
next_item:
if (fatal_signal_pending(current)) {
if (btrfs_task_interrupted()) {
ret = -EINTR;
goto out_unlock;
}
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -3676,7 +3676,7 @@ static loff_t find_desired_extent(struct file *file, loff_t offset, int whence)
start = extent_end;
last_extent_end = extent_end;
path->slots[0]++;
if (fatal_signal_pending(current)) {
if (btrfs_task_interrupted()) {
ret = -EINTR;
goto out;
}
Expand Down
5 changes: 2 additions & 3 deletions fs/btrfs/free-space-cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

#include <linux/pagemap.h>
#include <linux/sched.h>
#include <linux/sched/signal.h>
#include <linux/slab.h>
#include <linux/math64.h>
#include <linux/ratelimit.h>
Expand Down Expand Up @@ -3809,7 +3808,7 @@ static int trim_no_bitmap(struct btrfs_block_group *block_group,
if (async && *total_trimmed)
break;

if (fatal_signal_pending(current)) {
if (btrfs_task_interrupted()) {
ret = -ERESTARTSYS;
break;
}
Expand Down Expand Up @@ -4000,7 +3999,7 @@ static int trim_bitmaps(struct btrfs_block_group *block_group,
}
block_group->discard_cursor = start;

if (fatal_signal_pending(current)) {
if (btrfs_task_interrupted()) {
if (start != offset)
reset_trimming_bitmap(ctl, offset);
ret = -ERESTARTSYS;
Expand Down
7 changes: 7 additions & 0 deletions fs/btrfs/misc.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#include <linux/wait.h>
#include <linux/math64.h>
#include <linux/rbtree.h>
#include <linux/sched/signal.h>
#include <linux/freezer.h>

/*
* Enumerate bits using enum autoincrement. Define the @name as the n-th bit.
Expand Down Expand Up @@ -163,4 +165,9 @@ static inline bool bitmap_test_range_all_zero(const unsigned long *addr,
return (found_set == start + nbits);
}

static inline bool btrfs_task_interrupted(void)
{
return fatal_signal_pending(current) || freezing(current);
}

#endif
2 changes: 1 addition & 1 deletion fs/btrfs/reflink.c
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ static int btrfs_clone(struct inode *src, struct inode *inode,
btrfs_release_path(path);
key.offset = prev_extent_end;

if (fatal_signal_pending(current)) {
if (btrfs_task_interrupted()) {
ret = -EINTR;
goto out;
}
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/relocation.c
Original file line number Diff line number Diff line change
Expand Up @@ -2936,7 +2936,7 @@ noinline int btrfs_should_cancel_balance(const struct btrfs_fs_info *fs_info)
{
return atomic_read(&fs_info->balance_cancel_req) ||
atomic_read(&fs_info->reloc_cancel_req) ||
fatal_signal_pending(current);
btrfs_task_interrupted();
}
ALLOW_ERROR_INJECTION(btrfs_should_cancel_balance, TRUE);

Expand Down

0 comments on commit 00782aa

Please sign in to comment.