From: tip-bot for Cheng Chao <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, oleg@redhat.com,
tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com,
torvalds@linux-foundation.org, cs.os.kernel@gmail.com,
peterz@infradead.org
Subject: [tip:sched/core] stop_machine: Avoid a sleep and wakeup in stop_one_cpu()
Date: Thu, 22 Sep 2016 06:59:24 -0700 [thread overview]
Message-ID: <tip-bf89a304722f6904009499a31dc68ab9a5c9742e@git.kernel.org> (raw)
In-Reply-To: <1473818510-6779-1-git-send-email-cs.os.kernel@gmail.com>
Commit-ID: bf89a304722f6904009499a31dc68ab9a5c9742e
Gitweb: http://git.kernel.org/tip/bf89a304722f6904009499a31dc68ab9a5c9742e
Author: Cheng Chao <cs.os.kernel@gmail.com>
AuthorDate: Wed, 14 Sep 2016 10:01:50 +0800
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 22 Sep 2016 14:53:45 +0200
stop_machine: Avoid a sleep and wakeup in stop_one_cpu()
In case @cpu == smp_proccessor_id(), we can avoid a sleep+wakeup
cycle by doing a preemption.
Callers such as sched_exec() can benefit from this change.
Signed-off-by: Cheng Chao <cs.os.kernel@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: akpm@linux-foundation.org
Cc: chris@chris-wilson.co.uk
Cc: tj@kernel.org
Link: http://lkml.kernel.org/r/1473818510-6779-1-git-send-email-cs.os.kernel@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/sched/core.c | 8 ++++++--
kernel/stop_machine.c | 5 +++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index c5f020c..ff4e3c0 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1063,8 +1063,12 @@ static int migration_cpu_stop(void *data)
* holding rq->lock, if p->on_rq == 0 it cannot get enqueued because
* we're holding p->pi_lock.
*/
- if (task_rq(p) == rq && task_on_rq_queued(p))
- rq = __migrate_task(rq, p, arg->dest_cpu);
+ if (task_rq(p) == rq) {
+ if (task_on_rq_queued(p))
+ rq = __migrate_task(rq, p, arg->dest_cpu);
+ else
+ p->wake_cpu = arg->dest_cpu;
+ }
raw_spin_unlock(&rq->lock);
raw_spin_unlock(&p->pi_lock);
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index 4a1ca5f..082e71f 100644
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -126,6 +126,11 @@ int stop_one_cpu(unsigned int cpu, cpu_stop_fn_t fn, void *arg)
cpu_stop_init_done(&done, 1);
if (!cpu_stop_queue_work(cpu, &work))
return -ENOENT;
+ /*
+ * In case @cpu == smp_proccessor_id() we can avoid a sleep+wakeup
+ * cycle by doing a preemption:
+ */
+ cond_resched();
wait_for_completion(&done.completion);
return done.ret;
}
prev parent reply other threads:[~2016-09-22 14:00 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <OF73BCE1E4.D2224FEC-ON48258025.0022CFA7-48258025.0022E3DC@kedacom.com>
2016-09-09 8:13 ` [PATCH v2] stop_machine: Make migration_cpu_stop() does useful works for CONFIG_PREEMPT_NONE Cheng Chao
2016-09-09 8:19 ` chengchao
2016-09-09 13:14 ` Oleg Nesterov
2016-09-09 16:24 ` Peter Zijlstra
2016-09-10 8:52 ` [PATCH v3] " Cheng Chao
2016-09-10 9:51 ` Cheng Chao
2016-09-10 16:33 ` Peter Zijlstra
2016-09-12 11:03 ` Oleg Nesterov
2016-09-13 2:45 ` Cheng Chao
2016-09-12 11:37 ` Peter Zijlstra
2016-09-12 11:41 ` Peter Zijlstra
2016-09-12 13:05 ` Oleg Nesterov
2016-09-12 15:01 ` Peter Zijlstra
2016-09-13 16:14 ` Oleg Nesterov
2016-09-13 16:37 ` Peter Zijlstra
2016-09-14 2:07 ` Cheng Chao
2016-09-14 7:50 ` Peter Zijlstra
2016-09-14 15:45 ` Oleg Nesterov
2016-09-22 13:59 ` [tip:sched/core] sched/core: Optimize __schedule() tip-bot for Peter Zijlstra
2016-09-13 4:03 ` [PATCH v3] stop_machine: Make migration_cpu_stop() does useful works for CONFIG_PREEMPT_NONE Cheng Chao
2016-09-13 8:45 ` Peter Zijlstra
2016-09-14 2:01 ` [PATCH v4] stop_machine: Avoid a sleep and wakeup in the stop_one_cpu() Cheng Chao
2016-09-14 15:53 ` Oleg Nesterov
2016-09-18 2:07 ` Cheng Chao
2016-09-22 13:59 ` tip-bot for Cheng Chao [this message]
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=tip-bf89a304722f6904009499a31dc68ab9a5c9742e@git.kernel.org \
--to=tipbot@zytor.com \
--cc=cs.os.kernel@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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).