From patchwork Sun Oct 8 07:23:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9991739 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 AE31D60244 for ; Sun, 8 Oct 2017 07:47:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A039828689 for ; Sun, 8 Oct 2017 07:47:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 951EF28713; Sun, 8 Oct 2017 07:47:46 +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 16F7528689 for ; Sun, 8 Oct 2017 07:47:46 +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 1e16Gy-0002jQ-9a; Sun, 08 Oct 2017 07:45:16 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e16Gw-0002h3-Va for xen-devel@lists.xenproject.org; Sun, 08 Oct 2017 07:45:15 +0000 Received: from [85.158.143.35] by server-9.bemta-6.messagelabs.com id 34/CA-03428-A87D9D95; Sun, 08 Oct 2017 07:45:14 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrHIsWRWlGSWpSXmKPExsXS1tYhr9tx/Wa kwa3nShbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aSjf8ZC65aVsx+O4mlgfGNdhcjB4eQQIXE 3DPFXYycHBICvBJHls1ghbADJJpnX2HrYuQCKmlglOjYvpcNJMEmoC7x+GsPE4gtIqAkcW/VZ DCbWeA6o0TP3FgQW1jAT6Lt+0cWEJtFQFVi3aSLzCA2r4CHxK6vf5ggFshJnDw2GWwZJ1B81v kN7CC2kIC7xOrV7YwQ9YISJ2c+YQG5kxlo7/p5QhCr5CWat85mnsAoMAtJ1SyEqllIqhYwMq9 iVC9OLSpLLdK11EsqykzPKMlNzMzRNTQw08tNLS5OTE/NSUwq1kvOz93ECAxLBiDYwXh3U8Ah RkkOJiVR3j9XbkYK8SXlp1RmJBZnxBeV5qQWH2KU4eBQkuDdeg0oJ1iUmp5akZaZA4wQmLQEB 4+SCO/kS0Bp3uKCxNzizHSI1ClGXY6Om3f/MAmx5OXnpUqJ8x4BmSEAUpRRmgc3AhatlxhlpY R5GYGOEuIpSC3KzSxBlX/FKM7BqCTMuxtkCk9mXgncpldARzABHcFYfAPkiJJEhJRUAyN3qaA ro7vJp5txDbxz8hsW7kqLczrx3ZdVLVzhxs19syY1O3C9dxZbuj9VcktA+fYid6bkMxP6+lRm 3Lkj929frHvvrgU/Zy5qCuX4beU+eZ6NkQFDRzzXQn6Nb+lne7bF8S1qeflqA8PHvYwrcmMDX K/XLY7gXTYlVEKyy+rANoY6L62VLUosxRmJhlrMRcWJAIEthx/RAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1507448708!73382855!3 X-Originating-IP: [134.134.136.31] 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 52304 invoked from network); 8 Oct 2017 07:45:12 -0000 Received: from mga06.intel.com (HELO mga06.intel.com) (134.134.136.31) by server-3.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 8 Oct 2017 07:45:12 -0000 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP; 08 Oct 2017 00:45:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.42,493,1500966000"; d="scan'208"; a="1022874914" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.75]) by orsmga003.jf.intel.com with ESMTP; 08 Oct 2017 00:44:51 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Sun, 8 Oct 2017 15:23:56 +0800 Message-Id: <1507447441-5422-12-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507447441-5422-1-git-send-email-yi.y.sun@linux.intel.com> References: <1507447441-5422-1-git-send-email-yi.y.sun@linux.intel.com> MIME-Version: 1.0 Cc: Wei Liu , Chao Peng , Yi Sun , Ian Jackson , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [Xen-devel] [PATCH v6 11/16] 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 makes 'libxl_psr_cat_get_info' call 'libxl_psr_get_hw_info' to avoid redundant code in libxl_psr.c. Signed-off-by: Yi Sun Reviewed-by: Roger Pau Monné Acked-by: Wei Liu --- CC: Wei Liu CC: Ian Jackson CC: Roger Pau Monné CC: Chao Peng v5: - change 'if (rc < 0)' to 'if (rc)'. (suggested by Roger Pau Monné) v4: - remove 'xc_' from struct name. (suggested by Roger Pau Monné) - fix words in commit message. (suggested by Roger Pau Monné) - change type of 'libxl__hw_info_to_libxl_cat_info' to void and use assert to check invalid type. Then, remove check for 'libxl__hw_info_to_libxl_cat_info'. (suggested by Roger Pau Monné) - change type of 'libxl__xc_hw_info_to_libxl_hw_info' to void and use assert to check invalid type. Then, remove check for 'libxl__xc_hw_info_to_libxl_hw_info'. (suggested by Roger Pau Monné) 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 | 131 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 93 insertions(+), 38 deletions(-) diff --git a/tools/libxl/libxl_psr.c b/tools/libxl/libxl_psr.c index e1cc250..b053abd 100644 --- a/tools/libxl/libxl_psr.c +++ b/tools/libxl/libxl_psr.c @@ -386,56 +386,41 @@ static xc_psr_feat_type libxl__feat_type_to_libxc_feat_type( return xc_type; } +static void libxl__hw_info_to_libxl_cat_info( + libxl_psr_feat_type type, libxl_psr_hw_info *hw_info, + libxl_psr_cat_info *cat_info) +{ + assert(type == LIBXL_PSR_FEAT_TYPE_CAT); + + 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; +} + 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"); - 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, LIBXL_PSR_FEAT_TYPE_CAT, lvl, nr, &hw_info); + if (rc) goto out; - } - - xc_type = libxl__feat_type_to_libxc_feat_type(LIBXL_PSR_FEAT_TYPE_CAT, lvl); - - 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)) { - LOGE(ERROR, "failed to get hw info"); - rc = ERROR_FAIL; - free(ptr); - goto out; - } - ptr[i].cos_max = hw_info.cat.cos_max; - ptr[i].cbm_len = hw_info.cat.cbm_len; - ptr[i].cdp_enabled = hw_info.cat.cdp_enabled; + ptr = libxl__malloc(NOGC, *nr * sizeof(libxl_psr_cat_info)); - i++; - } + for (i = 0; i < *nr; i++) + libxl__hw_info_to_libxl_cat_info(LIBXL_PSR_FEAT_TYPE_CAT, + &hw_info[i], + &ptr[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 +461,85 @@ int libxl_psr_get_val(libxl_ctx *ctx, uint32_t domid, return ERROR_FAIL; } +static void 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->cat.cos_max; + xl_info->u.cat.cbm_len = xc_info->cat.cbm_len; + xl_info->u.cat.cdp_enabled = xc_info->cat.cdp_enabled; + break; + case LIBXL_PSR_FEAT_TYPE_MBA: + xl_info->u.mba.cos_max = xc_info->mba.cos_max; + xl_info->u.mba.thrtl_max = xc_info->mba.thrtl_max; + xl_info->u.mba.linear = xc_info->mba.linear; + break; + default: + assert(0); + } +} + int libxl_psr_get_hw_info(libxl_ctx *ctx, libxl_psr_feat_type type, unsigned int lvl, unsigned int *nr, libxl_psr_hw_info **info) { - 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); + + 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) { + 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; + } + + libxl__xc_hw_info_to_libxl_hw_info(type, &hw_info, &ptr[i]); + + 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); } /*