diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-09-25 23:27:57 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:08:10 -0400 |
| commit | c2fcff5973c93af7ffa87ad28eca2fddd2be83c5 (patch) | |
| tree | cec9c018bc69b9bf90f88394dca7a817c0e6d442 /fs | |
| parent | d06182cadb5bbd9ab7fa3d3e59608bb573bffbee (diff) | |
bcachefs: Fix suspend when moving data faster than ratelimit
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/bcachefs/move.c | 34 | ||||
| -rw-r--r-- | fs/bcachefs/util.c | 21 | ||||
| -rw-r--r-- | fs/bcachefs/util.h | 1 |
3 files changed, 26 insertions, 30 deletions
diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c index 93083cfff9bf..b29e7c322e9a 100644 --- a/fs/bcachefs/move.c +++ b/fs/bcachefs/move.c @@ -470,7 +470,7 @@ int bch2_move_data(struct bch_fs *c, struct bkey_s_c_extent e; struct data_opts data_opts; enum data_cmd data_cmd; - u64 cur_inum = U64_MAX; + u64 delay, cur_inum = U64_MAX; int ret = 0, ret2; closure_init_stack(&ctxt.cl); @@ -484,12 +484,30 @@ int bch2_move_data(struct bch_fs *c, if (rate) bch2_ratelimit_reset(rate); - while (!kthread || !(ret = kthread_should_stop())) { - if (rate && - bch2_ratelimit_delay(rate) && - (bch2_btree_iter_unlock(&stats->iter), - (ret = bch2_ratelimit_wait_freezable_stoppable(rate)))) - break; + while (1) { + do { + delay = rate ? bch2_ratelimit_delay(rate) : 0; + + if (delay) { + bch2_btree_iter_unlock(&stats->iter); + set_current_state(TASK_INTERRUPTIBLE); + } + + if (kthread && (ret = kthread_should_stop())) { + __set_current_state(TASK_RUNNING); + goto out; + } + + if (delay) + schedule_timeout(delay); + + if (unlikely(freezing(current))) { + bch2_btree_iter_unlock(&stats->iter); + move_ctxt_wait_event(&ctxt, list_empty(&ctxt.reads)); + closure_sync(&ctxt.cl); + try_to_freeze(); + } + } while (delay); peek: k = bch2_btree_iter_peek(&stats->iter); if (!k.k) @@ -560,7 +578,7 @@ next_nondata: bch2_btree_iter_next(&stats->iter); bch2_btree_iter_cond_resched(&stats->iter); } - +out: bch2_btree_iter_unlock(&stats->iter); move_ctxt_wait_event(&ctxt, list_empty(&ctxt.reads)); diff --git a/fs/bcachefs/util.c b/fs/bcachefs/util.c index 6666c3aed05f..75053322d0f0 100644 --- a/fs/bcachefs/util.c +++ b/fs/bcachefs/util.c @@ -424,27 +424,6 @@ void bch2_ratelimit_increment(struct bch_ratelimit *d, u64 done) d->next = now - NSEC_PER_SEC * 2; } -int bch2_ratelimit_wait_freezable_stoppable(struct bch_ratelimit *d) -{ - bool kthread = (current->flags & PF_KTHREAD) != 0; - - while (1) { - u64 delay = bch2_ratelimit_delay(d); - - if (delay) - set_current_state(TASK_INTERRUPTIBLE); - - if (kthread && kthread_should_stop()) - return 1; - - if (!delay) - return 0; - - schedule_timeout(delay); - try_to_freeze(); - } -} - /* pd controller: */ /* diff --git a/fs/bcachefs/util.h b/fs/bcachefs/util.h index c0b26123af4c..446216eb8c76 100644 --- a/fs/bcachefs/util.h +++ b/fs/bcachefs/util.h @@ -377,7 +377,6 @@ static inline void bch2_ratelimit_reset(struct bch_ratelimit *d) u64 bch2_ratelimit_delay(struct bch_ratelimit *); void bch2_ratelimit_increment(struct bch_ratelimit *, u64); -int bch2_ratelimit_wait_freezable_stoppable(struct bch_ratelimit *); struct bch_pd_controller { struct bch_ratelimit rate; |