2020-06-23 13:42:59 +00:00
|
|
|
From 29c32d3972bb9d63cde1df12571bb803d2ba0579 Mon Sep 17 00:00:00 2001
|
|
|
|
|
Message-Id: <29c32d3972bb9d63cde1df12571bb803d2ba0579.1592846147.git.zanussi@kernel.org>
|
|
|
|
|
In-Reply-To: <07cd0dbc80b976663c80755496a03f288decfe5a.1592846146.git.zanussi@kernel.org>
|
|
|
|
|
References: <07cd0dbc80b976663c80755496a03f288decfe5a.1592846146.git.zanussi@kernel.org>
|
2020-02-21 18:07:43 +00:00
|
|
|
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
|
|
|
Date: Fri, 29 Nov 2019 17:24:55 +0100
|
2020-06-23 13:42:59 +00:00
|
|
|
Subject: [PATCH 313/330] sched/core: migrate_enable() must access
|
2020-02-21 18:07:43 +00:00
|
|
|
takedown_cpu_task on !HOTPLUG_CPU
|
2020-06-23 13:42:59 +00:00
|
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.127-rt55.tar.xz
|
2020-02-21 18:07:43 +00:00
|
|
|
|
|
|
|
|
[ Upstream commit a61d1977f692e46bad99a100f264981ba08cb4bd ]
|
|
|
|
|
|
|
|
|
|
The variable takedown_cpu_task is never declared/used on !HOTPLUG_CPU
|
|
|
|
|
except for migrate_enable(). This leads to a link error.
|
|
|
|
|
|
|
|
|
|
Don't use takedown_cpu_task in !HOTPLUG_CPU.
|
|
|
|
|
|
|
|
|
|
Reported-by: Dick Hollenbeck <dick@softplc.com>
|
|
|
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
|
|
|
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
|
|
|
|
|
---
|
|
|
|
|
kernel/cpu.c | 2 ++
|
|
|
|
|
kernel/sched/core.c | 2 ++
|
|
|
|
|
2 files changed, 4 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/kernel/cpu.c b/kernel/cpu.c
|
2020-06-22 13:14:16 +00:00
|
|
|
index cb446db5790c..6876436155eb 100644
|
2020-02-21 18:07:43 +00:00
|
|
|
--- a/kernel/cpu.c
|
|
|
|
|
+++ b/kernel/cpu.c
|
2020-03-06 11:44:27 +00:00
|
|
|
@@ -845,7 +845,9 @@ static int take_cpu_down(void *_param)
|
2020-02-21 18:07:43 +00:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+#ifdef CONFIG_PREEMPT_RT_BASE
|
|
|
|
|
struct task_struct *takedown_cpu_task;
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
static int takedown_cpu(unsigned int cpu)
|
|
|
|
|
{
|
|
|
|
|
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
|
|
|
|
|
index e465381b464d..cbd76324babd 100644
|
|
|
|
|
--- a/kernel/sched/core.c
|
|
|
|
|
+++ b/kernel/sched/core.c
|
|
|
|
|
@@ -7314,9 +7314,11 @@ void migrate_enable(void)
|
|
|
|
|
|
|
|
|
|
p->migrate_disable = 0;
|
|
|
|
|
rq->nr_pinned--;
|
|
|
|
|
+#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
|
if (rq->nr_pinned == 0 && unlikely(!cpu_active(cpu)) &&
|
|
|
|
|
takedown_cpu_task)
|
|
|
|
|
wake_up_process(takedown_cpu_task);
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
if (!p->migrate_disable_scheduled)
|
|
|
|
|
goto out;
|
|
|
|
|
--
|
2020-06-22 13:14:16 +00:00
|
|
|
2.17.1
|
2020-02-21 18:07:43 +00:00
|
|
|
|
