- add symmetry to para and fully virtualized domain shutdown/reboot
PATCH 1/1 - add symmetry to para and fully virtualized domain shutdown/reboot
Add code to make handling domain poweroff/reboot symmetrical between paravirtualized and fully virtualized.
A paravirtualized domain uses sched_op to shut down and set the reason code. This will send a VIRQ_DOM_EXC, which can be handled in dom0 by control software. In some ways, this resembles SIGCHILD/waitpid, and is a reasonable model.
The fully virtualized case has qemu invoke xm directly. This is a different path than paravirtualized. It also removes decision and policy making choices from the rest of the control software and places it within qemu. When any dom0 logic eventually gets a VIRQ_DOM_EXC, the information about the domain is gone having been destroyed by xm.
It would be useful if all shutdown/reboot operations were symmetrical from domain 0's point of view. This approach uses the new sched_op to handle other domains than the current domain. The new code, SCHEDOP_remote_shutdown, is very much like SCHEDOP_shutdown, but is called with the id of the domain which is to be shut down. This allows fully virtualized shutdown and para-virtualized shutdown to be identical from that point forward.
A libxenctrl wrapper, xc_shutdown_domain has been added and qemu now calls it.
With this change, both domain types shutdown/reboot using the same dom0 management logic. All control decisions are removed from qemu, which now simply handles the request and reason. At a very high level, the flow is "notify of shutdown and reason", "send VIRQ_DOM_EXC", process, and destroy domain. Paravirtualized and fully-virtualized domains would differ slightly in the first step of notification.
Or, back to the opening sentence, make the operations as symmetrical as possible.
As a freebie, #if 0 some very verbose logging code in qemu. Totally unrelated, but as long as I was there...
Signature · 5 lines
------------------------------------------------------------------------ Ben Thomas Virtual Iron Software [email protected] Tower 1, Floor 2 978-849-1214 900 Chelmsford Street Lowell, MA 01851
linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c +1 -0
@@ -277,6 +277,7 @@ static int __init privcmd_init(void)set_bit (__HYPERVISOR_mmu_update, hypercall_permission_map);set_bit (__HYPERVISOR_mmuext_op, hypercall_permission_map);set_bit (__HYPERVISOR_xen_version, hypercall_permission_map); +set_bit (__HYPERVISOR_sched_op, hypercall_permission_map); privcmd_intf =create_xen_proc_entry ("privcmd" ,0400 );if (privcmd_intf !=NULL )
tools/ioemu/target-i386-dm/helper2.c +32 -13
57 lines not on this page · raw message
tools/ioemu/vl.c +2 -0
@@ -2556,8 +2556,10 @@ static int set_mm_mapping(int xc_handle,return -1 ; } +#if 0 /* Generates lots of log file output - turn on for debugging */ for (i =0 ; i < nr_pages; i++)fprintf (stderr,"set_map result i %x result %lx\n" , i, extent_start[i]); +#endif return 0 ; }
tools/libxc/xc_domain.c +29 -0
@@ -57,6 +57,35 @@ int xc_domain_destroy(int xc_handle, op.u.destroydomain.domain = (domid_t )domid;return do_dom0_op (xc_handle, &op); } + +int xc_domain_shutdown (int xc_handle, +uint32_t domid, +int reason) +{ +int ret =-1 ; +sched_remote_shutdown_t arg; +DECLARE_HYPERCALL ; + + hypercall.op = __HYPERVISOR_sched_op; + hypercall.arg[0 ] = (unsigned long )SCHEDOP_remote_shutdown; + hypercall.arg[1 ] = (unsigned long )&arg; + arg.domain_id = domid; + arg.reason = reason; + +if (mlock (&arg,sizeof (arg)) !=0 ) + { +PERROR ("Could not lock memory for Xen hypercall" ); + goto out1; + } + + ret =do_xen_hypercall (xc_handle, &hypercall); + +safe_munlock (&arg,sizeof (arg)); + + out1: +return ret; +} + int xc_vcpu_setaffinity(int xc_handle, uint32_t domid,
tools/libxc/xenctrl.h +15 -0
@@ -205,6 +205,21 @@ int xc_domain_unpause(int xc_handle,*/ int xc_domain_destroy (int xc_handle,uint32_t domid); + +/** +* This function will shutdown a domain. This is intended for use in +* fully-virtualized domains where this operation is analogous to the +* sched_op operations in a paravirtualized domain. The caller is +* expected to give the reason for the shutdown. +* +* @parm xc_handle a handle to an open hypervisor interface +* @parm domid the domain id to destroy +* @parm reason is the reason (SHUTDOWN_xxx) for the shutdown +* @return 0 on success, -1 on failure +*/ +int xc_domain_shutdown (int xc_handle, +uint32_t domid, +int reason); int xc_vcpu_setaffinity(int xc_handle, uint32_t domid,
xen/common/schedule.c +24 -0
@@ -413,6 +413,30 @@ long do_sched_op(int cmd, GUEST_HANDLE(vbreak ; } +case SCHEDOP_remote_shutdown: + { +struct domain *d; +struct sched_remote_shutdown sched_remote_shutdown; + +if ( !IS_PRIV (current->domain) ) +return -EPERM ; + + ret = -EFAULT ; +if (copy_from_guest (&sched_remote_shutdown, arg,1 ) ) +break ; + + ret = -ESRCH ; + d =find_domain_by_id (sched_remote_shutdown.domain_id); +if ( d !=NULL ) + { +domain_shutdown (d, (u8 )sched_remote_shutdown.reason); +put_domain (d); + ret =0 ; + } + +break ; + } +default : ret = -ENOSYS ; }
xen/include/public/sched.h +13 -0
@@ -65,6 +65,19 @@ DEFINE_GUEST_HANDLE(sched_poll_t);DEFINE_GUEST_HANDLE (sched_poll_t);/* +* Declare a shutdown for another domain. The main use of this function is +* in interpreting shutdown requests and reasons for fully-virtualized +* domains. A para-virtualized domain may use SCHEDOP_shutdown directly. +* @arg == pointer to sched_remote_shutdown structure. +*/ +#define SCHEDOP_remote_shutdown 4 +typedef struct sched_remote_shutdown { +domid_t domain_id;/* Remote domain ID */ +unsigned int reason;/* SHUTDOWN_xxx reason */ +}sched_remote_shutdown_t ; +DEFINE_GUEST_HANDLE (sched_remote_shutdown_t); + +/* * Reason codes for SCHEDOP_shutdown. These may be interpreted by control * software to determine the appropriate action. For the most part, Xen does * not care about the shutdown code.
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel