[RT,06/23] sched: __set_cpus_allowed_ptr: Check cpus_mask, not cpus_ptr
diff mbox series

Message ID 414ce6cf9d1dbe18cc4e9897cb958e9f1a2cb816.1582814004.git.zanussi@kernel.org
State New
Headers show
  • Linux v4.14.170-rt75-rc2
Related show

Commit Message

Tom Zanussi Feb. 27, 2020, 2:33 p.m. UTC
From: Scott Wood <swood@redhat.com>

v4.14.170-rt75-rc2 stable review patch.
If anyone has any objections, please let me know.


[ Upstream commit e5606fb7b042db634ed62b4dd733d62e050e468f ]

This function is concerned with the long-term cpu mask, not the
transitory mask the task might have while migrate disabled.  Before
this patch, if a task was migrate disabled at the time
__set_cpus_allowed_ptr() was called, and the new mask happened to be
equal to the cpu that the task was running on, then the mask update
would be lost.

Signed-off-by: Scott Wood <swood@redhat.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Tom Zanussi <zanussi@kernel.org>
 kernel/sched/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index fcff75934bdc..8d6badac9225 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1192,7 +1192,7 @@  static int __set_cpus_allowed_ptr(struct task_struct *p,
 		goto out;
-	if (cpumask_equal(p->cpus_ptr, new_mask))
+	if (cpumask_equal(&p->cpus_mask, new_mask))
 		goto out;
 	dest_cpu = cpumask_any_and(cpu_valid_mask, new_mask);