From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Tue, 7 Apr 2020 17:49:14 +0000 (-0400)
Subject: bcachefs: Account for ioclock slop when throttling rebalance thread
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e77e4efce31f3739fa85a84c5197b7cd18747a64;p=linux.git

bcachefs: Account for ioclock slop when throttling rebalance thread

This should fix an issue where the rebalance thread was spinning

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/rebalance.c b/fs/bcachefs/rebalance.c
index a0a75cfa41cbe..eb3f7d02c791c 100644
--- a/fs/bcachefs/rebalance.c
+++ b/fs/bcachefs/rebalance.c
@@ -204,17 +204,21 @@ static int bch2_rebalance_thread(void *arg)
 			prev_run_time;
 
 		if (w.dev_most_full_percent < 20 && throttle > 0) {
-			r->state = REBALANCE_THROTTLED;
 			r->throttled_until_iotime = io_start +
 				div_u64(w.dev_most_full_capacity *
 					(20 - w.dev_most_full_percent),
 					50);
-			r->throttled_until_cputime = start + throttle;
 
-			bch2_kthread_io_clock_wait(clock,
-				r->throttled_until_iotime,
-				throttle);
-			continue;
+			if (atomic_long_read(&clock->now) + clock->max_slop <
+			    r->throttled_until_iotime) {
+				r->throttled_until_cputime = start + throttle;
+				r->state = REBALANCE_THROTTLED;
+
+				bch2_kthread_io_clock_wait(clock,
+					r->throttled_until_iotime,
+					throttle);
+				continue;
+			}
 		}
 
 		/* minimum 1 mb/sec: */