From patchwork Mon Oct 16 03:04:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 10007603 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 10603601E7 for ; Mon, 16 Oct 2017 03:28:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 04C16279E0 for ; Mon, 16 Oct 2017 03:28:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0334D27D16; Mon, 16 Oct 2017 03:28:21 +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 4ED0B279E0 for ; Mon, 16 Oct 2017 03:28:19 +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 1e3w2G-0002bs-MS; Mon, 16 Oct 2017 03:25:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e3w2F-0002Z8-6I for xen-devel@lists.xenproject.org; Mon, 16 Oct 2017 03:25:47 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id D5/80-07262-AB624E95; Mon, 16 Oct 2017 03:25:46 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrMIsWRWlGSWpSXmKPExsXS1tYhr7tT7Um kwbtZJhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa0b3pgXsBfNdKxZuDGlg/GXUxcjJISRQIbH/ 8FtGEFtCgFfiyLIZrBC2j8TvG18YIWoaGCVaHhqA2GwC6hKPv/YwgdgiAkoS91ZNBrOZBa4zS vTMjQWxhQX8JNYfeswOYrMIqEr8OXWJBcTmFfCQ+PW2mx1ivpzEyWOTwXZxAsVn3t3E1sXIAb TLXeLiFXWIckGJkzOfsICEmYHWrp8nBLFJXqJ562zmCYwCs5BUzUKomoWkagEj8ypGjeLUorL UIl0jE72kosz0jJLcxMwcXUMDY73c1OLixPTUnMSkYr3k/NxNjMCgrGdgYNzB+Oq43yFGSQ4m JVHec60PI4X4kvJTKjMSizPii0pzUosPMcpwcChJ8G5XfRIpJFiUmp5akZaZA4wPmLQEB4+SC O8kkDRvcUFibnFmOkTqFKMxx7FNl/8wcXTcvPuHSYglLz8vVUqc9wpIqQBIaUZpHtwgWNxeYp SVEuZlZGBgEOIpSC3KzSxBlX/FKM7BqCTMewtkCk9mXgncvldApzABnfIu4gHIKSWJCCmpBsY 1Kk/YONK3vP+cc+mqYvlL1sYrx2wcZZimHdC+mPzjUf6XWu144WJ2ob1yx5/y+oqtCPymGs13 7fMWkWtl75p4Frx17jq6yOeBdu9XjuINk6NkGhb/3P/l0Pl0m4hJhTxBIj5FDR1aivW7d9r+l LrMXdq7xGbmn8cCZSwp5VPDin6vzN4ygUWJpTgj0VCLuag4EQALMBGz1gIAAA== X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1508124315!54894109!11 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 36162 invoked from network); 16 Oct 2017 03:25:45 -0000 Received: from mga06.intel.com (HELO mga06.intel.com) (134.134.136.31) by server-9.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 16 Oct 2017 03:25:45 -0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP; 15 Oct 2017 20:25:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,371,1503385200"; d="scan'208";a="533673" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.75]) by orsmga001.jf.intel.com with ESMTP; 15 Oct 2017 20:25:42 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Mon, 16 Oct 2017 11:04:15 +0800 Message-Id: <1508123061-6600-11-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508123061-6600-1-git-send-email-yi.y.sun@linux.intel.com> References: <1508123061-6600-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 v8 10/16] 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 Reviewed-by: Roger Pau Monné Acked-by: Wei Liu --- CC: Wei Liu CC: Ian Jackson CC: Roger Pau Monné CC: Chao Peng v6: - remove unnecessary spaces in brackets. (suggested by Wei Liu) - use assert to check input lvl. (suggested by Roger Pau Monné) v5: - directly define 'xc_psr_hw_info' as union type. (suggested by Roger Pau Monné) - converge L2 and L3 cases in 'xc_psr_get_hw_info'. (suggested by Roger Pau Monné) v4: - remove 'ALLOC_' from macro names. (suggested by Roger Pau Monné) - remove 'XC_PSR_FEAT_UNKNOWN' which is not necessary. (suggested by Roger Pau Monné) - remove 'FEAT_' from enum item names. (suggested by Roger Pau Monné) - remove 'xc_' from struct name. (suggested by Roger Pau Monné) - adjust codes to reduce indentation. (suggested by Roger Pau Monné) - assert for not happened case. (suggested by Roger Pau Monné) - add LOGE to show errno. (suggested by Roger Pau Monné) 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 | 27 ++++++++++++++++++--- tools/libxc/xc_psr.c | 55 +++++++++++++++++++++++++++---------------- tools/libxl/libxl_psr.c | 38 ++++++++++++++++++++++++++++-- 3 files changed, 95 insertions(+), 25 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 3bcab3c..8527389 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2494,6 +2494,28 @@ enum xc_psr_cat_type { }; typedef enum xc_psr_cat_type xc_psr_cat_type; +enum xc_psr_feat_type { + XC_PSR_CAT_L3, + XC_PSR_CAT_L2, + XC_PSR_MBA, +}; +typedef enum xc_psr_feat_type xc_psr_feat_type; + +union xc_psr_hw_info { + struct { + uint32_t cos_max; + uint32_t cbm_len; + bool cdp_enabled; + } cat; + + struct { + uint32_t cos_max; + uint32_t thrtl_max; + bool linear; + } mba; +}; +typedef union 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, @@ -2515,9 +2537,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 5c54a35..2c605a7 100644 --- a/tools/libxc/xc_psr.c +++ b/tools/libxc/xc_psr.c @@ -323,37 +323,52 @@ 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: - sysctl.u.psr_alloc.cmd = XEN_SYSCTL_PSR_get_l2_info; + case XC_PSR_CAT_L2: + case XC_PSR_CAT_L3: + sysctl.u.psr_alloc.cmd = (type == XC_PSR_CAT_L2) ? + XEN_SYSCTL_PSR_get_l2_info : + XEN_SYSCTL_PSR_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 = false; - } + if ( rc ) + break; + + hw_info->cat.cos_max = sysctl.u.psr_alloc.u.cat_info.cos_max; + hw_info->cat.cbm_len = sysctl.u.psr_alloc.u.cat_info.cbm_len; + hw_info->cat.cdp_enabled = (type == XC_PSR_CAT_L2) ? + false : + (sysctl.u.psr_alloc.u.cat_info.flags & + XEN_SYSCTL_PSR_CAT_L3_CDP); + break; - case 3: - sysctl.u.psr_alloc.cmd = XEN_SYSCTL_PSR_get_l3_info; + case XC_PSR_MBA: + sysctl.u.psr_alloc.cmd = XEN_SYSCTL_PSR_get_mba_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_CAT_L3_CDP; - } + if ( rc ) + break; + + hw_info->mba.cos_max = sysctl.u.psr_alloc.u.mba_info.cos_max; + hw_info->mba.thrtl_max = sysctl.u.psr_alloc.u.mba_info.thrtl_max; + hw_info->mba.linear = sysctl.u.psr_alloc.u.mba_info.flags & + XEN_SYSCTL_PSR_MBA_LINEAR; + break; default: errno = EOPNOTSUPP; diff --git a/tools/libxl/libxl_psr.c b/tools/libxl/libxl_psr.c index d4f5f67..e1cc250 100644 --- a/tools/libxl/libxl_psr.c +++ b/tools/libxl/libxl_psr.c @@ -361,6 +361,31 @@ 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; + + switch (type) { + case LIBXL_PSR_FEAT_TYPE_CAT: + assert(lvl == 3 || lvl == 2); + + if (lvl == 3) + xc_type = XC_PSR_CAT_L3; + if (lvl == 2) + xc_type = XC_PSR_CAT_L2; + break; + case LIBXL_PSR_FEAT_TYPE_MBA: + xc_type = XC_PSR_MBA; + break; + default: + /* Could not happen */ + assert(0); + } + + 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 +394,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 +412,23 @@ 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); + 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)) { + 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; + i++; }