This patch factor out iocg deactivation into a separate function:
iocg_deactivate(). No functional changes.
Signed-off-by: Chengming Zhou <zhouchengming@xxxxxxxxxxxxx>
---
block/blk-iocost.c | 59 ++++++++++++++++++++++++++--------------------
1 file changed, 33 insertions(+), 26 deletions(-)
diff --git a/block/blk-iocost.c b/block/blk-iocost.c
index 33a11ba971ea..b1f2305e8032 100644
--- a/block/blk-iocost.c
+++ b/block/blk-iocost.c
@@ -1322,6 +1322,37 @@ static bool iocg_activate(struct ioc_gq *iocg, struct ioc_now *now)
return false;
}
+static void iocg_deactivate(struct ioc_gq *iocg, struct ioc_now *now)
+{
+ struct ioc *ioc = iocg->ioc;
+ u64 vtime = atomic64_read(&iocg->vtime);
+ s64 excess;
+
+ lockdep_assert_held(&ioc->lock);
+ lockdep_assert_held(&iocg->waitq.lock);
+
+ /*
+ * @iocg has been inactive for a full duration and will
+ * have a high budget. Account anything above target as
+ * error and throw away. On reactivation, it'll start
+ * with the target budget.
+ */
+ excess = now->vnow - vtime - ioc->margins.target;
+ if (excess > 0) {
+ u32 old_hwi;
+
+ current_hweight(iocg, NULL, &old_hwi);
+ ioc->vtime_err -= div64_u64(excess * old_hwi,
+ WEIGHT_ONE);
+ }
+
+ TRACE_IOCG_PATH(iocg_idle, iocg, now,
+ atomic64_read(&iocg->active_period),
+ atomic64_read(&ioc->cur_period), vtime);
+ __propagate_weights(iocg, 0, 0, false, now);
+ list_del_init(&iocg->active_list);
+}
+
static bool iocg_kick_delay(struct ioc_gq *iocg, struct ioc_now *now)
{
struct ioc *ioc = iocg->ioc;
@@ -2165,32 +2196,8 @@ static int ioc_check_iocgs(struct ioc *ioc, struct ioc_now *now)
iocg_kick_waitq(iocg, true, now);
if (iocg->abs_vdebt || iocg->delay)
nr_debtors++;
- } else if (iocg_is_idle(iocg)) {
- /* no waiter and idle, deactivate */
- u64 vtime = atomic64_read(&iocg->vtime);
- s64 excess;
-
- /*
- * @iocg has been inactive for a full duration and will
- * have a high budget. Account anything above target as
- * error and throw away. On reactivation, it'll start
- * with the target budget.
- */
- excess = now->vnow - vtime - ioc->margins.target;
- if (excess > 0) {
- u32 old_hwi;
-
- current_hweight(iocg, NULL, &old_hwi);
- ioc->vtime_err -= div64_u64(excess * old_hwi,
- WEIGHT_ONE);
- }
-
- TRACE_IOCG_PATH(iocg_idle, iocg, now,
- atomic64_read(&iocg->active_period),
- atomic64_read(&ioc->cur_period), vtime);
- __propagate_weights(iocg, 0, 0, false, now);
- list_del_init(&iocg->active_list);
- }
+ } else if (iocg_is_idle(iocg))
+ iocg_deactivate(iocg, now);
spin_unlock(&iocg->waitq.lock);
}
--
2.36.1
