x86: call machine_shutdown and stop all CPUs in native_machine_halt
PATCH 1/1 x86: call machine_shutdown and stop all CPUs in native_machine_halt
Function machine_halt (resp. native_machine_halt) is empty for x86 architectures. When command 'halt -f' is invoked, the message "System halted." is displayed but this is not really true because all CPUs are still running.
There are also similar inconsistencies for other arches (some uses power-off for halt or forever-loop with IRQs enabled/disabled). IMO there should be used the same approach for all architectures OR what does the message "System halted" really mean?
--- arch/x86/kernel/reboot.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
arch/x86/kernel/reboot.c +8 -0
@@ -465,6 +465,14 @@ static void native_machine_restart(char *__unused)static void native_machine_halt (void ) { +/* stop other cpus and apics */ +machine_shutdown (); + +/* stop this cpu */ +local_irq_disable (); +if (hlt_works (smp_processor_id ())) +for (;;)halt (); +for (;;); }static void native_machine_power_off (void )
Signature · 1 line
1.5.6.3
Quoted 36 lines · Ivan Vecera
Function
machine_halt(resp.native_machine_halt) is empty for x86 architectures. When command 'halt -f' is invoked, the message "System halted." is displayed but this is not really true because all CPUs are still running.
There are also similar inconsistencies for other arches (some uses power-off for halt or forever-loop with IRQs enabled/disabled). IMO there should be used the same approach for all architectures OR what does the message "System halted" really mean?Signed-off-by Ivan Vecera <[email protected]>--- arch/x86/kernel/reboot.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)arch/x86/kernel/reboot.c +8
-0@@ -465,6 +465,14 @@ static void native_machine_restart(char *__unused)static void native_machine_halt (void ) { +/* stop other cpus and apics */ +machine_shutdown (); + +/* stop this cpu */ +local_irq_disable (); +if (hlt_works (smp_processor_id ())) +for (;;)halt (); +for (;;); }static void native_machine_power_off (void )Signature · 1 line
1.5.6.3
Signature · 8 lines
/*************************************************** *Neil Horman *Senior Software Engineer *Red Hat, Inc. *[email protected] *gpg keyid: 1024D / 0x92A74FA1 *http://pgp.mit.edu ***************************************************/
Quoted 7 lines · Ivan Vecera
Function
machine_halt(resp.native_machine_halt) is empty for x86 architectures. When command 'halt -f' is invoked, the message "System halted." is displayed but this is not really true because all CPUs are still running. There are also similar inconsistencies for other arches (some uses power-off for halt or forever-loop with IRQs enabled/disabled). IMO there should be used the same approach for all architectures OR what does the message "System halted" really mean?
no fundamental objections, but could you please do it a bit cleaner:
arch/x86/kernel/reboot.c static void native_machine_restart(char *__unused) · line 476
Quoted 11 lines
static void
native_machine_halt(void)
{arch/x86/kernel/reboot.c +8
-0+/* stop other cpus and apics */ +machine_shutdown (); + +/* stop this cpu */ +local_irq_disable (); +if (hlt_works (smp_processor_id ())) +for (;;)halt (); +for (;;); }
the code in arch/x86/kernel/smp.c::stop_this_cpu() is very similar to this and could be shared. You could move the stop_this_cpu() function to arch/x86/kernel/process.c (out of smp.c), so that it can be used by reboot.c.
furthermore, native_machine_power_off() should probably fall back to native_machine_halt() as well - should pm_power_off() be disabled (or if it fails to stop the machine).
hm?
Ingo
Quoted 5 lines · Ingo Molnar
the code in arch/x86/kernel/smp.c::stop_this_cpu() is very similar to this and could be shared. You could move the
stop_this_cpu()function toarch/x86/kernel/process.c(out ofsmp.c), so that it can be used byreboot.c.
Yes, this make sense. Here is the patch.
Ivan
--- arch/x86/kernel/process.c | 16 ++++++++++++++++ arch/x86/kernel/reboot.c | 5 +++++ arch/x86/kernel/smp.c | 13 ------------- include/asm-x86/system.h | 2 ++ 4 files changed, 23 insertions(+), 13 deletions(-)
arch/x86/kernel/process.c +16 -0
@@ -8,6 +8,7 @@#include <linux/pm.h> #include <linux/clockchips.h> #include <asm/system.h> +#include <asm/apic.h> unsigned long idle_halt;EXPORT_SYMBOL (idle_halt);
@@ -122,6 +123,21 @@ void default_idle(void)EXPORT_SYMBOL (default_idle);#endif +void stop_this_cpu (void *dummy) +{ +local_irq_disable (); +/* +* Remove this CPU: +*/ +cpu_clear (smp_processor_id (), cpu_online_map); +#ifdef CONFIG_X86_LOCAL_APIC +disable_local_APIC (); +#endif +if (hlt_works (smp_processor_id ())) +for (;;)halt (); +for (;;); +} +static void do_nothing (void *unused) { }
arch/x86/kernel/reboot.c +5 -0
@@ -465,6 +465,11 @@ static void native_machine_restart(char *__unused)static void native_machine_halt (void ) { +/* stop other cpus and apics */ +machine_shutdown (); + +/* stop this cpu */ +stop_this_cpu (NULL ); }static void native_machine_power_off (void )
arch/x86/kernel/smp.c +0 -13
@@ -140,19 +140,6 @@ void native_send_call_func_ipi(cpumask_t mask)send_IPI_mask (mask,CALL_FUNCTION_VECTOR ); } -static void stop_this_cpu (void *dummy) -{ -local_irq_disable (); -/* -* Remove this CPU: -*/ -cpu_clear (smp_processor_id (), cpu_online_map); -disable_local_APIC (); -if (hlt_works (smp_processor_id ())) -for (;;)halt (); -for (;;); -} -/* * this function calls the 'stop' function on all other CPUs in the system. */
include/asm-x86/system.h +2 -0
@@ -314,6 +314,8 @@ extern void free_init_pages(char *what, unsigned long begin, unsigned long end);void default_idle (void ); +void stop_this_cpu (void *dummy); +/* * Force strict CPU ordering. * And yes, this is required on UP too when we're talking
Signature · 1 line
1.5.6.3
Any comments?
Ivan
---
Quoted 104 lines · Ivan Vecera
Quoted 5 lines · Ingo Molnar
the code in arch/x86/kernel/smp.c::stop_this_cpu() is very similar to this and could be shared. You could move the
stop_this_cpu()function toarch/x86/kernel/process.c(out ofsmp.c), so that it can be used byreboot.c.Yes, this make sense. Here is the patch.
Ivan
--- arch/x86/kernel/process.c | 16 ++++++++++++++++ arch/x86/kernel/reboot.c | 5 +++++ arch/x86/kernel/smp.c | 13 ------------- include/asm-x86/system.h | 2 ++ 4 files changed, 23 insertions(+), 13 deletions(-)arch/x86/kernel/process.c +16
-0@@ -8,6 +8,7 @@#include <linux/pm.h> #include <linux/clockchips.h> #include <asm/system.h> +#include <asm/apic.h> unsigned long idle_halt;EXPORT_SYMBOL (idle_halt);@@ -122,6 +123,21 @@ void default_idle(void)EXPORT_SYMBOL (default_idle);#endif +void stop_this_cpu (void *dummy) +{ +local_irq_disable (); +/* +* Remove this CPU: +*/ +cpu_clear (smp_processor_id (), cpu_online_map); +#ifdef CONFIG_X86_LOCAL_APIC +disable_local_APIC (); +#endif +if (hlt_works (smp_processor_id ())) +for (;;)halt (); +for (;;); +} +static void do_nothing (void *unused) { }arch/x86/kernel/reboot.c +5
-0@@ -465,6 +465,11 @@ static void native_machine_restart(char *__unused)static void native_machine_halt (void ) { +/* stop other cpus and apics */ +machine_shutdown (); + +/* stop this cpu */ +stop_this_cpu (NULL ); }static void native_machine_power_off (void )arch/x86/kernel/smp.c +0
-13@@ -140,19 +140,6 @@ void native_send_call_func_ipi(cpumask_t mask)send_IPI_mask (mask,CALL_FUNCTION_VECTOR ); } -static void stop_this_cpu (void *dummy) -{ -local_irq_disable (); -/* -* Remove this CPU: -*/ -cpu_clear (smp_processor_id (), cpu_online_map); -disable_local_APIC (); -if (hlt_works (smp_processor_id ())) -for (;;)halt (); -for (;;); -} -/* * this function calls the 'stop' function on all other CPUs in the system. */ include/asm-x86/system.h +2
-0@@ -314,6 +314,8 @@ extern void free_init_pages(char *what, unsigned long begin, unsigned long end);void default_idle (void ); +void stop_this_cpu (void *dummy); +/* * Force strict CPU ordering. * And yes, this is required on UP too when we're talking
Neil Horman
Acked-byQuoted 4 lines · Ivan Vecera
Any comments?
Ivan
Quoted 107 lines
---
Quoted 104 lines · Ivan Vecera
Quoted 5 lines · Ingo Molnar
the code in arch/x86/kernel/smp.c::stop_this_cpu() is very similar to this and could be shared. You could move the
stop_this_cpu()function toarch/x86/kernel/process.c(out ofsmp.c), so that it can be used byreboot.c.Yes, this make sense. Here is the patch.
Ivan
--- arch/x86/kernel/process.c | 16 ++++++++++++++++ arch/x86/kernel/reboot.c | 5 +++++ arch/x86/kernel/smp.c | 13 ------------- include/asm-x86/system.h | 2 ++ 4 files changed, 23 insertions(+), 13 deletions(-)arch/x86/kernel/process.c +16
-0@@ -8,6 +8,7 @@#include <linux/pm.h> #include <linux/clockchips.h> #include <asm/system.h> +#include <asm/apic.h> unsigned long idle_halt;EXPORT_SYMBOL (idle_halt);@@ -122,6 +123,21 @@ void default_idle(void)EXPORT_SYMBOL (default_idle);#endif +void stop_this_cpu (void *dummy) +{ +local_irq_disable (); +/* +* Remove this CPU: +*/ +cpu_clear (smp_processor_id (), cpu_online_map); +#ifdef CONFIG_X86_LOCAL_APIC +disable_local_APIC (); +#endif +if (hlt_works (smp_processor_id ())) +for (;;)halt (); +for (;;); +} +static void do_nothing (void *unused) { }arch/x86/kernel/reboot.c +5
-0@@ -465,6 +465,11 @@ static void native_machine_restart(char *__unused)static void native_machine_halt (void ) { +/* stop other cpus and apics */ +machine_shutdown (); + +/* stop this cpu */ +stop_this_cpu (NULL ); }static void native_machine_power_off (void )arch/x86/kernel/smp.c +0
-13@@ -140,19 +140,6 @@ void native_send_call_func_ipi(cpumask_t mask)send_IPI_mask (mask,CALL_FUNCTION_VECTOR ); } -static void stop_this_cpu (void *dummy) -{ -local_irq_disable (); -/* -* Remove this CPU: -*/ -cpu_clear (smp_processor_id (), cpu_online_map); -disable_local_APIC (); -if (hlt_works (smp_processor_id ())) -for (;;)halt (); -for (;;); -} -/* * this function calls the 'stop' function on all other CPUs in the system. */ include/asm-x86/system.h +2
-0@@ -314,6 +314,8 @@ extern void free_init_pages(char *what, unsigned long begin, unsigned long end);void default_idle (void ); +void stop_this_cpu (void *dummy); +/* * Force strict CPU ordering. * And yes, this is required on UP too when we're talking
Signature · 8 lines
/*************************************************** *Neil Horman *Senior Software Engineer *Red Hat, Inc. *[email protected] *gpg keyid: 1024D / 0x92A74FA1 *http://pgp.mit.edu ***************************************************/
Quoted 39 lines · Ivan Vecera
Any comments?
Ivan
---
Quoted 33 lines · Ivan Vecera
Quoted 5 lines · Ingo Molnar
the code in arch/x86/kernel/smp.c::stop_this_cpu() is very similar to this and could be shared. You could move the
stop_this_cpu()function toarch/x86/kernel/process.c(out ofsmp.c), so that it can be used byreboot.c.Yes, this make sense. Here is the patch.
Ivan
--- arch/x86/kernel/process.c | 16 ++++++++++++++++ arch/x86/kernel/reboot.c | 5 +++++ arch/x86/kernel/smp.c | 13 ------------- include/asm-x86/system.h | 2 ++ 4 files changed, 23 insertions(+), 13 deletions(-)arch/x86/kernel/process.c +1
-0@@ -8,6 +8,7 @@#include <linux/pm.h> #include <linux/clockchips.h> #include <asm/system.h> +#include <asm/apic.h> unsigned long idle_halt;EXPORT_SYMBOL (idle_halt);@@ -122,6 +123,21 @@ void default_idle(void)EXPORT_SYMBOL (default_idle);#endif
Quoted 14 lines
Quoted 4 lines
arch/x86/kernel/process.c +4
-0+void stop_this_cpu (void *dummy) +{ +local_irq_disable (); +/* arch/x86/kernel/process.c void default_idle(void) · line 139
Quoted 10 lines
arch/x86/kernel/process.c +10
-0+* Remove this CPU: +*/ +cpu_clear (smp_processor_id (), cpu_online_map); +#ifdef CONFIG_X86_LOCAL_APIC +disable_local_APIC (); +#endif +if (hlt_works (smp_processor_id ())) +for (;;)halt (); +for (;;); +}
Why the new ifdef? And while we are at it, why is it neccessary to disable APIC for stopping CPU? (comment in code would be nice)
Quoted 16 lines
Quoted 16 lines
arch/x86/kernel/process.c +0
-13-static void stop_this_cpu (void *dummy) -{ -local_irq_disable (); -/* -* Remove this CPU: -*/ -cpu_clear (smp_processor_id (), cpu_online_map); -disable_local_APIC (); -if (hlt_works (smp_processor_id ())) -for (;;)halt (); -for (;;); -} -/* * this function calls the 'stop' function on all other CPUs in the system. */
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Quoted 49 lines · Pavel Machek
Quoted 48 lines · Ivan Vecera
Any comments?
Ivan
---
Quoted 42 lines · Ivan Vecera
Quoted 5 lines · Ingo Molnar
the code in arch/x86/kernel/smp.c::stop_this_cpu() is very similar to this and could be shared. You could move the
stop_this_cpu()function toarch/x86/kernel/process.c(out ofsmp.c), so that it can be used byreboot.c.Yes, this make sense. Here is the patch.
Ivan
--- arch/x86/kernel/process.c | 16 ++++++++++++++++ arch/x86/kernel/reboot.c | 5 +++++ arch/x86/kernel/smp.c | 13 ------------- include/asm-x86/system.h | 2 ++ 4 files changed, 23 insertions(+), 13 deletions(-)arch/x86/kernel/process.c +10
-0@@ -8,6 +8,7 @@#include <linux/pm.h> #include <linux/clockchips.h> #include <asm/system.h> +#include <asm/apic.h> unsigned long idle_halt;EXPORT_SYMBOL (idle_halt);@@ -122,6 +123,21 @@ void default_idle(void)EXPORT_SYMBOL (default_idle);#endif +void stop_this_cpu (void *dummy) +{ +local_irq_disable (); +/* +* Remove this CPU: +*/ +cpu_clear (smp_processor_id (), cpu_online_map); +#ifdef CONFIG_X86_LOCAL_APIC +disable_local_APIC ();
Quoted 8 lines
Quoted 5 lines
arch/x86/kernel/process.c void default_idle(void) · line 139
Quoted 5 lines
arch/x86/kernel/process.c +5
-0+#endif +if (hlt_works (smp_processor_id ())) +for (;;)halt (); +for (;;); +}Why the new ifdef? And while we are at it, why is it neccessary to disable APIC for stopping CPU? (comment in code would be nice)
Because stop_this_cpu is shared between native_machine_halt and native_smp_send_stop. It was only moved from smp.c to process.c. native_machine_halt doesn't require disable APIC for stopping the current CPU because at this time is already disabled. The ifdef is another thing and I sent already corrected patch.
Quoted 18 lines
Quoted 17 lines
Quoted 17 lines
arch/x86/kernel/process.c +0
-13-static void stop_this_cpu (void *dummy) -{ -local_irq_disable (); -/* -* Remove this CPU: -*/ -cpu_clear (smp_processor_id (), cpu_online_map); -disable_local_APIC (); -if (hlt_works (smp_processor_id ())) -for (;;)halt (); -for (;;); -} -/* * this function calls the 'stop' function on all other CPUs in the system. */
Quoted 7 lines · Ivan Vecera
Quoted 5 lines · Ingo Molnar
the code in arch/x86/kernel/smp.c::stop_this_cpu() is very similar to this and could be shared. You could move the
stop_this_cpu()function toarch/x86/kernel/process.c(out ofsmp.c), so that it can be used byreboot.c.Yes, this make sense. Here is the patch.
looks good. One small detail:
arch/x86/kernel/process.c void default_idle(void) · line 135
Quoted 3 lines
arch/x86/kernel/process.c +3
-0+#ifdef CONFIG_X86_LOCAL_APIC +disable_local_APIC (); +#endif
could you please avoid this #ifdef by putting an inline void function for disable_local_APIC() into arch/x86/include/asm/apic.h for the !CONFIG_X86_LOCAL_APIC case?
Ingo
Quoted 11 lines · Ingo Molnar
looks good. One small detail:
Review
Quoted 3 lines
(quoted diff) +3
-0+#ifdef CONFIG_X86_LOCAL_APIC + disable_local_APIC(); +#endifcould you please avoid this #ifdef by putting an inline void function for
disable_local_APIC()intoarch/x86/include/asm/apic.hfor the !CONFIG_X86_LOCAL_APIC case?Ingo
OK, here is the result.
Ivan
--- arch/x86/include/asm/apic.h | 1 + arch/x86/include/asm/system.h | 2 ++ arch/x86/kernel/process.c | 14 ++++++++++++++ arch/x86/kernel/reboot.c | 5 +++++ arch/x86/kernel/smp.c | 13 ------------- 5 files changed, 22 insertions(+), 13 deletions(-)
arch/x86/include/asm/apic.h +1 -0
@@ -193,6 +193,7 @@ extern u8 setup_APIC_eilvt_ibs(u8 vector, u8 msg_type, u8 mask);static inline void lapic_shutdown (void ) { }#define local_apic_timer_c2_ok 1static inline void init_apic_mappings (void ) { } +static inline void disable_local_APIC (void ) { }#endif /* !CONFIG_X86_LOCAL_APIC */
arch/x86/include/asm/system.h +2 -0
@@ -314,6 +314,8 @@ extern void free_init_pages(char *what, unsigned long begin, unsigned long end);void default_idle (void ); +void stop_this_cpu (void *dummy); +/* * Force strict CPU ordering. * And yes, this is required on UP too when we're talking
arch/x86/kernel/process.c +14 -0
@@ -8,6 +8,7 @@#include <linux/pm.h> #include <linux/clockchips.h> #include <asm/system.h> +#include <asm/apic.h> unsigned long idle_halt;EXPORT_SYMBOL (idle_halt);
@@ -122,6 +123,19 @@ void default_idle(void)EXPORT_SYMBOL (default_idle);#endif +void stop_this_cpu (void *dummy) +{ +local_irq_disable (); +/* +* Remove this CPU: +*/ +cpu_clear (smp_processor_id (), cpu_online_map); +disable_local_APIC (); +if (hlt_works (smp_processor_id ())) +for (;;)halt (); +for (;;); +} +static void do_nothing (void *unused) { }
arch/x86/kernel/reboot.c +5 -0
@@ -461,6 +461,11 @@ static void native_machine_restart(char *__unused)static void native_machine_halt (void ) { +/* stop other cpus and apics */ +machine_shutdown (); + +/* stop this cpu */ +stop_this_cpu (NULL ); }static void native_machine_power_off (void )
arch/x86/kernel/smp.c +0 -13
@@ -140,19 +140,6 @@ void native_send_call_func_ipi(cpumask_t mask)send_IPI_mask (mask,CALL_FUNCTION_VECTOR ); } -static void stop_this_cpu (void *dummy) -{ -local_irq_disable (); -/* -* Remove this CPU: -*/ -cpu_clear (smp_processor_id (), cpu_online_map); -disable_local_APIC (); -if (hlt_works (smp_processor_id ())) -for (;;)halt (); -for (;;); -} -/* * this function calls the 'stop' function on all other CPUs in the system. */
Signature · 1 line
1.5.6.3
Quoted 16 lines · Ivan Vecera
Quoted 11 lines · Ingo Molnar
looks good. One small detail:
Review
Quoted 3 lines
(quoted diff) +3
-0+#ifdef CONFIG_X86_LOCAL_APIC + disable_local_APIC(); +#endifcould you please avoid this #ifdef by putting an inline void function for
disable_local_APIC()intoarch/x86/include/asm/apic.hfor the !CONFIG_X86_LOCAL_APIC case?Ingo
OK, here is the result.
Ivan
Quoted 7 lines
--- arch/x86/include/asm/apic.h | 1 + arch/x86/include/asm/system.h | 2 ++ arch/x86/kernel/process.c | 14 ++++++++++++++ arch/x86/kernel/reboot.c | 5 +++++ arch/x86/kernel/smp.c | 13 ------------- 5 files changed, 22 insertions(+), 13 deletions(-)
applied to tip/x86/reboot, thanks Ivan!
Ingo