71 lines
2.1 KiB
Diff
71 lines
2.1 KiB
Diff
From 6ce542437c4e24aae95e41efdfd7baa1345a0617 Mon Sep 17 00:00:00 2001
|
|
From: Mike Galbraith <efault@gmx.de>
|
|
Date: Tue, 23 Aug 2011 16:12:43 +0200
|
|
Subject: [PATCH 170/278] sched, rt: Fix migrate_enable() thinko
|
|
|
|
Assigning mask = tsk_cpus_allowed(p) after p->migrate_disable = 0 ensures
|
|
that we won't see a mask change.. no push/pull, we stack tasks on one CPU.
|
|
|
|
Also add a couple fields to sched_debug for the next guy.
|
|
|
|
[ Build fix from Stratos Psomadakis <psomas@gentoo.org> ]
|
|
|
|
Signed-off-by: Mike Galbraith <efault@gmx.de>
|
|
Cc: Paul E. McKenney <paulmck@us.ibm.com>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Link: http://lkml.kernel.org/r/1314108763.6689.4.camel@marge.simson.net
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
kernel/sched.c | 4 +++-
|
|
kernel/sched_debug.c | 7 +++++++
|
|
2 files changed, 10 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/kernel/sched.c b/kernel/sched.c
|
|
index 2b20b2d..6b0a53a 100644
|
|
--- a/kernel/sched.c
|
|
+++ b/kernel/sched.c
|
|
@@ -6562,12 +6562,14 @@ void migrate_enable(void)
|
|
*/
|
|
rq = this_rq();
|
|
raw_spin_lock_irqsave(&rq->lock, flags);
|
|
- p->migrate_disable = 0;
|
|
mask = tsk_cpus_allowed(p);
|
|
+ p->migrate_disable = 0;
|
|
|
|
WARN_ON(!cpumask_test_cpu(smp_processor_id(), mask));
|
|
|
|
if (!cpumask_equal(&p->cpus_allowed, mask)) {
|
|
+ /* Get the mask now that migration is enabled */
|
|
+ mask = tsk_cpus_allowed(p);
|
|
if (p->sched_class->set_cpus_allowed)
|
|
p->sched_class->set_cpus_allowed(p, mask);
|
|
p->rt.nr_cpus_allowed = cpumask_weight(mask);
|
|
diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
|
|
index a6710a1..528032b 100644
|
|
--- a/kernel/sched_debug.c
|
|
+++ b/kernel/sched_debug.c
|
|
@@ -235,6 +235,9 @@ void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq)
|
|
P(rt_throttled);
|
|
PN(rt_time);
|
|
PN(rt_runtime);
|
|
+#ifdef CONFIG_SMP
|
|
+ P(rt_nr_migratory);
|
|
+#endif
|
|
|
|
#undef PN
|
|
#undef P
|
|
@@ -484,6 +487,10 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m)
|
|
P(se.load.weight);
|
|
P(policy);
|
|
P(prio);
|
|
+#ifdef CONFIG_PREEMPT_RT_FULL
|
|
+ P(migrate_disable);
|
|
+#endif
|
|
+ P(rt.nr_cpus_allowed);
|
|
#undef PN
|
|
#undef __PN
|
|
#undef P
|
|
--
|
|
1.7.10
|
|
|