kernel/reboot: Change registration order of legacy power-off handler
PATCH 1/1 kernel/reboot: Change registration order of legacy power-off handler
We're unconditionally registering sys-off handler for the legacy pm_power_off() callback, this causes problem for platforms that don't use power-off handlers at all and should be halted. Now reboot syscall assumes that there is a power-off handler installed and tries to power off system instead of halting it.
To fix the trouble, move the handler's registration to the reboot syscall and check the pm_power_off() presence.
--- kernel/reboot.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)
kernel/reboot.c +17 -16
@@ -569,22 +569,6 @@ static int legacy_pm_power_off(struct sys_off_data *data)return NOTIFY_DONE ; } -/* -* Register sys-off handlers for legacy PM callbacks. This allows legacy -* PM callbacks co-exist with the new sys-off API. -* -* TODO: Remove legacy handlers once all legacy PM users will be switched -* to the sys-off based APIs. -*/ -static int __init legacy_pm_init (void ) -{ -register_sys_off_handler (SYS_OFF_MODE_POWER_OFF ,SYS_OFF_PRIO_DEFAULT , - legacy_pm_power_off,NULL ); - -return 0 ; -} -core_initcall (legacy_pm_init); -static void do_kernel_power_off_prepare (void ) {blocking_notifier_call_chain (&power_off_prep_handler_list,0 ,NULL );
@@ -646,6 +630,7 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd, void __user *, arg) {struct pid_namespace *pid_ns =task_active_pid_ns (current); +struct sys_off_handler *sys_off =NULL ;char buffer[256 ];int ret =0 ;
@@ -670,6 +655,21 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,if (ret)return ret; +/* +* Register sys-off handlers for legacy PM callback. This allows +* legacy PM callbacks temporary co-exist with the new sys-off API. +* +* TODO: Remove legacy handlers once all legacy PM users will be +* switched to the sys-off based APIs. +*/ +if (pm_power_off) { + sys_off =register_sys_off_handler (SYS_OFF_MODE_POWER_OFF , +SYS_OFF_PRIO_DEFAULT , + legacy_pm_power_off,NULL ); +if (IS_ERR (sys_off)) +return PTR_ERR (sys_off); + } +/* Instead of trying to make the power_off code look like * halt when pm_power_off is not set do it the easy way. */
@@ -727,6 +727,7 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,break ; }mutex_unlock (&system_transition_mutex); +unregister_sys_off_handler (sys_off);return ret; }
Signature · 1 line
2.35.3
Rafael J. Wysocki
AppliedQuoted 76 lines · Dmitry Osipenko
We're unconditionally registering sys-off handler for the legacy
pm_power_off()callback, this causes problem for platforms that don't use power-off handlers at all and should be halted. Now reboot syscall assumes that there is a power-off handler installed and tries to power off system instead of halting it.To fix the trouble, move the handler's registration to the reboot syscall and check the
pm_power_off()presence.Fixes 0e2110d2e910 ("kernel/reboot: Add kernel_can_power_off()")Reported-by Geert Uytterhoeven <[email protected]>Tested-by Geert Uytterhoeven <[email protected]>Signed-off-by Dmitry Osipenko <[email protected]>--- kernel/reboot.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)kernel/reboot.c +16
-16@@ -569,22 +569,6 @@ static int legacy_pm_power_off(struct sys_off_data *data)return NOTIFY_DONE ; } -/* -* Register sys-off handlers for legacy PM callbacks. This allows legacy -* PM callbacks co-exist with the new sys-off API. -* -* TODO: Remove legacy handlers once all legacy PM users will be switched -* to the sys-off based APIs. -*/ -static int __init legacy_pm_init (void ) -{ -register_sys_off_handler (SYS_OFF_MODE_POWER_OFF ,SYS_OFF_PRIO_DEFAULT , - legacy_pm_power_off,NULL ); - -return 0 ; -} -core_initcall (legacy_pm_init); -static void do_kernel_power_off_prepare (void ) {blocking_notifier_call_chain (&power_off_prep_handler_list,0 ,NULL );@@ -646,6 +630,7 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd, void __user *, arg) {struct pid_namespace *pid_ns =task_active_pid_ns (current); +struct sys_off_handler *sys_off =NULL ;char buffer[256 ];int ret =0 ;@@ -670,6 +655,21 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,if (ret)return ret; +/* +* Register sys-off handlers for legacy PM callback. This allows +* legacy PM callbacks temporary co-exist with the new sys-off API. +* +* TODO: Remove legacy handlers once all legacy PM users will be +* switched to the sys-off based APIs. +*/ +if (pm_power_off) { + sys_off =register_sys_off_handler (SYS_OFF_MODE_POWER_OFF , +SYS_OFF_PRIO_DEFAULT , + legacy_pm_power_off,NULL ); +if (IS_ERR (sys_off)) +return PTR_ERR (sys_off); + } +/* Instead of trying to make the power_off code look like * halt when pm_power_off is not set do it the easy way. */
kernel/reboot.c SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
Quoted 8 lines
kernel/reboot.c +1
-1@@ -727,6 +727,7 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,break ; }mutex_unlock (&system_transition_mutex); +unregister_sys_off_handler (sys_off);return ret; } --
Applied, thanks!
Quoted 8 lines · Dmitry Osipenko
We're unconditionally registering sys-off handler for the legacy
pm_power_off()callback, this causes problem for platforms that don't use power-off handlers at all and should be halted. Now reboot syscall assumes that there is a power-off handler installed and tries to power off system instead of halting it.To fix the trouble, move the handler's registration to the reboot syscall and check the
pm_power_off()presence.
I'm seeing a qemu virtual machine (ppce500) fail to power off using the gpio-poweroff driver. I bisected it to this commit.
I think the problem is that the machine is going via kernel_power_off(), not sys_reboot(), and so legacy_pm_power_off() has not been registered.
If I just put the core_initcall back then it works as before. Not sure if that's a safe change in general though.
cheers
Quoted 75 lines
Fixes 0e2110d2e910 ("kernel/reboot: Add kernel_can_power_off()")Reported-by Geert Uytterhoeven <[email protected]>Tested-by Geert Uytterhoeven <[email protected]>Signed-off-by Dmitry Osipenko <[email protected]>--- kernel/reboot.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)kernel/reboot.c +17
-16@@ -569,22 +569,6 @@ static int legacy_pm_power_off(struct sys_off_data *data)return NOTIFY_DONE ; } -/* -* Register sys-off handlers for legacy PM callbacks. This allows legacy -* PM callbacks co-exist with the new sys-off API. -* -* TODO: Remove legacy handlers once all legacy PM users will be switched -* to the sys-off based APIs. -*/ -static int __init legacy_pm_init (void ) -{ -register_sys_off_handler (SYS_OFF_MODE_POWER_OFF ,SYS_OFF_PRIO_DEFAULT , - legacy_pm_power_off,NULL ); - -return 0 ; -} -core_initcall (legacy_pm_init); -static void do_kernel_power_off_prepare (void ) {blocking_notifier_call_chain (&power_off_prep_handler_list,0 ,NULL );@@ -646,6 +630,7 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd, void __user *, arg) {struct pid_namespace *pid_ns =task_active_pid_ns (current); +struct sys_off_handler *sys_off =NULL ;char buffer[256 ];int ret =0 ;@@ -670,6 +655,21 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,if (ret)return ret; +/* +* Register sys-off handlers for legacy PM callback. This allows +* legacy PM callbacks temporary co-exist with the new sys-off API. +* +* TODO: Remove legacy handlers once all legacy PM users will be +* switched to the sys-off based APIs. +*/ +if (pm_power_off) { + sys_off =register_sys_off_handler (SYS_OFF_MODE_POWER_OFF , +SYS_OFF_PRIO_DEFAULT , + legacy_pm_power_off,NULL ); +if (IS_ERR (sys_off)) +return PTR_ERR (sys_off); + } +/* Instead of trying to make the power_off code look like * halt when pm_power_off is not set do it the easy way. */ @@ -727,6 +727,7 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,break ; }mutex_unlock (&system_transition_mutex); +unregister_sys_off_handler (sys_off);return ret; }Signature · 1 line
2.35.3
Hi Michael,
Quoted 10 lines · Michael Ellerman
Quoted 8 lines · Dmitry Osipenko
We're unconditionally registering sys-off handler for the legacy
pm_power_off()callback, this causes problem for platforms that don't use power-off handlers at all and should be halted. Now reboot syscall assumes that there is a power-off handler installed and tries to power off system instead of halting it.To fix the trouble, move the handler's registration to the reboot syscall and check the
pm_power_off()presence.
Quoted 8 lines
I'm seeing a qemu virtual machine (ppce500) fail to power off using the gpio-poweroff driver. I bisected it to this commit.
I think the problem is that the machine is going via
kernel_power_off(), notsys_reboot(), and solegacy_pm_power_off()has not been registered.If I just put the
core_initcallback then it works as before. Not sure if that's a safe change in general though.
Thank you very much for the testing and reporting the problem! I see now the two more cases that were missed previously:
1. There is the orderly_poweroff() used by some drivers.
2. PowerPC may invoke do_kernel_power_off() directly from xmon code.
Could you please test this change:
--- >8 ---
kernel/reboot.c +28 -19
@@ -320,6 +320,7 @@ static struct sys_off_handler platform_sys_off_handler;static struct sys_off_handler *alloc_sys_off_handler (int priority) {struct sys_off_handler *handler; +gfp_t flags;/* * Platforms like m68k can't allocate sys_off handler dynamically
@@ -330,7 +331,12 @@ static struct sys_off_handler *alloc_sys_off_handler(int priority)if (handler->cb_data)return ERR_PTR (-EBUSY ); }else { - handler =kzalloc (sizeof (*handler),GFP_KERNEL ); +if (system_state >SYSTEM_RUNNING ) + flags =GFP_ATOMIC ; +else + flags =GFP_KERNEL ; + + handler =kzalloc (sizeof (*handler), flags);if (!handler)return ERR_PTR (-ENOMEM ); }
@@ -615,7 +621,26 @@ static void do_kernel_power_off_prepare(void)*/ void do_kernel_power_off (void ) { +struct sys_off_handler *sys_off =NULL ; + +/* +* Register sys-off handlers for legacy PM callback. This allows +* legacy PM callbacks temporary co-exist with the new sys-off API. +* +* TODO: Remove legacy handlers once all legacy PM users will be +* switched to the sys-off based APIs. +*/ +if (pm_power_off) { + sys_off =register_sys_off_handler (SYS_OFF_MODE_POWER_OFF , +SYS_OFF_PRIO_DEFAULT , + legacy_pm_power_off,NULL ); +if (IS_ERR (sys_off)) +return ; + } +atomic_notifier_call_chain (&power_off_handler_list,0 ,NULL ); + +unregister_sys_off_handler (sys_off); }/**
@@ -626,7 +651,8 @@ void do_kernel_power_off(void)*/ bool kernel_can_power_off (void ) { -return !atomic_notifier_call_chain_is_empty (&power_off_handler_list); +return !atomic_notifier_call_chain_is_empty (&power_off_handler_list) || + pm_power_off; }EXPORT_SYMBOL_GPL (kernel_can_power_off);
@@ -661,7 +687,6 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd, void __user *, arg) {struct pid_namespace *pid_ns =task_active_pid_ns (current); -struct sys_off_handler *sys_off =NULL ;char buffer[256 ];int ret =0 ;
@@ -686,21 +711,6 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,if (ret)return ret; -/* -* Register sys-off handlers for legacy PM callback. This allows -* legacy PM callbacks temporary co-exist with the new sys-off API. -* -* TODO: Remove legacy handlers once all legacy PM users will be -* switched to the sys-off based APIs. -*/ -if (pm_power_off) { - sys_off =register_sys_off_handler (SYS_OFF_MODE_POWER_OFF , -SYS_OFF_PRIO_DEFAULT , - legacy_pm_power_off,NULL ); -if (IS_ERR (sys_off)) -return PTR_ERR (sys_off); - } -/* Instead of trying to make the power_off code look like * halt when pm_power_off is not set do it the easy way. */
@@ -758,7 +768,6 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,break ; }mutex_unlock (&system_transition_mutex); -unregister_sys_off_handler (sys_off);return ret; }
Michael Ellerman
Tested-byQuoted 22 lines · Dmitry Osipenko
Hi Michael,
Quoted 10 lines · Michael Ellerman
Quoted 8 lines · Dmitry Osipenko
We're unconditionally registering sys-off handler for the legacy
pm_power_off()callback, this causes problem for platforms that don't use power-off handlers at all and should be halted. Now reboot syscall assumes that there is a power-off handler installed and tries to power off system instead of halting it.To fix the trouble, move the handler's registration to the reboot syscall and check the
pm_power_off()presence.Quoted 8 lines
I'm seeing a qemu virtual machine (ppce500) fail to power off using the gpio-poweroff driver. I bisected it to this commit.
I think the problem is that the machine is going via
kernel_power_off(), notsys_reboot(), and solegacy_pm_power_off()has not been registered.If I just put the
core_initcallback then it works as before. Not sure if that's a safe change in general though.
Quoted 6 lines
Thank you very much for the testing and reporting the problem! I see now the two more cases that were missed previously:
1. There is the
orderly_poweroff()used by some drivers.
2. PowerPC may invokedo_kernel_power_off()directly from xmon code.Could you please test this change:
That works, thanks.
I tested both sysrq-o and the xmon power off path.
I couldn't come up with an easy way to test the orderly_poweroff() path, but it boils down to basically the same code in the end.
cheers
Quoted 32 lines · Michael Ellerman
Quoted 22 lines · Dmitry Osipenko
Hi Michael,
Quoted 10 lines · Michael Ellerman
Quoted 8 lines · Dmitry Osipenko
We're unconditionally registering sys-off handler for the legacy
pm_power_off()callback, this causes problem for platforms that don't use power-off handlers at all and should be halted. Now reboot syscall assumes that there is a power-off handler installed and tries to power off system instead of halting it.To fix the trouble, move the handler's registration to the reboot syscall and check the
pm_power_off()presence.Quoted 8 lines
I'm seeing a qemu virtual machine (ppce500) fail to power off using the gpio-poweroff driver. I bisected it to this commit.
I think the problem is that the machine is going via
kernel_power_off(), notsys_reboot(), and solegacy_pm_power_off()has not been registered.If I just put the
core_initcallback then it works as before. Not sure if that's a safe change in general though.Quoted 6 lines
Thank you very much for the testing and reporting the problem! I see now the two more cases that were missed previously:
1. There is the
orderly_poweroff()used by some drivers.
2. PowerPC may invokedo_kernel_power_off()directly from xmon code.Could you please test this change:
That works, thanks.
Quoted 8 lines
I tested both sysrq-o and the xmon power off path.
I couldn't come up with an easy way to test the
orderly_poweroff()path, but it boils down to basically the same code in the end.Tested-by Michael Ellerman <[email protected]>cheers
Awesome, thank you!
Signature · 2 lines
Best regards, Dmitry