From patchwork Tue Sep 5 09:32:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9938341 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 E7FB7601EB for ; Tue, 5 Sep 2017 09:53:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA60028902 for ; Tue, 5 Sep 2017 09:53:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF0D72890B; Tue, 5 Sep 2017 09:53:52 +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 2CBC028902 for ; Tue, 5 Sep 2017 09:53:52 +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 1dpAWG-0007MQ-VT; Tue, 05 Sep 2017 09:51:44 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dpAWF-0007Kn-CD for xen-devel@lists.xenproject.org; Tue, 05 Sep 2017 09:51:43 +0000 Received: from [193.109.254.147] by server-9.bemta-6.messagelabs.com id A8/A3-03422-EA37EA95; Tue, 05 Sep 2017 09:51:42 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrMIsWRWlGSWpSXmKPExsXS1taRoru2eF2 kwbJLNhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8ap97EFN80qzr25wNLA2K7ZxcjJISRQKbHw zGR2EFtCgFfiyLIZrBC2v0TbxO+MXYxcQDUNjBLLpu9jBEmwCahLPP7awwRiiwgoSdxbNZkJp IhZ4ByTxJ6PO8ASwgJ+EqcPd4DZLAKqElcm3gObyivgIXHy7E4WiA1yEiePTQaKc3BwAsWXXq uDOMhd4s+2u1DlghInZz5hASlhBtq7fp4QSJhZQF6ieets5gmMArOQVM1CqJqFpGoBI/MqRo3 i1KKy1CJdQ0O9pKLM9IyS3MTMHF1DAzO93NTi4sT01JzEpGK95PzcTYzAwGQAgh2Mn5YFHGKU 5GBSEuUNTVwXKcSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mC91YRUE6wKDU9tSItMwcYIzBpCQ4eJ RHecyBp3uKCxNzizHSI1ClGRSlx3uMgCQGQREZpHlwbLC4vMcpKCfMyAh0ixFOQWpSbWYIq/4 pRnINRSZh3CcgUnsy8Erjpr4AWMwEtrnq5BmRxSSJCSqqBUaNzec5e+cz/m9bO9epl4Vw9+5T GgfBZ1Vs2JQSv7/Q7MEG/PHJpOGes2yfu/6prna/Mj88qZnnMLlCZ7ZN+ykfrx7EJTA2fdm17 v7ZyzeyXLK316wtiHmRcFZo0W3x1SJFizvmwHt6QdatEuN1LFj3bOU349u9NJ3qrX8fXdU5o7 /uw+PCOg0osxRmJhlrMRcWJAGvdzTfGAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1504605073!62289035!7 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 48189 invoked from network); 5 Sep 2017 09:51:41 -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:41 -0000 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP; 05 Sep 2017 02:51:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,479,1498546800"; d="scan'208";a="897185395" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.80]) by FMSMGA003.fm.intel.com with ESMTP; 05 Sep 2017 02:51:35 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Tue, 5 Sep 2017 17:32:32 +0800 Message-Id: <1504603957-5389-11-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 10/15] tools: implement the new libxl 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 the new libxl get hw info interface, 'libxl_psr_get_hw_info', which is suitable to all psr allocation features. It also implements corresponding list free function, 'libxl_psr_hw_info_list_free' and make 'libxl_psr_cat_get_info' to call 'libxl_psr_get_hw_info' to avoid redundant codes in libxl_psr.c. Signed-off-by: Yi Sun --- v3: - remove casting. (suggested by Roger Pau Monné) - remove inline. (suggested by Roger Pau Monné) - change 'libxc__psr_hw_info_to_libxl_psr_hw_info' to 'libxl__xc_hw_info_to_libxl_hw_info'. (suggested by Roger Pau Monné) - remove '_hw' from parameter names. (suggested by Roger Pau Monné) - change some 'LOGE' to 'LOG'. (suggested by Roger Pau Monné) - check returned 'xc_type' and remove redundant 'lvl' check. (suggested by Roger Pau Monné) v2: - split this patch out from a big patch in v1. (suggested by Wei Liu) - change 'CAT_INFO'/'MBA_INFO' to 'CAT' and 'MBA. Also the libxl structure name 'cat_info'/'mba_info' is changed to 'cat'/'mba'. (suggested by Chao Peng) - call 'libxl_psr_hw_info_list_free' in 'libxl_psr_cat_get_info' to free allocated resources. (suggested by Chao Peng) --- tools/libxl/libxl_psr.c | 145 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 108 insertions(+), 37 deletions(-) diff --git a/tools/libxl/libxl_psr.c b/tools/libxl/libxl_psr.c index dd412cc..d534ec2 100644 --- a/tools/libxl/libxl_psr.c +++ b/tools/libxl/libxl_psr.c @@ -382,60 +382,49 @@ static xc_psr_feat_type libxl__feat_type_to_libxc_feat_type( return xc_type; } +static int libxl__hw_info_to_libxl_cat_info( + libxl_psr_feat_type type, libxl_psr_hw_info *hw_info, + libxl_psr_cat_info *cat_info) +{ + if (type != LIBXL_PSR_FEAT_TYPE_CAT) + return ERROR_INVAL; + + cat_info->id = hw_info->id; + cat_info->cos_max = hw_info->u.cat.cos_max; + cat_info->cbm_len = hw_info->u.cat.cbm_len; + cat_info->cdp_enabled = hw_info->u.cat.cdp_enabled; + + return 0; +} + int libxl_psr_cat_get_info(libxl_ctx *ctx, libxl_psr_cat_info **info, unsigned int *nr, unsigned int lvl) { GC_INIT(ctx); int rc; - int i = 0, socketid, nr_sockets; - libxl_bitmap socketmap; + unsigned int i; + libxl_psr_hw_info *hw_info; libxl_psr_cat_info *ptr; - xc_psr_hw_info hw_info; - xc_psr_feat_type xc_type; - - libxl_bitmap_init(&socketmap); - rc = libxl__count_physical_sockets(gc, &nr_sockets); - if (rc) { - LOGE(ERROR, "failed to get system socket count"); + rc = libxl_psr_get_hw_info(ctx, &hw_info, nr, LIBXL_PSR_FEAT_TYPE_CAT, lvl); + if (rc) goto out; - } - libxl_socket_bitmap_alloc(ctx, &socketmap, nr_sockets); - rc = libxl_get_online_socketmap(ctx, &socketmap); - if (rc < 0) { - LOGE(ERROR, "failed to get available sockets"); - 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 * sizeof(libxl_psr_cat_info)); - 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_get_hw_info(ctx->xch, socketid, xc_type, &hw_info)) { + for (i = 0; i < *nr; i++) { + if (libxl__hw_info_to_libxl_cat_info(LIBXL_PSR_FEAT_TYPE_CAT, + &hw_info[i], &ptr[i])) { + libxl_psr_hw_info_list_free(hw_info, *nr); 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++; } *info = ptr; - *nr = i; + libxl_psr_hw_info_list_free(hw_info, *nr); out: - libxl_bitmap_dispose(&socketmap); GC_FREE; return rc; } @@ -476,15 +465,97 @@ int libxl_psr_get_val(libxl_ctx *ctx, uint32_t domid, return ERROR_FAIL; } +static int libxl__xc_hw_info_to_libxl_hw_info( + libxl_psr_feat_type type, xc_psr_hw_info *xc_info, + libxl_psr_hw_info *xl_info) +{ + switch (type) { + case LIBXL_PSR_FEAT_TYPE_CAT: + xl_info->u.cat.cos_max = xc_info->u.xc_cat.cos_max; + xl_info->u.cat.cbm_len = xc_info->u.xc_cat.cbm_len; + xl_info->u.cat.cdp_enabled = xc_info->u.xc_cat.cdp_enabled; + break; + case LIBXL_PSR_FEAT_TYPE_MBA: + xl_info->u.mba.cos_max = xc_info->u.xc_mba.cos_max; + xl_info->u.mba.thrtl_max = xc_info->u.xc_mba.thrtl_max; + xl_info->u.mba.linear = xc_info->u.xc_mba.linear; + break; + default: + return ERROR_INVAL; + } + + return 0; +} + int libxl_psr_get_hw_info(libxl_ctx *ctx, libxl_psr_hw_info **info, unsigned int *nr, libxl_psr_feat_type type, unsigned int lvl) { - return ERROR_FAIL; + GC_INIT(ctx); + int rc, nr_sockets; + unsigned int i = 0, socketid; + libxl_bitmap socketmap; + libxl_psr_hw_info *ptr; + xc_psr_feat_type xc_type; + xc_psr_hw_info hw_info; + + libxl_bitmap_init(&socketmap); + + xc_type = libxl__feat_type_to_libxc_feat_type(type, lvl); + if (xc_type == XC_PSR_FEAT_UNKNOWN) { + LOG(ERROR, "feature type or lvl is wrong"); + rc = ERROR_FAIL; + goto out; + } + + rc = libxl__count_physical_sockets(gc, &nr_sockets); + if (rc) { + LOG(ERROR, "failed to get system socket count"); + goto out; + } + + libxl_socket_bitmap_alloc(ctx, &socketmap, nr_sockets); + rc = libxl_get_online_socketmap(ctx, &socketmap); + if (rc < 0) { + LOGE(ERROR, "failed to get available sockets"); + goto out; + } + + ptr = libxl__malloc(NOGC, nr_sockets * sizeof(libxl_psr_hw_info)); + + libxl_for_each_set_bit(socketid, socketmap) { + ptr[i].id = socketid; + if (xc_psr_get_hw_info(ctx->xch, socketid, xc_type, &hw_info)) { + rc = ERROR_FAIL; + free(ptr); + goto out; + } + + if (libxl__xc_hw_info_to_libxl_hw_info(type, &hw_info, &ptr[i])) { + LOGE(ERROR, "Input type %d is wrong!\n", type); + rc = ERROR_FAIL; + free(ptr); + goto out; + } + + i++; + } + + *info = ptr; + *nr = i; +out: + libxl_bitmap_dispose(&socketmap); + GC_FREE; + return rc; } void libxl_psr_hw_info_list_free(libxl_psr_hw_info *list, unsigned int nr) { + unsigned int i; + + for (i = 0; i < nr; i++) + libxl_psr_hw_info_dispose(&list[i]); + free(list); } /*