51 lines
1.8 KiB
Diff
51 lines
1.8 KiB
Diff
From bccdf34a949d258f53d3105e474254bbd22ac075 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <bccdf34a949d258f53d3105e474254bbd22ac075.1601675153.git.zanussi@kernel.org>
|
|
In-Reply-To: <5b5a156f9808b1acf1205606e03da117214549ea.1601675151.git.zanussi@kernel.org>
|
|
References: <5b5a156f9808b1acf1205606e03da117214549ea.1601675151.git.zanussi@kernel.org>
|
|
From: Scott Wood <swood@redhat.com>
|
|
Date: Sat, 27 Jul 2019 00:56:34 -0500
|
|
Subject: [PATCH 301/333] sched: migrate disable: Protect cpus_ptr with lock
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.148-rt64.tar.xz
|
|
|
|
[ Upstream commit 27ee52a891ed2c7e2e2c8332ccae0de7c2674b09 ]
|
|
|
|
Various places assume that cpus_ptr is protected by rq/pi locks,
|
|
so don't change it before grabbing those locks.
|
|
|
|
Signed-off-by: Scott Wood <swood@redhat.com>
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
|
|
---
|
|
kernel/sched/core.c | 6 ++----
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
|
|
index 7109b23c7a60..0d64d14f0b39 100644
|
|
--- a/kernel/sched/core.c
|
|
+++ b/kernel/sched/core.c
|
|
@@ -7245,9 +7245,8 @@ migrate_disable_update_cpus_allowed(struct task_struct *p)
|
|
struct rq *rq;
|
|
struct rq_flags rf;
|
|
|
|
- p->cpus_ptr = cpumask_of(smp_processor_id());
|
|
-
|
|
rq = task_rq_lock(p, &rf);
|
|
+ p->cpus_ptr = cpumask_of(smp_processor_id());
|
|
update_nr_migratory(p, -1);
|
|
p->nr_cpus_allowed = 1;
|
|
task_rq_unlock(rq, p, &rf);
|
|
@@ -7259,9 +7258,8 @@ migrate_enable_update_cpus_allowed(struct task_struct *p)
|
|
struct rq *rq;
|
|
struct rq_flags rf;
|
|
|
|
- p->cpus_ptr = &p->cpus_mask;
|
|
-
|
|
rq = task_rq_lock(p, &rf);
|
|
+ p->cpus_ptr = &p->cpus_mask;
|
|
p->nr_cpus_allowed = cpumask_weight(&p->cpus_mask);
|
|
update_nr_migratory(p, 1);
|
|
task_rq_unlock(rq, p, &rf);
|
|
--
|
|
2.17.1
|
|
|