From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chao Peng Subject: Re: [PATCH v2 3/4] tools: add tools support for Intel CDP Date: Wed, 9 Sep 2015 15:32:11 +0800 Message-ID: <20150909073211.GP19417@pengc-linux.bj.intel.com> References: <1441775808-29766-1-git-send-email-he.chen@linux.intel.com> <1441775808-29766-4-git-send-email-he.chen@linux.intel.com> Reply-To: Chao Peng Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZZvF-0002DN-PF for xen-devel@lists.xenproject.org; Wed, 09 Sep 2015 07:36:02 +0000 Content-Disposition: inline In-Reply-To: <1441775808-29766-4-git-send-email-he.chen@linux.intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: He Chen Cc: wei.liu2@citrix.com, ian.campbell@citrix.com, stefano.stabellini@eu.citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, jbeulich@suse.com, xen-devel@lists.xenproject.org, keir@xen.org List-Id: xen-devel@lists.xenproject.org On Wed, Sep 09, 2015 at 01:16:47PM +0800, He Chen wrote: > This is the xl/xc changes to support Intel Code/Data Prioritization. > CAT xl commands to set/get CBMs are extended to support CDP. > > Signed-off-by: He Chen > --- > diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h > index 5f9047c..e4eb4df 100644 > --- a/tools/libxl/libxl.h > +++ b/tools/libxl/libxl.h > @@ -796,6 +796,13 @@ void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, libxl_mac *src); > * If this is defined, the Cache Allocation Technology feature is supported. > */ > #define LIBXL_HAVE_PSR_CAT 1 > + > +/* > + * LIBXL_HAVE_PSR_CDP > + * > + * If this is defined, the Code/Data Prioritization feature is supported. > + */ > +#define LIBXL_HAVE_PSR_CDP 1 > #endif > > /* > @@ -1729,6 +1736,9 @@ int libxl_psr_cat_get_l3_info(libxl_ctx *ctx, libxl_psr_cat_info **info, > void libxl_psr_cat_info_list_free(libxl_psr_cat_info *list, int nr); > #endif > > +#ifdef LIBXL_HAVE_PSR_CDP > +#endif > + Why this? There are several of them in this patch. > /* misc */ > > /* Each of these sets or clears the flag according to whether the > diff --git a/tools/libxl/libxl_psr.c b/tools/libxl/libxl_psr.c > index 3378239..26939a5 100644 > --- a/tools/libxl/libxl_psr.c > +++ b/tools/libxl/libxl_psr.c > @@ -297,6 +297,7 @@ int libxl_psr_cat_set_cbm(libxl_ctx *ctx, uint32_t domid, > GC_INIT(ctx); > int rc; > int socketid, nr_sockets; > + libxl_psr_cat_info *info; > > rc = libxl__count_physical_sockets(gc, &nr_sockets); > if (rc) { > @@ -304,14 +305,41 @@ int libxl_psr_cat_set_cbm(libxl_ctx *ctx, uint32_t domid, > goto out; > } > > + rc = libxl_psr_cat_get_l3_info(ctx, &info, &nr_sockets); > + if (rc) { > + LOGE(ERROR, "Failed to get cat info"); > + goto out; > + } > + > + if (!info->cdp_enabled && > + (type == LIBXL_PSR_CBM_TYPE_L3_CODE || > + type == LIBXL_PSR_CBM_TYPE_L3_DATA)) > + { > + LOGE(ERROR, "Unable to set Code/Data CBM with CDP disabled"); > + rc = EINVAL; > + free(info); > + goto out; > + } > + > libxl_for_each_set_bit(socketid, *target_map) { > if (socketid >= nr_sockets) > break; > - if (xc_psr_cat_set_domain_data(ctx->xch, domid, type, socketid, cbm)) { > + if (info->cdp_enabled && type == LIBXL_PSR_CBM_TYPE_L3_CBM) > + { > + if(xc_psr_cat_set_domain_data(ctx->xch, domid, > + LIBXL_PSR_CBM_TYPE_L3_CODE, socketid, cbm) || > + xc_psr_cat_set_domain_data(ctx->xch, domid, > + LIBXL_PSR_CBM_TYPE_L3_DATA, socketid, cbm)) > + { > + libxl__psr_cat_log_err_msg(gc, errno); > + rc = ERROR_FAIL; > + } Will you merge the two if's? Chao > + } else if (xc_psr_cat_set_domain_data(ctx->xch, domid, type, socketid, cbm)) { > libxl__psr_cat_log_err_msg(gc, errno); > rc = ERROR_FAIL; > } > } > + free(info); > > out: > GC_FREE;