Domain Groups: VMM domain group framework
PATCH 4/8 Domain Groups: VMM domain group framework
xen:
1. Create generic support data structures for group information.
2. Add domgrpctl interface (similar to domctl).
xen/common/Makefile +2 -0
@@ -1,7 +1,9 @@ obj-y += acm_ops.o obj-y += acm_ops.o obj-y += bitmap.o obj-y += domctl.o +obj-y += domgrpctl.o obj-y += domain.o +obj-y += domgrp.o obj-y += event_channel.o obj-y += grant_table.o obj-y += kernel.o
xen/common/domain.c +8 -0
@@ -11,6 +11,7 @@#include <xen/errno.h> #include <xen/sched.h> #include <xen/domain.h> +#include <xen/domgrp.h> #include <xen/mm.h> #include <xen/event.h> #include <xen/time.h>
@@ -51,6 +52,7 @@ struct domain *alloc_domain(domid_t domimemset (d,0 ,sizeof (*d)); d->domain_id = domid; + d->group_id =INVAL_GROUP_ID ;atomic_set (&d->refcnt,1 );spin_lock_init (&d->big_lock);spin_lock_init (&d->page_alloc_lock);
@@ -184,6 +186,8 @@ struct domain *domain_create(domid_t dom d->next_in_hashbucket = domain_hash[DOMAIN_HASH (domid)]; domain_hash[DOMAIN_HASH (domid)] = d;write_unlock (&domlist_lock); + +add_dom_to_grp (d,NULL_GROUP_ID ); }return d;
@@ -288,6 +292,8 @@ void domain_shutdown(struct domain *d, u {struct vcpu *v; +del_dom_from_grp (d); +if ( d->domain_id ==0 )dom0_shutdown (reason);
@@ -329,6 +335,8 @@ void domain_destroy(struct domain *d) old =atomic_compareandswap (old, new, &d->refcnt);if (_atomic_read (old) !=0 )return ; + +del_dom_from_grp (d);/* Delete from task list and task hashtable. */ write_lock (&domlist_lock);
xen/common/domctl.c +10 -1
@@ -12,6 +12,7 @@#include <xen/mm.h> #include <xen/sched.h> #include <xen/domain.h> +#include <xen/domgrp.h> #include <xen/event.h> #include <xen/domain_page.h> #include <xen/trace.h>
@@ -86,8 +87,10 @@ void getdomaininfo(struct domain *d, stru64 cpu_time =0 ;int flags = XEN_DOMINF_blocked;struct vcpu_runstate_info runstate; - +struct domain_group *grp; + info->domain = d->domain_id; + info->group = d->group_id; info->nr_online_vcpus =0 ;/*
@@ -130,6 +133,9 @@ void getdomaininfo(struct domain *d, str info->shared_info_frame =mfn_to_gmfn (d,__pa (d->shared_info)>>PAGE_SHIFT );memcpy (info->handle, d->handle,sizeof (xen_domain_handle_t)); + grp =find_grp_by_id (info->group); +if (grp) +memcpy (info->dg_handle, grp->handle,sizeof (xen_domain_group_handle_t)); }static unsigned int default_vcpu0_location (void )
@@ -250,6 +256,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domc {struct domain *d =get_domain_by_id (op->domain); ret = -ESRCH ; +if ( d !=NULL ) { ret = -EINVAL ;
@@ -267,6 +274,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domc {struct domain *d =get_domain_by_id (op->domain); ret = -ESRCH ; +if ( d !=NULL ) { ret = -EINVAL ;
@@ -404,6 +412,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domc {struct domain *d =get_domain_by_id (op->domain); ret = -ESRCH ; +if ( d !=NULL ) { ret = -EINVAL ;
xen/include/public/domctl.h +2 -0
@@ -67,6 +67,7 @@ struct xen_domctl_getdomaininfo {struct xen_domctl_getdomaininfo {/* OUT variables. */ domid_t domain;/* Also echoed in domctl.domain */ +dgid_t group;/* Domain is scheduled to die. */ #define _XEN_DOMINF_dying 0#define XEN_DOMINF_dying (1U<<_XEN_DOMINF_dying)
@@ -100,6 +101,7 @@ struct xen_domctl_getdomaininfo {uint32_t max_vcpu_id;/* Maximum VCPUID in use by this domain. */ uint32_t ssidref;xen_domain_handle_t handle; +xen_domain_group_handle_t dg_handle; };typedef struct xen_domctl_getdomaininfo xen_domctl_getdomaininfo_t ;DEFINE_XEN_GUEST_HANDLE (xen_domctl_getdomaininfo_t);
xen/include/public/xen.h +5 -0
@@ -80,6 +80,7 @@#define __HYPERVISOR_sysctl 35#define __HYPERVISOR_domctl 36#define __HYPERVISOR_kexec_op 37 +#define __HYPERVISOR_domgrpctl 38/* Architecture-specific hypercall definitions. */ #define __HYPERVISOR_arch_0 48
@@ -295,6 +296,8 @@ DEFINE_XEN_GUEST_HANDLE(mmuext_op_t);#ifndef __ASSEMBLY__typedef uint16_t domid_t ; + +typedef uint16_t dgid_t ;/* Domain ids >= DOMID_FIRST_RESERVED cannot be used for ordinary domains. */ #define DOMID_FIRST_RESERVED (0x7FF0U)
@@ -572,6 +575,8 @@ typedef struct dom0_vga_console_info {typedef uint8_t xen_domain_handle_t [16 ]; +typedef uint8_t xen_domain_group_handle_t [16 ]; +/* Turn a plain number into a C unsigned long constant. */ #define __mk_unsigned_long (x) x ## UL#define mk_unsigned_long (x) __mk_unsigned_long(x)
xen/include/xen/hypercall.h +5 -0
@@ -10,6 +10,7 @@#include <xen/time.h> #include <public/xen.h> #include <public/domctl.h> +#include <public/domgrpctl.h> #include <public/sysctl.h> #include <public/platform.h> #include <public/acm_ops.h>
@@ -33,6 +34,10 @@ extern longextern long do_domctl (XEN_GUEST_HANDLE (xen_domctl_t) u_domctl); + +extern long +do_domgrpctl ( +XEN_GUEST_HANDLE (xen_domgrpctl_t) u_domgrpctl);extern long do_sysctl(
xen/include/xen/sched.h +21 -0
@@ -9,6 +9,7 @@#include <xen/shared.h> #include <public/xen.h> #include <public/domctl.h> +#include <public/domgrpctl.h> #include <public/vcpu.h> #include <xen/time.h> #include <xen/timer.h>
@@ -25,6 +26,7 @@ DEFINE_XEN_GUEST_HANDLE(vcpu_runstate_inextern unsigned long volatile jiffies;extern rwlock_t domlist_lock; +extern rwlock_t domgrplist_lock;/* A global pointer to the initial domain (DOM0). */ extern struct domain *dom0;
@@ -124,9 +126,13 @@ struct domain {domid_t domain_id; +dgid_t group_id;/* TODO: replace struct group ptr */ +struct list_head member; +shared_info_t *shared_info;/* shared data area */ spinlock_t big_lock; +spinlock_t *grp_big_lock;spinlock_t page_alloc_lock;/* protects all the following fields */ struct list_head page_list;/* linked list, of size tot_pages */
@@ -193,6 +199,21 @@ struct domain/* OProfile support. */ struct xenoprof *xenoprof;int32_t time_offset_seconds; +}; + +struct domain_group +{ +dgid_t group_id; +uint16_t size; + +struct list_head groups; + +struct list_head member_list; + +spinlock_t grp_big_lock; +rwlock_t member_list_lock; + +xen_domain_group_handle_t handle; };struct domain_setup_info
xen/common/domgrp.c new file +317 -0
317 lines not on this page · raw message
xen/common/domgrpctl.c new file +134 -0
134 lines not on this page · raw message
xen/include/public/domgrpctl.h new file +86 -0
86 lines not on this page · raw message
xen/include/xen/domgrp.h new file +36 -0
@@ -0,0 +1,36 @@ +/****************************************************************************** +* domgrp.h +* +* Generic domain group-handling functions. +* +* Author: Chris Bookholt ([email protected]) +*/ + +#ifndef __XEN_DOM_GROUP_H__ +#define __XEN_DOM_GROUP_H__ + +#include <public/domgrpctl.h> + +extern struct list_head domgrplist; + +void get_grp_info (struct domain_group *grp,xen_domgrpctl_getgrpinfo_t * info); + +struct domain_group *find_grp_by_id (dgid_t dgid); + +uint16_t get_new_group_id (void ); + +struct domain_group *domain_group_create (dgid_t dgid); + +int del_dom_from_grp (struct domain *old_dom); + +int add_dom_to_grp (struct domain *dom,dgid_t dgid); + +int pause_grp (dgid_t dgid); + +int unpause_grp (dgid_t dgid); + +int domain_group_destroy (dgid_t dgid); + +int init_domain_groups (void ); + +#endif /* __XEN_DOM_GROUP_H__ */
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel