From patchwork Tue Sep 5 09:32:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9938343 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 26A19601EB for ; Tue, 5 Sep 2017 09:53:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1883B28902 for ; Tue, 5 Sep 2017 09:53:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D1A92890B; Tue, 5 Sep 2017 09:53:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7804628902 for ; Tue, 5 Sep 2017 09:53:53 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dpAWB-0007IB-NW; Tue, 05 Sep 2017 09:51:39 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dpAWA-0007H1-FJ for xen-devel@lists.xenproject.org; Tue, 05 Sep 2017 09:51:38 +0000 Received: from [193.109.254.147] by server-6.bemta-6.messagelabs.com id 56/77-03423-9A37EA95; Tue, 05 Sep 2017 09:51:37 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrHIsWRWlGSWpSXmKPExsXS1taRoruieF2 kwfQJjBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aM/W/ZC37ZVcxf/oS9gfGebhcjB4eQQKXE ivOOXYycHBICvBJHls1gBQlLCPhLPD7j0MXIBVTRwChx7PYLdpAaNgF1icdfe5hAbBEBJYl7q yYzgRQxC5xjktjzcQdYQljAT+Jr4zdGEJtFQFViyb7lrCA2r4CHxLNHs9kglslJnDw2GWwZJ1 B86bU6kLCQgLvEn213ocoFJU7OfMICUsIMtHf9PCGQMLOAvETz1tnMExgFZiGpmoVQNQtJ1QJ G5lWMGsWpRWWpRbqGhnpJRZnpGSW5iZk5uoYGZnq5qcXFiempOYlJxXrJ+bmbGIFhyQAEOxg/ LQs4xCjJwaQkyhuauC5SiC8pP6UyI7E4I76oNCe1+BCjDAeHkgTvrSKgnGBRanpqRVpmDjBCY NISHDxKIrznQNK8xQWJucWZ6RCpU4y6HBtWr//CJMSSl5+XKiXOexykSACkKKM0D24ELFovMc pKCfMyAh0lxFOQWpSbWYIq/4pRnINRSZh3CcgUnsy8ErhNr4COYAI6ourlGpAjShIRUlINjBO zHsQeTk/lcsqMtG1O+6fxwspXN2aF48UFhvwhKZ9ZZ/He0vlwTkboHb/tgp1hnDN3/P89Y8bK NRV7ZPeYhJWtmML46vU+r2mdf2zKTRY6FXv/5k2aq7PlZMuuxO9Rp3+m7dm12lg04GbUOUaR2 VseTX0/LWtflcmkTcovS37wuWT2KR9c4qfEUpyRaKjFXFScCAAz8rXv0QIAAA== X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1504605073!62289035!6 X-Originating-IP: [134.134.136.100] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 45435 invoked from network); 5 Sep 2017 09:51:35 -0000 Received: from mga07.intel.com (HELO mga07.intel.com) (134.134.136.100) by server-15.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 5 Sep 2017 09:51:35 -0000 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP; 05 Sep 2017 02:51:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,479,1498546800"; d="scan'208";a="897185385" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.80]) by FMSMGA003.fm.intel.com with ESMTP; 05 Sep 2017 02:51:30 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Tue, 5 Sep 2017 17:32:31 +0800 Message-Id: <1504603957-5389-10-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504603957-5389-1-git-send-email-yi.y.sun@linux.intel.com> References: <1504603957-5389-1-git-send-email-yi.y.sun@linux.intel.com> MIME-Version: 1.0 Cc: kevin.tian@intel.com, wei.liu2@citrix.com, andrew.cooper3@citrix.com, dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, Yi Sun , julien.grall@arm.com, mengxu@cis.upenn.edu, jbeulich@suse.com, chao.p.peng@linux.intel.com, dgdegra@tycho.nsa.gov, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v3 09/15] tools: implement the new libxc get hw info interface X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch implements a new libxc get hw info interface and corresponding data structures. It also changes libxl_psr.c to call this new interface. Signed-off-by: Yi Sun --- v3: - rename 'psr_cat/PSR_CAT' to 'psr_alloc/PSR_ALLOC' and remove 'op/OP' from name. (suggested by Roger Pau Monné) - remove 'info' from 'xc_cat_info' and 'xc_mba_info'. (suggested by Roger Pau Monné) - set errno in 'xc_psr_get_hw_info'. (suggested by Roger Pau Monné) - remove 'inline'. (suggested by Roger Pau Monné) - remove 'psr' from 'libxl__psr_feat_type_to_libxc_psr_feat_type' to make function name shorter. (suggested by Roger Pau Monné) - check 'xc_type' in 'libxl_psr_cat_get_info'. (suggested by Roger Pau Monné) v2: - split this patch out from a big patch in v1. (suggested by Wei Liu) - change 'CAT_INFO' and 'MBA_INFO' to 'CAT' and 'MBA'. (suggested by Chao Peng) --- tools/libxc/include/xenctrl.h | 30 +++++++++++++++++++++++--- tools/libxc/xc_psr.c | 49 ++++++++++++++++++++++++++++++++----------- tools/libxl/libxl_psr.c | 38 +++++++++++++++++++++++++++++++-- 3 files changed, 100 insertions(+), 17 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index c7710b8..bbdf8e2 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2458,6 +2458,31 @@ enum xc_psr_cat_type { }; typedef enum xc_psr_cat_type xc_psr_cat_type; +enum xc_psr_feat_type { + XC_PSR_FEAT_UNKNOWN, + XC_PSR_FEAT_CAT_L3, + XC_PSR_FEAT_CAT_L2, + XC_PSR_FEAT_MBA, +}; +typedef enum xc_psr_feat_type xc_psr_feat_type; + +struct xc_psr_hw_info { + union { + struct { + uint32_t cos_max; + uint32_t cbm_len; + bool cdp_enabled; + } xc_cat; + + struct { + uint32_t cos_max; + uint32_t thrtl_max; + bool linear; + } xc_mba; + } u; +}; +typedef struct xc_psr_hw_info xc_psr_hw_info; + int xc_psr_cmt_attach(xc_interface *xch, uint32_t domid); int xc_psr_cmt_detach(xc_interface *xch, uint32_t domid); int xc_psr_cmt_get_domain_rmid(xc_interface *xch, uint32_t domid, @@ -2479,9 +2504,8 @@ int xc_psr_cat_set_domain_data(xc_interface *xch, uint32_t domid, int xc_psr_cat_get_domain_data(xc_interface *xch, uint32_t domid, xc_psr_cat_type type, uint32_t target, uint64_t *data); -int xc_psr_cat_get_info(xc_interface *xch, uint32_t socket, unsigned int lvl, - uint32_t *cos_max, uint32_t *cbm_len, - bool *cdp_enabled); +int xc_psr_get_hw_info(xc_interface *xch, uint32_t socket, + xc_psr_feat_type type, xc_psr_hw_info *hw_info); int xc_get_cpu_levelling_caps(xc_interface *xch, uint32_t *caps); int xc_get_cpu_featureset(xc_interface *xch, uint32_t index, diff --git a/tools/libxc/xc_psr.c b/tools/libxc/xc_psr.c index 7e1c0d6..a8a750a 100644 --- a/tools/libxc/xc_psr.c +++ b/tools/libxc/xc_psr.c @@ -323,36 +323,61 @@ int xc_psr_cat_get_domain_data(xc_interface *xch, uint32_t domid, return rc; } -int xc_psr_cat_get_info(xc_interface *xch, uint32_t socket, unsigned int lvl, - uint32_t *cos_max, uint32_t *cbm_len, bool *cdp_enabled) +int xc_psr_get_hw_info(xc_interface *xch, uint32_t socket, + xc_psr_feat_type type, xc_psr_hw_info *hw_info) { int rc = -1; DECLARE_SYSCTL; + if ( !hw_info ) + { + errno = EINVAL; + return rc; + } + sysctl.cmd = XEN_SYSCTL_psr_alloc; sysctl.u.psr_alloc.target = socket; - switch ( lvl ) + switch ( type ) { - case 2: + case XC_PSR_FEAT_CAT_L2: sysctl.u.psr_alloc.cmd = XEN_SYSCTL_PSR_ALLOC_get_l2_info; rc = xc_sysctl(xch, &sysctl); if ( !rc ) { - *cos_max = sysctl.u.psr_alloc.u.cat_info.cos_max; - *cbm_len = sysctl.u.psr_alloc.u.cat_info.cbm_len; - *cdp_enabled = false; + hw_info->u.xc_cat.cos_max = + sysctl.u.psr_alloc.u.cat_info.cos_max; + hw_info->u.xc_cat.cbm_len = + sysctl.u.psr_alloc.u.cat_info.cbm_len; + hw_info->u.xc_cat.cdp_enabled = false; } break; - case 3: + case XC_PSR_FEAT_CAT_L3: sysctl.u.psr_alloc.cmd = XEN_SYSCTL_PSR_ALLOC_get_l3_info; rc = xc_sysctl(xch, &sysctl); if ( !rc ) { - *cos_max = sysctl.u.psr_alloc.u.cat_info.cos_max; - *cbm_len = sysctl.u.psr_alloc.u.cat_info.cbm_len; - *cdp_enabled = sysctl.u.psr_alloc.u.cat_info.flags & - XEN_SYSCTL_PSR_ALLOC_L3_CDP; + hw_info->u.xc_cat.cos_max = + sysctl.u.psr_alloc.u.cat_info.cos_max; + hw_info->u.xc_cat.cbm_len = + sysctl.u.psr_alloc.u.cat_info.cbm_len; + hw_info->u.xc_cat.cdp_enabled = + sysctl.u.psr_alloc.u.cat_info.flags & + XEN_SYSCTL_PSR_ALLOC_L3_CDP; + } + break; + case XC_PSR_FEAT_MBA: + sysctl.u.psr_alloc.cmd = XEN_SYSCTL_PSR_ALLOC_get_mba_info; + rc = xc_sysctl(xch, &sysctl); + if ( !rc ) + { + hw_info->u.xc_mba.cos_max = + sysctl.u.psr_alloc.u.mba_info.cos_max; + hw_info->u.xc_mba.thrtl_max = + sysctl.u.psr_alloc.u.mba_info.thrtl_max; + hw_info->u.xc_mba.linear = + sysctl.u.psr_alloc.u.mba_info.flags & + XEN_SYSCTL_PSR_ALLOC_MBA_LINEAR; } break; default: diff --git a/tools/libxl/libxl_psr.c b/tools/libxl/libxl_psr.c index 4a6978e..dd412cc 100644 --- a/tools/libxl/libxl_psr.c +++ b/tools/libxl/libxl_psr.c @@ -361,6 +361,27 @@ int libxl_psr_cat_get_cbm(libxl_ctx *ctx, uint32_t domid, return rc; } +static xc_psr_feat_type libxl__feat_type_to_libxc_feat_type( + libxl_psr_feat_type type, unsigned int lvl) +{ + xc_psr_feat_type xc_type = XC_PSR_FEAT_UNKNOWN; + + switch (type) { + case LIBXL_PSR_FEAT_TYPE_CAT: + if (lvl == 3) + xc_type = XC_PSR_FEAT_CAT_L3; + if (lvl == 2) + xc_type = XC_PSR_FEAT_CAT_L2; + break; + case LIBXL_PSR_FEAT_TYPE_MBA: + xc_type = XC_PSR_FEAT_MBA; + default: + break; + } + + return xc_type; +} + int libxl_psr_cat_get_info(libxl_ctx *ctx, libxl_psr_cat_info **info, unsigned int *nr, unsigned int lvl) { @@ -369,6 +390,8 @@ int libxl_psr_cat_get_info(libxl_ctx *ctx, libxl_psr_cat_info **info, int i = 0, socketid, nr_sockets; libxl_bitmap socketmap; libxl_psr_cat_info *ptr; + xc_psr_hw_info hw_info; + xc_psr_feat_type xc_type; libxl_bitmap_init(&socketmap); @@ -385,16 +408,27 @@ int libxl_psr_cat_get_info(libxl_ctx *ctx, libxl_psr_cat_info **info, goto out; } + xc_type = libxl__feat_type_to_libxc_feat_type(LIBXL_PSR_FEAT_TYPE_CAT, lvl); + if (xc_type == XC_PSR_FEAT_UNKNOWN) { + LOG(ERROR, "feature type or lvl is wrong"); + rc = ERROR_FAIL; + goto out; + } + ptr = libxl__malloc(NOGC, nr_sockets * sizeof(libxl_psr_cat_info)); libxl_for_each_set_bit(socketid, socketmap) { ptr[i].id = socketid; - if (xc_psr_cat_get_info(ctx->xch, socketid, lvl, &ptr[i].cos_max, - &ptr[i].cbm_len, &ptr[i].cdp_enabled)) { + if (xc_psr_get_hw_info(ctx->xch, socketid, xc_type, &hw_info)) { rc = ERROR_FAIL; free(ptr); goto out; } + + ptr[i].cos_max = hw_info.u.xc_cat.cos_max; + ptr[i].cbm_len = hw_info.u.xc_cat.cbm_len; + ptr[i].cdp_enabled = hw_info.u.xc_cat.cdp_enabled; + i++; }