[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH RFC v1 3/4] libxl for rt scheduler
Add libxl functions to set/get domain's parameters for rt scheduler Signed-off-by: Sisu Xi <xisisu@xxxxxxxxx> Signed-off-by: Meng Xu <mengxu@xxxxxxxxxxxxx> --- tools/libxl/libxl.c | 121 +++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl.h | 7 +++ tools/libxl/libxl_types.idl | 13 +++++ 3 files changed, 141 insertions(+) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 39f1c28..670420e 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5100,6 +5100,121 @@ static int sched_sedf_domain_set(libxl__gc *gc, uint32_t domid, return 0; } +static int sched_rt_domain_get(libxl__gc *gc, uint32_t domid, + libxl_domain_sched_params *scinfo) +{ + struct xen_domctl_sched_rt_params sdom; + int rc, i; + + rc = xc_sched_rt_domain_get(CTX->xch, domid, &sdom); + if (rc != 0) { + LOGE(ERROR, "getting domain sched rt"); + return ERROR_FAIL; + } + + libxl_domain_sched_params_init(scinfo); + scinfo->sched = LIBXL_SCHEDULER_RT; + scinfo->rt.max_vcpus = LIBXL_XEN_LEGACY_MAX_VCPUS; + /*TODO: alloc array with exact num of dom's vcpus; and use GCNEW_ARRAY()*/ + scinfo->rt.vcpus = (libxl_vcpu *) + malloc( sizeof(libxl_vcpu) * scinfo->rt.max_vcpus ); + if ( !scinfo->rt.vcpus ){ + LOGE(ERROR, "Allocate lib_vcpu array fails\n"); + return ERROR_INVAL; + } + scinfo->rt.num_vcpus = sdom.num_vcpus; + for( i = 0; i < sdom.num_vcpus; ++i) + { + scinfo->rt.vcpus[i].period = sdom.vcpus[i].period; + scinfo->rt.vcpus[i].budget = sdom.vcpus[i].budget; + } + + return 0; +} + +#define SCHED_RT_VCPU_PARAMS_MAX 4294967295 /* 2^32-1 */ + +/* + * Sanity check of the scinfo parameters + * return 0 if all values are valid + * return 1 if one param is default value + * return 2 if the target vcpu's index, period or budget is out of range + */ +static int sched_rt_domain_set_validate_params(libxl__gc *gc, + const libxl_domain_sched_params *scinfo) +{ + int vcpu_index = scinfo->rt.vcpu_index; + + if (scinfo->rt.vcpus == NULL || + vcpu_index == LIBXL_DOMAIN_SCHED_PARAM_VCPU_DEFAULT || + scinfo->rt.vcpus[vcpu_index].period == LIBXL_DOMAIN_SCHED_PARAM_PERIOD_DEFAULT || + scinfo->rt.vcpus[vcpu_index].budget == LIBXL_DOMAIN_SCHED_PARAM_BUDGET_DEFAULT) + { + return 1; + } + + if (vcpu_index < 0 || vcpu_index > scinfo->rt.num_vcpus) + { + LOG(ERROR, "VCPU index is not set or out of range, " + "valid values are within range from 0 to %d", scinfo->rt.num_vcpus); + return 2; + } + + if (scinfo->rt.vcpus[vcpu_index].period < 1 || + scinfo->rt.vcpus[vcpu_index].period > SCHED_RT_VCPU_PARAMS_MAX) + { + LOG(ERROR, "VCPU period is not set or out of range, " + "valid values are within range from 0 to %lu", SCHED_RT_VCPU_PARAMS_MAX); + return 2; + } + + if (scinfo->rt.vcpus[vcpu_index].budget < 1 || + scinfo->rt.vcpus[vcpu_index].budget > SCHED_RT_VCPU_PARAMS_MAX) + { + LOG(ERROR, "VCPU budget is not set or out of range, " + "valid values are within range from 0 to %lu", SCHED_RT_VCPU_PARAMS_MAX); + return 2; + } + + return 0; + +} + +static int sched_rt_domain_set(libxl__gc *gc, uint32_t domid, + const libxl_domain_sched_params *scinfo) +{ + struct xen_domctl_sched_rt_params sdom; + int vcpu_index; + int rc; + + rc = xc_sched_rt_domain_get(CTX->xch, domid, &sdom); + if (rc != 0) { + LOGE(ERROR, "getting domain sched rt"); + return ERROR_FAIL; + } + + rc = sched_rt_domain_set_validate_params(gc, scinfo); + if (rc == 2) + return ERROR_INVAL; + if (rc == 1) + return 0; + if (rc == 0) + { + vcpu_index = scinfo->rt.vcpu_index; + sdom.vcpu_index = scinfo->rt.vcpu_index; + sdom.vcpus[vcpu_index].period = scinfo->rt.vcpus[vcpu_index].period; + sdom.vcpus[vcpu_index].budget = scinfo->rt.vcpus[vcpu_index].budget; + } + + rc = xc_sched_rt_domain_set(CTX->xch, domid, &sdom); + if ( rc < 0 ) { + LOGE(ERROR, "setting domain sched rt"); + return ERROR_FAIL; + } + + return 0; +} + int libxl_domain_sched_params_set(libxl_ctx *ctx, uint32_t domid, const libxl_domain_sched_params *scinfo) { @@ -5123,6 +5238,9 @@ int libxl_domain_sched_params_set(libxl_ctx *ctx, uint32_t domid, case LIBXL_SCHEDULER_ARINC653: ret=sched_arinc653_domain_set(gc, domid, scinfo); break; + case LIBXL_SCHEDULER_RT: + ret=sched_rt_domain_set(gc, domid, scinfo); + break; default: LOG(ERROR, "Unknown scheduler"); ret=ERROR_INVAL; @@ -5153,6 +5271,9 @@ int libxl_domain_sched_params_get(libxl_ctx *ctx, uint32_t domid, case LIBXL_SCHEDULER_CREDIT2: ret=sched_credit2_domain_get(gc, domid, scinfo); break; + case LIBXL_SCHEDULER_RT: + ret=sched_rt_domain_get(gc, domid, scinfo); + break; default: LOG(ERROR, "Unknown scheduler"); ret=ERROR_INVAL; diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 459557d..42c8ede 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1217,6 +1217,13 @@ int libxl_sched_credit_params_set(libxl_ctx *ctx, uint32_t poolid, #define LIBXL_DOMAIN_SCHED_PARAM_LATENCY_DEFAULT -1 #define LIBXL_DOMAIN_SCHED_PARAM_EXTRATIME_DEFAULT -1 +#define LIBXL_DOMAIN_SCHED_PARAM_BUDGET_DEFAULT -1 +#define LIBXL_DOMAIN_SCHED_PARAM_VCPU_DEFAULT -1 +#define LIBXL_DOMAIN_SCHED_PARAM_NUM_VCPUS_DEFAULT -1 +#define LIBXL_DOMAIN_SCHED_PARAM_VCPU_INDEX_DEFAULT -1 +/* Consistent with XEN_LEGACY_MAX_VCPUS xen/arch-x86/xen.h*/ +#define LIBXL_XEN_LEGACY_MAX_VCPUS 32 + int libxl_domain_sched_params_get(libxl_ctx *ctx, uint32_t domid, libxl_domain_sched_params *params); int libxl_domain_sched_params_set(libxl_ctx *ctx, uint32_t domid, diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index de25f42..00e00d8 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -139,6 +139,7 @@ libxl_scheduler = Enumeration("scheduler", [ (5, "credit"), (6, "credit2"), (7, "arinc653"), + (8, "rt"), ]) # Consistent with SHUTDOWN_* in sched.h (apart from UNKNOWN) @@ -289,6 +290,17 @@ libxl_domain_restore_params = Struct("domain_restore_params", [ ("checkpointed_stream", integer), ]) +libxl_rt_vcpu = Struct("vcpu",[ + ("period", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_PERIOD_DEFAULT'}), + ("budget", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_BUDGET_DEFAULT'}), + ]) + +libxl_domain_sched_rt_params = Struct("domain_sched_rt_params",[ + ("vcpus", Array(libxl_rt_vcpu, "max_vcpus")), + ("num_vcpus", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_NUM_VCPUS_DEFAULT'}), + ("vcpu_index", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_VCPU_INDEX_DEFAULT'}), + ]) + libxl_domain_sched_params = Struct("domain_sched_params",[ ("sched", libxl_scheduler), ("weight", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_WEIGHT_DEFAULT'}), @@ -297,6 +309,7 @@ libxl_domain_sched_params = Struct("domain_sched_params",[ ("slice", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_SLICE_DEFAULT'}), ("latency", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_LATENCY_DEFAULT'}), ("extratime", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_EXTRATIME_DEFAULT'}), + ("rt", libxl_domain_sched_rt_params), ]) libxl_domain_build_info = Struct("domain_build_info",[ -- 1.7.9.5 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |