implementation of cpupool support in xl
PATCH 1/1 implementation of cpupool support in xl
Hi,
attached patch implements cpupool support in xl. Rewrite of previous patch after rework of libxl.
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]
tools/libxc/xc_cpupool.c +68 -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 +8 ) /8 ; + +return cpumap_size; +} +int xc_cpupool_create (xc_interface *xch,uint32_t *ppoolid,uint32_t sched_id)
@@ -64,50 +78,56 @@ 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); + cpumap_size = (local_size +7 ) /8 ; + size =sizeof (xc_cpupoolinfo_t) + cpumap_size *8 + local_size; + 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 ); + local = (uint8_t *)(info->cpumap + cpumap_size); + + 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 +170,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 +211 -12
240 lines not on this page · raw message
tools/libxl/libxl.h +9 -0
@@ -471,6 +471,15 @@ int libxl_device_net2_del(libxl_ctx *ctxint libxl_device_net2_del (libxl_ctx *ctx,libxl_device_net2 *net2,int wait); +int libxl_get_freecpus (libxl_ctx *ctx,int *n_cpus,uint64_t **cpumap); +int libxl_create_cpupool (libxl_ctx *ctx,char *name,int schedid, +uint64_t *cpumap,int n_cpus,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 +5 -1
@@ -43,7 +43,11 @@ SHUTDOWN_* constant."""), ], destructor_fn=None) libxl_poolinfo = Struct("poolinfo", [ - ("poolid", uint32) + ("poolid", uint32), + ("sched_id", uint32), + ("n_dom", uint32), + ("cpumap_size", uint32), + ("cpumap", libxl_cpumap) ], destructor_fn=None) libxl_vminfo = Struct("vminfo", [
tools/libxl/libxl_utils.c +33 -0
@@ -31,6 +31,17 @@#include "libxl_utils.h" #include "libxl_internal.h" +struct schedid_name { +char *name; +int id; +}; + +static struct schedid_name schedid_name[] = { + {"credit" ,XEN_SCHEDULER_CREDIT }, + {"sedf" ,XEN_SCHEDULER_SEDF }, + {"credit2" ,XEN_SCHEDULER_CREDIT2 }, + {NULL ,-1 } +};unsigned long libxl_get_required_shadow_memory (unsigned long maxmem_kb,unsigned int smp_cpus) {
@@ -137,6 +148,28 @@ int libxl_name_to_poolid(libxl_ctx *ctx, }free (poolinfo);return ret; +} + +int libxl_name_to_schedid (libxl_ctx *ctx,const char *name) +{ +int i; + +for (i =0 ; schedid_name[i].name !=NULL ; i++) +if (strcmp (name, schedid_name[i].name) ==0 ) +return schedid_name[i].id; + +return -1 ; +} + +char *libxl_schedid_to_name (libxl_ctx *ctx,int schedid) +{ +int i; + +for (i =0 ; schedid_name[i].name !=NULL ; i++) +if (schedid_name[i].id == schedid) +return schedid_name[i].name; + +return "unknown" ; }int libxl_get_stubdom_id (libxl_ctx *ctx,int guest_domid)
tools/libxl/libxl_utils.h +2 -0
@@ -23,6 +23,8 @@ char *libxl_domid_to_name(libxl_ctx *ctxchar *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_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);
tools/libxl/libxlu_cfg_l.c +8 -22
@@ -54,6 +54,7 @@ typedef unsigned char flex_uint8_t;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 @@ typedef unsigned int flex_uint32_t;#ifndef UINT32_MAX #define UINT32_MAX (4294967295U)#endif - -#endif /* ! C99 */ #endif /* ! FLEXINT_H */
@@ -159,15 +158,7 @@ typedef void* yyscan_t;/* 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_nvoid 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 @@ static int input (yyscan_t yyscanner );/* 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 @@ static int input (yyscan_t yyscanner );/* 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 @@ static int input (yyscan_t yyscanner );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 @@ YY_DECL#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 @@ YY_RULE_SETUP#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 @@ YY_BUFFER_STATE xlu__cfg_yy_scan_string/** 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 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 @@ typedef unsigned int flex_uint32_t;#ifndef UINT32_MAX #define UINT32_MAX (4294967295U)#endif - -#endif /* ! C99 */ #endif /* ! FLEXINT_H */
@@ -132,15 +131,7 @@ typedef void* yyscan_t;/* 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 @@ static int yy_flex_strlen (yyconst char/* 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 @@ extern int xlu__cfg_yylex \#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 *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 +452 -5
484 lines not on this page · raw message
tools/libxl/xl_cmdtable.c +35 -0
@@ -338,6 +338,41 @@ struct cmd_spec cmd_table[] = { "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 );
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