From: Steve Sistare <steven.sistare@oracle.com>
To: mingo@redhat.com, peterz@infradead.org
Cc: subhra.mazumdar@oracle.com, dhaval.giani@oracle.com,
rohit.k.jain@oracle.com, daniel.m.jordan@oracle.com,
pavel.tatashin@microsoft.com, matt@codeblueprint.co.uk,
umgwanakikbuti@gmail.com, riel@redhat.com, jbacik@fb.com,
juri.lelli@redhat.com, steven.sistare@oracle.com,
linux-kernel@vger.kernel.org
Subject: [PATCH 05/10] sched/fair: Hoist idle_stamp up from idle_balance
Date: Mon, 22 Oct 2018 07:59:36 -0700 [thread overview]
Message-ID: <1540220381-424433-6-git-send-email-steven.sistare@oracle.com> (raw)
In-Reply-To: <1540220381-424433-1-git-send-email-steven.sistare@oracle.com>
Move the update of idle_stamp from idle_balance to the call site in
pick_next_task_fair, to prepare for a future patch that adds work to
pick_next_task_fair which must be included in the idle_stamp interval.
No functional change.
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
---
kernel/sched/fair.c | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index c623338..9f31045 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -3724,6 +3724,8 @@ static inline bool within_margin(int value, int margin)
WRITE_ONCE(p->se.avg.util_est, ue);
}
+#define IF_SMP(statement) statement
+
static void overload_clear(struct rq *rq)
{
struct sparsemask *overload_cpus;
@@ -3769,6 +3771,8 @@ static inline int idle_balance(struct rq *rq, struct rq_flags *rf)
return 0;
}
+#define IF_SMP(statement) /* empty */
+
static inline void overload_clear(struct rq *rq) {}
static inline void overload_set(struct rq *rq) {}
@@ -6740,8 +6744,19 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
return p;
idle:
+ /*
+ * We must set idle_stamp _before_ calling idle_balance(), such that we
+ * measure the duration of idle_balance() as idle time.
+ */
+ IF_SMP(rq->idle_stamp = rq_clock(rq);)
+
new_tasks = idle_balance(rq, rf);
+ if (new_tasks)
+ IF_SMP(rq->idle_stamp = 0;)
+
+ schedstat_end_time(rq->find_time, time);
+
/*
* Because idle_balance() releases (and re-acquires) rq->lock, it is
* possible for any higher priority task to appear. In that case we
@@ -9504,12 +9519,6 @@ static int idle_balance(struct rq *this_rq, struct rq_flags *rf)
u64 curr_cost = 0;
/*
- * We must set idle_stamp _before_ calling idle_balance(), such that we
- * measure the duration of idle_balance() as idle time.
- */
- this_rq->idle_stamp = rq_clock(this_rq);
-
- /*
* Do not pull tasks towards !active CPUs...
*/
if (!cpu_active(this_cpu))
@@ -9600,9 +9609,6 @@ static int idle_balance(struct rq *this_rq, struct rq_flags *rf)
if (this_rq->nr_running != this_rq->cfs.h_nr_running)
pulled_task = -1;
- if (pulled_task)
- this_rq->idle_stamp = 0;
-
rq_repin_lock(this_rq, rf);
return pulled_task;
--
1.8.3.1
next prev parent reply other threads:[~2018-10-22 15:09 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-22 14:59 [PATCH 00/10] steal tasks to improve CPU utilization Steve Sistare
2018-10-22 14:59 ` [PATCH 01/10] sched: Provide sparsemask, a reduced contention bitmap Steve Sistare
2018-10-22 14:59 ` [PATCH 02/10] sched/topology: Provide hooks to allocate data shared per LLC Steve Sistare
2018-10-22 14:59 ` [PATCH 03/10] sched/topology: Provide cfs_overload_cpus bitmap Steve Sistare
2018-10-22 14:59 ` [PATCH 04/10] sched/fair: Dynamically update cfs_overload_cpus Steve Sistare
2018-10-22 16:56 ` Peter Zijlstra
2018-10-22 18:43 ` Steven Sistare
2018-10-22 14:59 ` Steve Sistare [this message]
2018-10-25 13:47 ` [PATCH 05/10] sched/fair: Hoist idle_stamp up from idle_balance Valentin Schneider
2018-10-25 14:04 ` Steven Sistare
2018-10-22 14:59 ` [PATCH 06/10] sched/fair: Generalize the detach_task interface Steve Sistare
2018-10-22 14:59 ` [PATCH 07/10] sched/fair: Provide can_migrate_task_llc Steve Sistare
2018-10-26 18:04 ` Valentin Schneider
2018-10-26 18:28 ` Steven Sistare
2018-10-29 19:34 ` Valentin Schneider
2018-10-31 15:43 ` Steven Sistare
2018-10-31 18:48 ` Valentin Schneider
2018-10-31 19:14 ` Peter Zijlstra
2018-11-01 11:16 ` Valentin Schneider
2018-10-22 14:59 ` [PATCH 08/10] sched/fair: Steal work from an overloaded CPU when CPU goes idle Steve Sistare
2018-10-25 13:48 ` Valentin Schneider
2018-10-25 14:07 ` Steven Sistare
2018-10-22 14:59 ` [PATCH 09/10] sched/fair: disable stealing if too many NUMA nodes Steve Sistare
2018-10-22 17:06 ` Peter Zijlstra
2018-10-22 18:47 ` Steven Sistare
2018-10-22 19:21 ` Steven Sistare
2018-10-22 22:05 ` Peter Zijlstra
2018-10-23 13:18 ` Steven Sistare
2018-10-22 14:59 ` [PATCH 10/10] sched/fair: Provide idle search schedstats Steve Sistare
2018-10-22 17:04 ` [PATCH 00/10] steal tasks to improve CPU utilization Peter Zijlstra
2018-10-22 19:07 ` Steven Sistare
2018-10-22 22:09 ` Peter Zijlstra
2018-10-24 15:34 ` Valentin Schneider
2018-10-24 19:27 ` Steven Sistare
2018-10-25 11:31 ` Valentin Schneider
2018-10-25 12:21 ` Steven Sistare
2018-10-25 7:50 ` Vincent Guittot
2018-10-25 11:28 ` Steven Sistare
2018-10-25 12:43 ` Vincent Guittot
2018-10-25 14:19 ` Steven Sistare
2018-10-31 19:35 ` Steven Sistare
2018-11-01 11:56 ` Steven Sistare
2018-11-02 23:39 ` Subhra Mazumdar
2018-11-05 20:08 ` Steven Sistare
2019-01-04 13:37 ` Shijith Thotton
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=1540220381-424433-6-git-send-email-steven.sistare@oracle.com \
--to=steven.sistare@oracle.com \
--cc=daniel.m.jordan@oracle.com \
--cc=dhaval.giani@oracle.com \
--cc=jbacik@fb.com \
--cc=juri.lelli@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=matt@codeblueprint.co.uk \
--cc=mingo@redhat.com \
--cc=pavel.tatashin@microsoft.com \
--cc=peterz@infradead.org \
--cc=riel@redhat.com \
--cc=rohit.k.jain@oracle.com \
--cc=subhra.mazumdar@oracle.com \
--cc=umgwanakikbuti@gmail.com \
/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).