From mboxrd@z Thu Jan 1 00:00:00 1970 From: Meng Xu Subject: [PATCH for 4.5 v4 3/4] libxl: add rtds scheduler Date: Sat, 20 Sep 2014 18:14:43 -0400 Message-ID: <1411251283-2169-1-git-send-email-mengxu@cis.upenn.edu> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: ian.campbell@citrix.com, xisisu@gmail.com, stefano.stabellini@eu.citrix.com, george.dunlap@eu.citrix.com, lu@cse.wustl.edu, dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, ptxlinh@gmail.com, xumengpanda@gmail.com, Meng Xu , chaowang@wustl.edu, lichong659@gmail.com, dgolomb@seas.upenn.edu List-Id: xen-devel@lists.xenproject.org Add libxl functions to set/get domain's parameters for rtds scheduler Note: VCPU's information (period, budget) is in microsecond (us). Signed-off-by: Meng Xu Signed-off-by: Sisu Xi Reviewed-by: Dario Faggioli Reviewed-by: George Dunlap --- tools/libxl/libxl.c | 72 +++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl.h | 7 +++++ tools/libxl/libxl_types.idl | 2 ++ 3 files changed, 81 insertions(+) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index f796da8..233496e 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5443,6 +5443,72 @@ static int sched_sedf_domain_set(libxl__gc *gc, uint32_t domid, return 0; } +static int sched_rtds_domain_get(libxl__gc *gc, uint32_t domid, + libxl_domain_sched_params *scinfo) +{ + struct xen_domctl_sched_rtds sdom; + int rc; + + rc = xc_sched_rtds_domain_get(CTX->xch, domid, &sdom); + if (rc != 0) { + LOGE(ERROR, "getting domain sched rtds"); + return ERROR_FAIL; + } + + libxl_domain_sched_params_init(scinfo); + + scinfo->sched = LIBXL_SCHEDULER_RTDS; + scinfo->period = sdom.period; + scinfo->budget = sdom.budget; + + return 0; +} + +static int sched_rtds_domain_set(libxl__gc *gc, uint32_t domid, + const libxl_domain_sched_params *scinfo) +{ + struct xen_domctl_sched_rtds sdom; + int rc; + + rc = xc_sched_rtds_domain_get(CTX->xch, domid, &sdom); + if (rc != 0) { + LOGE(ERROR, "getting domain sched rtds"); + return ERROR_FAIL; + } + + if (scinfo->period != LIBXL_DOMAIN_SCHED_PARAM_PERIOD_DEFAULT) { + if (scinfo->period < 1) { + LOG(ERROR, "VCPU period is not set or out of range, " + "valid values are larger than 1"); + return ERROR_INVAL; + } + sdom.period = scinfo->period; + } + + if (scinfo->budget != LIBXL_DOMAIN_SCHED_PARAM_BUDGET_DEFAULT) { + if (scinfo->budget < 1) { + LOG(ERROR, "VCPU budget is not set or out of range, " + "valid values are larger than 1"); + return ERROR_INVAL; + } + sdom.budget = scinfo->budget; + } + + if (sdom.budget > sdom.period) { + LOG(ERROR, "VCPU budget is larger than VCPU period, " + "VCPU budget should be no larger than VCPU period"); + return ERROR_INVAL; + } + + rc = xc_sched_rtds_domain_set(CTX->xch, domid, &sdom); + if (rc < 0) { + LOGE(ERROR, "setting domain sched rtds"); + return ERROR_FAIL; + } + + return 0; +} + int libxl_domain_sched_params_set(libxl_ctx *ctx, uint32_t domid, const libxl_domain_sched_params *scinfo) { @@ -5466,6 +5532,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_RTDS: + ret=sched_rtds_domain_set(gc, domid, scinfo); + break; default: LOG(ERROR, "Unknown scheduler"); ret=ERROR_INVAL; @@ -5496,6 +5565,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_RTDS: + ret=sched_rtds_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 bc68cac..b7f4f39 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -145,6 +145,12 @@ #define LIBXL_HAVE_BUILDINFO_IOMEM_START_GFN 1 /* + * LIBXL_HAVE_SCHED_RTDS indicates that the RTDS real time scheduler + * is available. A 'budget' field added in libxl_domain_sched_params. + */ +#define LIBXL_HAVE_SCHED_RTDS 1 + +/* * libxl ABI compatibility * * The only guarantee which libxl makes regarding ABI compatibility @@ -1319,6 +1325,7 @@ int libxl_sched_credit_params_set(libxl_ctx *ctx, uint32_t poolid, #define LIBXL_DOMAIN_SCHED_PARAM_SLICE_DEFAULT -1 #define LIBXL_DOMAIN_SCHED_PARAM_LATENCY_DEFAULT -1 #define LIBXL_DOMAIN_SCHED_PARAM_EXTRATIME_DEFAULT -1 +#define LIBXL_DOMAIN_SCHED_PARAM_BUDGET_DEFAULT -1 int libxl_domain_sched_params_get(libxl_ctx *ctx, uint32_t domid, libxl_domain_sched_params *params); diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index f1fcbc3..15234d6 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -156,6 +156,7 @@ libxl_scheduler = Enumeration("scheduler", [ (5, "credit"), (6, "credit2"), (7, "arinc653"), + (8, "rtds"), ]) # Consistent with SHUTDOWN_* in sched.h (apart from UNKNOWN) @@ -318,6 +319,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'}), + ("budget", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_BUDGET_DEFAULT'}), ]) libxl_domain_build_info = Struct("domain_build_info",[ -- 1.7.9.5