implementation of cpupool support in xl
PATCH RESEND 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
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
Quoted 6 lines · Juergen Gross
diff -r
3985fea87987tools/libxl/libxl.idltools/libxl/libxl.idl Wed Sep 15 09:19:02 2010 +0200 renamed from tools/libxl/libxl.idl Fri Sep 10 19:06:33 2010 +0100 +0
-0@@ -43,7 +43,11 @@ SHUTDOWN_* constant."""), ], destructor_fn=None)
tools/libxl/libxl.idl Wed Sep 15 09:19:02 2010 +0200 SHUTDOWN_* constant."""), · line 53
Quoted 10 lines
tools/libxl/libxl.idl Wed Sep 15 09:19:02 2010 +0200 renamed from tools/libxl/libxl.idl Fri Sep 10 19:06:33 2010 +0100 +5
-1libxl_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", [
Does the addition of the cpumap field here mean that we now need to generate a destructor function (by removing destructor_fn=None) and call it e.g. from main_pool*?
Would it make sense to turn libxl_cpumap into a struct containing both the size and the data pointer?
tools/libxl/libxl.h int libxl_device_net2_del(libxl_ctx *ctx · line 477
Quoted 11 lines
diff -r
3985fea87987tools/libxl/libxl.htools/libxl/libxl.h +4
-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);
Should these cpumap parameters be libxl_cpumap* or are they a different sort of cpumap?
Ian.
Quoted 16 lines · Ian Campbell
Quoted 15 lines · Juergen Gross
diff -r
3985fea87987tools/libxl/libxl.idltools/libxl/libxl.idl Wed Sep 15 09:19:02 2010 +0200 renamed from tools/libxl/libxl.idl Fri Sep 10 19:06:33 2010 +0100 +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)
Quoted 5 lines
tools/libxl/libxl.idl Wed Sep 15 09:19:02 2010 +0200 SHUTDOWN_* constant."""), · line 53
Quoted 1 line
tools/libxl/libxl.idl Wed Sep 15 09:19:02 2010 +0200 renamed from tools/libxl/libxl.idl Fri Sep 10 19:06:33 2010 +0100 +0
-0libxl_vminfo = Struct("vminfo", [Does the addition of the cpumap field here mean that we now need to generate a destructor function (by removing destructor_fn=None) and call it e.g. from main_pool*?
I took care of this by allocating the space for the cpumap(s) together with the poolinfo structure(s).
If you don't like this, a destructor would be the correct solution, I think.
Quoted 2 lines
Would it make sense to turn
libxl_cpumapinto a struct containing both the size and the data pointer?
IMO this would make sense. You ALWAYS need the size of a cpumap to handle it correctly.
Quoted 8 lines
Quoted 8 lines
diff -r
3985fea87987tools/libxl/libxl.htools/libxl/libxl.h +0
-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);
Quoted 6 lines
tools/libxl/libxl.h int libxl_device_net2_del(libxl_ctx *ctx · line 477
Quoted 4 lines
tools/libxl/libxl.h +4
-0+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);Should these cpumap parameters be libxl_cpumap* or are they a different sort of cpumap?
You are right, these should be libxl_cpumap.
I'll update the patch. It would be nice to know whether you are planning to change libxl_cpumap to include the size or not.
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
Quoted 23 lines · Juergen Gross
Quoted 16 lines · Ian Campbell
Quoted 15 lines · Juergen Gross
diff -r
3985fea87987tools/libxl/libxl.idltools/libxl/libxl.idl Wed Sep 15 09:19:02 2010 +0200 renamed from tools/libxl/libxl.idl Fri Sep 10 19:06:33 2010 +0100 +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)Quoted 5 lines
tools/libxl/libxl.idl Wed Sep 15 09:19:02 2010 +0200 SHUTDOWN_* constant."""), · line 53
Quoted 1 line
tools/libxl/libxl.idl Wed Sep 15 09:19:02 2010 +0200 renamed from tools/libxl/libxl.idl Fri Sep 10 19:06:33 2010 +0100 +0
-0libxl_vminfo = Struct("vminfo", [Does the addition of the cpumap field here mean that we now need to generate a destructor function (by removing destructor_fn=None) and call it e.g. from main_pool*?
Quoted 3 lines
I took care of this by allocating the space for the cpumap(s) together with the poolinfo structure(s).
If you don't like this, a destructor would be the correct solution, I think.
Personally I would prefer using the destructor style for consistency with other libxl types.
Quoted 2 lines
I'll update the patch. It would be nice to know whether you are planning to change
libxl_cpumapto include the size or not.
I wasn't immediately planning on it but I can if you don't want to do it as part of this patchset.
Thanks,
Ian.
Quoted 24 lines · Ian Campbell
Quoted 23 lines · Juergen Gross
Quoted 21 lines · Ian Campbell
Quoted 6 lines · Juergen Gross
diff -r
3985fea87987tools/libxl/libxl.idltools/libxl/libxl.idl Wed Sep 15 09:19:02 2010 +0200 renamed from tools/libxl/libxl.idl Fri Sep 10 19:06:33 2010 +0100 +0
-0@@ -43,7 +43,11 @@ SHUTDOWN_* constant."""), ], destructor_fn=None)tools/libxl/libxl.idl Wed Sep 15 09:19:02 2010 +0200 SHUTDOWN_* constant."""), · line 53
Quoted 10 lines
tools/libxl/libxl.idl Wed Sep 15 09:19:02 2010 +0200 renamed from tools/libxl/libxl.idl Fri Sep 10 19:06:33 2010 +0100 +5
-1libxl_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", [Does the addition of the cpumap field here mean that we now need to generate a destructor function (by removing destructor_fn=None) and call it e.g. from main_pool*?
Quoted 6 lines
Quoted 3 lines
I took care of this by allocating the space for the cpumap(s) together with the poolinfo structure(s).
If you don't like this, a destructor would be the correct solution, I think.Personally I would prefer using the destructor style for consistency with other libxl types.
Okay, I'll change it accordingly.
Quoted 6 lines
Quoted 3 lines
I'll update the patch. It would be nice to know whether you are planning to change
libxl_cpumapto include the size or not.I wasn't immediately planning on it but I can if you don't want to do it as part of this patchset.
I think it shouldn't be included in this patch. :-)
And I'm not sure I'll get the generating of the bindings correctly. So yes, please do it!
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
Quoted 3 lines · Juergen Gross
And I'm not sure I'll get the generating of the bindings correctly. So yes, please do it!
Will do.
Quoted 1 line
From looking at your patch it seems that the intention is that the size
is the number of bytes in the map, rather than the number of CPUs which can be represented or the number of uint64_t's, is that right and/or what you would like to use?
Ian.
Quoted 11 lines · Ian Campbell
Quoted 3 lines · Juergen Gross
And I'm not sure I'll get the generating of the bindings correctly. So yes, please do it!
Will do.
Quoted 1 line
From looking at your patch it seems that the intention is that the size
is the number of bytes in the map, rather than the number of CPUs which can be represented or the number of uint64_t's, is that right and/or what you would like to use?
Seems like libxc counts bytes but libxl (with your patch) counts 64 bit words.
There doesn't seem to be any users of the size currently so I went with bytes in the below (compile tested + examined generated code only) but since your patch adds the first actual user feel free to change it if that makes the libxl interface more suitable for your needs or whatever.
Ian.
tools/libxl/libxl.c +4 -3
@@ -2924,8 +2924,9 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ct num_cpuwords = ((physinfo.max_cpu_id +64 ) /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) { + ptr->cpumap.size = num_cpuwords *sizeof (*ptr->cpumap.map); + ptr->cpumap.map =malloc (ptr->cpumap.size); +if (!ptr->cpumap.map) {return NULL ; }if (xc_vcpu_getinfo (ctx->xch, domid, *nb_vcpu, &vcpuinfo) ==-1 ) {
@@ -2933,7 +2934,7 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ctreturn 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 ; }
tools/libxl/libxl.h +0 -2
@@ -138,8 +138,6 @@ typedef char **libxl_string_list;typedef char **libxl_string_list ;typedef char **libxl_key_value_list ; - -typedef uint64_t *libxl_cpumap ;typedef uint32_t libxl_hwcap [8 ];
tools/libxl/libxl.idl +5 -2
@@ -14,8 +14,6 @@ libxl_nic_type = Builtin("nic_type") 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_cpumap = Builtin("cpumap", destructor_fn="free") libxl_hwcap = Builtin("hwcap")
@@ -42,6 +40,11 @@ SHUTDOWN_* constant."""), ("vcpu_online", uint32), ], destructor_fn=None) +libxl_cpumap = Struct("cpumap", [ + ("size", uint32), + ("map", Reference(uint64)), + ]) + libxl_poolinfo = Struct("poolinfo", [ ("poolid", uint32) ], destructor_fn=None)
tools/libxl/libxltypes.py +4 -1
@@ -119,7 +119,10 @@ class Reference(Type): 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/xl_cmdimpl.c +2 -2
@@ -3289,7 +3289,7 @@ static void print_vcpuinfo(uint32_t tdomprintf ("%9.1f " , ((float )vcpuinfo->vcpu_time /1e9 ));/* CPU AFFINITY */ pcpumap = nr_cpus >64 ? (uint64_t )-1 : ((1ULL << nr_cpus) -1 ); -for (cpumap = vcpuinfo->cpumap; nr_cpus; ++cpumap) { +for (cpumap = vcpuinfo->cpumap.map; nr_cpus; ++cpumap) {if (*cpumap < pcpumap) {break ; }
@@ -3304,7 +3304,7 @@ static void print_vcpuinfo(uint32_t tdomif (!nr_cpus) {printf ("any cpu\n" ); }else { -for (cpumap = vcpuinfo->cpumap; nr_cpus; ++cpumap) { +for (cpumap = vcpuinfo->cpumap.map; nr_cpus; ++cpumap) { pcpumap = *cpumap;for (i =0 ; !(pcpumap &1 ); ++i, pcpumap >>=1 ) ;
Quoted 13 lines · Ian Campbell
Quoted 11 lines · Ian Campbell
Quoted 3 lines · Juergen Gross
And I'm not sure I'll get the generating of the bindings correctly. So yes, please do it!
Will do.
Quoted 1 line
From looking at your patch it seems that the intention is that the size
is the number of bytes in the map, rather than the number of CPUs which can be represented or the number of uint64_t's, is that right and/or what you would like to use?
Quoted 7 lines
Seems like libxc counts bytes but libxl (with your patch) counts 64 bit words.
There doesn't seem to be any users of the size currently so I went with bytes in the below (compile tested + examined generated code only) but since your patch adds the first actual user feel free to change it if that makes the libxl interface more suitable for your needs or whatever.
Thanks, updated patch is attached.
I didn't add the destructor, because this would have made things much more complicated as libxl_list_pool returns an array of libxl_poolinfo elements. Doing only one free() at caller side is much easier than cycling through the elements and free-ing all extra allocated cpumaps.
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
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 +215 -15
259 lines not on this page · raw message
tools/libxl/libxl.h +9 -2
@@ -138,8 +138,6 @@ typedef char **libxl_string_list;typedef char **libxl_string_list ;typedef char **libxl_key_value_list ; - -typedef uint64_t *libxl_cpumap ;typedef uint32_t libxl_hwcap [8 ];
@@ -471,6 +469,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,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 +9 -3
@@ -14,8 +14,6 @@ libxl_nic_type = Builtin("nic_type") 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_cpumap = Builtin("cpumap", destructor_fn="free") libxl_hwcap = Builtin("hwcap")
@@ -42,8 +40,16 @@ SHUTDOWN_* constant."""), ("vcpu_online", uint32), ], destructor_fn=None) +libxl_cpumap = Struct("cpumap", [ + ("size", uint32), + ("map", Reference(uint64)), + ]) + libxl_poolinfo = Struct("poolinfo", [ - ("poolid", uint32) + ("poolid", uint32), + ("sched_id", uint32), + ("n_dom", 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/libxltypes.py +4 -1
@@ -119,7 +119,10 @@ class Reference(Type): 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 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 +454 -7
500 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
Quoted 22 lines · Juergen Gross
Quoted 13 lines · Ian Campbell
Quoted 11 lines · Ian Campbell
Quoted 3 lines · Juergen Gross
And I'm not sure I'll get the generating of the bindings correctly. So yes, please do it!
Will do.
Quoted 1 line
From looking at your patch it seems that the intention is that the size
is the number of bytes in the map, rather than the number of CPUs which can be represented or the number of uint64_t's, is that right and/or what you would like to use?
Quoted 7 lines
Seems like libxc counts bytes but libxl (with your patch) counts 64 bit words.
There doesn't seem to be any users of the size currently so I went with bytes in the below (compile tested + examined generated code only) but since your patch adds the first actual user feel free to change it if that makes the libxl interface more suitable for your needs or whatever.
Quoted 5 lines
Thanks, updated patch is attached.
I didn't add the destructor, because this would have made things much more complicated aslibxl_list_poolreturns an array oflibxl_poolinfoelements. Doing only onefree()at caller side is much easier than cycling through the elements and free-ing all extra allocated cpumaps.
I'm afraid I think you do need to cycle through the elements calling libxl_poolinfo_destroy on each, this is consistent with how all other libxl types are handled and means that users of the library are isolated from a certain amount of change to the underlying types.
Often you can destroy each element as you walk over the list doing whatever it is you needed the list for, for example see how xl_cmdimpl.c:print_domain_vcpuinfo does it. libxl_list_vcpu has basically the same semantics as libxl_list_pool should have.
Ian.
Quoted 9 lines · Ian Campbell
I'm afraid I think you do need to cycle through the elements calling
libxl_poolinfo_destroyon each, this is consistent with how all other libxl types are handled and means that users of the library are isolated from a certain amount of change to the underlying types.Often you can destroy each element as you walk over the list doing whatever it is you needed the list for, for example see how xl_cmdimpl.c:print_domain_vcpuinfo does it.
libxl_list_vcpuhas basically the same semantics aslibxl_list_poolshould have.
Okay, new patch attached.
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
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 +213 -14
256 lines not on this page · raw message
tools/libxl/libxl.h +9 -2
@@ -138,8 +138,6 @@ typedef char **libxl_string_list;typedef char **libxl_string_list ;typedef char **libxl_key_value_list ; - -typedef uint64_t *libxl_cpumap ;typedef uint32_t libxl_hwcap [8 ];
@@ -471,6 +469,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,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 +10 -4
@@ -14,8 +14,6 @@ libxl_nic_type = Builtin("nic_type") 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_cpumap = Builtin("cpumap", destructor_fn="free") libxl_hwcap = Builtin("hwcap")
@@ -42,9 +40,17 @@ SHUTDOWN_* constant."""), ("vcpu_online", uint32), ], destructor_fn=None) +libxl_cpumap = Struct("cpumap", [ + ("size", uint32), + ("map", Reference(uint64)), + ]) + libxl_poolinfo = Struct("poolinfo", [ - ("poolid", uint32) - ], destructor_fn=None) + ("poolid", uint32), + ("sched_id", uint32), + ("n_dom", uint32), + ("cpumap", libxl_cpumap) + ], destructor_fn="libxl_poolinfo_destroy") libxl_vminfo = Struct("vminfo", [ ("uuid", libxl_uuid),
tools/libxl/libxl_utils.c +41 -8
66 lines not on this page · raw message
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/libxltypes.py +4 -1
@@ -119,7 +119,10 @@ class Reference(Type): 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 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 +456 -7
502 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
В Срд, 15/09/2010 в 09:26 +0200, Juergen Gross пишет:
Quoted 7 lines
Hi,
attached patch implements cpupool support in xl. Rewrite of previous patch after rework of libxl.
Juergen
Sorry for may be breaking thread, but what benefits of using cpu pool in Xen? Can You provide some use cases for using cpu pools?
Thank You.
Signature · 2 lines
Vasiliy G Tolstov <[email protected]> Selfip.Ru
Quoted 4 lines · Juergen Gross
Hi,
attached patch implements cpupool support in xl. Rewrite of previous patch after rework of libxl.
Thanks!
Please could you provide a changelog message? It seems you needed to modify the libxc interface in order to support libxl, it would be worth commenting on what/why you changed.
In several places I notice you calculate (X + 64) / 64. Normally I would expect a (X + 63) / 64 pattern to round something up (for example in other places you use + 7 / 8). Is this deliberate? Probably worth a comment, or maybe wrap the concept into a function with an appropriate name?
I think the units of libxl_cpumap.size might be worth a comment too, especially since appears to differ from the units used in the libxc interface. You can do this in the IDL with e.g.
- ("size", uint32),
+ ("size", uint32, False, "number of <bananas> in map"),
("map", Reference(uint64)),I think <bananas>=="uint64_t sized words"? Perhaps size would be better represented as the maximum CPU ID in the map? The fact that the map is rounded up to the next 64 bit boundary isn't too interesting to callers, is it?
I saw a "size * 8" which I think would better as "size * sizeof(*....map)", although perhaps this usage reinforces the idea that the size should be in CPUs not multiples of some word size? Especially given that this is seen in the caller who I guess shouldn't really need to know these details.
Similarly callers seem to be doing "map[i / 64] & (i %64)" type arithmetic, I think providing a libxl_cpumap_cpu_present helper (and _set/_clear if necessary) would help here.
Ian.
Quoted 11 lines · Ian Campbell
Quoted 4 lines · Juergen Gross
Hi,
attached patch implements cpupool support in xl. Rewrite of previous patch after rework of libxl.
Thanks!
Please could you provide a changelog message? It seems you needed to modify the libxc interface in order to support libxl, it would be worth commenting on what/why you changed.
Okay, done.
Quoted 5 lines
In several places I notice you calculate (X + 64) / 64. Normally I would expect a (X + 63) / 64 pattern to round something up (for example in other places you use + 7 / 8). Is this deliberate? Probably worth a comment, or maybe wrap the concept into a function with an appropriate name?
This was the conversion from max_cpu_id (which is 1 less than the max number of cpus) to the number of map elements. I've moved this to an own function for allocating a cpumap.map.
Review
Quoted 6 lines
I think the units of libxl_cpumap.size might be worth a comment too, especially since appears to differ from the units used in the libxc interface. You can do this in the IDL with e.g.
(quoted diff) +1
-1- ("size", uint32), + ("size", uint32, False, "number of<bananas> in map"), ("map", Reference(uint64)),
Okay.
Quoted 4 lines
I think<bananas>=="uint64_t sized words"? Perhaps size would be better represented as the maximum CPU ID in the map? The fact that the map is rounded up to the next 64 bit boundary isn't too interesting to callers, is it?
I kept your proposal to keep the size in bytes (like in xc).
Quoted 2 lines
I saw a "size * 8" which I think would better as "size *
sizeof(*....map)",
The 8 is the number of bits in a byte (size being number of bytes).
Quoted 3 lines
Similarly callers seem to be doing "map[i / 64]& (i %64)" type arithmetic, I think providing a
libxl_cpumap_cpu_presenthelper (and _set/_clear if necessary) would help here.
Done that, too.
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
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
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 as well These were:
definition of xc_cpupoolinfo_t
xc_cpupool_getinfo()
xc_cpupool_freeinfo()
tools/libxc/xc_cpupool.c +68 -41
@@ -34,6 +34,20 @@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 @@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); + 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_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 @@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 @@* 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 @@* * @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 +206 -16
258 lines not on this page · raw message
tools/libxl/libxl.h +9 -2
@@ -138,8 +138,6 @@typedef char **libxl_string_list ;typedef char **libxl_key_value_list ; - -typedef uint64_t *libxl_cpumap ;typedef uint32_t libxl_hwcap [8 ];
@@ -471,6 +469,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 +10 -4
@@ -14,8 +14,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_cpumap = Builtin("cpumap", destructor_fn="free") libxl_hwcap = Builtin("hwcap")
@@ -42,9 +40,17 @@ ("vcpu_online", uint32), ], destructor_fn=None) +libxl_cpumap = Struct("cpumap", [ + ("size", uint32, False, "number of bytes in map"), + ("map", Reference(uint64)), + ]) + libxl_poolinfo = Struct("poolinfo", [ - ("poolid", uint32) - ], destructor_fn=None) + ("poolid", uint32), + ("sched_id", uint32), + ("n_dom", uint32), + ("cpumap", libxl_cpumap) + ], destructor_fn="libxl_poolinfo_destroy") libxl_vminfo = Struct("vminfo", [ ("uuid", libxl_uuid),
tools/libxl/libxl_utils.c +74 -8
102 lines not on this page · raw message
tools/libxl/libxl_utils.h +6 -0
@@ -23,6 +23,8 @@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_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
@@ -119,7 +119,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 +454 -7
500 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 );
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
Quoted 2 lines · Vasiliy G Tolstov
Sorry for may be breaking thread, but what benefits of using cpu pool in Xen? Can You provide some use cases for using cpu pools?
Without cpu pools the whole Xen server is running one scheduler which is scheduling all domains on all cpus (possibly with some restrictions due to cpu pinning). With cpu pools each pool is running it's own scheduler responsible only for some cpus and some domains. This may be important if you want to:
- isolate some domains from others regarding cpu usage
- restrict a group of domains to a subset of cpus (e.g. due to license restrictions), while scheduling parameters should still be working (this was our main problem without cpu pools: scheduling weights and cpu pinning are not working together very well)
- use different scheduling strategies for different domains (e.g. credit scheduler for some domains and credit2 or sedf for others)
For an extended discussion on cpu pools please see:
http://lists.xensource.com/archives/html/xen-devel/2009-07/msg01116.html
HTH 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
В Чтв, 16/09/2010 в 15:01 +0200, Juergen Gross пишет:
Quoted 17 lines · Vasiliy G Tolstov
Quoted 2 lines
Sorry for may be breaking thread, but what benefits of using cpu pool in Xen? Can You provide some use cases for using cpu pools?
Without cpu pools the whole Xen server is running one scheduler which is scheduling all domains on all cpus (possibly with some restrictions due to cpu pinning). With cpu pools each pool is running it's own scheduler responsible only for some cpus and some domains. This may be important if you want to:
- isolate some domains from others regarding cpu usage
- restrict a group of domains to a subset of cpus (e.g. due to license restrictions), while scheduling parameters should still be working (this was our main problem without cpu pools: scheduling weights and cpu pinning are not working together very well)
- use different scheduling strategies for different domains (e.g. credit scheduler for some domains and credit2 or sedf for others)
Quoted 6 lines
For an extended discussion on cpu pools please see:
http://lists.xensource.com/archives/html/xen-devel/2009-07/msg01116.htmlHTH Juergen
Thank you very much!
Signature · 2 lines
Vasiliy G Tolstov <[email protected]> Selfip.Ru
Juergen Gross writes ("Re: [Xen-devel] [Patch][resend] implementation of cpupool support in xl"):
Quoted 6 lines
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 as well These were:
definition ofxc_cpupoolinfo_t
xc_cpupool_getinfo()
xc_cpupool_freeinfo()
I think it would make sense to separate out this part of the patch (which also touches tools/python). Can the consequence in libxl of this change to the xc_ functions be decoupled from the extra functionality of the new libxl and xl features ?
I think ideally this would be three patches:
libxc: cpupools: support arbitrary number of physical cpus
libxl: support more cpupool operations
xl: support cpupools
although splitting the 2nd and 3rd apart is trivial so I could do it myself :-).
Ian.
Juergen Gross writes ("Re: [Xen-devel] [Patch][resend] implementation of cpupool support in xl"):
Quoted 1 line
Okay, new patch attached.
Thanks. See the comments in my other mail, just sent. Also can you please refresh your patch(es) against xen-unstable staging ? There are a few conflicts when I test-apply it, right now.
Ian.