linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for Thomas Gleixner <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@kernel.org, torvalds@linux-foundation.org,
	tglx@linutronix.de, rostedt@goodmis.org,
	linux-kernel@vger.kernel.org, mark.rutland@arm.com,
	hpa@zytor.com, gregkh@linuxfoundation.org, peterz@infradead.org
Subject: [tip:sched/core] init: Pin init task to the boot CPU, initially
Date: Tue, 23 May 2017 01:47:41 -0700	[thread overview]
Message-ID: <tip-8fb12156b8db61af3d49f3e5e104568494581d1f@git.kernel.org> (raw)
In-Reply-To: <20170516184734.943149935@linutronix.de>

Commit-ID:  8fb12156b8db61af3d49f3e5e104568494581d1f
Gitweb:     http://git.kernel.org/tip/8fb12156b8db61af3d49f3e5e104568494581d1f
Author:     Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Tue, 16 May 2017 20:42:32 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 23 May 2017 10:01:34 +0200

init: Pin init task to the boot CPU, initially

Some of the boot code in init_kernel_freeable() which runs before SMP
bringup assumes (rightfully) that it runs on the boot CPU and therefore can
use smp_processor_id() in preemptible context.

That works so far because the smp_processor_id() check starts to be
effective after smp bringup. That's just wrong. Starting with SMP bringup
and the ability to move threads around, smp_processor_id() in preemptible
context is broken.

Aside of that it does not make sense to allow init to run on all CPUs
before sched_smp_init() has been run.

Pin the init to the boot CPU so the existing code can continue to use
smp_processor_id() without triggering the checks when the enabling of those
checks starts earlier.

Tested-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/20170516184734.943149935@linutronix.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 init/main.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/init/main.c b/init/main.c
index f866510..badae3b 100644
--- a/init/main.c
+++ b/init/main.c
@@ -389,6 +389,7 @@ static __initdata DECLARE_COMPLETION(kthreadd_done);
 
 static noinline void __ref rest_init(void)
 {
+	struct task_struct *tsk;
 	int pid;
 
 	rcu_scheduler_starting();
@@ -397,7 +398,17 @@ static noinline void __ref rest_init(void)
 	 * the init task will end up wanting to create kthreads, which, if
 	 * we schedule it before we create kthreadd, will OOPS.
 	 */
-	kernel_thread(kernel_init, NULL, CLONE_FS);
+	pid = kernel_thread(kernel_init, NULL, CLONE_FS);
+	/*
+	 * Pin init on the boot CPU. Task migration is not properly working
+	 * until sched_init_smp() has been run. It will set the allowed
+	 * CPUs for init to the non isolated CPUs.
+	 */
+	rcu_read_lock();
+	tsk = find_task_by_pid_ns(pid, &init_pid_ns);
+	set_cpus_allowed_ptr(tsk, cpumask_of(smp_processor_id()));
+	rcu_read_unlock();
+
 	numa_default_policy();
 	pid = kernel_thread(kthreadd, NULL, CLONE_FS | CLONE_FILES);
 	rcu_read_lock();
@@ -1015,10 +1026,6 @@ static noinline void __init kernel_init_freeable(void)
 	 * init can allocate pages on any node
 	 */
 	set_mems_allowed(node_states[N_MEMORY]);
-	/*
-	 * init can run on any cpu.
-	 */
-	set_cpus_allowed_ptr(current, cpu_all_mask);
 
 	cad_pid = task_pid(current);
 

  parent reply	other threads:[~2017-05-23  8:52 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-16 18:42 [patch V2 00/17] init: Enable might_sleep() and smp_processor_id() debugging early Thomas Gleixner
2017-05-16 18:42 ` [patch V2 01/17] init: Pin init task to boot cpu initially Thomas Gleixner
2017-05-16 19:06   ` Steven Rostedt
2017-05-23  8:47   ` tip-bot for Thomas Gleixner [this message]
2017-05-16 18:42 ` [patch V2 02/17] arm: Adjust system_state check Thomas Gleixner
2017-05-23  8:48   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-05-16 18:42 ` [patch V2 03/17] arm64: " Thomas Gleixner
2017-05-17 10:09   ` Mark Rutland
2017-05-17 14:23   ` Catalin Marinas
2017-05-23  8:48   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-05-16 18:42 ` [patch V2 04/17] x86/smp: " Thomas Gleixner
2017-05-23  8:49   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-05-16 18:42 ` [patch V2 05/17] metag: " Thomas Gleixner
2017-05-23  8:50   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-05-16 18:42 ` [patch V2 06/17] powerpc: " Thomas Gleixner
2017-05-23  8:50   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-05-16 18:42 ` [patch V2 07/17] ACPI: " Thomas Gleixner
2017-05-16 19:07   ` Steven Rostedt
2017-05-23  8:51   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-05-16 18:42 ` [patch V2 08/17] mm: " Thomas Gleixner
2017-05-23  8:51   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-05-16 18:42 ` [patch V2 09/17] cpufreq/pasemi: " Thomas Gleixner
2017-05-23  8:52   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-05-16 18:42 ` [patch V2 10/17] iommu/vt-d: Adjust system_state checks Thomas Gleixner
2017-05-23  8:52   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-05-16 18:42 ` [patch V2 11/17] iommu/of: Adjust system_state check Thomas Gleixner
2017-05-23  8:53   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-05-16 18:42 ` [patch V2 12/17] async: Adjust system_state checks Thomas Gleixner
2017-05-23  8:53   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-05-16 18:42 ` [patch V2 13/17] extable: " Thomas Gleixner
2017-05-23  8:54   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-05-16 18:42 ` [patch V2 14/17] printk: " Thomas Gleixner
2017-05-23  8:55   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-05-16 18:42 ` [patch V2 15/17] mm/vmscan: " Thomas Gleixner
2017-05-17  6:56   ` Vlastimil Babka
2017-05-23  8:55   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-05-16 18:42 ` [patch V2 16/17] init: Introduce SYSTEM_SCHEDULING state Thomas Gleixner
2017-05-17 10:58   ` Mark Rutland
2017-05-17 21:15   ` Boris Ostrovsky
2017-05-23  8:56   ` [tip:sched/core] " tip-bot for Thomas Gleixner
2017-05-16 18:42 ` [patch V2 17/17] sched: Enable might_sleep() and smp_processor_id() checks early Thomas Gleixner
2017-05-16 19:12   ` Steven Rostedt
2017-05-16 22:46     ` Thomas Gleixner
2017-05-16 22:50       ` Steven Rostedt
2017-05-17 11:02   ` Mark Rutland
2017-05-23  8:56   ` [tip:sched/core] sched/core: " tip-bot for Thomas Gleixner
2017-05-17 10:58 ` [patch V2 00/17] init: Enable might_sleep() and smp_processor_id() debugging early Mark Rutland

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-8fb12156b8db61af3d49f3e5e104568494581d1f@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=rostedt@goodmis.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).