51 lines
1.8 KiB
Diff
51 lines
1.8 KiB
Diff
From 30bf6f60094018e4f878ea339be2f6e921107b1b Mon Sep 17 00:00:00 2001
|
|
Message-Id: <30bf6f60094018e4f878ea339be2f6e921107b1b.1592846147.git.zanussi@kernel.org>
|
|
In-Reply-To: <07cd0dbc80b976663c80755496a03f288decfe5a.1592846146.git.zanussi@kernel.org>
|
|
References: <07cd0dbc80b976663c80755496a03f288decfe5a.1592846146.git.zanussi@kernel.org>
|
|
From: Scott Wood <swood@redhat.com>
|
|
Date: Sat, 27 Jul 2019 00:56:34 -0500
|
|
Subject: [PATCH 302/330] sched: migrate disable: Protect cpus_ptr with lock
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.127-rt55.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 a29f33e776d0..d9a3f88508ee 100644
|
|
--- a/kernel/sched/core.c
|
|
+++ b/kernel/sched/core.c
|
|
@@ -7250,9 +7250,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);
|
|
@@ -7264,9 +7263,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
|
|
|