diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
commit | 9e3ee1c39c0cc71222f9980ccbf87fe072897eef (patch) | |
tree | 99462000e6f0d4f907cb2fc690f19d4d441ba0f3 /kernel/stop_machine.c | |
parent | e56b3bc7942982ac2589c942fb345e38bc7a341a (diff) | |
parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/stop_machine.c')
-rw-r--r-- | kernel/stop_machine.c | 287 |
1 files changed, 131 insertions, 156 deletions
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index ba9b2054ecbd..e446c7c7d6a9 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* Copyright 2005 Rusty Russell rusty@rustcorp.com.au IBM Corporation. | 1 | /* Copyright 2008, 2005 Rusty Russell rusty@rustcorp.com.au IBM Corporation. |
2 | * GPL v2 and any later version. | 2 | * GPL v2 and any later version. |
3 | */ | 3 | */ |
4 | #include <linux/cpu.h> | 4 | #include <linux/cpu.h> |
@@ -13,203 +13,178 @@ | |||
13 | #include <asm/atomic.h> | 13 | #include <asm/atomic.h> |
14 | #include <asm/uaccess.h> | 14 | #include <asm/uaccess.h> |
15 | 15 | ||
16 | /* Since we effect priority and affinity (both of which are visible | 16 | /* This controls the threads on each CPU. */ |
17 | * to, and settable by outside processes) we do indirection via a | ||
18 | * kthread. */ | ||
19 | |||
20 | /* Thread to stop each CPU in user context. */ | ||
21 | enum stopmachine_state { | 17 | enum stopmachine_state { |
22 | STOPMACHINE_WAIT, | 18 | /* Dummy starting state for thread. */ |
19 | STOPMACHINE_NONE, | ||
20 | /* Awaiting everyone to be scheduled. */ | ||
23 | STOPMACHINE_PREPARE, | 21 | STOPMACHINE_PREPARE, |
22 | /* Disable interrupts. */ | ||
24 | STOPMACHINE_DISABLE_IRQ, | 23 | STOPMACHINE_DISABLE_IRQ, |
24 | /* Run the function */ | ||
25 | STOPMACHINE_RUN, | ||
26 | /* Exit */ | ||
25 | STOPMACHINE_EXIT, | 27 | STOPMACHINE_EXIT, |
26 | }; | 28 | }; |
29 | static enum stopmachine_state state; | ||
27 | 30 | ||
28 | static enum stopmachine_state stopmachine_state; | 31 | struct stop_machine_data { |
29 | static unsigned int stopmachine_num_threads; | 32 | int (*fn)(void *); |
30 | static atomic_t stopmachine_thread_ack; | 33 | void *data; |
31 | 34 | int fnret; | |
32 | static int stopmachine(void *cpu) | 35 | }; |
33 | { | ||
34 | int irqs_disabled = 0; | ||
35 | int prepared = 0; | ||
36 | |||
37 | set_cpus_allowed_ptr(current, &cpumask_of_cpu((int)(long)cpu)); | ||
38 | |||
39 | /* Ack: we are alive */ | ||
40 | smp_mb(); /* Theoretically the ack = 0 might not be on this CPU yet. */ | ||
41 | atomic_inc(&stopmachine_thread_ack); | ||
42 | |||
43 | /* Simple state machine */ | ||
44 | while (stopmachine_state != STOPMACHINE_EXIT) { | ||
45 | if (stopmachine_state == STOPMACHINE_DISABLE_IRQ | ||
46 | && !irqs_disabled) { | ||
47 | local_irq_disable(); | ||
48 | hard_irq_disable(); | ||
49 | irqs_disabled = 1; | ||
50 | /* Ack: irqs disabled. */ | ||
51 | smp_mb(); /* Must read state first. */ | ||
52 | atomic_inc(&stopmachine_thread_ack); | ||
53 | } else if (stopmachine_state == STOPMACHINE_PREPARE | ||
54 | && !prepared) { | ||
55 | /* Everyone is in place, hold CPU. */ | ||
56 | preempt_disable(); | ||
57 | prepared = 1; | ||
58 | smp_mb(); /* Must read state first. */ | ||
59 | atomic_inc(&stopmachine_thread_ack); | ||
60 | } | ||
61 | /* Yield in first stage: migration threads need to | ||
62 | * help our sisters onto their CPUs. */ | ||
63 | if (!prepared && !irqs_disabled) | ||
64 | yield(); | ||
65 | cpu_relax(); | ||
66 | } | ||
67 | |||
68 | /* Ack: we are exiting. */ | ||
69 | smp_mb(); /* Must read state first. */ | ||
70 | atomic_inc(&stopmachine_thread_ack); | ||
71 | |||
72 | if (irqs_disabled) | ||
73 | local_irq_enable(); | ||
74 | if (prepared) | ||
75 | preempt_enable(); | ||
76 | 36 | ||
77 | return 0; | 37 | /* Like num_online_cpus(), but hotplug cpu uses us, so we need this. */ |
78 | } | 38 | static unsigned int num_threads; |
39 | static atomic_t thread_ack; | ||
40 | static struct completion finished; | ||
41 | static DEFINE_MUTEX(lock); | ||
79 | 42 | ||
80 | /* Change the thread state */ | 43 | static void set_state(enum stopmachine_state newstate) |
81 | static void stopmachine_set_state(enum stopmachine_state state) | ||
82 | { | 44 | { |
83 | atomic_set(&stopmachine_thread_ack, 0); | 45 | /* Reset ack counter. */ |
46 | atomic_set(&thread_ack, num_threads); | ||
84 | smp_wmb(); | 47 | smp_wmb(); |
85 | stopmachine_state = state; | 48 | state = newstate; |
86 | while (atomic_read(&stopmachine_thread_ack) != stopmachine_num_threads) | ||
87 | cpu_relax(); | ||
88 | } | 49 | } |
89 | 50 | ||
90 | static int stop_machine(void) | 51 | /* Last one to ack a state moves to the next state. */ |
52 | static void ack_state(void) | ||
91 | { | 53 | { |
92 | int i, ret = 0; | 54 | if (atomic_dec_and_test(&thread_ack)) { |
93 | 55 | /* If we're the last one to ack the EXIT, we're finished. */ | |
94 | atomic_set(&stopmachine_thread_ack, 0); | 56 | if (state == STOPMACHINE_EXIT) |
95 | stopmachine_num_threads = 0; | 57 | complete(&finished); |
96 | stopmachine_state = STOPMACHINE_WAIT; | 58 | else |
97 | 59 | set_state(state + 1); | |
98 | for_each_online_cpu(i) { | ||
99 | if (i == raw_smp_processor_id()) | ||
100 | continue; | ||
101 | ret = kernel_thread(stopmachine, (void *)(long)i,CLONE_KERNEL); | ||
102 | if (ret < 0) | ||
103 | break; | ||
104 | stopmachine_num_threads++; | ||
105 | } | ||
106 | |||
107 | /* Wait for them all to come to life. */ | ||
108 | while (atomic_read(&stopmachine_thread_ack) != stopmachine_num_threads) { | ||
109 | yield(); | ||
110 | cpu_relax(); | ||
111 | } | 60 | } |
61 | } | ||
112 | 62 | ||
113 | /* If some failed, kill them all. */ | 63 | /* This is the actual thread which stops the CPU. It exits by itself rather |
114 | if (ret < 0) { | 64 | * than waiting for kthread_stop(), because it's easier for hotplug CPU. */ |
115 | stopmachine_set_state(STOPMACHINE_EXIT); | 65 | static int stop_cpu(struct stop_machine_data *smdata) |
116 | return ret; | 66 | { |
117 | } | 67 | enum stopmachine_state curstate = STOPMACHINE_NONE; |
68 | int uninitialized_var(ret); | ||
118 | 69 | ||
119 | /* Now they are all started, make them hold the CPUs, ready. */ | 70 | /* Simple state machine */ |
120 | preempt_disable(); | 71 | do { |
121 | stopmachine_set_state(STOPMACHINE_PREPARE); | 72 | /* Chill out and ensure we re-read stopmachine_state. */ |
73 | cpu_relax(); | ||
74 | if (state != curstate) { | ||
75 | curstate = state; | ||
76 | switch (curstate) { | ||
77 | case STOPMACHINE_DISABLE_IRQ: | ||
78 | local_irq_disable(); | ||
79 | hard_irq_disable(); | ||
80 | break; | ||
81 | case STOPMACHINE_RUN: | ||
82 | /* |= allows error detection if functions on | ||
83 | * multiple CPUs. */ | ||
84 | smdata->fnret |= smdata->fn(smdata->data); | ||
85 | break; | ||
86 | default: | ||
87 | break; | ||
88 | } | ||
89 | ack_state(); | ||
90 | } | ||
91 | } while (curstate != STOPMACHINE_EXIT); | ||
122 | 92 | ||
123 | /* Make them disable irqs. */ | 93 | local_irq_enable(); |
124 | local_irq_disable(); | 94 | do_exit(0); |
125 | hard_irq_disable(); | 95 | } |
126 | stopmachine_set_state(STOPMACHINE_DISABLE_IRQ); | ||
127 | 96 | ||
97 | /* Callback for CPUs which aren't supposed to do anything. */ | ||
98 | static int chill(void *unused) | ||
99 | { | ||
128 | return 0; | 100 | return 0; |
129 | } | 101 | } |
130 | 102 | ||
131 | static void restart_machine(void) | 103 | int __stop_machine(int (*fn)(void *), void *data, const cpumask_t *cpus) |
132 | { | 104 | { |
133 | stopmachine_set_state(STOPMACHINE_EXIT); | 105 | int i, err; |
134 | local_irq_enable(); | 106 | struct stop_machine_data active, idle; |
135 | preempt_enable_no_resched(); | 107 | struct task_struct **threads; |
136 | } | 108 | |
109 | active.fn = fn; | ||
110 | active.data = data; | ||
111 | active.fnret = 0; | ||
112 | idle.fn = chill; | ||
113 | idle.data = NULL; | ||
114 | |||
115 | /* This could be too big for stack on large machines. */ | ||
116 | threads = kcalloc(NR_CPUS, sizeof(threads[0]), GFP_KERNEL); | ||
117 | if (!threads) | ||
118 | return -ENOMEM; | ||
119 | |||
120 | /* Set up initial state. */ | ||
121 | mutex_lock(&lock); | ||
122 | init_completion(&finished); | ||
123 | num_threads = num_online_cpus(); | ||
124 | set_state(STOPMACHINE_PREPARE); | ||
137 | 125 | ||
138 | struct stop_machine_data { | 126 | for_each_online_cpu(i) { |
139 | int (*fn)(void *); | 127 | struct stop_machine_data *smdata = &idle; |
140 | void *data; | 128 | struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 }; |
141 | struct completion done; | ||
142 | }; | ||
143 | 129 | ||
144 | static int do_stop(void *_smdata) | 130 | if (!cpus) { |
145 | { | 131 | if (i == first_cpu(cpu_online_map)) |
146 | struct stop_machine_data *smdata = _smdata; | 132 | smdata = &active; |
147 | int ret; | 133 | } else { |
134 | if (cpu_isset(i, *cpus)) | ||
135 | smdata = &active; | ||
136 | } | ||
148 | 137 | ||
149 | ret = stop_machine(); | 138 | threads[i] = kthread_create((void *)stop_cpu, smdata, "kstop%u", |
150 | if (ret == 0) { | 139 | i); |
151 | ret = smdata->fn(smdata->data); | 140 | if (IS_ERR(threads[i])) { |
152 | restart_machine(); | 141 | err = PTR_ERR(threads[i]); |
153 | } | 142 | threads[i] = NULL; |
143 | goto kill_threads; | ||
144 | } | ||
154 | 145 | ||
155 | /* We're done: you can kthread_stop us now */ | 146 | /* Place it onto correct cpu. */ |
156 | complete(&smdata->done); | 147 | kthread_bind(threads[i], i); |
157 | 148 | ||
158 | /* Wait for kthread_stop */ | 149 | /* Make it highest prio. */ |
159 | set_current_state(TASK_INTERRUPTIBLE); | 150 | if (sched_setscheduler_nocheck(threads[i], SCHED_FIFO, ¶m)) |
160 | while (!kthread_should_stop()) { | 151 | BUG(); |
161 | schedule(); | ||
162 | set_current_state(TASK_INTERRUPTIBLE); | ||
163 | } | 152 | } |
164 | __set_current_state(TASK_RUNNING); | ||
165 | return ret; | ||
166 | } | ||
167 | 153 | ||
168 | struct task_struct *__stop_machine_run(int (*fn)(void *), void *data, | 154 | /* We've created all the threads. Wake them all: hold this CPU so one |
169 | unsigned int cpu) | 155 | * doesn't hit this CPU until we're ready. */ |
170 | { | 156 | get_cpu(); |
171 | static DEFINE_MUTEX(stopmachine_mutex); | 157 | for_each_online_cpu(i) |
172 | struct stop_machine_data smdata; | 158 | wake_up_process(threads[i]); |
173 | struct task_struct *p; | ||
174 | 159 | ||
175 | smdata.fn = fn; | 160 | /* This will release the thread on our CPU. */ |
176 | smdata.data = data; | 161 | put_cpu(); |
177 | init_completion(&smdata.done); | 162 | wait_for_completion(&finished); |
163 | mutex_unlock(&lock); | ||
178 | 164 | ||
179 | mutex_lock(&stopmachine_mutex); | 165 | kfree(threads); |
180 | 166 | ||
181 | /* If they don't care which CPU fn runs on, bind to any online one. */ | 167 | return active.fnret; |
182 | if (cpu == NR_CPUS) | ||
183 | cpu = raw_smp_processor_id(); | ||
184 | 168 | ||
185 | p = kthread_create(do_stop, &smdata, "kstopmachine"); | 169 | kill_threads: |
186 | if (!IS_ERR(p)) { | 170 | for_each_online_cpu(i) |
187 | struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 }; | 171 | if (threads[i]) |
172 | kthread_stop(threads[i]); | ||
173 | mutex_unlock(&lock); | ||
188 | 174 | ||
189 | /* One high-prio thread per cpu. We'll do this one. */ | 175 | kfree(threads); |
190 | sched_setscheduler_nocheck(p, SCHED_FIFO, ¶m); | 176 | return err; |
191 | kthread_bind(p, cpu); | ||
192 | wake_up_process(p); | ||
193 | wait_for_completion(&smdata.done); | ||
194 | } | ||
195 | mutex_unlock(&stopmachine_mutex); | ||
196 | return p; | ||
197 | } | 177 | } |
198 | 178 | ||
199 | int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu) | 179 | int stop_machine(int (*fn)(void *), void *data, const cpumask_t *cpus) |
200 | { | 180 | { |
201 | struct task_struct *p; | ||
202 | int ret; | 181 | int ret; |
203 | 182 | ||
204 | /* No CPUs can come up or down during this. */ | 183 | /* No CPUs can come up or down during this. */ |
205 | get_online_cpus(); | 184 | get_online_cpus(); |
206 | p = __stop_machine_run(fn, data, cpu); | 185 | ret = __stop_machine(fn, data, cpus); |
207 | if (!IS_ERR(p)) | ||
208 | ret = kthread_stop(p); | ||
209 | else | ||
210 | ret = PTR_ERR(p); | ||
211 | put_online_cpus(); | 186 | put_online_cpus(); |
212 | 187 | ||
213 | return ret; | 188 | return ret; |
214 | } | 189 | } |
215 | EXPORT_SYMBOL_GPL(stop_machine_run); | 190 | EXPORT_SYMBOL_GPL(stop_machine); |