From: Scott Wood <swood@redhat.com>
To: Steven Rostedt <rostedt@goodmis.org>,
Ingo Molnar <mingo@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Vincent Guittot <vincent.guittot@linaro.org>
Cc: Dietmar Eggemann <dietmar.eggemann@arm.com>,
Rik van Riel <riel@surriel.com>, Mel Gorman <mgorman@suse.de>,
linux-kernel@vger.kernel.org,
linux-rt-users <linux-rt-users@vger.kernel.org>
Subject: [RFC PATCH 3/3] sched,rt: break out of load balancing if an RT task appears
Date: Tue, 28 Apr 2020 00:02:42 -0500 [thread overview]
Message-ID: <20200428050242.17717-4-swood@redhat.com> (raw)
In-Reply-To: <20200428050242.17717-1-swood@redhat.com>
From: Rik van Riel <riel@redhat.com>
Bugzilla: 1331562
The CFS load balancer can take a little while, to the point of
it having a special LBF_NEED_BREAK flag, when the task moving
code takes a breather.
However, at that point it will jump right back in to load balancing,
without checking whether the CPU has gained any runnable real time
(or deadline) tasks.
Only idle_balance used to check for runnable real time tasks on a
CPU. This patch moves that check into a separate inline function,
and calls that function in load_balance, at approximately the same
granularity that LBF_NEED_BREAK happens.
Besides breaking out of load_balance, this patch also clears
continue_balancing, in order for rebalance_domains to break out
of its loop when a realtime task becomes runnable.
Signed-off-by: Rik van Riel <riel@redhat.com>
Reported-by: Clark Williams <williams@redhat.com>
Signed-off-by: Clark Williams <williams@redhat.com>
---
kernel/sched/fair.c | 19 +++++++++++++++++--
kernel/sched/sched.h | 6 ++++++
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index dfde7f0ce3db..e7437e4e40b4 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -9377,10 +9377,16 @@ voluntary_active_balance(struct lb_env *env)
return 0;
}
-static int need_active_balance(struct lb_env *env)
+static int need_active_balance(struct lb_env *env, int *continue_balancing)
{
struct sched_domain *sd = env->sd;
+ /* Run the realtime task now; load balance later. */
+ if (rq_has_runnable_rt_task(env->dst_rq)) {
+ *continue_balancing = 0;
+ return 0;
+ }
+
if (voluntary_active_balance(env))
return 1;
@@ -9394,6 +9400,10 @@ static int should_we_balance(struct lb_env *env)
struct sched_group *sg = env->sd->groups;
int cpu, balance_cpu = -1;
+ /* Run the realtime task now; load balance later. */
+ if (rq_has_runnable_rt_task(env->dst_rq))
+ return 0;
+
/*
* Ensure the balancing environment is consistent; can happen
* when the softirq triggers 'during' hotplug.
@@ -9521,6 +9531,11 @@ static int load_balance(int this_cpu, struct rq *this_rq,
local_irq_restore(rf.flags);
+ if (rq_has_runnable_rt_task(this_rq)) {
+ *continue_balancing = 0;
+ goto out;
+ }
+
if (env.flags & LBF_NEED_BREAK) {
env.flags &= ~LBF_NEED_BREAK;
goto more_balance;
@@ -9604,7 +9619,7 @@ static int load_balance(int this_cpu, struct rq *this_rq,
if (idle != CPU_NEWLY_IDLE)
sd->nr_balance_failed++;
- if (need_active_balance(&env)) {
+ if (need_active_balance(&env, continue_balancing)) {
unsigned long flags;
raw_spin_lock_irqsave(&busiest->lock, flags);
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 3d97c51544d7..a2a01dfd2bea 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -1878,6 +1878,12 @@ static inline struct cpuidle_state *idle_get_state(struct rq *rq)
return rq->idle_state;
}
+
+/* Is there a task of a high priority class? */
+static inline bool rq_has_runnable_rt_task(struct rq *rq)
+{
+ return unlikely(rq->nr_running != rq->cfs.h_nr_running);
+}
#else
static inline void idle_set_state(struct rq *rq,
struct cpuidle_state *idle_state)
--
2.18.2
next prev parent reply other threads:[~2020-04-28 5:03 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 5:02 [RFC PATCH 0/3] newidle_balance() latency mitigation Scott Wood
2020-04-28 5:02 ` [RFC PATCH 1/3] sched/fair: Call newidle_balance() from finish_task_switch() Scott Wood
2020-04-28 21:37 ` Valentin Schneider
2020-04-28 22:09 ` Peter Zijlstra
2020-04-28 22:55 ` Scott Wood
2020-04-28 23:02 ` Peter Zijlstra
2020-04-28 23:20 ` Scott Wood
2020-04-29 9:05 ` Peter Zijlstra
2020-04-30 1:31 ` Scott Wood
2020-05-11 10:58 ` Peter Zijlstra
2020-05-11 12:13 ` Peter Zijlstra
2020-04-28 22:33 ` Scott Wood
2020-04-29 12:00 ` Valentin Schneider
2020-04-29 8:27 ` Vincent Guittot
2020-04-30 1:36 ` Scott Wood
2020-04-28 5:02 ` [RFC PATCH 2/3] sched/fair: Enable interrupts when dropping lock in newidle_balance() Scott Wood
2020-04-28 5:02 ` Scott Wood [this message]
2020-04-28 21:56 ` [RFC PATCH 3/3] sched,rt: break out of load balancing if an RT task appears Valentin Schneider
2020-04-28 22:33 ` Scott Wood
2020-04-28 22:52 ` Scott Wood
2020-04-29 12:01 ` Valentin Schneider
2020-04-28 13:27 ` [RFC PATCH 0/3] newidle_balance() latency mitigation Steven Rostedt
2020-04-29 23:13 ` Valentin Schneider
2020-04-30 7:44 ` Vincent Guittot
2020-04-30 10:14 ` Valentin Schneider
2020-04-30 12:42 ` Vincent Guittot
2020-04-30 13:56 ` Valentin Schneider
2020-04-30 12:48 ` Vincent Guittot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200428050242.17717-4-swood@redhat.com \
--to=swood@redhat.com \
--cc=dietmar.eggemann@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=mgorman@suse.de \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=riel@surriel.com \
--cc=rostedt@goodmis.org \
--cc=vincent.guittot@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).