support of cpupools in xl
PATCH 1/1 support of cpupools in xl
This is the next version of my patches to support cpupools in xl/libxl. For full functionality it is necessary to change cpumask handling for cpupools in libxc (patch 1). Patch 2 adds the full cpupool support in xl. Patch 3 adds an example configuration file for xm/xl pool-create.
Changes since last version: requests of Ian Campbell, Gianni Tedesco, Stefano
Stabellini
18 files changed, 1018 insertions(+), 237 deletions(-) tools/examples/README | 1 tools/examples/cpupool | 17 + tools/libxc/xc_cpupool.c | 118 +++++--- tools/libxc/xc_misc.c | 14 + tools/libxc/xenctrl.h | 26 - tools/libxl/libxl.c | 252 ++++++++++++++++-- tools/libxl/libxl.h | 21 + tools/libxl/libxl.idl | 12 tools/libxl/libxl_internal.h | 2 tools/libxl/libxl_utils.c | 98 ++++++- tools/libxl/libxl_utils.h | 10 tools/libxl/libxltypes.py | 5 tools/libxl/libxlu_cfg_l.c | 30 -- tools/libxl/libxlu_cfg_l.h | 18 - tools/libxl/xl.h | 6 tools/libxl/xl_cmdimpl.c | 494 +++++++++++++++++++++++++++++++++++-- tools/libxl/xl_cmdtable.c | 35 ++ tools/python/xen/lowlevel/xc/xc.c | 96 ++-----
PATCH 1/1 Support arbitrary numbers of physical cpus for cpupools in tools
To be able to support arbitrary numbers of physical cpus it was necessary to include the size of cpumaps in the xc-interfaces for cpu pools. These were:
definition of xc_cpupoolinfo_t
xc_cpupool_getinfo()
xc_cpupool_freeinfo()xc_cpupool_getinfo() and xc_cpupool_freeinfo() are changed to allocate the needed buffer and return it.
8 files changed, 182 insertions(+), 151 deletions(-) tools/libxc/xc_cpupool.c | 118 ++++++++++++++++++++++--------------- tools/libxc/xc_misc.c | 14 ++++ tools/libxc/xenctrl.h | 26 ++++---- tools/libxl/libxl.c | 49 +++++++-------- tools/libxl/libxl.h | 3 tools/libxl/libxl_utils.c | 5 + tools/libxl/xl_cmdimpl.c | 22 +++--- tools/python/xen/lowlevel/xc/xc.c | 96 ++++++++++++------------------
# HG changeset patch
# User Juergen Gross <[email protected]>
# Date 1286536603 -7200
# Node ID fc17462ba612d67069c1110f8cca3b1adb8c233b
# Parent a33886146b45da46a5161a7ebed4d2f607642aee Support arbitrary numbers of physical cpus for cpupools in tools
To be able to support arbitrary numbers of physical cpus it was necessary to include the size of cpumaps in the xc-interfaces for cpu pools. These were:
definition of xc_cpupoolinfo_t
xc_cpupool_getinfo()
xc_cpupool_freeinfo()xc_cpupool_getinfo() and xc_cpupool_freeinfo() are changed to allocate the needed buffer and return it.
tools/libxc/xc_cpupool.c +72 -46
@@ -34,6 +34,11 @@return ret; } +static int get_cpumap_size (xc_interface *xch) +{ +return (xc_get_max_cpus (xch) +7 ) /8 ; +} +int xc_cpupool_create (xc_interface *xch,uint32_t *ppoolid,uint32_t sched_id)
@@ -64,50 +69,61 @@return do_sysctl_save (xch, &sysctl); } -int xc_cpupool_getinfo (xc_interface *xch, -uint32_t first_poolid, -uint32_t n_max, -xc_cpupoolinfo_t *info) +xc_cpupoolinfo_t *xc_cpupool_getinfo (xc_interface *xch, +uint32_t poolid) {int err =0 ; -int p; -uint32_t poolid = first_poolid; -uint8_t local[sizeof (info->cpumap)]; +xc_cpupoolinfo_t *info; +uint8_t *local; +int local_size; +int cpumap_size; +int size;DECLARE_SYSCTL ; -memset (info,0 , n_max *sizeof (xc_cpupoolinfo_t)); + local_size =get_cpumap_size (xch); +if (!local_size) + { +PERROR ("Could not get number of cpus" ); +return NULL ; + } + local =alloca (local_size); + cpumap_size = (local_size +sizeof (*info->cpumap) -1 ) /sizeof (*info->cpumap); + size =sizeof (xc_cpupoolinfo_t) + cpumap_size *sizeof (*info->cpumap); + info =malloc (size); +if ( !info ) +return NULL ; -for (p =0 ; p < n_max; p++) +memset (info,0 , size); + info->cpumap_size = local_size *8 ; + info->cpumap = (uint64_t *)(info +1 ); + + sysctl.cmd = XEN_SYSCTL_cpupool_op; + sysctl.u.cpupool_op.op =XEN_SYSCTL_CPUPOOL_OP_INFO ; + sysctl.u.cpupool_op.cpupool_id = poolid; +set_xen_guest_handle (sysctl.u.cpupool_op.cpumap.bitmap, local); + sysctl.u.cpupool_op.cpumap.nr_cpus = local_size *8 ; + +if ( (err =lock_pages (local, local_size)) !=0 ) { - sysctl.cmd = XEN_SYSCTL_cpupool_op; - sysctl.u.cpupool_op.op =XEN_SYSCTL_CPUPOOL_OP_INFO ; - sysctl.u.cpupool_op.cpupool_id = poolid; -set_xen_guest_handle (sysctl.u.cpupool_op.cpumap.bitmap, local); - sysctl.u.cpupool_op.cpumap.nr_cpus =sizeof (info->cpumap) *8 ; +PERROR ("Could not lock memory for Xen hypercall" ); +free (info); +return NULL ; + } + err =do_sysctl_save (xch, &sysctl); +unlock_pages (local, local_size); -if ( (err =lock_pages (local,sizeof (local))) !=0 ) - { -PERROR ("Could not lock memory for Xen hypercall" ); -break ; - } - err =do_sysctl_save (xch, &sysctl); -unlock_pages (local,sizeof (local)); - -if ( err <0 ) -break ; - - info->cpupool_id = sysctl.u.cpupool_op.cpupool_id; - info->sched_id = sysctl.u.cpupool_op.sched_id; - info->n_dom = sysctl.u.cpupool_op.n_dom; -bitmap_byte_to_64 (&(info->cpumap), local,sizeof (local) *8 ); - poolid = sysctl.u.cpupool_op.cpupool_id +1 ; - info++; +if ( err <0 ) + { +free (info); +return NULL ; } -if ( p ==0 ) -return err; + info->cpupool_id = sysctl.u.cpupool_op.cpupool_id; + info->sched_id = sysctl.u.cpupool_op.sched_id; + info->n_dom = sysctl.u.cpupool_op.n_dom; +bitmap_byte_to_64 (info->cpumap, local, local_size *8 ); -return p; +return info; } int xc_cpupool_addcpu(xc_interface *xch,
@@ -149,31 +165,41 @@return do_sysctl_save (xch, &sysctl); } -int xc_cpupool_freeinfo (xc_interface *xch, -uint64_t *cpumap) +uint64_t *xc_cpupool_freeinfo (xc_interface *xch, +int *cpusize) {int err; -uint8_t local[sizeof (*cpumap)]; +uint8_t *local; +uint64_t *cpumap;DECLARE_SYSCTL ; + + *cpusize =get_cpumap_size (xch); +if (*cpusize ==0 ) +return NULL ; + local =alloca (*cpusize); + cpumap =calloc ((*cpusize +sizeof (*cpumap) -1 ) /sizeof (*cpumap),sizeof (*cpumap)); +if (cpumap ==NULL ) +return NULL ; sysctl.cmd = XEN_SYSCTL_cpupool_op; sysctl.u.cpupool_op.op =XEN_SYSCTL_CPUPOOL_OP_FREEINFO ;set_xen_guest_handle (sysctl.u.cpupool_op.cpumap.bitmap, local); - sysctl.u.cpupool_op.cpumap.nr_cpus =sizeof (*cpumap) *8 ; + sysctl.u.cpupool_op.cpumap.nr_cpus = *cpusize *8 ; -if ( (err =lock_pages (local,sizeof (local))) !=0 ) +if ( (err =lock_pages (local, *cpusize)) !=0 ) {PERROR ("Could not lock memory for Xen hypercall" ); -return err; +free (cpumap); +return NULL ; } err =do_sysctl_save (xch, &sysctl); -unlock_pages (local,sizeof (local)); +unlock_pages (local, *cpusize); +bitmap_byte_to_64 (cpumap, local, *cpusize *8 ); -if (err <0 ) -return err; +if (err >=0 ) +return cpumap; -bitmap_byte_to_64 (cpumap, local,sizeof (local) *8 ); - -return 0 ; +free (cpumap); +return NULL ; }
tools/libxc/xc_misc.c +14 -0
@@ -20,6 +20,20 @@#include "xc_private.h" #include <xen/hvm/hvm_op.h> + +int xc_get_max_cpus (xc_interface *xch) +{ +static int max_cpus =0 ; +xc_physinfo_t physinfo; + +if ( max_cpus ) +return max_cpus; + +if ( !xc_physinfo (xch, &physinfo) ) + max_cpus = physinfo.max_cpu_id +1 ; + +return max_cpus; +} int xc_readconsolering(xc_interface *xch, char **pbuffer,
tools/libxc/xenctrl.h +13 -13
@@ -215,6 +215,9 @@start_info_t s; } start_info_any_t; + +/* return maximum number of cpus the hypervisor supports */ +int xc_get_max_cpus (xc_interface *xch); int xc_domain_create(xc_interface *xch, uint32_t ssidref,
@@ -535,7 +538,8 @@uint32_t cpupool_id;uint32_t sched_id;uint32_t n_dom; -uint64_t cpumap; +uint32_t cpumap_size;/* max number of cpus in map */ +uint64_t *cpumap; } xc_cpupoolinfo_t;/**
@@ -564,15 +568,11 @@* Get cpupool info. Returns info for up to the specified number of cpupools * starting at the given id. * @parm xc_handle a handle to an open hypervisor interface -* @parm first_poolid lowest id for which info is returned -* @parm n_max maximum number of cpupools to return info -* @parm info pointer to xc_cpupoolinfo_t array -* return number of cpupool infos +* @parm poolid lowest id for which info is returned +* return cpupool info ptr (obtained by malloc) */ -int xc_cpupool_getinfo (xc_interface *xch, -uint32_t first_poolid, -uint32_t n_max, -xc_cpupoolinfo_t *info); +xc_cpupoolinfo_t *xc_cpupool_getinfo (xc_interface *xch, +uint32_t poolid);/** * Add cpu to a cpupool. cpu may be -1 indicating the first unassigned.
@@ -614,11 +614,11 @@* Return map of cpus not in any cpupool. * * @parm xc_handle a handle to an open hypervisor interface -* @parm cpumap pointer where to store the cpumap -* return 0 on success, -1 on failure +* @parm cpusize where to store array size in bytes +* return cpumap array on success, NULL else */ -int xc_cpupool_freeinfo (xc_interface *xch, -uint64_t *cpumap); +uint64_t *xc_cpupool_freeinfo (xc_interface *xch, +int *cpusize);/*
tools/libxl/libxl.c +24 -25
75 lines not on this page · raw message
tools/libxl/libxl.h +3 -0
@@ -249,6 +249,9 @@int libxl_domain_destroy (libxl_ctx *ctx,uint32_t domid,int force);int libxl_domain_preserve (libxl_ctx *ctx,uint32_t domid,libxl_domain_create_info *info,const char *name_suffix,libxl_uuid new_uuid); +/* get max. number of cpus supported by hypervisor */ +int libxl_get_max_cpus (libxl_ctx *ctx); +/* * Run the configured bootloader for a PV domain and update * info->kernel, info->u.pv.ramdisk and info->u.pv.cmdline as
tools/libxl/libxl_utils.c +5 -0
@@ -675,3 +675,8 @@libxl__free_all (&gc);return rc; } + +int libxl_get_max_cpus (libxl_ctx *ctx) +{ +return xc_get_max_cpus (ctx->xch); +}
tools/libxl/xl_cmdimpl.c +11 -11
@@ -3620,12 +3620,11 @@static void vcpupin (char *d,const char *vcpu,char *cpu) {libxl_vcpuinfo *vcpuinfo; -libxl_physinfo physinfo;uint64_t *cpumap =NULL ;uint32_t vcpuid, cpuida, cpuidb;char *endptr, *toka, *tokb; -int i, nb_vcpu, cpusize; +int i, nb_vcpu, cpusize, cpumapsize; vcpuid =strtoul (vcpu, &endptr,10 );if (vcpu == endptr) {
@@ -3638,12 +3637,13 @@find_domain (d); -if (libxl_get_physinfo (&ctx, &physinfo) !=0 ) { -fprintf (stderr,"libxl_get_physinfo failed.\n" ); +if ((cpusize =libxl_get_max_cpus (&ctx)) ==0 ) { +fprintf (stderr,"libxl_get_max_cpus failed.\n" ); goto vcpupin_out1; } - - cpumap =calloc (physinfo.max_cpu_id +1 ,sizeof (uint64_t )); + cpumapsize = (cpusize +sizeof (uint64_t ) -1 ) /sizeof (uint64_t ); + + cpumap =calloc (cpumapsize,sizeof (uint64_t ));if (!cpumap) { goto vcpupin_out1; }
@@ -3671,24 +3671,24 @@ } }else { -memset (cpumap,-1 ,sizeof (uint64_t ) * (physinfo.max_cpu_id +1 )); +memset (cpumap,-1 ,sizeof (uint64_t ) * cpumapsize); }if (vcpuid !=-1 ) {if (libxl_set_vcpuaffinity (&ctx, domid, vcpuid, - cpumap, physinfo.max_cpu_id +1 ) ==-1 ) { + cpumap, cpusize) ==-1 ) {fprintf (stderr,"Could not set affinity for vcpu `%u'.\n" , vcpuid); } }else { -if (!(vcpuinfo =libxl_list_vcpu (&ctx, domid, &nb_vcpu, &cpusize))) { +if (!(vcpuinfo =libxl_list_vcpu (&ctx, domid, &nb_vcpu, &i))) {fprintf (stderr,"libxl_list_vcpu failed.\n" ); goto vcpupin_out; }for (; nb_vcpu >0 ; --nb_vcpu, ++vcpuinfo) {if (libxl_set_vcpuaffinity (&ctx, domid, vcpuinfo->vcpuid, - cpumap, physinfo.max_cpu_id +1 ) ==-1 ) { -fprintf (stderr,"libxl_list_vcpu failed on vcpu `%u'.\n" , vcpuinfo->vcpuid); + cpumap, cpusize) ==-1 ) { +fprintf (stderr,"libxl_set_vcpuaffinity failed on vcpu `%u'.\n" , vcpuinfo->vcpuid); } } }
tools/python/xen/lowlevel/xc/xc.c +40 -56
175 lines not on this page · raw message
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
PATCH 1/1 support of cpupools in xl: commands and library changes
In reply to Juergen GrossSupport of cpu pools in xl:
library functions
xl pool-create
xl pool-list
xl pool-destroy
xl pool-cpu-add
xl pool-cpu-remove
xl pool-migrate
Renamed all cpu pool related names to *cpupool*
12 files changed, 818 insertions(+), 86 deletions(-) tools/libxl/libxl.c | 203 +++++++++++++++++- tools/libxl/libxl.h | 18 + tools/libxl/libxl.idl | 12 - tools/libxl/libxl_internal.h | 2 tools/libxl/libxl_utils.c | 93 +++++++- tools/libxl/libxl_utils.h | 10 tools/libxl/libxltypes.py | 5 tools/libxl/libxlu_cfg_l.c | 30 -- tools/libxl/libxlu_cfg_l.h | 18 - tools/libxl/xl.h | 6 tools/libxl/xl_cmdimpl.c | 472 ++++++++++++++++++++++++++++++++++++++++-- tools/libxl/xl_cmdtable.c | 35 +++
# HG changeset patch
# User Juergen Gross <[email protected]> # Date 1286536912 -7200
# Node ID 91397dcffead192708972a2628b4b31a58fdbdfb # Parent fc17462ba612d67069c1110f8cca3b1adb8c233b support of cpupools in xl: commands and library changes
Support of cpu pools in xl:
library functions
xl pool-create
xl pool-list
xl pool-destroy
xl pool-cpu-add
xl pool-cpu-remove
xl pool-migrate
Renamed all cpu pool related names to *cpupool*
tools/libxl/libxl.c +193 -10
@@ -607,21 +607,26 @@return 0 ; } -libxl_poolinfo *libxl_list_pool (libxl_ctx *ctx,int *nb_pool) -{ -libxl_poolinfo *ptr, *tmp; -int i; +libxl_cpupoolinfo *libxl_list_cpupool (libxl_ctx *ctx,int *nb_pool) +{ +libxl_cpupoolinfo *ptr, *tmp; +int i, m, ncpu;xc_cpupoolinfo_t *info;uint32_t poolid; ptr =NULL ; + ncpu =xc_get_max_cpus (ctx->xch); +if (!ncpu) { +LIBXL__LOG_ERRNO (ctx,LIBXL__LOG_ERROR ,"getting max cpu number" ); +return NULL ; + } poolid =0 ;for (i =0 ;; i++) { info =xc_cpupool_getinfo (ctx->xch, poolid);if (info ==NULL )break ; - tmp =realloc (ptr, (i +1 ) *sizeof (libxl_poolinfo)); + tmp =realloc (ptr, (i +1 ) *sizeof (libxl_cpupoolinfo));if (!tmp) {LIBXL__LOG_ERRNO (ctx,LIBXL__LOG_ERROR ,"allocating cpupool info" );free (ptr);
@@ -629,6 +634,13 @@ } ptr = tmp; ptr[i].poolid = info->cpupool_id; + ptr[i].sched_id = info->sched_id; + ptr[i].n_dom = info->n_dom; +if (libxl_cpumap_alloc (&ptr[i].cpumap, ncpu)) +break ; +for (m =0 ; m < ptr[i].cpumap.size /sizeof (*ptr[i].cpumap.map); m++) + ptr[i].cpumap.map[m] = (info->cpumap_size > (m *sizeof (*ptr[i].cpumap.map))) ? + info->cpumap[m] :0 ; poolid = info->cpupool_id +1 ;free (info); }
@@ -3207,7 +3219,6 @@libxl_vcpuinfo *ptr, *ret;xc_domaininfo_t domaininfo;xc_vcpuinfo_t vcpuinfo; -unsigned num_cpuwords;if (xc_domain_getinfolist (ctx->xch, domid,1 , &domaininfo) !=1 ) {LIBXL__LOG_ERRNO (ctx,LIBXL__LOG_ERROR ,"getting infolist" );
@@ -3219,10 +3230,9 @@return NULL ; } - num_cpuwords = ((*nrcpus +63 ) /64 );for (*nb_vcpu =0 ; *nb_vcpu <= domaininfo.max_vcpu_id; ++*nb_vcpu, ++ptr) { - ptr->cpumap =malloc (num_cpuwords *sizeof (*ptr->cpumap)); -if (!ptr->cpumap) { +if (libxl_cpumap_alloc (&ptr->cpumap, *nrcpus)) { +LIBXL__LOG_ERRNO (ctx,LIBXL__LOG_ERROR ,"allocating cpumap" );return NULL ; }if (xc_vcpu_getinfo (ctx->xch, domid, *nb_vcpu, &vcpuinfo) ==-1 ) {
@@ -3230,7 +3240,7 @@return NULL ; }if (xc_vcpu_getaffinity (ctx->xch, domid, *nb_vcpu, - ptr->cpumap, ((*nrcpus) +7 ) /8 ) ==-1 ) { + ptr->cpumap.map, ((*nrcpus) +7 ) /8 ) ==-1 ) {LIBXL__LOG_ERRNO (ctx,LIBXL__LOG_ERROR ,"getting vcpu affinity" );return NULL ; }
@@ -3913,3 +3923,176 @@libxl__file_reference_unmap (f);free (f->path); } + +int libxl_get_freecpus (libxl_ctx *ctx,libxl_cpumap *cpumap) +{ +int ncpus; + + cpumap->map =xc_cpupool_freeinfo (ctx->xch, &ncpus); +if (cpumap->map ==NULL ) +return ERROR_FAIL ; + + cpumap->size = (ncpus +7 ) /8 ; + +return 0 ; +} + +int libxl_create_cpupool (libxl_ctx *ctx,char *name,int schedid, +libxl_cpumap cpumap,libxl_uuid *uuid, +uint32_t *poolid) +{ +libxl__gc gc =LIBXL_INIT_GC (ctx); +int rc; +int i; +xs_transaction_t t; +char *uuid_string; + + uuid_string =libxl__uuid2string (&gc, *uuid); +if (!uuid_string) +return ERROR_NOMEM ; + + rc =xc_cpupool_create (ctx->xch, poolid, schedid); +if (rc) { +LIBXL__LOG_ERRNOVAL (ctx,LIBXL__LOG_ERROR , rc, +"Could not create cpupool" ); +return ERROR_FAIL ; + } + +for (i =0 ; i < cpumap.size *8 ; i++) +if (cpumap.map[i /64 ] & (1L << (i %64 ))) { + rc =xc_cpupool_addcpu (ctx->xch, *poolid, i); +if (rc) { +LIBXL__LOG_ERRNOVAL (ctx,LIBXL__LOG_ERROR , rc, +"Error moving cpu to cpupool" ); +libxl_destroy_cpupool (ctx, *poolid); +return ERROR_FAIL ; + } + } + +for (;;) { + t =xs_transaction_start (ctx->xsh); + +xs_mkdir (ctx->xsh, t,libxl__sprintf (&gc,"/local/pool/%d" , *poolid)); +libxl__xs_write (&gc, t,libxl__sprintf (&gc,"/local/pool/%d/uuid" , *poolid), + uuid_string); +libxl__xs_write (&gc, t,libxl__sprintf (&gc,"/local/pool/%d/name" , *poolid), + name); + +if (xs_transaction_end (ctx->xsh, t,0 ) || (errno !=EAGAIN )) +return 0 ; + } +} + +int libxl_destroy_cpupool (libxl_ctx *ctx,uint32_t poolid) +{ +libxl__gc gc =LIBXL_INIT_GC (ctx); +int rc, i; +xc_cpupoolinfo_t *info; +xs_transaction_t t; + + info =xc_cpupool_getinfo (ctx->xch, poolid); +if (info ==NULL ) +return ERROR_NOMEM ; + + rc =ERROR_INVAL ; +if ((info->cpupool_id != poolid) || (info->n_dom)) + goto out; + +for (i =0 ; i < info->cpumap_size; i++) +if (info->cpumap[i /64 ] & (1L << (i %64 ))) { + rc =xc_cpupool_removecpu (ctx->xch, poolid, i); +if (rc) { +LIBXL__LOG_ERRNOVAL (ctx,LIBXL__LOG_ERROR , rc, +"Error removing cpu from cpupool" ); + rc =ERROR_FAIL ; + goto out; + } + } + + rc =xc_cpupool_destroy (ctx->xch, poolid); +if (rc) { +LIBXL__LOG_ERRNOVAL (ctx,LIBXL__LOG_ERROR , rc,"Could not destroy cpupool" ); + rc =ERROR_FAIL ; + goto out; + } + +for (;;) { + t =xs_transaction_start (ctx->xsh); + +xs_rm (ctx->xsh,XBT_NULL ,libxl__sprintf (&gc,"/local/pool/%d" , poolid)); + +if (xs_transaction_end (ctx->xsh, t,0 ) || (errno !=EAGAIN )) +break ; + } + + rc =0 ; + +out: +free (info); + +return rc; +} + +int libxl_cpupool_cpuadd (libxl_ctx *ctx,uint32_t poolid,int cpu) +{ +int rc; + + rc =xc_cpupool_addcpu (ctx->xch, poolid, cpu); +if (rc) { +LIBXL__LOG_ERRNOVAL (ctx,LIBXL__LOG_ERROR , rc, +"Error moving cpu to cpupool" ); +return ERROR_FAIL ; + } +return 0 ; +} + +int libxl_cpupool_cpuremove (libxl_ctx *ctx,uint32_t poolid,int cpu) +{ +int rc; + + rc =xc_cpupool_removecpu (ctx->xch, poolid, cpu); +if (rc) { +LIBXL__LOG_ERRNOVAL (ctx,LIBXL__LOG_ERROR , rc, +"Error removing cpu from cpupool" ); +return ERROR_FAIL ; + } +return 0 ; +} + +int libxl_cpupool_movedomain (libxl_ctx *ctx,uint32_t poolid,uint32_t domid) +{ +libxl__gc gc =LIBXL_INIT_GC (ctx); +int rc; +char *dom_path; +char *vm_path; +char *poolname; +xs_transaction_t t; + + dom_path =libxl__xs_get_dompath (&gc, domid); +if (!dom_path) { +return ERROR_FAIL ; + } + + rc =xc_cpupool_movedomain (ctx->xch, poolid, domid); +if (rc) { +LIBXL__LOG_ERRNOVAL (ctx,LIBXL__LOG_ERROR , rc, +"Error moving domain to cpupool" ); +return ERROR_FAIL ; + } + +for (;;) { + t =xs_transaction_start (ctx->xsh); + + poolname =libxl__cpupoolid_to_name (&gc, poolid); + vm_path =libxl__xs_read (&gc,XBT_NULL ,libxl__sprintf (&gc,"%s/vm" , dom_path)); +if (!vm_path) +break ; + +libxl__xs_write (&gc, t,libxl__sprintf (&gc,"%s/pool_name" , vm_path), poolname); + +if (xs_transaction_end (ctx->xsh, t,0 ) || (errno !=EAGAIN )) +break ; + } + +return 0 ; +}
tools/libxl/libxl.h +15 -3
@@ -141,9 +141,12 @@typedef char **libxl_key_value_list ;void libxl_key_value_list_destroy (libxl_key_value_list *kvl); -typedef uint64_t *libxl_cpumap ; +typedef uint32_t libxl_hwcap [8 ]; -typedef uint32_t libxl_hwcap [8 ]; +typedef struct { +uint32_t size;/* number of bytes in map */ +uint64_t *map; +}libxl_cpumap ; typedef enum { XENFV = 1,
@@ -361,7 +364,7 @@int libxl_domain_info (libxl_ctx *,libxl_dominfo *info_r,uint32_t domid);libxl_dominfo *libxl_list_domain (libxl_ctx *,int *nb_domain); -libxl_poolinfo *libxl_list_pool (libxl_ctx *,int *nb_pool); +libxl_cpupoolinfo *libxl_list_cpupool (libxl_ctx *,int *nb_pool);libxl_vminfo *libxl_list_vm (libxl_ctx *ctx,int *nb_vm);typedef struct libxl__device_model_starting libxl_device_model_starting ;
@@ -504,6 +507,15 @@int libxl_device_net2_del (libxl_ctx *ctx,libxl_device_net2 *net2,int wait); +int libxl_get_freecpus (libxl_ctx *ctx,libxl_cpumap *cpumap); +int libxl_create_cpupool (libxl_ctx *ctx,char *name,int schedid, +libxl_cpumap cpumap,libxl_uuid *uuid, +uint32_t *poolid); +int libxl_destroy_cpupool (libxl_ctx *ctx,uint32_t poolid); +int libxl_cpupool_cpuadd (libxl_ctx *ctx,uint32_t poolid,int cpu); +int libxl_cpupool_cpuremove (libxl_ctx *ctx,uint32_t poolid,int cpu); +int libxl_cpupool_movedomain (libxl_ctx *ctx,uint32_t poolid,uint32_t domid); +/* common paths */ const char *libxl_sbindir_path (void );const char *libxl_bindir_path (void );
tools/libxl/libxl.idl +7 -5
@@ -6,6 +6,7 @@ libxl_ctx = Builtin("ctx") libxl_uuid = Builtin("uuid") libxl_mac = Builtin("mac") +libxl_cpumap = Builtin("cpumap") libxl_qemu_machine_type = Number("qemu_machine_type", namespace="libxl_") libxl_console_consback = Number("console_consback", namespace="libxl_") libxl_console_constype = Number("console_constype", namespace="libxl_")
@@ -16,8 +17,6 @@ libxl_string_list = Builtin("string_list", destructor_fn="libxl_string_list_destroy", passby=PASS_BY_REFERENCE) libxl_key_value_list = Builtin("key_value_list", destructor_fn="libxl_key_value_list_destroy", passby=PASS_BY_REFERENCE) libxl_file_reference = Builtin("file_reference", destructor_fn="libxl_file_reference_destroy", passby=PASS_BY_REFERENCE) - -libxl_cpumap = Builtin("cpumap", destructor_fn="free") libxl_hwcap = Builtin("hwcap")
@@ -45,9 +44,12 @@ ("vcpu_online", uint32), ], destructor_fn=None) -libxl_poolinfo = Struct("poolinfo", [ - ("poolid", uint32) - ], destructor_fn=None) +libxl_cpupoolinfo = Struct("cpupoolinfo", [ + ("poolid", uint32), + ("sched_id", uint32), + ("n_dom", uint32), + ("cpumap", libxl_cpumap) + ], destructor_fn="libxl_cpupoolinfo_destroy") libxl_vminfo = Struct("vminfo", [ ("uuid", libxl_uuid),
tools/libxl/libxl_internal.h +1 -1
@@ -237,7 +237,7 @@#define LIBXL__LOG_ERROR XTL_ERROR _hidden char *libxl__domid_to_name(libxl__gc *gc, uint32_t domid); -_hidden char *libxl__poolid_to_name(libxl__gc *gc, uint32_t poolid); +_hidden char *libxl__cpupoolid_to_name(libxl__gc *gc, uint32_t poolid);/* holds the CPUID response for a single CPUID leaf
tools/libxl/libxl_utils.c +79 -14
138 lines not on this page · raw message
tools/libxl/libxl_utils.h +8 -2
@@ -21,8 +21,10 @@unsigned long libxl_get_required_shadow_memory (unsigned long maxmem_kb,unsigned int smp_cpus);int libxl_name_to_domid (libxl_ctx *ctx,const char *name,uint32_t *domid);char *libxl_domid_to_name (libxl_ctx *ctx,uint32_t domid); -int libxl_name_to_poolid (libxl_ctx *ctx,const char *name,uint32_t *poolid); -char *libxl_poolid_to_name (libxl_ctx *ctx,uint32_t poolid); +int libxl_name_to_cpupoolid (libxl_ctx *ctx,const char *name,uint32_t *poolid); +char *libxl_cpupoolid_to_name (libxl_ctx *ctx,uint32_t poolid); +int libxl_name_to_schedid (libxl_ctx *ctx,const char *name); +char *libxl_schedid_to_name (libxl_ctx *ctx,int schedid);int libxl_get_stubdom_id (libxl_ctx *ctx,int guest_domid);int libxl_is_stubdom (libxl_ctx *ctx,uint32_t domid,uint32_t *target_domid);int libxl_create_logfile (libxl_ctx *ctx,char *name,char **full_name);
@@ -74,5 +76,9 @@* return -1 if there are an error */ int libxl_check_device_model_version (libxl_ctx *ctx,char *path); +int libxl_cpumap_alloc (libxl_cpumap *cpumap,int max_cpus); +int libxl_cpumap_test (libxl_cpumap *cpumap,int cpu); +void libxl_cpumap_set (libxl_cpumap *cpumap,int cpu); +void libxl_cpumap_reset (libxl_cpumap *cpumap,int cpu);#endif
tools/libxl/libxltypes.py +4 -1
@@ -131,7 +131,10 @@ kwargs.setdefault('passby', PASS_BY_VALUE) kwargs.setdefault('namespace', ty.namespace) - typename = ty.typename[len(kwargs['namespace']):] + + typename = ty.typename + if ty.namespace: + typename = typename[len(kwargs['namespace']):] Type.__init__(self, typename + " *", **kwargs) #
tools/libxl/libxlu_cfg_l.c +8 -22
@@ -54,6 +54,7 @@typedef unsigned char flex_uint8_t ;typedef unsigned short int flex_uint16_t ;typedef unsigned int flex_uint32_t ; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN
@@ -83,8 +84,6 @@#ifndef UINT32_MAX #define UINT32_MAX (4294967295U)#endif - -#endif /* ! C99 */ #endif /* ! FLEXINT_H */
@@ -159,15 +158,7 @@/* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. -* Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. -* Ditto for the __ia64__ case accordingly. -*/ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -496,7 +487,7 @@void xlu__cfg_yyset_column (int column_no,yyscan_t yyscanner); -#line 500 "libxlu_cfg_l.c" +#line 491 "libxlu_cfg_l.c"#define INITIAL 0#define lexerr 1
@@ -632,12 +623,7 @@/* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */
@@ -645,7 +631,7 @@/* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO fwrite( yytext, yyleng, 1, yyout )#endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -656,7 +642,7 @@if (YY_CURRENT_BUFFER_LVALUE ->yy_is_interactive ) \ { \int c ='*' ; \ -size_t n; \ +int n; \for ( n =0 ; n < max_size && \ (c =getc ( yyin )) !=EOF && c !='\n' ; ++n ) \ buf[n] = (char ) c; \
@@ -744,7 +730,7 @@#line 37 "libxlu_cfg_l.l" -#line 748 "libxlu_cfg_l.c" +#line 734 "libxlu_cfg_l.c" yylval = yylval_param;
@@ -944,7 +930,7 @@#line 82 "libxlu_cfg_l.l"YY_FATAL_ERROR ("flex scanner jammed" ); YY_BREAK -#line 948 "libxlu_cfg_l.c" +#line 934 "libxlu_cfg_l.c"case YY_STATE_EOF (INITIAL ):case YY_STATE_EOF (lexerr):yyterminate ();
@@ -1687,8 +1673,8 @@/** Setup the input buffer state to scan the given bytes. The next call to xlu__cfg_yylex() will * scan from a @e copy of @a bytes. -* @param yybytes the byte buffer to scan -* @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. +* @param bytes the byte buffer to scan +* @param len the number of bytes in the buffer pointed to by @a bytes. * @param yyscanner The scanner object. * @return the newly allocated buffer state object. */
tools/libxl/libxlu_cfg_l.h +2 -16
@@ -58,6 +58,7 @@typedef unsigned char flex_uint8_t ;typedef unsigned short int flex_uint16_t ;typedef unsigned int flex_uint32_t ; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN
@@ -87,8 +88,6 @@#ifndef UINT32_MAX #define UINT32_MAX (4294967295U)#endif - -#endif /* ! C99 */ #endif /* ! FLEXINT_H */
@@ -132,15 +131,7 @@/* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. -* Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. -* Ditto for the __ia64__ case accordingly. -*/ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif #ifndef YY_TYPEDEF_YY_BUFFER_STATE
@@ -310,12 +301,7 @@/* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Number of entries by which start-condition stack grows. */
@@ -352,6 +338,6 @@#line 82 "libxlu_cfg_l.l" -#line 356 "libxlu_cfg_l.h" +#line 342 "libxlu_cfg_l.h"#undef xlu__cfg_yyIN_HEADER#endif /* xlu__cfg_yyHEADER_H */
tools/libxl/xl.h +6 -0
@@ -79,6 +79,12 @@int main_network2attach (int argc,char **argv);int main_network2list (int argc,char **argv);int main_network2detach (int argc,char **argv); +int main_poolcreate (int argc,char **argv); +int main_poollist (int argc,char **argv); +int main_pooldestroy (int argc,char **argv); +int main_poolcpuadd (int argc,char **argv); +int main_poolcpuremove (int argc,char **argv); +int main_poolmigrate (int argc,char **argv);void help (char *command);
tools/libxl/xl_cmdimpl.c +460 -12
529 lines not on this page · raw message
tools/libxl/xl_cmdtable.c +35 -0
@@ -338,6 +338,41 @@ "destroy a domain's version 2 virtual network device", "<Domain> <DevId>", }, + {"pool-create" , + &main_poolcreate, +"Create a CPU pool based an ConfigFile" , +"[options] <ConfigFile> [vars]" , +"-h, --help Print this help.\n" +"-f=FILE, --defconfig=FILE Use the given configuration file.\n" +"-n, --dryrun Dry run - prints the resulting configuration." + }, + { "pool-list", + &main_poollist, +"List CPU pools on host" , +"[-l|--long] [-c|--cpus] [<CPU Pool>]" , +"-l, --long Output all CPU pool details.\n" +"-c, --cpus Output list of CPUs used by a pool" + }, + { "pool-destroy", + &main_pooldestroy, +"Deactivates a CPU pool" , +"<CPU Pool>" , + }, + { "pool-cpu-add", + &main_poolcpuadd, +"Adds a CPU to a CPU pool" , +"<CPU Pool> <CPU nr>" , + }, + { "pool-cpu-remove", + &main_poolcpuremove, +"Removes a CPU from a CPU pool" , +"<CPU Pool> <CPU nr>" , + }, + { "pool-migrate", + &main_poolmigrate, +"Moves a domain into a CPU pool" , + "<Domain> <CPU Pool>", + }, };int cmdtable_len =sizeof (cmd_table)/sizeof (struct cmd_spec );
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Re: [PATCH 2 of 3] support of cpupools in xl: commands and library changes
Juergen Gross writes ("[Xen-devel] [PATCH 2 of 3] support of cpupools in xl: commands and library changes"):
Quoted 2 lines
tools/libxl/libxlu_cfg_l.c | 30 -- tools/libxl/libxlu_cfg_l.h | 18 -
I see you reran flex. That's not wrong, but we shouldn't change these files needlessly, and you didn't make any changes to the .l source file, so when we apply this patch we should drop the changes to *_l.[ch].
Quoted 1 line
Renamed all cpu pool related names to *cpupool*
Is that really true in this patch ? The function names and subcommand names in xl are still all "pool-*" and "pool_*".
Ian.
Re: [PATCH 2 of 3] support of cpupools in xl: commands and library changes
Quoted 8 lines · Ian Jackson
Juergen Gross writes ("[Xen-devel] [PATCH 2 of 3] support of cpupools in xl: commands and library changes"):
Quoted 2 lines
tools/libxl/libxlu_cfg_l.c | 30 -- tools/libxl/libxlu_cfg_l.h | 18 -I see you reran flex. That's not wrong, but we shouldn't change these files needlessly, and you didn't make any changes to the .l source file, so when we apply this patch we should drop the changes to *_l.[ch].
I excluded these changes once before and was told they should be included... I didn't call flex manually, this was done by make.
Quoted 5 lines
Quoted 2 lines
Renamed all cpu pool related names to *cpupool*
Is that really true in this patch ? The function names and subcommand names in xl are still all "pool-*" and "pool_*".
There was no response to the question whether to change the sub-command names or not. And I think the sub-command functions should reflect the names.
Juergen
Signature · 5 lines
Juergen Gross Principal Developer Operating Systems TSP ES&S SWE OS6 Telephone: +49 (0) 89 3222 2967 Fujitsu Technology Solutions e-mail: [email protected] Domagkstr. 28 Internet: ts.fujitsu.com D-80807 Muenchen Company details: ts.fujitsu.com/imprint.html
Re: [PATCH 2 of 3] support of cpupools in xl: commands and library changes
In reply to Ian JacksonQuoted 9 lines · Ian Jackson
Juergen Gross writes ("[Xen-devel] [PATCH 2 of 3] support of cpupools in xl: commands and library changes"):
Quoted 2 lines
tools/libxl/libxlu_cfg_l.c | 30 -- tools/libxl/libxlu_cfg_l.h | 18 -I see you reran flex. That's not wrong, but we shouldn't change these files needlessly, and you didn't make any changes to the .l source file, so when we apply this patch we should drop the changes to *_l.[ch].
Quoted 4 lines
Quoted 1 line
Renamed all cpu pool related names to *cpupool*
Is that really true in this patch ? The function names and subcommand names in xl are still all "pool-*" and "pool_*".
The subcommands names are the xm names, which I thought we needed to keep for compatibility.
We could add both cpupool- and pool- variants and deprecate the later. Or perhaps these commands are not widely used (at least from scripts and whatnot) and we can just change the name.
See <[email protected]> and <[email protected]> for some previous discussion.
Ian.
Re: [PATCH 2 of 3] support of cpupools in xl: commands and library changes
Quoted 15 lines · Ian Campbell
Quoted 9 lines · Ian Jackson
Juergen Gross writes ("[Xen-devel] [PATCH 2 of 3] support of cpupools in xl: commands and library changes"):
Quoted 2 lines
tools/libxl/libxlu_cfg_l.c | 30 -- tools/libxl/libxlu_cfg_l.h | 18 -I see you reran flex. That's not wrong, but we shouldn't change these files needlessly, and you didn't make any changes to the .l source file, so when we apply this patch we should drop the changes to *_l.[ch].
Quoted 4 lines
Quoted 1 line
Renamed all cpu pool related names to *cpupool*
Is that really true in this patch ? The function names and subcommand names in xl are still all "pool-*" and "pool_*".
Quoted 6 lines
The subcommands names are the xm names, which I thought we needed to keep for compatibility.
We could add both cpupool- and pool- variants and deprecate the later. Or perhaps these commands are not widely used (at least from scripts and whatnot) and we can just change the name.
I have no problems changing the names to cpupool-*.
Do you think we should change the names for xm, too? This move should be ack'ed by Novell, as they have included the cpupool stuff in SLES11 SP1. I don't know if there are other users than Fujitsu (and we could change quite easily). An option would be to support both variants in xm and only cpupool-* in xl. CC-ing Jan.
Juergen
Signature · 5 lines
Juergen Gross Principal Developer Operating Systems TSP ES&S SWE OS6 Telephone: +49 (0) 89 3222 2967 Fujitsu Technology Solutions e-mail: [email protected] Domagkstr. 28 Internet: ts.fujitsu.com D-80807 Muenchen Company details: ts.fujitsu.com/imprint.html
Re: [PATCH 2 of 3] support of cpupools in xl: commands and library changes
In reply to Juergen GrossOn Fri, 2010-10-08 at 12:23 +0100, Juergen Gross wrote:
You need a destructor for the libxl_cpumap type, else you will leak the ->map.
Also you don't need to explicitly specific destructor_fn for libxl_cpupoolinfo.
Something like the following. (hint: you can usually spot this stuff by taking a look at the diff of the generated code in tools/libxl/_libxl_types.[ch]).
Ian.
tools/libxl/libxl.h +1 -0
@@ -147,6 +147,7 @@ typedef struct {uint32_t size;/* number of bytes in map */ uint64_t *map; } libxl_cpumap; +void libxl_cpumap_destroy (libxl_cpumap *map); typedef enum { XENFV = 1,
tools/libxl/libxl.idl +2 -2
@@ -6,7 +6,7 @@ libxl_ctx = Builtin("ctx") libxl_ctx = Builtin("ctx") libxl_uuid = Builtin("uuid") libxl_mac = Builtin("mac") -libxl_cpumap = Builtin("cpumap") +libxl_cpumap = Builtin("cpumap", destructor_fn="libxl_cpumap_destroy", passby=PASS_BY_REFERENCE) libxl_qemu_machine_type = Number("qemu_machine_type", namespace="libxl_") libxl_console_consback = Number("console_consback", namespace="libxl_") libxl_console_constype = Number("console_constype", namespace="libxl_")
@@ -49,7 +49,7 @@ libxl_cpupoolinfo = Struct("cpupoolinfo" ("sched_id", uint32), ("n_dom", uint32), ("cpumap", libxl_cpumap) - ], destructor_fn="libxl_cpupoolinfo_destroy") + ]) libxl_vminfo = Struct("vminfo", [ ("uuid", libxl_uuid),
tools/libxl/libxl_utils.c +5 -0
@@ -720,6 +720,11 @@ int libxl_cpumap_alloc(libxl_cpumap *cpureturn 0 ; } +void libxl_cpumap_destroy (libxl_cpumap *map) +{ +free (map->map); +} +int libxl_cpumap_test (libxl_cpumap *cpumap,int cpu) {if (cpu >= cpumap->size *8 )
PATCH 1/1 add example cpupool config file
In reply to Juergen GrossAdds an example configuration file for xm/xl pool-create
2 files changed, 18 insertions(+)
tools/examples/README | 1 +tools/examples/cpupool | 17 +++++++++++++++++
# HG changeset patch
# User Juergen Gross <[email protected]> # Date 1286536957 -7200
# Node ID e7b68ed07b470225d52418f0dce6111cee8abbb0 # Parent 91397dcffead192708972a2628b4b31a58fdbdfb add example cpupool config file
Adds an example configuration file for xm/xl pool-create
tools/examples/README +1 -0
@@ -13,6 +13,7 @@ block-common.sh - sourced by block, block-* block-enbd - binds/unbinds network block devices block-nbd - binds/unbinds network block devices +cpupool - example configuration script for 'xm pool-create' external-device-migrate - called by xend for migrating external devices locking.sh - locking functions to prevent concurrent access to critical sections inside script files
tools/examples/cpupool new file +17 -0
@@ -0,0 +1,17 @@ +#============================================================================ +# Configuration setup for 'xm pool-create' or 'xl pool-create'. +# This script sets the parameters used when a cpupool is created using +# 'xm pool-create' or 'xl pool-create'. +# You use a separate script for each cpupool you want to create, or +# you can set the parameters for the cpupool on the xm command line. +#============================================================================ + +# the name of the new cpupool +name = "Example-Cpupool" + +# the scheduler to use: valid are e.g. credit, sedf, credit2 +sched = "credit" + +# list of cpus to use +cpus = ["2", "3"] +
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel