From patchwork Thu Aug 24 01:14:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9918809 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 1669F60349 for ; Thu, 24 Aug 2017 01:34:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09625283FD for ; Thu, 24 Aug 2017 01:34:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F264828AB3; Thu, 24 Aug 2017 01:34:38 +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 ED242283FD for ; Thu, 24 Aug 2017 01:34:37 +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 1dkh0e-0000yK-Hw; Thu, 24 Aug 2017 01:32:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dkh0e-0000rN-58 for xen-devel@lists.xenproject.org; Thu, 24 Aug 2017 01:32:36 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 65/9A-01862-3BC2E995; Thu, 24 Aug 2017 01:32:35 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRWlGSWpSXmKPExsXS1tbhqLtZZ16 kwfWZLBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aRK73sBRNMKr5/Vm9g/KLWxcjFISQwnVGi ofcJUxcjJ4eEAK/EkWUzWCFsf4mXK3cyQRQ1MEoc+rSXHSTBJqAu8fhrD1iDiICSxL1Vk8GKm AW2MUm8v/wCrEhYwE/i1Z81bCA2i4CqxP9PR5hBbF4BT4lJ+24xQmyQkzh5bDLQNg4OTqD42n W+IGEhAQ+Ju+/usk5g5F3AyLCKUb04tagstUjXRC+pKDM9oyQ3MTNH19DAWC83tbg4MT01JzG pWC85P3cTIzAYGIBgB2PjF6dDjJIcTEqivE+k50UK8SXlp1RmJBZnxBeV5qQWH2KU4eBQkuCV 1wbKCRalpqdWpGXmAMMSJi3BwaMkwlsAkuYtLkjMLc5Mh0idYlSUEudNBEkIgCQySvPg2mCxc IlRVkqYlxHoECGegtSi3MwSVPlXjOIcjErCvO+0gKbwZOaVwE1/BbSYCWjxpBNzQBaXJCKkpB oY9f2mGqw9sKwjR0hIa3Yxw72nm1Xtpmpc3O1YdEMh4vqrRZsCnufZcEZ0XU5ZaKY/nYP79rT VrzmvM9vu4PsnJdr/77C0sTC3rti/qONdlWuKlKe6WwSVek555rsjoeCX7Jx3J+5wCznvfGPs x7UvaOtdh5DDC+5vEWyZ6mU2VfSOWxxPaEmbEktxRqKhFnNRcSIAD1PkVIACAAA= X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1503538328!80460649!11 X-Originating-IP: [134.134.136.65] 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 8767 invoked from network); 24 Aug 2017 01:32:34 -0000 Received: from mga03.intel.com (HELO mga03.intel.com) (134.134.136.65) by server-11.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 24 Aug 2017 01:32:34 -0000 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Aug 2017 18:32:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,419,1498546800"; d="scan'208";a="303775173" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.80]) by fmsmga004.fm.intel.com with ESMTP; 23 Aug 2017 18:32:30 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Thu, 24 Aug 2017 09:14:44 +0800 Message-Id: <1503537289-56036-11-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1503537289-56036-1-git-send-email-yi.y.sun@linux.intel.com> References: <1503537289-56036-1-git-send-email-yi.y.sun@linux.intel.com> 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, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v2 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: , MIME-Version: 1.0 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 --- 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, 112 insertions(+), 33 deletions(-) diff --git a/tools/libxl/libxl_psr.c b/tools/libxl/libxl_psr.c index b183305..d7da7d7 100644 --- a/tools/libxl/libxl_psr.c +++ b/tools/libxl/libxl_psr.c @@ -382,56 +382,51 @@ static inline xc_psr_feat_type libxl__psr_feat_type_to_libxc_psr_feat_type( return xc_type; } +static inline int libxl__psr_hw_info_to_libxl_psr_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, 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"); - 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"); + rc = libxl_psr_get_hw_info(ctx, &hw_info, (unsigned int *)nr, + LIBXL_PSR_FEAT_TYPE_CAT, lvl); + if (rc) goto out; - } - xc_type = libxl__psr_feat_type_to_libxc_psr_feat_type( - LIBXL_PSR_FEAT_TYPE_CAT, lvl); + 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__psr_hw_info_to_libxl_psr_cat_info( + LIBXL_PSR_FEAT_TYPE_CAT, + &hw_info[i], &ptr[i])) { + libxl_psr_hw_info_list_free(hw_info, (unsigned int)*nr); rc = ERROR_FAIL; free(ptr); goto out; } - - ptr[i].cos_max = hw_info.u.xc_cat_info.cos_max; - ptr[i].cbm_len = hw_info.u.xc_cat_info.cbm_len; - ptr[i].cdp_enabled = hw_info.u.xc_cat_info.cdp_enabled; - - i++; } *info = ptr; - *nr = i; + libxl_psr_hw_info_list_free(hw_info, (unsigned int)*nr); out: - libxl_bitmap_dispose(&socketmap); GC_FREE; return rc; } @@ -469,15 +464,99 @@ int libxl_psr_get_val(libxl_ctx *ctx, uint32_t domid, return ERROR_FAIL; } +static inline int libxc__psr_hw_info_to_libxl_psr_hw_info( + libxl_psr_feat_type type, xc_psr_hw_info *xc_hw_info, + libxl_psr_hw_info *xl_hw_info) +{ + switch (type) { + case LIBXL_PSR_FEAT_TYPE_CAT: + xl_hw_info->u.cat.cos_max = xc_hw_info->u.xc_cat_info.cos_max; + xl_hw_info->u.cat.cbm_len = xc_hw_info->u.xc_cat_info.cbm_len; + xl_hw_info->u.cat.cdp_enabled = + xc_hw_info->u.xc_cat_info.cdp_enabled; + break; + case LIBXL_PSR_FEAT_TYPE_MBA: + xl_hw_info->u.mba.cos_max = xc_hw_info->u.xc_mba_info.cos_max; + xl_hw_info->u.mba.thrtl_max = xc_hw_info->u.xc_mba_info.thrtl_max; + xl_hw_info->u.mba.linear = xc_hw_info->u.xc_mba_info.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); + + if (type == LIBXL_PSR_FEAT_TYPE_CAT && lvl != 3 && lvl != 2) { + LOGE(ERROR, "input lvl %d is wrong!\n", lvl); + rc = ERROR_FAIL; + goto out; + } + + xc_type = libxl__psr_feat_type_to_libxc_psr_feat_type(type, lvl); + + rc = libxl__count_physical_sockets(gc, &nr_sockets); + if (rc) { + LOGE(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 (libxc__psr_hw_info_to_libxl_psr_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); } /*