support of cpupools in xl: update cpumask handling for cpu pools in libxc and python
PATCH 1/2 support of cpupools in xl: update cpumask handling for cpu pools in libxc and python
Hi,
attached patch updates the cpumask handling for cpu pools in libxc and python to support arbitrary numbers of cpus.
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
Signed-off-by [email protected]
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()
tools/libxc/xc_cpupool.c +73 -41
@@ -34,6 +34,20 @@ static int do_sysctl_save(xc_interface *return ret; } +static int get_cpumap_size (xc_interface *xch) +{ +static int cpumap_size =0 ; +xc_physinfo_t physinfo; + +if ( cpumap_size ) +return cpumap_size; + +if ( !xc_physinfo (xch, &physinfo) ) + cpumap_size = ((physinfo.max_cpu_id +1 ) +7 ) /8 ;/* round to bytes */ + +return cpumap_size; +} +int xc_cpupool_create (xc_interface *xch,uint32_t *ppoolid,uint32_t sched_id)
@@ -64,50 +78,61 @@ int xc_cpupool_destroy(xc_interface *xchreturn 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); + local =alloca (local_size); +if (!local_size) + { +PERROR ("Could not get number of cpus" ); +return NULL ; + } + 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,
@@ -150,30 +175,37 @@ int xc_cpupool_movedomain(xc_interface * }int xc_cpupool_freeinfo (xc_interface *xch, -uint64_t *cpumap) +uint64_t *cpumap, +int cpusize) {int err; -uint8_t local[sizeof (*cpumap)]; +uint8_t *local;DECLARE_SYSCTL ; + + local =malloc (cpusize); +if (local ==NULL ) +return -ENOMEM ; 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" ); +free (local);return err; } err =do_sysctl_save (xch, &sysctl); -unlock_pages (local,sizeof (local)); +unlock_pages (local, cpusize); +bitmap_byte_to_64 (cpumap, local, cpusize *8 ); + +free (local);if (err <0 )return err; -bitmap_byte_to_64 (cpumap, local,sizeof (local) *8 ); -return 0 ; }
tools/libxc/xenctrl.h +9 -10
@@ -535,7 +535,8 @@ typedef struct xc_cpupoolinfo {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 +565,11 @@ int xc_cpupool_destroy(xc_interface *xch* 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.
@@ -615,10 +612,12 @@ int xc_cpupool_movedomain(xc_interface ** * @parm xc_handle a handle to an open hypervisor interface * @parm cpumap pointer where to store the cpumap +* @parm cpusize size of cpumap array in bytes * return 0 on success, -1 on failure */ int xc_cpupool_freeinfo (xc_interface *xch, -uint64_t *cpumap); +uint64_t *cpumap, +int cpusize);/*
tools/libxl/libxl.c +20 -11
@@ -609,9 +609,17 @@ libxl_poolinfo * libxl_list_pool(libxl_clibxl_poolinfo *libxl_list_pool (libxl_ctx *ctx,int *nb_pool) {libxl_poolinfo *ptr; -int i, ret; -xc_cpupoolinfo_t info[256 ]; -int size =256 ; +int i; +xc_cpupoolinfo_t *info; +int size; +uint32_t poolid; +libxl_physinfo physinfo; + +if (libxl_get_physinfo (ctx, &physinfo) !=0 ) { +LIBXL__LOG_ERRNO (ctx,LIBXL__LOG_ERROR ,"getting phys info" ); +return NULL ; + } + size = physinfo.max_cpu_id +LIBXL__CPUPOOL_INFO_SPARE ;/* allow some inactive cpu pools */ ptr =calloc (size,sizeof (libxl_poolinfo));if (!ptr) {
@@ -619,16 +627,17 @@ libxl_poolinfo * libxl_list_pool(libxl_creturn NULL ; } - ret =xc_cpupool_getinfo (ctx->xch,0 ,256 , info); -if (ret<0 ) { -LIBXL__LOG_ERRNO (ctx,LIBXL__LOG_ERROR ,"getting cpupool info" ); -return NULL ; + poolid =0 ; +for (i =0 ; i < size; i++) { + info =xc_cpupool_getinfo (ctx->xch, poolid); +if (info ==NULL ) +break ; + ptr[i].poolid = info->cpupool_id; + poolid = info->cpupool_id +1 ; +free (info); } -for (i =0 ; i < ret; i++) { - ptr[i].poolid = info[i].cpupool_id; - } - *nb_pool = ret; + *nb_pool = i;return ptr; }
tools/libxl/libxl_internal.h +1 -0
@@ -236,6 +236,7 @@ _hidden char *libxl__domid_to_name(libxl _hidden char *libxl__domid_to_name(libxl__gc *gc, uint32_t domid); _hidden char *libxl__poolid_to_name(libxl__gc *gc, uint32_t poolid); +#define LIBXL__CPUPOOL_INFO_SPARE 32/* holds the CPUID response for a single CPUID leaf * input contains the value of the EAX and ECX register,
tools/python/xen/lowlevel/xc/xc.c +44 -34
137 lines not on this page · raw message
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel