Skip to contentSkip to conversation

shutdown.c - halt_action

PATCH In review Ben Thomas 2 participants 4 messages Nov 3, 2006 – Nov 6, 2006

lore
Share & tools
lore

Ben Thomas

author
#0 lore raw

PATCH 1/1 shutdown.c - halt_action

It's not always desirable for a system to halt. The hypervisor has a number of places where it does request a halt, and this might be useful for debugging, but not always in a production environment. Add a hypervisor command line parameter, halt_action, which allows the overriding of any halt requests. The parameter takes the form of halt_action=halt, halt_action=reboot or halt_action=reboot:20 for halting, rebooting after a default 10 seconds, or rebooting after a specified number of seconds. The default is halt_action=halt and preserves existing behavior.

Signature · 5 lines
------------------------------------------------------------------------
Ben Thomas                                         Virtual Iron Software
[email protected]                            Tower 1, Floor 2
978-849-1214                                       900 Chelmsford Street
                                                   Lowell, MA 01851

# It's not always desirable for a system to halt. The hypervisor has a

# number of places where it does request a halt, and this might be useful
# for debugging, but not always in a production environment. Add a
# hypervisor command line parameter, halt_action, which allows the
# overriding of any halt requests.  The parameter takes the form of
# halt_action=halt, halt_action=reboot or halt_action=reboot:20
# for halting, rebooting after a default 10 seconds, or rebooting after
# a specified number of seconds. The default preserves is halt_action=halt
# and preserves existing behavior.
#
# Signed-off-by: Ben Thomas ([email protected])
xen/arch/x86/shutdown.c +36 -0
Index: xen-unstable.hg/xen/arch/x86/shutdown.c
===================================================================
@@ -29,6 +29,29 @@
 static long no_idt[2];
 static int reboot_mode;
 
+void machine_restart(char * __unused);
+
+enum {HALT_ACTION_HALT, HALT_ACTION_REBOOT};
+static int halt_action = HALT_ACTION_HALT;
+static long halt_action_wait = 10;
+
+static void __init halt_action_set(char *str)
+{
+    if (strcmp(str, "halt") == 0)
+        halt_action = HALT_ACTION_HALT;
+     else if (strncmp(str, "reboot", strlen("reboot")) == 0)
+    {
+        halt_action = HALT_ACTION_REBOOT;
+	str += strlen("reboot");
+	if (*str == ':')
+	  halt_action_wait = simple_strtol(++str, NULL, 10);
+	else
+	  halt_action_wait = 10;
+    } else
+        printk("halt_action '%s' not recognized", str);
+}
+custom_param("halt_action", halt_action_set);
+
 static inline void kb_wait(void)
 {
     int i;
@@ -48,6 +71,19 @@
 {
     watchdog_disable();
     console_start_sync();
+    if (halt_action != HALT_ACTION_HALT)
+    {
+    	printk("%s - reboot requested\n", __FUNCTION__);
+	halt_action = HALT_ACTION_HALT;		// We may end up back here - don't loop
+	if (halt_action_wait > 0)
+	{
+	    printk("%s - delay %ld seconds before reboot...\n", __FUNCTION__, halt_action_wait);
+	    mdelay(halt_action_wait * 1000);
+	}
+    	printk("%s - rebooting...\n", __FUNCTION__);
+	machine_restart(0);
+	// We shouldn't get back here, but if we do just halt
+    }
     smp_call_function(__machine_halt, NULL, 1, 0);
     __machine_halt(NULL);
 }

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#1 lore raw
Quoted 11 lines · Ben Thomas

It's not always desirable for a system to halt. The hypervisor has a number of places where it does request a halt, and this might be useful for debugging, but not always in a production environment. Add a hypervisor command line parameter, halt_action, which allows the overriding of any halt requests. The parameter takes the form of halt_action=halt, halt_action=reboot or halt_action=reboot:20 for halting, rebooting after a default 10 seconds, or rebooting after a specified number of seconds. The default is halt_action=halt and preserves existing behavior.

We halt in three situations:
1. Domain-0 asked us to (thru poweroff or halt)
2. 'noreboot' was specified as a boot parameter
3. We take an exception with IRQs disabled or we take a double fault.

Behaviours (1) and (2) are quite reasonable. We should really just fix (3) to (attempt to) reboot after a few seconds, just like any other fatal exception.

-- Keir

author
#2 lore raw

Hi Keir,

As always, there are alternatives to almost any issue. I had considered just fixing up the instances (eg, #3 below), but decided on an alternate approach for a few reasons. I'll spare you the reasoning, and jump to another proposal.

As you note, there are a few calls to machine_halt:

fatal_trap
do_double_fault

maybe_reboot (with opt_noreboot set)
panic (with opt_noreboot set)
dom0_shutdown (with poweroff requested)

This is the same list you mention below, and the last 3 items are governed by a "switch", two of which would appear to default to rebooting and one by specific request. So, let's assume that those 3 are ok. What would you like done with fatal_trap and do_double_fault ? Should they be handled the same as panic and maybe_reboot ? More specifically, perhaps fatal_trap, do_double_fault and panic should just call maybe_reboot rather than machine_halt. That keeps a common routine, which I like for reasons of maintenance and defensiveness; it defaults to rebooting, but can be set to halting; it builds off the exiting boot parameter. And, my real goal, it allows the option of not halting. Unfortunately, it will change some of the current behavior in that fatal_trap and do_double_fault will now reboot and not halt. Is that an acceptable difference ?

Does that more closely approximate what you'd like to see ?

Thanks,
-b

-

Quoted 28 lines · Keir Fraser
Quoted 11 lines · Ben Thomas

It's not always desirable for a system to halt. The hypervisor has a number of places where it does request a halt, and this might be useful for debugging, but not always in a production environment. Add a hypervisor command line parameter, halt_action, which allows the overriding of any halt requests. The parameter takes the form of halt_action=halt, halt_action=reboot or halt_action=reboot:20 for halting, rebooting after a default 10 seconds, or rebooting after a specified number of seconds. The default is halt_action=halt and preserves existing behavior.

We halt in three situations:
1. Domain-0 asked us to (thru poweroff or halt)
2. 'noreboot' was specified as a boot parameter
3. We take an exception with IRQs disabled or we take a double fault.

Behaviours (1) and (2) are quite reasonable. We should really just fix (3) to (attempt to) reboot after a few seconds, just like any other fatal exception.

-- Keir

Signature · 5 lines
------------------------------------------------------------------------
Ben Thomas                                         Virtual Iron Software
[email protected]                            Tower 1, Floor 2
978-849-1214                                       900 Chelmsford Street
                                                   Lowell, MA 01851
#3 lore raw
Quoted 1 line · Ben Thomas

Does that more closely approximate what you'd like to see ?

That's basically what I checked in a few days ago. It may only just have hit the public tree as network connectivity issues have stalled the usual automatic pushes from the staging tree.

-- Keir