diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 21:10:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 21:10:18 -0400 |
| commit | 08615d7d85e5aa02c05bf6c4dde87d940e7f85f6 (patch) | |
| tree | 18906149d313d25914160aca21cedf54b3a7e818 /kernel/cpu.c | |
| parent | 9fdadb2cbaf4b482dfd6086e8bd3d2db071a1702 (diff) | |
| parent | 0a4dd35c67b144d8ef9432120105f1aab9293ee9 (diff) | |
Merge branch 'akpm' (Andrew's patch-bomb)
Merge misc patches from Andrew Morton:
- the "misc" tree - stuff from all over the map
- checkpatch updates
- fatfs
- kmod changes
- procfs
- cpumask
- UML
- kexec
- mqueue
- rapidio
- pidns
- some checkpoint-restore feature work. Reluctantly. Most of it
delayed a release. I'm still rather worried that we don't have a
clear roadmap to completion for this work.
* emailed from Andrew Morton <akpm@linux-foundation.org>: (78 patches)
kconfig: update compression algorithm info
c/r: prctl: add ability to set new mm_struct::exe_file
c/r: prctl: extend PR_SET_MM to set up more mm_struct entries
c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat
syscalls, x86: add __NR_kcmp syscall
fs, proc: introduce /proc/<pid>/task/<tid>/children entry
sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()
eventfd: change int to __u64 in eventfd_signal()
fs/nls: add Apple NLS
pidns: make killed children autoreap
pidns: use task_active_pid_ns in do_notify_parent
rapidio/tsi721: add DMA engine support
rapidio: add DMA engine support for RIO data transfers
ipc/mqueue: add rbtree node caching support
tools/selftests: add mq_perf_tests
ipc/mqueue: strengthen checks on mqueue creation
ipc/mqueue: correct mq_attr_ok test
ipc/mqueue: improve performance of send/recv
selftests: add mq_open_tests
...
Diffstat (limited to 'kernel/cpu.c')
| -rw-r--r-- | kernel/cpu.c | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index 0e6353cf147a..a4eb5227a19e 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c | |||
| @@ -10,7 +10,10 @@ | |||
| 10 | #include <linux/sched.h> | 10 | #include <linux/sched.h> |
| 11 | #include <linux/unistd.h> | 11 | #include <linux/unistd.h> |
| 12 | #include <linux/cpu.h> | 12 | #include <linux/cpu.h> |
| 13 | #include <linux/oom.h> | ||
| 14 | #include <linux/rcupdate.h> | ||
| 13 | #include <linux/export.h> | 15 | #include <linux/export.h> |
| 16 | #include <linux/bug.h> | ||
| 14 | #include <linux/kthread.h> | 17 | #include <linux/kthread.h> |
| 15 | #include <linux/stop_machine.h> | 18 | #include <linux/stop_machine.h> |
| 16 | #include <linux/mutex.h> | 19 | #include <linux/mutex.h> |
| @@ -173,6 +176,47 @@ void __ref unregister_cpu_notifier(struct notifier_block *nb) | |||
| 173 | } | 176 | } |
| 174 | EXPORT_SYMBOL(unregister_cpu_notifier); | 177 | EXPORT_SYMBOL(unregister_cpu_notifier); |
| 175 | 178 | ||
| 179 | /** | ||
| 180 | * clear_tasks_mm_cpumask - Safely clear tasks' mm_cpumask for a CPU | ||
| 181 | * @cpu: a CPU id | ||
| 182 | * | ||
| 183 | * This function walks all processes, finds a valid mm struct for each one and | ||
| 184 | * then clears a corresponding bit in mm's cpumask. While this all sounds | ||
| 185 | * trivial, there are various non-obvious corner cases, which this function | ||
| 186 | * tries to solve in a safe manner. | ||
| 187 | * | ||
| 188 | * Also note that the function uses a somewhat relaxed locking scheme, so it may | ||
| 189 | * be called only for an already offlined CPU. | ||
| 190 | */ | ||
| 191 | void clear_tasks_mm_cpumask(int cpu) | ||
| 192 | { | ||
| 193 | struct task_struct *p; | ||
| 194 | |||
| 195 | /* | ||
| 196 | * This function is called after the cpu is taken down and marked | ||
| 197 | * offline, so its not like new tasks will ever get this cpu set in | ||
| 198 | * their mm mask. -- Peter Zijlstra | ||
| 199 | * Thus, we may use rcu_read_lock() here, instead of grabbing | ||
| 200 | * full-fledged tasklist_lock. | ||
| 201 | */ | ||
| 202 | WARN_ON(cpu_online(cpu)); | ||
| 203 | rcu_read_lock(); | ||
| 204 | for_each_process(p) { | ||
| 205 | struct task_struct *t; | ||
| 206 | |||
| 207 | /* | ||
| 208 | * Main thread might exit, but other threads may still have | ||
| 209 | * a valid mm. Find one. | ||
| 210 | */ | ||
| 211 | t = find_lock_task_mm(p); | ||
| 212 | if (!t) | ||
| 213 | continue; | ||
| 214 | cpumask_clear_cpu(cpu, mm_cpumask(t->mm)); | ||
| 215 | task_unlock(t); | ||
| 216 | } | ||
| 217 | rcu_read_unlock(); | ||
| 218 | } | ||
| 219 | |||
| 176 | static inline void check_for_tasks(int cpu) | 220 | static inline void check_for_tasks(int cpu) |
| 177 | { | 221 | { |
| 178 | struct task_struct *p; | 222 | struct task_struct *p; |
