From patchwork Sun Oct 8 07:23:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9991737 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 950F460244 for ; Sun, 8 Oct 2017 07:47:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8754128689 for ; Sun, 8 Oct 2017 07:47:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C6AA28713; Sun, 8 Oct 2017 07:47:43 +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 10FC928689 for ; Sun, 8 Oct 2017 07:47:43 +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-0002ji-Gi; 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-0002h4-Vu for xen-devel@lists.xenproject.org; Sun, 08 Oct 2017 07:45:15 +0000 Received: from [85.158.143.35] by server-8.bemta-6.messagelabs.com id E0/AB-03870-A87D9D95; Sun, 08 Oct 2017 07:45:14 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrHIsWRWlGSWpSXmKPExsXS1tYhr9t2/Wa kwftGVYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNePi9StMBf80Kk5t/8jcwLhErouRg0NIoELi 3960LkZODgkBXokjy2awQtgBEq0v1zF3MXIBlTQwSiyb9Z8RJMEmoC7x+GsPE4gtIqAkcW/VZ CaQImaB34wSp7YcAksICzhKfN22gA1kAYuAqsT11lyQMK+Au8Ta1x1QC+QkTh6bDGZzCnhIzD q/gR3EFgKqWb26nRGiXlDi5MwnLCBjmIH2rp8nBBJmFpCXaN46m3kCo8AsJFWzEKpmIalawMi 8ilG9OLWoLLVI11IvqSgzPaMkNzEzR9fQwEwvN7W4ODE9NScxqVgvOT93EyMwLBmAYAfj3U0B hxglOZiURHn/XLkZKcSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mCd+s1oJxgUWp6akVaZg4wQmDSE hw8SiK8ky8BpXmLCxJzizPTIVKnGHU5Om7e/cMkxJKXn5cqJc57BGSGAEhRRmke3AhYtF5ilJ US5mUEOkqIpyC1KDezBFX+FaM4B6OSMO9ukCk8mXklcJteAR3BBHQEY/ENkCNKEhFSUg2MrCy fxZdwMT6Zcv9qqdZXrrUCSS4mHMa18w+tX6t3+tmXV38XZ7y0XHovRNJdcULnVJ+t5zhz/1fM //VYINQ9Qq5mr+tMthNcmw8wbzjYsPxv19ZWpTtO26drpl+qf7EnRSFtobR3WL7H1BWeyk7rX GKq1q4w0b4tc9biwOUPUtOrJIUfHMk6rcRSnJFoqMVcVJwIAH/b2+nRAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1507448708!73382855!1 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 52147 invoked from network); 8 Oct 2017 07:45:10 -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:10 -0000 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP; 08 Oct 2017 00:45:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.42,493,1500966000"; d="scan'208"; a="1022874868" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.75]) by orsmga003.jf.intel.com with ESMTP; 08 Oct 2017 00:44:36 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Sun, 8 Oct 2017 15:23:51 +0800 Message-Id: <1507447441-5422-7-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 , Yi Sun , Andrew Cooper , Jan Beulich , Chao Peng , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [Xen-devel] [PATCH v6 06/16] x86: implement get hw info flow for MBA 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 get HW info flow for MBA including its callback function and sysctl interface. Signed-off-by: Yi Sun Reviewed-by: Roger Pau Monné Acked-by: Jan Beulich --- CC: Jan Beulich CC: Andrew Cooper CC: Wei Liu CC: Roger Pau Monné CC: Chao Peng v5: - use ASSERT in 'mba_get_feat_info'. (suggested by Roger Pau Monné) - correct initialization format of 'data[PSR_INFO_ARRAY_SIZE]'. (suggested by Roger Pau Monné and Jan Beulich) v4: - remove 'ALLOC_' from macro names. (suggested by Roger Pau Monné) - initialize 'data[PSR_INFO_ARRAY_SIZE]' to 0 to prevent to leak stack data. (suggested by Roger Pau Monné) v3: - replace 'PSR_VAL_TYPE_MBA' to 'PSR_TYPE_MBA_THRTL'. (suggested by Roger Pau Monné) v2: - use 'XEN_SYSCTL_PSR_MBA_LINEAR' to set MBA feature HW info. (suggested by Chao Peng) v1: - sort 'PSR_INFO_IDX_' macros as feature. (suggested by Chao Peng) - rename 'PSR_INFO_IDX_MBA_LINEAR' to 'PSR_INFO_IDX_MBA_FLAG'. - rename 'linear' in 'struct mba_info' to 'flags' for future extension. (suggested by Chao Peng) --- xen/arch/x86/psr.c | 14 +++++++++++++- xen/arch/x86/sysctl.c | 21 ++++++++++++++++++++- xen/include/asm-x86/psr.h | 2 ++ xen/include/public/sysctl.h | 8 ++++++++ 4 files changed, 43 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 157e11f..03f24c0 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -263,6 +263,10 @@ static enum psr_feat_type psr_type_to_feat_type(enum psr_type type) feat_type = FEAT_TYPE_L2_CAT; break; + case PSR_TYPE_MBA_THRTL: + feat_type = FEAT_TYPE_MBA; + break; + default: ASSERT_UNREACHABLE(); } @@ -483,7 +487,15 @@ static const struct feat_props l2_cat_props = { static bool mba_get_feat_info(const struct feat_node *feat, uint32_t data[], unsigned int array_len) { - return false; + ASSERT(array_len == PSR_INFO_ARRAY_SIZE); + + data[PSR_INFO_IDX_COS_MAX] = feat->cos_max; + data[PSR_INFO_IDX_MBA_THRTL_MAX] = feat->mba.thrtl_max; + + if ( feat->mba.linear ) + data[PSR_INFO_IDX_MBA_FLAG] |= XEN_SYSCTL_PSR_MBA_LINEAR; + + return true; } static void mba_write_msr(unsigned int cos, uint32_t val, diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index 6867ee1..f48d6fd 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -174,7 +174,7 @@ long arch_do_sysctl( case XEN_SYSCTL_psr_alloc: switch ( sysctl->u.psr_alloc.cmd ) { - uint32_t data[PSR_INFO_ARRAY_SIZE]; + uint32_t data[PSR_INFO_ARRAY_SIZE] = { }; case XEN_SYSCTL_PSR_get_l3_info: { @@ -214,6 +214,25 @@ long arch_do_sysctl( break; } + case XEN_SYSCTL_PSR_get_mba_info: + { + ret = psr_get_info(sysctl->u.psr_alloc.target, + PSR_TYPE_MBA_THRTL, data, ARRAY_SIZE(data)); + if ( ret ) + break; + + sysctl->u.psr_alloc.u.mba_info.cos_max = + data[PSR_INFO_IDX_COS_MAX]; + sysctl->u.psr_alloc.u.mba_info.thrtl_max = + data[PSR_INFO_IDX_MBA_THRTL_MAX]; + sysctl->u.psr_alloc.u.mba_info.flags = + data[PSR_INFO_IDX_MBA_FLAG]; + + if ( __copy_field_to_guest(u_sysctl, sysctl, u.psr_alloc) ) + ret = -EFAULT; + break; + } + default: ret = -EOPNOTSUPP; break; diff --git a/xen/include/asm-x86/psr.h b/xen/include/asm-x86/psr.h index 9d14264..084ae97 100644 --- a/xen/include/asm-x86/psr.h +++ b/xen/include/asm-x86/psr.h @@ -39,6 +39,8 @@ #define PSR_INFO_IDX_COS_MAX 0 #define PSR_INFO_IDX_CAT_CBM_LEN 1 #define PSR_INFO_IDX_CAT_FLAG 2 +#define PSR_INFO_IDX_MBA_THRTL_MAX 1 +#define PSR_INFO_IDX_MBA_FLAG 2 #define PSR_INFO_ARRAY_SIZE 3 struct psr_cmt_l3 { diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index a50e345..f7f26c3 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -698,6 +698,7 @@ struct xen_sysctl_pcitopoinfo { #define XEN_SYSCTL_PSR_get_l3_info 0 #define XEN_SYSCTL_PSR_get_l2_info 1 +#define XEN_SYSCTL_PSR_get_mba_info 2 struct xen_sysctl_psr_alloc { uint32_t cmd; /* IN: XEN_SYSCTL_PSR_* */ uint32_t target; /* IN */ @@ -708,6 +709,13 @@ struct xen_sysctl_psr_alloc { #define XEN_SYSCTL_PSR_CAT_L3_CDP (1u << 0) uint32_t flags; /* OUT: CAT flags */ } cat_info; + + struct { + uint32_t thrtl_max; /* OUT: Maximum throttle */ + uint32_t cos_max; /* OUT: Maximum COS */ +#define XEN_SYSCTL_PSR_MBA_LINEAR (1u << 0) + uint32_t flags; /* OUT: MBA flags */ + } mba_info; } u; };