Mailing List Archive

# HG changeset patch
# User kaf24@firebug.cl.cam.ac.uk
# Node ID 6993a0f91efc3c081f838215181931e3e2cc9814
# Parent ab627e9da8fb7be385f4e713ac184c275aba7c7c
Domain creation/destruction cleanups.

1. Move alloc/dealloc routines to domain.[ch]
2. Merge alloc_task/add_vcpu schedops -> init_vcpu
3. Merge free_task/remove_vcpu schedops -> destroy_domain

Signed-off-by: Keir Fraser <keir@xensource.com>
---
xen/arch/ia64/xen/domain.c | 1
xen/arch/x86/mm.c | 1
xen/arch/x86/smpboot.c | 1
xen/common/domain.c | 94 +++++++++++++++++++++++++++++++-----
xen/common/sched_bvt.c | 36 +++++--------
xen/common/sched_credit.c | 30 ++++-------
xen/common/sched_sedf.c | 39 ++++-----------
xen/common/schedule.c | 116 ++++++---------------------------------------
xen/include/xen/domain.h | 22 +++++---
xen/include/xen/sched-if.h | 11 ++--
xen/include/xen/sched.h | 10 ---
11 files changed, 163 insertions(+), 198 deletions(-)

diff -r ab627e9da8fb -r 6993a0f91efc xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c Thu Jun 01 16:39:42 2006 +0100
+++ b/xen/arch/ia64/xen/domain.c Thu Jun 01 18:10:00 2006 +0100
@@ -14,6 +14,7 @@
#include <xen/init.h>
#include <xen/lib.h>
#include <xen/errno.h>
+#include <xen/domain.h>
#include <xen/sched.h>
#include <xen/smp.h>
#include <xen/delay.h>
diff -r ab627e9da8fb -r 6993a0f91efc xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Thu Jun 01 16:39:42 2006 +0100
+++ b/xen/arch/x86/mm.c Thu Jun 01 18:10:00 2006 +0100
@@ -89,6 +89,7 @@
#include <xen/kernel.h>
#include <xen/lib.h>
#include <xen/mm.h>
+#include <xen/domain.h>
#include <xen/sched.h>
#include <xen/errno.h>
#include <xen/perfc.h>
diff -r ab627e9da8fb -r 6993a0f91efc xen/arch/x86/smpboot.c
--- a/xen/arch/x86/smpboot.c Thu Jun 01 16:39:42 2006 +0100
+++ b/xen/arch/x86/smpboot.c Thu Jun 01 18:10:00 2006 +0100
@@ -37,6 +37,7 @@
#include <xen/init.h>
#include <xen/kernel.h>
#include <xen/mm.h>
+#include <xen/domain.h>
#include <xen/sched.h>
#include <xen/irq.h>
#include <xen/delay.h>
diff -r ab627e9da8fb -r 6993a0f91efc xen/common/domain.c
--- a/xen/common/domain.c Thu Jun 01 16:39:42 2006 +0100
+++ b/xen/common/domain.c Thu Jun 01 18:10:00 2006 +0100
@@ -32,6 +32,79 @@ struct domain *domain_list;

struct domain *dom0;

+struct domain *alloc_domain(domid_t domid)
+{
+ struct domain *d;
+
+ if ( (d = xmalloc(struct domain)) == NULL )
+ return NULL;
+
+ memset(d, 0, sizeof(*d));
+ d->domain_id = domid;
+ atomic_set(&d->refcnt, 1);
+ spin_lock_init(&d->big_lock);
+ spin_lock_init(&d->page_alloc_lock);
+ INIT_LIST_HEAD(&d->page_list);
+ INIT_LIST_HEAD(&d->xenpage_list);
+
+ return d;
+}
+
+
+void free_domain(struct domain *d)
+{
+ struct vcpu *v;
+ int i;
+
+ sched_destroy_domain(d);
+
+ for ( i = MAX_VIRT_CPUS-1; i >= 0; i-- )
+ if ( (v = d->vcpu[i]) != NULL )
+ free_vcpu_struct(v);
+
+ xfree(d);
+}
+
+
+struct vcpu *alloc_vcpu(
+ struct domain *d, unsigned int vcpu_id, unsigned int cpu_id)
+{
+ struct vcpu *v;
+
+ BUG_ON(d->vcpu[vcpu_id] != NULL);
+
+ if ( (v = alloc_vcpu_struct(d, vcpu_id)) == NULL )
+ return NULL;
+
+ v->domain = d;
+ v->vcpu_id = vcpu_id;
+ v->processor = cpu_id;
+ atomic_set(&v->pausecnt, 0);
+ v->vcpu_info = &d->shared_info->vcpu_info[vcpu_id];
+
+ v->cpu_affinity = is_idle_domain(d) ?
+ cpumask_of_cpu(cpu_id) : CPU_MASK_ALL;
+
+ v->runstate.state = is_idle_vcpu(v) ? RUNSTATE_running : RUNSTATE_offline;
+ v->runstate.state_entry_time = NOW();
+
+ if ( (vcpu_id != 0) && !is_idle_domain(d) )
+ set_bit(_VCPUF_down, &v->vcpu_flags);
+
+ if ( sched_init_vcpu(v) < 0 )
+ {
+ free_vcpu_struct(v);
+ return NULL;
+ }
+
+ d->vcpu[vcpu_id] = v;
+ if ( vcpu_id != 0 )
+ d->vcpu[v->vcpu_id-1]->next_in_list = v;
+
+ return v;
+}
+
+
struct domain *domain_create(domid_t domid, unsigned int cpu)
{
struct domain *d, **pd;
@@ -117,19 +190,16 @@ struct domain *find_domain_by_id(domid_t

void domain_kill(struct domain *d)
{
- struct vcpu *v;
-
domain_pause(d);
- if ( !test_and_set_bit(_DOMF_dying, &d->domain_flags) )
- {
- for_each_vcpu(d, v)
- sched_rem_domain(v);
- gnttab_release_mappings(d);
- domain_relinquish_resources(d);
- put_domain(d);
-
- send_guest_global_virq(dom0, VIRQ_DOM_EXC);
- }
+
+ if ( test_and_set_bit(_DOMF_dying, &d->domain_flags) )
+ return;
+
+ gnttab_release_mappings(d);
+ domain_relinquish_resources(d);
+ put_domain(d);
+
+ send_guest_global_virq(dom0, VIRQ_DOM_EXC);
}


diff -r ab627e9da8fb -r 6993a0f91efc xen/common/sched_bvt.c
--- a/xen/common/sched_bvt.c Thu Jun 01 16:39:42 2006 +0100
+++ b/xen/common/sched_bvt.c Thu Jun 01 18:10:00 2006 +0100
@@ -160,15 +160,14 @@ static inline u32 calc_evt(struct vcpu *
}

/**
- * bvt_alloc_task - allocate BVT private structures for a task
- * @p: task to allocate private structures for
- *
+ * bvt_init_vcpu - allocate BVT private structures for a VCPU.
* Returns non-zero on failure.
*/
-static int bvt_alloc_task(struct vcpu *v)
+static int bvt_init_vcpu(struct vcpu *v)
{
struct domain *d = v->domain;
struct bvt_dom_info *inf;
+ struct bvt_vcpu_info *einf;

if ( (d->sched_priv == NULL) )
{
@@ -199,15 +198,7 @@ static int bvt_alloc_task(struct vcpu *v
init_timer(&inf->unwarp_timer, unwarp_timer_fn, inf, v->processor);
}

- return 0;
-}
-
-/*
- * Add and remove a domain
- */
-static void bvt_add_task(struct vcpu *v)
-{
- struct bvt_vcpu_info *einf = EBVT_INFO(v);
+ einf = EBVT_INFO(v);

/* Allocate per-CPU context if this is the first domain to be added. */
if ( CPU_INFO(v->processor) == NULL )
@@ -223,13 +214,15 @@ static void bvt_add_task(struct vcpu *v)
einf->avt = einf->evt = ~0U;
BUG_ON(__task_on_runqueue(v));
__add_to_runqueue_head(v);
- }
+ }
else
{
/* Set avt and evt to system virtual time. */
einf->avt = CPU_SVT(v->processor);
einf->evt = CPU_SVT(v->processor);
}
+
+ return 0;
}

static void bvt_wake(struct vcpu *v)
@@ -298,10 +291,9 @@ static int bvt_set_affinity(struct vcpu


/**
- * bvt_free_task - free BVT private structures for a task
- * @d: task
- */
-static void bvt_free_task(struct domain *d)
+ * bvt_destroy_domain - free BVT private structures for a domain.
+ */
+static void bvt_destroy_domain(struct domain *d)
{
struct bvt_dom_info *inf = BVT_INFO(d);

@@ -568,10 +560,10 @@ struct scheduler sched_bvt_def = {
.name = "Borrowed Virtual Time",
.opt_name = "bvt",
.sched_id = SCHED_BVT,
-
- .alloc_task = bvt_alloc_task,
- .add_task = bvt_add_task,
- .free_task = bvt_free_task,
+
+ .init_vcpu = bvt_init_vcpu,
+ .destroy_domain = bvt_destroy_domain,
+
.do_schedule = bvt_do_schedule,
.control = bvt_ctl,
.adjdom = bvt_adjdom,
diff -r ab627e9da8fb -r 6993a0f91efc xen/common/sched_credit.c
--- a/xen/common/sched_credit.c Thu Jun 01 16:39:42 2006 +0100
+++ b/xen/common/sched_credit.c Thu Jun 01 18:10:00 2006 +0100
@@ -75,14 +75,13 @@
} while ( 0 );

#define CSCHED_STATS_EXPAND_SCHED(_MACRO) \
- _MACRO(vcpu_alloc) \
- _MACRO(vcpu_add) \
+ _MACRO(vcpu_init) \
_MACRO(vcpu_sleep) \
_MACRO(vcpu_wake_running) \
_MACRO(vcpu_wake_onrunq) \
_MACRO(vcpu_wake_runnable) \
_MACRO(vcpu_wake_not_runnable) \
- _MACRO(dom_free) \
+ _MACRO(dom_destroy) \
_MACRO(schedule) \
_MACRO(tickle_local_idler) \
_MACRO(tickle_local_over) \
@@ -429,14 +428,14 @@ __csched_vcpu_acct_idle_locked(struct cs
}

static int
-csched_vcpu_alloc(struct vcpu *vc)
+csched_vcpu_init(struct vcpu *vc)
{
struct domain * const dom = vc->domain;
struct csched_dom *sdom;
struct csched_vcpu *svc;
int16_t pri;

- CSCHED_STAT_CRANK(vcpu_alloc);
+ CSCHED_STAT_CRANK(vcpu_init);

/* Allocate, if appropriate, per-domain info */
if ( is_idle_vcpu(vc) )
@@ -489,19 +488,13 @@ csched_vcpu_alloc(struct vcpu *vc)
if ( likely(sdom != NULL) )
csched_vcpu_acct(svc, 0);

- return 0;
-}
-
-static void
-csched_vcpu_add(struct vcpu *vc)
-{
- CSCHED_STAT_CRANK(vcpu_add);
-
/* Allocate per-PCPU info */
if ( unlikely(!CSCHED_PCPU(vc->processor)) )
csched_pcpu_init(vc->processor);

CSCHED_VCPU_CHECK(vc);
+
+ return 0;
}

static void
@@ -644,12 +637,12 @@ csched_dom_cntl(
}

static void
-csched_dom_free(struct domain *dom)
+csched_dom_destroy(struct domain *dom)
{
struct csched_dom * const sdom = CSCHED_DOM(dom);
int i;

- CSCHED_STAT_CRANK(dom_free);
+ CSCHED_STAT_CRANK(dom_destroy);

for ( i = 0; i < MAX_VIRT_CPUS; i++ )
{
@@ -1215,14 +1208,15 @@ struct scheduler sched_credit_def = {
.opt_name = "credit",
.sched_id = SCHED_CREDIT,

- .alloc_task = csched_vcpu_alloc,
- .add_task = csched_vcpu_add,
+ .init_vcpu = csched_vcpu_init,
+ .destroy_domain = csched_dom_destroy,
+
.sleep = csched_vcpu_sleep,
.wake = csched_vcpu_wake,
+
.set_affinity = csched_vcpu_set_affinity,

.adjdom = csched_dom_cntl,
- .free_task = csched_dom_free,

.tick = csched_tick,
.do_schedule = csched_schedule,
diff -r ab627e9da8fb -r 6993a0f91efc xen/common/sched_sedf.c
--- a/xen/common/sched_sedf.c Thu Jun 01 16:39:42 2006 +0100
+++ b/xen/common/sched_sedf.c Thu Jun 01 18:10:00 2006 +0100
@@ -328,11 +328,9 @@ static inline void __add_to_runqueue_sor
}


-/* Allocates memory for per domain private scheduling data*/
-static int sedf_alloc_task(struct vcpu *v)
-{
- PRINT(2, "sedf_alloc_task was called, domain-id %i.%i\n",
- v->domain->domain_id, v->vcpu_id);
+static int sedf_init_vcpu(struct vcpu *v)
+{
+ struct sedf_vcpu_info *inf;

if ( v->domain->sched_priv == NULL )
{
@@ -344,23 +342,11 @@ static int sedf_alloc_task(struct vcpu *

if ( (v->sched_priv = xmalloc(struct sedf_vcpu_info)) == NULL )
return -1;
-
memset(v->sched_priv, 0, sizeof(struct sedf_vcpu_info));

- return 0;
-}
-
-
-/* Setup the sedf_dom_info */
-static void sedf_add_task(struct vcpu *v)
-{
- struct sedf_vcpu_info *inf = EDOM_INFO(v);
-
+ inf = EDOM_INFO(v);
inf->vcpu = v;

- PRINT(2,"sedf_add_task was called, domain-id %i.%i\n",
- v->domain->domain_id, v->vcpu_id);
-
/* Allocate per-CPU context if this is the first domain to be added. */
if ( unlikely(schedule_data[v->processor].sched_priv == NULL) )
{
@@ -408,14 +394,13 @@ static void sedf_add_task(struct vcpu *v
EDOM_INFO(v)->deadl_abs = 0;
EDOM_INFO(v)->status &= ~SEDF_ASLEEP;
}
-}
-
-/* Frees memory used by domain info */
-static void sedf_free_task(struct domain *d)
+
+ return 0;
+}
+
+static void sedf_destroy_domain(struct domain *d)
{
int i;
-
- PRINT(2,"sedf_free_task was called, domain-id %i\n",d->domain_id);

xfree(d->sched_priv);

@@ -1452,9 +1437,9 @@ struct scheduler sched_sedf_def = {
.opt_name = "sedf",
.sched_id = SCHED_SEDF,

- .alloc_task = sedf_alloc_task,
- .add_task = sedf_add_task,
- .free_task = sedf_free_task,
+ .init_vcpu = sedf_init_vcpu,
+ .destroy_domain = sedf_destroy_domain,
+
.do_schedule = sedf_do_schedule,
.dump_cpu_state = sedf_dump_cpu_state,
.sleep = sedf_sleep,
diff -r ab627e9da8fb -r 6993a0f91efc xen/common/schedule.c
--- a/xen/common/schedule.c Thu Jun 01 16:39:42 2006 +0100
+++ b/xen/common/schedule.c Thu Jun 01 18:10:00 2006 +0100
@@ -99,82 +99,7 @@ void vcpu_runstate_get(struct vcpu *v, s
}
}

-struct domain *alloc_domain(domid_t domid)
-{
- struct domain *d;
-
- if ( (d = xmalloc(struct domain)) == NULL )
- return NULL;
-
- memset(d, 0, sizeof(*d));
- d->domain_id = domid;
- atomic_set(&d->refcnt, 1);
- spin_lock_init(&d->big_lock);
- spin_lock_init(&d->page_alloc_lock);
- INIT_LIST_HEAD(&d->page_list);
- INIT_LIST_HEAD(&d->xenpage_list);
-
- return d;
-}
-
-void free_domain(struct domain *d)
-{
- struct vcpu *v;
- int i;
-
- for_each_vcpu ( d, v )
- sched_rem_domain(v);
-
- SCHED_OP(free_task, d);
-
- for ( i = MAX_VIRT_CPUS-1; i >= 0; i-- )
- if ( (v = d->vcpu[i]) != NULL )
- free_vcpu_struct(v);
-
- xfree(d);
-}
-
-struct vcpu *alloc_vcpu(
- struct domain *d, unsigned int vcpu_id, unsigned int cpu_id)
-{
- struct vcpu *v;
-
- BUG_ON(d->vcpu[vcpu_id] != NULL);
-
- if ( (v = alloc_vcpu_struct(d, vcpu_id)) == NULL )
- return NULL;
-
- v->domain = d;
- v->vcpu_id = vcpu_id;
- v->processor = cpu_id;
- atomic_set(&v->pausecnt, 0);
- v->vcpu_info = &d->shared_info->vcpu_info[vcpu_id];
-
- v->cpu_affinity = is_idle_domain(d) ?
- cpumask_of_cpu(cpu_id) : CPU_MASK_ALL;
-
- v->runstate.state = is_idle_vcpu(v) ? RUNSTATE_running : RUNSTATE_offline;
- v->runstate.state_entry_time = NOW();
-
- if ( (vcpu_id != 0) && !is_idle_domain(d) )
- set_bit(_VCPUF_down, &v->vcpu_flags);
-
- if ( SCHED_OP(alloc_task, v) < 0 )
- {
- free_vcpu_struct(v);
- return NULL;
- }
-
- d->vcpu[vcpu_id] = v;
- if ( vcpu_id != 0 )
- d->vcpu[v->vcpu_id-1]->next_in_list = v;
-
- sched_add_domain(v);
-
- return v;
-}
-
-void sched_add_domain(struct vcpu *v)
+int sched_init_vcpu(struct vcpu *v)
{
/* Initialise the per-domain timers. */
init_timer(&v->timer, vcpu_timer_fn, v, v->processor);
@@ -187,17 +112,23 @@ void sched_add_domain(struct vcpu *v)
set_bit(_VCPUF_running, &v->vcpu_flags);
}

- SCHED_OP(add_task, v);
TRACE_2D(TRC_SCHED_DOM_ADD, v->domain->domain_id, v->vcpu_id);
-}
-
-void sched_rem_domain(struct vcpu *v)
-{
- kill_timer(&v->timer);
- kill_timer(&v->poll_timer);
-
- SCHED_OP(rem_task, v);
- TRACE_2D(TRC_SCHED_DOM_REM, v->domain->domain_id, v->vcpu_id);
+
+ return SCHED_OP(init_vcpu, v);
+}
+
+void sched_destroy_domain(struct domain *d)
+{
+ struct vcpu *v;
+
+ for_each_vcpu ( d, v )
+ {
+ kill_timer(&v->timer);
+ kill_timer(&v->poll_timer);
+ TRACE_2D(TRC_SCHED_DOM_REM, v->domain->domain_id, v->vcpu_id);
+ }
+
+ SCHED_OP(destroy_domain, d);
}

void vcpu_sleep_nosync(struct vcpu *v)
@@ -671,7 +602,7 @@ static void poll_timer_fn(void *data)
/* Initialise the data structures. */
void __init scheduler_init(void)
{
- int i, rc;
+ int i;

open_softirq(SCHEDULE_SOFTIRQ, __enter_scheduler);

@@ -694,17 +625,6 @@ void __init scheduler_init(void)

printk("Using scheduler: %s (%s)\n", ops.name, ops.opt_name);
SCHED_OP(init);
-
- if ( idle_vcpu[0] != NULL )
- {
- schedule_data[0].curr = idle_vcpu[0];
- schedule_data[0].idle = idle_vcpu[0];
-
- rc = SCHED_OP(alloc_task, idle_vcpu[0]);
- BUG_ON(rc < 0);
-
- sched_add_domain(idle_vcpu[0]);
- }
}

/*
diff -r ab627e9da8fb -r 6993a0f91efc xen/include/xen/domain.h
--- a/xen/include/xen/domain.h Thu Jun 01 16:39:42 2006 +0100
+++ b/xen/include/xen/domain.h Thu Jun 01 18:10:00 2006 +0100
@@ -2,8 +2,13 @@
#ifndef __XEN_DOMAIN_H__
#define __XEN_DOMAIN_H__

-extern int boot_vcpu(
+struct vcpu *alloc_vcpu(
+ struct domain *d, unsigned int vcpu_id, unsigned int cpu_id);
+int boot_vcpu(
struct domain *d, int vcpuid, struct vcpu_guest_context *ctxt);
+
+struct domain *alloc_domain(domid_t domid);
+void free_domain(struct domain *d);

/*
* Arch-specifics.
@@ -11,19 +16,18 @@ extern int boot_vcpu(

struct vcpu *alloc_vcpu_struct(struct domain *d, unsigned int vcpu_id);

-extern void free_vcpu_struct(struct vcpu *v);
+void free_vcpu_struct(struct vcpu *v);

-extern int arch_domain_create(struct domain *d);
+int arch_domain_create(struct domain *d);

-extern void arch_domain_destroy(struct domain *d);
+void arch_domain_destroy(struct domain *d);

-extern int arch_set_info_guest(
- struct vcpu *v, struct vcpu_guest_context *c);
+int arch_set_info_guest(struct vcpu *v, struct vcpu_guest_context *c);

-extern void domain_relinquish_resources(struct domain *d);
+void domain_relinquish_resources(struct domain *d);

-extern void dump_pageframe_info(struct domain *d);
+void dump_pageframe_info(struct domain *d);

-extern void arch_dump_domain_info(struct domain *d);
+void arch_dump_domain_info(struct domain *d);

#endif /* __XEN_DOMAIN_H__ */
diff -r ab627e9da8fb -r 6993a0f91efc xen/include/xen/sched-if.h
--- a/xen/include/xen/sched-if.h Thu Jun 01 16:39:42 2006 +0100
+++ b/xen/include/xen/sched-if.h Thu Jun 01 18:10:00 2006 +0100
@@ -60,14 +60,17 @@ struct scheduler {

void (*init) (void);
void (*tick) (unsigned int cpu);
- int (*alloc_task) (struct vcpu *);
- void (*add_task) (struct vcpu *);
- void (*free_task) (struct domain *);
- void (*rem_task) (struct vcpu *);
+
+ int (*init_vcpu) (struct vcpu *);
+ void (*destroy_domain) (struct domain *);
+
void (*sleep) (struct vcpu *);
void (*wake) (struct vcpu *);
+
int (*set_affinity) (struct vcpu *, cpumask_t *);
+
struct task_slice (*do_schedule) (s_time_t);
+
int (*control) (struct sched_ctl_cmd *);
int (*adjdom) (struct domain *,
struct sched_adjdom_cmd *);
diff -r ab627e9da8fb -r 6993a0f91efc xen/include/xen/sched.h
--- a/xen/include/xen/sched.h Thu Jun 01 16:39:42 2006 +0100
+++ b/xen/include/xen/sched.h Thu Jun 01 18:10:00 2006 +0100
@@ -186,12 +186,6 @@ extern struct vcpu *idle_vcpu[NR_CPUS];
#define is_idle_domain(d) ((d)->domain_id == IDLE_DOMAIN_ID)
#define is_idle_vcpu(v) (is_idle_domain((v)->domain))

-struct vcpu *alloc_vcpu(
- struct domain *d, unsigned int vcpu_id, unsigned int cpu_id);
-
-struct domain *alloc_domain(domid_t domid);
-void free_domain(struct domain *d);
-
#define DOMAIN_DESTROYED (1<<31) /* assumes atomic_t is >= 32 bits */
#define put_domain(_d) \
if ( atomic_dec_and_test(&(_d)->refcnt) ) domain_destroy(_d)
@@ -269,8 +263,8 @@ void new_thread(struct vcpu *d,
#define set_current_state(_s) do { current->state = (_s); } while (0)
void scheduler_init(void);
void schedulers_start(void);
-void sched_add_domain(struct vcpu *);
-void sched_rem_domain(struct vcpu *);
+int sched_init_vcpu(struct vcpu *);
+void sched_destroy_domain(struct domain *);
long sched_ctl(struct sched_ctl_cmd *);
long sched_adjdom(struct sched_adjdom_cmd *);
int sched_id(void);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog