From patchwork Sat Sep 30 01:39:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9979019 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 6C7FB60311 for ; Sat, 30 Sep 2017 02:01:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A68D298AA for ; Sat, 30 Sep 2017 02:01:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4F2C0298CE; Sat, 30 Sep 2017 02:01:42 +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 D5343298AA for ; Sat, 30 Sep 2017 02:01:41 +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 1dy73r-0004Sz-7B; Sat, 30 Sep 2017 01:59:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dy73q-0004R3-5K for xen-devel@lists.xenproject.org; Sat, 30 Sep 2017 01:59:22 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 33/23-02048-97AFEC95; Sat, 30 Sep 2017 01:59:21 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLIsWRWlGSWpSXmKPExsXS1taRolvx61y kwdpj2hbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aHdc4FczUrZr8+x9LAeFSui5GdQ0igQuI5 XxcjJ4eEAK/EkWUzWCHsAIkb93czdzFyAVU0MEocezKRBSTBJqAu8fhrDxOILSKgJHFv1WQmk CJmgd+MEqe2HAJLCAs4SnyZvBzI5uBgEVCV2DGlDCTMK+Auca3zHjvEAjmJk8cmgy3jFPCQuN bTxAZiCwHVXGlZywhRLyhxcuYTFpAxzEB7188TAgkzC8hLNG+dzTyBUWAWkqpZCFWzkFQtYGR exahRnFpUllqka2Sil1SUmZ5RkpuYmaNraGCsl5taXJyYnpqTmFSsl5yfu4kRGJT1DAyMOxhf Hfc7xCjJwaQkyrv827lIIb6k/JTKjMTijPii0pzU4kOMMhwcShK8538C5QSLUtNTK9Iyc4DxA ZOW4OBREuHdApLmLS5IzC3OTIdInWLU5ei4efcPkxBLXn5eqpQ4bwFIkQBIUUZpHtwIWKxeYp SVEuZlZGBgEOIpSC3KzSxBlX/FKM7BqCTMWwsyhSczrwRu0yugI5iAjpg88QzIESWJCCmpBsb AG7sr19V+VwncnR769MgT2aVpP0R/JSr+4JvyQjI+wvPPc7d+vqfqgve3Svvdv1Jvs+ihnlvE L6MVR5Ypz+H8JN4dPSN1rWzWxfKVLemnpW4+/3ayxvWriu1kWV/ObqOs0pliPTXi99pSOR+8W /FQXPWR19rE5BN7Kp9+Onr7g8vXzVlTY4qVWIozEg21mIuKEwFj0kCz0AIAAA== X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1506736756!114010125!1 X-Originating-IP: [134.134.136.100] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3881 invoked from network); 30 Sep 2017 01:59:18 -0000 Received: from mga07.intel.com (HELO mga07.intel.com) (134.134.136.100) by server-5.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 30 Sep 2017 01:59:18 -0000 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP; 29 Sep 2017 18:59:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.42,455,1500966000"; d="scan'208"; a="1020039033" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.75]) by orsmga003.jf.intel.com with ESMTP; 29 Sep 2017 18:59:16 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Sat, 30 Sep 2017 09:39:16 +0800 Message-Id: <1506735566-5706-7-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1506735566-5706-1-git-send-email-yi.y.sun@linux.intel.com> References: <1506735566-5706-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 v5 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é --- 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 8520709..66e20a7 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(); } @@ -489,7 +493,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 uint32_t mba_write_msr(unsigned int cos, uint32_t val, diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index 9dee163..11e8482 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 24191f0..b6930b8 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -745,6 +745,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_sysctl_pcitopoinfo_t); #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 */ @@ -755,6 +756,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; }; typedef struct xen_sysctl_psr_alloc xen_sysctl_psr_alloc_t;