kill the broken and deadlockable cpuset_lock/cpuset_cpus_allowed_locked code
PATCH 1/6 kill the broken and deadlockable cpuset_lock/cpuset_cpus_allowed_locked code
This patch just states the fact the cpusets/cpuhotplug interaction is broken and removes the deadlockable code which only pretends to work.
- cpuset_lock() doesn't really work. It is needed for cpuset_cpus_allowed_locked() but we can't take this lock in try_to_wake_up()->select_fallback_rq() path.
- cpuset_lock() is deadlockable. Suppose that a task T bound to CPU takes callback_mutex. If cpu_down(CPU) happens before T drops callback_mutex stop_machine() preempts T, then migration_call(CPU_DEAD) tries to take cpuset_lock() and hangs forever because CPU is already dead and thus T can't be scheduled.
- cpuset_cpus_allowed_locked() is deadlockable too. It takes task_lock() which is not irq-safe, but try_to_wake_up() can be called from irq.
Kill them, and change select_fallback_rq() to use cpu_possible_mask, like we currently do without CONFIG_CPUSETS.
Also, with or without this patch, with or without CONFIG_CPUSETS, the callers of select_fallback_rq() can race with each other or with set_cpus_allowed() pathes.
The subsequent patches try to to fix these problems.
---
include/linux/cpuset.h | 13 ------------- kernel/cpuset.c | 27 +-------------------------- kernel/sched.c | 10 +++------- 3 files changed, 4 insertions(+), 46 deletions(-)
include/linux/cpuset.h renamed from include/linux/cpuset.h~1_KILL_CPUSET_LOCK +0 -13
@@ -21,8 +21,6 @@ extern int number_of_cpusets; /* How manextern int cpuset_init (void );extern void cpuset_init_smp (void );extern void cpuset_cpus_allowed (struct task_struct *p,struct cpumask *mask); -extern void cpuset_cpus_allowed_locked (struct task_struct *p, -struct cpumask *mask);extern nodemask_t cpuset_mems_allowed (struct task_struct *p);#define cpuset_current_mems_allowed (current->mems_allowed)void cpuset_init_current_mems_allowed (void );
@@ -69,9 +67,6 @@ struct seq_file;extern void cpuset_task_status_allowed (struct seq_file *m,struct task_struct *task); -extern void cpuset_lock (void ); -extern void cpuset_unlock (void ); -extern int cpuset_mem_spread_node (void );static inline int cpuset_do_page_mem_spread (void )
@@ -105,11 +100,6 @@ static inline void cpuset_cpus_allowed(s {cpumask_copy (mask, cpu_possible_mask); } -static inline void cpuset_cpus_allowed_locked (struct task_struct *p, -struct cpumask *mask) -{ -cpumask_copy (mask, cpu_possible_mask); -}static inline nodemask_t cpuset_mems_allowed (struct task_struct *p) {
@@ -157,9 +147,6 @@ static inline void cpuset_task_status_al { } -static inline void cpuset_lock (void ) {} -static inline void cpuset_unlock (void ) {} -static inline int cpuset_mem_spread_node (void ) {return 0 ;
kernel/cpuset.c renamed from kernel/cpuset.c~1_KILL_CPUSET_LOCK +1 -26
@@ -2140,19 +2140,10 @@ void __init cpuset_init_smp(void)void cpuset_cpus_allowed (struct task_struct *tsk,struct cpumask *pmask) {mutex_lock (&callback_mutex); -cpuset_cpus_allowed_locked (tsk, pmask); -mutex_unlock (&callback_mutex); -} - -/** -* cpuset_cpus_allowed_locked - return cpus_allowed mask from a tasks cpuset. -* Must be called with callback_mutex held. -**/ -void cpuset_cpus_allowed_locked (struct task_struct *tsk,struct cpumask *pmask) -{task_lock (tsk);guarantee_online_cpus (task_cs (tsk), pmask);task_unlock (tsk); +mutex_unlock (&callback_mutex); }void cpuset_init_current_mems_allowed (void )
@@ -2341,22 +2332,6 @@ int __cpuset_node_allowed_hardwall(int n }/** -* cpuset_lock - lock out any changes to cpuset structures -* -* The out of memory (oom) code needs to mutex_lock cpusets -* from being changed while it scans the tasklist looking for a -* task in an overlapping cpuset. Expose callback_mutex via this -* cpuset_lock() routine, so the oom code can lock it, before -* locking the task list. The tasklist_lock is a spinlock, so -* must be taken inside callback_mutex. -*/ - -void cpuset_lock (void ) -{ -mutex_lock (&callback_mutex); -} - -/** * cpuset_unlock - release lock on cpuset changes * * Undo the lock taken in a previous cpuset_lock() call.
kernel/sched.c renamed from kernel/sched.c~1_KILL_CPUSET_LOCK +3 -7
@@ -2288,11 +2288,9 @@ static int select_fallback_rq(int cpu, sreturn dest_cpu;/* No more Mr. Nice Guy. */ -if (dest_cpu >= nr_cpu_ids) { -rcu_read_lock (); -cpuset_cpus_allowed_locked (p, &p->cpus_allowed); -rcu_read_unlock (); - dest_cpu =cpumask_any_and (cpu_active_mask, &p->cpus_allowed); +if (unlikely (dest_cpu >= nr_cpu_ids)) { +cpumask_copy (&p->cpus_allowed, cpu_possible_mask); + dest_cpu =cpumask_any (cpu_active_mask);/* * Don't tell them about moving exiting tasks or
@@ -5929,7 +5927,6 @@ migration_call(struct notifier_block *nfcase CPU_DEAD :case CPU_DEAD_FROZEN : -cpuset_lock ();/* around calls to cpuset_cpus_allowed_lock() */ migrate_live_tasks (cpu); rq =cpu_rq (cpu);kthread_stop (rq->migration_thread);
@@ -5943,7 +5940,6 @@ migration_call(struct notifier_block *nf rq->idle->sched_class = &idle_sched_class;migrate_dead_tasks (cpu);raw_spin_unlock_irq (&rq->lock); -cpuset_unlock ();migrate_nr_uninterruptible (rq);BUG_ON (rq->nr_running !=0 );calc_global_load_remove (rq);
Quoted 7 lines · Oleg Nesterov
This patch just states the fact the cpusets/cpuhotplug interaction is broken and removes the deadlockable code which only pretends to work.
-
cpuset_lock()doesn't really work. It is needed forcpuset_cpus_allowed_locked()but we can't take this lock in try_to_wake_up()->select_fallback_rq() path.
Quoted 5 lines
-
cpuset_lock()is deadlockable. Suppose that a task T bound to CPU takescallback_mutex. Ifcpu_down(CPU)happens before T dropscallback_mutexstop_machine()preempts T, thenmigration_call(CPU_DEAD)tries to takecpuset_lock()and hangs forever because CPU is already dead and thus T can't be scheduled.
The problem what you said don't exist, because the kernel already move T to the active cpu when preparing to turn off a CPU.
Thanks!
Miao
Quoted 9 lines · Miao Xie
Quoted 7 lines · Oleg Nesterov
This patch just states the fact the cpusets/cpuhotplug interaction is broken and removes the deadlockable code which only pretends to work.
-
cpuset_lock()doesn't really work. It is needed forcpuset_cpus_allowed_locked()but we can't take this lock in try_to_wake_up()->select_fallback_rq() path.
Quoted 8 lines
Quoted 5 lines
-
cpuset_lock()is deadlockable. Suppose that a task T bound to CPU takescallback_mutex. Ifcpu_down(CPU)happens before T dropscallback_mutexstop_machine()preempts T, thenmigration_call(CPU_DEAD)tries to takecpuset_lock()and hangs forever because CPU is already dead and thus T can't be scheduled.The problem what you said don't exist, because the kernel already move T to the active cpu when preparing to turn off a CPU.
we need cpuset_lock() to move T. please look at _cpu_down().
OK.
A task T holds callback_mutex, and it is bound to CPU 1.
_cpu_down(cpu => 1) is called by the task X.
_cpu_down()->stop_machine() spawns rt-threads for each cpu, a thread running on CPU 1 preempts T and calls take_cpu_down() which removes CPU 1 from online/active masks.
X continues, and does raw_notifier_call_chain(CPU_DEAD), this calls migration_call(CPU_DEAD), and _this_ is what move the tasks from the dead CPU.
migration_call(CPU_DEAD) calls cpuset_lock() and deadlocks.
See?
Oleg.
Quoted 31 lines · Oleg Nesterov
Quoted 9 lines · Miao Xie
Quoted 7 lines · Oleg Nesterov
This patch just states the fact the cpusets/cpuhotplug interaction is broken and removes the deadlockable code which only pretends to work.
-
cpuset_lock()doesn't really work. It is needed forcpuset_cpus_allowed_locked()but we can't take this lock in try_to_wake_up()->select_fallback_rq() path.Quoted 8 lines
Quoted 5 lines
-
cpuset_lock()is deadlockable. Suppose that a task T bound to CPU takescallback_mutex. Ifcpu_down(CPU)happens before T dropscallback_mutexstop_machine()preempts T, thenmigration_call(CPU_DEAD)tries to takecpuset_lock()and hangs forever because CPU is already dead and thus T can't be scheduled.The problem what you said don't exist, because the kernel already move T to the active cpu when preparing to turn off a CPU.
we need
cpuset_lock()to move T. please look at_cpu_down().OK.
A task T holds
callback_mutex, and it is bound to CPU 1.
_cpu_down(cpu => 1)is called by the task X._cpu_down()->stop_machine() spawns rt-threads for each cpu, a thread running on CPU 1 preempts T and calls
take_cpu_down()which removes CPU 1 from online/active masks.
Quoted 7 lines
X continues, and does
raw_notifier_call_chain(CPU_DEAD), this callsmigration_call(CPU_DEAD), and _this_ is what move the tasks from the dead CPU.
migration_call(CPU_DEAD)callscpuset_lock()and deadlocks.See?
But when the kernel want to offline a cpu, it does
raw_notifier_call_chain(CPU_DOWN_PREPARE)
at first. this calls cpuset_track_online_cpus() to update cpuset's cpus and task->cpus_allowed, and then moves the task running on the dying cpu to the other online cpu. At that time, rt-threads for each cpu have not been created.
And when the kernel does migration_call(CPU_DEAD), the rt-threads already exit. the task that holds callback_mutex can run as normal.
Miao
Quoted 6 lines
Oleg.
Quoted 23 lines · Miao Xie
Quoted 21 lines · Oleg Nesterov
Quoted 3 lines · Miao Xie
The problem what you said don't exist, because the kernel already move T to the active cpu when preparing to turn off a CPU.
we need
cpuset_lock()to move T. please look at_cpu_down().OK.
A task T holds
callback_mutex, and it is bound to CPU 1.
_cpu_down(cpu => 1)is called by the task X._cpu_down()->stop_machine() spawns rt-threads for each cpu, a thread running on CPU 1 preempts T and calls
take_cpu_down()which removes CPU 1 from online/active masks.X continues, and does
raw_notifier_call_chain(CPU_DEAD), this callsmigration_call(CPU_DEAD), and _this_ is what move the tasks from the dead CPU.
Quoted 7 lines
Quoted 3 lines
migration_call(CPU_DEAD)callscpuset_lock()and deadlocks.See?
But when the kernel want to offline a cpu, it does
raw_notifier_call_chain(CPU_DOWN_PREPARE)
at first. this callscpuset_track_online_cpus()to update cpuset's cpus
First of let me note that it is wrong to call scan_for_empty_cpusets() at CPU_DOWN_PREPARE state. _cpu_down() can fail after that but we can't revert the result of remove_tasks_in_empty_cpuset().
But this doesn't matter,
Quoted 2 lines
and
task->cpus_allowed, and then moves the task running on the dying cpu to the other online cpu.
No, it doesn't track task->cpus_allowed afaics. It only checks cpumask_empty(cp->cpus_allowed) and does nothing otherwise.
And it is quite possible that the task belongs to some cpuset cs, bound to a single cpu, but cs->cpus_allowed is "wide" and includes other online cpus.
Quoted 2 lines
At that time, rt-threads for each cpu have not
been created.
(doesn't matter, but the are already created and sleeping)
Quoted 2 lines
And when the kernel does
migration_call(CPU_DEAD), the rt-threads already exit.
No, there are sleeping, but this doesn't matter again.
Quoted 1 line
the task that holds
callback_mutexcan run as normal.
It can't afaics, please see above.
That said, let me remind. I read this code only once a long ago, during my first attempt to fix these problems (all my attempts were ignored until I rerouted my concerns to Peter). It is possible that I missed/forgot/both something. But when I did the second version I bothered to actually test my theory and the kernel hanged, see the changelog in
http://marc.info/?t=124910242400002
You was cc'ed too ;)
Oleg.
[tip:sched/core] sched: Kill the broken and deadlockable cpuset_lock/cpuset_cpus_allowed_locked code
In reply to Oleg NesterovCommit-ID: 897f0b3c3ff40b443c84e271bef19bd6ae885195 Gitweb: http://git.kernel.org/tip/897f0b3c3ff40b443c84e271bef19bd6ae885195 Author: Oleg Nesterov <[email protected]> AuthorDate: Mon, 15 Mar 2010 10:10:03 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 2 Apr 2010 20:12:01 +0200
sched: Kill the broken and deadlockable cpuset_lock/cpuset_cpus_allowed_locked code
This patch just states the fact the cpusets/cpuhotplug interaction is broken and removes the deadlockable code which only pretends to work.
- cpuset_lock() doesn't really work. It is needed for cpuset_cpus_allowed_locked() but we can't take this lock in try_to_wake_up()->select_fallback_rq() path.
- cpuset_lock() is deadlockable. Suppose that a task T bound to CPU takes callback_mutex. If cpu_down(CPU) happens before T drops callback_mutex stop_machine() preempts T, then migration_call(CPU_DEAD) tries to take cpuset_lock() and hangs forever because CPU is already dead and thus T can't be scheduled.
- cpuset_cpus_allowed_locked() is deadlockable too. It takes task_lock() which is not irq-safe, but try_to_wake_up() can be called from irq.
Kill them, and change select_fallback_rq() to use cpu_possible_mask, like we currently do without CONFIG_CPUSETS.
Also, with or without this patch, with or without CONFIG_CPUSETS, the callers of select_fallback_rq() can race with each other or with set_cpus_allowed() pathes.
The subsequent patches try to to fix these problems.
LKML-Reference: <[email protected]>
--- include/linux/cpuset.h | 13 ------------- kernel/cpuset.c | 27 +-------------------------- kernel/sched.c | 10 +++------- 3 files changed, 4 insertions(+), 46 deletions(-)
include/linux/cpuset.h +0 -13
@@ -21,8 +21,6 @@ extern int number_of_cpusets; /* How many cpusets are defined in system? */extern int cpuset_init (void );extern void cpuset_init_smp (void );extern void cpuset_cpus_allowed (struct task_struct *p,struct cpumask *mask); -extern void cpuset_cpus_allowed_locked (struct task_struct *p, -struct cpumask *mask);extern nodemask_t cpuset_mems_allowed (struct task_struct *p);#define cpuset_current_mems_allowed (current->mems_allowed)void cpuset_init_current_mems_allowed (void );
@@ -69,9 +67,6 @@ struct seq_file;extern void cpuset_task_status_allowed (struct seq_file *m,struct task_struct *task); -extern void cpuset_lock (void ); -extern void cpuset_unlock (void ); -extern int cpuset_mem_spread_node (void );static inline int cpuset_do_page_mem_spread (void )
@@ -105,11 +100,6 @@ static inline void cpuset_cpus_allowed(struct task_struct *p, {cpumask_copy (mask, cpu_possible_mask); } -static inline void cpuset_cpus_allowed_locked (struct task_struct *p, -struct cpumask *mask) -{ -cpumask_copy (mask, cpu_possible_mask); -}static inline nodemask_t cpuset_mems_allowed (struct task_struct *p) {
@@ -157,9 +147,6 @@ static inline void cpuset_task_status_allowed(struct seq_file *m, { } -static inline void cpuset_lock (void ) {} -static inline void cpuset_unlock (void ) {} -static inline int cpuset_mem_spread_node (void ) {return 0 ;
kernel/cpuset.c +1 -26
@@ -2182,19 +2182,10 @@ void __init cpuset_init_smp(void)void cpuset_cpus_allowed (struct task_struct *tsk,struct cpumask *pmask) {mutex_lock (&callback_mutex); -cpuset_cpus_allowed_locked (tsk, pmask); -mutex_unlock (&callback_mutex); -} - -/** -* cpuset_cpus_allowed_locked - return cpus_allowed mask from a tasks cpuset. -* Must be called with callback_mutex held. -**/ -void cpuset_cpus_allowed_locked (struct task_struct *tsk,struct cpumask *pmask) -{task_lock (tsk);guarantee_online_cpus (task_cs (tsk), pmask);task_unlock (tsk); +mutex_unlock (&callback_mutex); }void cpuset_init_current_mems_allowed (void )
@@ -2383,22 +2374,6 @@ int __cpuset_node_allowed_hardwall(int node, gfp_t gfp_mask) }/** -* cpuset_lock - lock out any changes to cpuset structures -* -* The out of memory (oom) code needs to mutex_lock cpusets -* from being changed while it scans the tasklist looking for a -* task in an overlapping cpuset. Expose callback_mutex via this -* cpuset_lock() routine, so the oom code can lock it, before -* locking the task list. The tasklist_lock is a spinlock, so -* must be taken inside callback_mutex. -*/ - -void cpuset_lock (void ) -{ -mutex_lock (&callback_mutex); -} - -/** * cpuset_unlock - release lock on cpuset changes * * Undo the lock taken in a previous cpuset_lock() call.
kernel/sched.c +3 -7
@@ -2296,11 +2296,9 @@ static int select_fallback_rq(int cpu, struct task_struct *p)return dest_cpu;/* No more Mr. Nice Guy. */ -if (dest_cpu >= nr_cpu_ids) { -rcu_read_lock (); -cpuset_cpus_allowed_locked (p, &p->cpus_allowed); -rcu_read_unlock (); - dest_cpu =cpumask_any_and (cpu_active_mask, &p->cpus_allowed); +if (unlikely (dest_cpu >= nr_cpu_ids)) { +cpumask_copy (&p->cpus_allowed, cpu_possible_mask); + dest_cpu =cpumask_any (cpu_active_mask);/* * Don't tell them about moving exiting tasks or
@@ -5866,7 +5864,6 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)case CPU_DEAD :case CPU_DEAD_FROZEN : -cpuset_lock ();/* around calls to cpuset_cpus_allowed_lock() */ migrate_live_tasks (cpu); rq =cpu_rq (cpu);kthread_stop (rq->migration_thread);
@@ -5879,7 +5876,6 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) rq->idle->sched_class = &idle_sched_class;migrate_dead_tasks (cpu);raw_spin_unlock_irq (&rq->lock); -cpuset_unlock ();migrate_nr_uninterruptible (rq);BUG_ON (rq->nr_running !=0 );calc_global_load_remove (rq);