From patchwork Tue Aug 1 08:48:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9873897 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 BD6B060365 for ; Tue, 1 Aug 2017 09:07:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C4A932582C for ; Tue, 1 Aug 2017 09:07:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B91B028670; Tue, 1 Aug 2017 09:07:06 +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 DC0432582C for ; Tue, 1 Aug 2017 09:07:05 +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 1dcT6K-0004zg-1D; Tue, 01 Aug 2017 09:04:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dcT6J-0004yx-FG for xen-devel@lists.xenproject.org; Tue, 01 Aug 2017 09:04:27 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id C7/97-02176-A1440895; Tue, 01 Aug 2017 09:04:26 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRWlGSWpSXmKPExsXS1tYhoivl0hB p8K2N0eL7lslMDowehz9cYQlgjGLNzEvKr0hgzbi8qZe14IBPxe6ePsYGxmMWXYxcHEIC0xgl mjt2sXUxcnJICPBKHFk2gxXC9pc4O/kBG0RRA6PEywcbmUESbALqEo+/9jCB2CICShL3Vk1mA iliFpjPJPH6/AOwImGBQImTkyCKWARUJSbsvAsW5xVwl9jxbRrUNjmJk8cmg23jFPCQ2HHzBl ANB9A2d4mdMxMnMPIuYGRYxahenFpUllqka6qXVJSZnlGSm5iZo2toYKqXm1pcnJiempOYVKy XnJ+7iREYDgxAsIPxS7/zIUZJDiYlUV7FnvpIIb6k/JTKjMTijPii0pzU4kOMMhwcShK8Es4N kUKCRanpqRVpmTnAwIRJS3DwKInwXnACSvMWFyTmFmemQ6ROMepyvJrw/xuTEEtefl6qlDjvR ZAiAZCijNI8uBGwKLnEKCslzMsIdJQQT0FqUW5mCar8K0ZxDkYlYd77IFN4MvNK4Da9AjqCCe gIydJakCNKEhFSUg2M3mfeH6wKi8qofKEmeopT8BJH3C6W+QuvzuA4kO2mLbD92qom0asRPEL XH3zSK4j7cfHz9S2f+opKDCWfK794wS/Pu6j0woYUl4R/AikaW4M99k89vOvJDGW2KZzvFiot El1+4vxN8V19b0OO/kk9/OYnq+iTewrnhVcKy1vsV3bZe33WBf+PDUosxRmJhlrMRcWJABVh7 yaNAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1501578248!89431283!7 X-Originating-IP: [134.134.136.20] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjAgPT4gMzU1MzU4\n X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 48109 invoked from network); 1 Aug 2017 09:04:25 -0000 Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by server-16.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 1 Aug 2017 09:04:25 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Aug 2017 02:04:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,305,1498546800"; d="scan'208";a="118061558" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.80]) by orsmga002.jf.intel.com with ESMTP; 01 Aug 2017 02:04:22 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Tue, 1 Aug 2017 16:48:37 +0800 Message-Id: <1501577334-7431-7-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1501577334-7431-1-git-send-email-yi.y.sun@linux.intel.com> References: <1501577334-7431-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 , mengxu@cis.upenn.edu, jbeulich@suse.com, chao.p.peng@linux.intel.com, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v15 06/23] x86: refactor psr: L3 CAT: implement get hw info flow. 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 get HW info flow including L3 CAT callback function. It also changes sysctl interface to make it more general. With this patch, 'psr-hwinfo' can work for L3 CAT. Signed-off-by: Yi Sun Reviewed-by: Jan Beulich --- v12: - use 'ASSERT_UNREACHABLE()' to record bug. (suggested by Jan Beulich) v11: - changes about 'cos_max' and 'cbm_len'. (suggested by Jan Beulich) - change about 'feat_props'. (suggested by Jan Beulich) - declare 'PSR_SOCKET_FEAT_UNKNOWN' to handle error case. (suggested by Jan Beulich) - use 'ASSERT' to check data. (suggested by Jan Beulich) - fix comment of 'get_feat_info'. (suggested by Jan Beulich) - fix a bug when checking 'feat_type'. (suggested by Jan Beulich) v10: - remove 'PSR_SOCKET_UNKNOWN' and use 'ASSERT_UNREACHABLE()' to handle this case. (suggested by Jan Beulich) - check 'feat_type'. (suggested by Jan Beulich) - adjust macros names and values to make them more appropriate. (suggested by Jan Beulich) - use 'feat_init_done'. (suggested by Jan Beulich) - changes about 'cbm_len'. (suggested by Jan Beulich) v9: - replace feature list handling to feature array handling. (suggested by Roger Pau) - define 'PSR_INFO_SIZE'. (suggested by Roger Pau) - fix coding style issue. (suggested by Roger Pau and Jan Beulich) - use 'ARRAY_SIZE'. (suggested by Roger Pau) - rename 'l3_cat_get_feat_info' to 'cat_get_feat_info' to make it a common function for both L3/L2 CAT. (suggested by Roger Pau) - move constant to the right of comparison. (suggested by Wei Liu) - remove wrong comment. (suggested by Jan Beulich) - rename macros used by psr_get_info to make them meaningful. (suggested by Jan Beulich) - remove assignment for 'PSR_SOCKET_UNKNOWN'. (suggested by Jan Beulich) - retain blank line after 'case XEN_SYSCTL_PSR_CAT_get_l3_info'. (suggested by Jan Beulich) - modify patch title to indicate 'L3 CAT'. (suggested by Jan Beulich) - move common data check into common function. (suggested by Jan Beulich) v6: - fix coding style issue. (suggested by Konrad Rzeszutek Wilk) - define 'PSR_SOCKET_UNKNOWN' in 'psr_feat_type'. (suggested by Konrad Rzeszutek Wilk) - change '-ENOTSOCK' to 'ERANGE'. (suggested by Konrad Rzeszutek Wilk) - modify position of macros to remove odd spacing in psr.h. (suggested by Konrad Rzeszutek Wilk) v5: - change 'dat[]' to 'data[]'. (suggested by Jan Beulich) - modify parameter type to avoid fixed width type when there is no such intention. (suggested by Jan Beulich) - use 'const' when it is possible. (suggested by Jan Beulich) - check feature type outside callback function. (suggested by Jan Beulich) - modify macros names to add prefix 'PSR_' and change 'CDP_FLAG' to 'PSR_FLAG'. (suggested by Jan Beulich) v4: - create this patch to make codes easier to understand. (suggested by Jan Beulich) --- xen/arch/x86/psr.c | 81 +++++++++++++++++++++++++++++++++++++++++++++-- xen/arch/x86/sysctl.c | 19 ++++++++--- xen/include/asm-x86/psr.h | 16 +++++++--- 3 files changed, 104 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 91bb1f0..20d083e 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -63,6 +63,7 @@ enum psr_feat_type { FEAT_TYPE_L3_CAT, FEAT_TYPE_NUM, + FEAT_TYPE_UNKNOWN, }; /* @@ -108,6 +109,10 @@ static const struct feat_props { * feature does some special operations. */ enum cbm_type alt_type; + + /* get_feat_info is used to return feature HW info through sysctl. */ + bool (*get_feat_info)(const struct feat_node *feat, + uint32_t data[], unsigned int array_len); } *feat_props[FEAT_TYPE_NUM]; /* @@ -184,6 +189,22 @@ static void free_socket_resources(unsigned int socket) memset(info->cos_ref, 0, MAX_COS_REG_CNT * sizeof(unsigned int)); } +static enum psr_feat_type psr_cbm_type_to_feat_type(enum cbm_type type) +{ + enum psr_feat_type feat_type = FEAT_TYPE_UNKNOWN; + + switch ( type ) + { + case PSR_CBM_TYPE_L3: + feat_type = FEAT_TYPE_L3_CAT; + break; + default: + ASSERT_UNREACHABLE(); + } + + return feat_type; +} + /* CAT common functions implementation. */ static int cat_init_feature(const struct cpuid_leaf *regs, struct feat_node *feat, @@ -226,11 +247,25 @@ static int cat_init_feature(const struct cpuid_leaf *regs, return 0; } +static bool cat_get_feat_info(const struct feat_node *feat, + uint32_t data[], unsigned int array_len) +{ + if ( array_len != PSR_INFO_ARRAY_SIZE ) + return false; + + data[PSR_INFO_IDX_COS_MAX] = feat->cos_max; + data[PSR_INFO_IDX_CAT_CBM_LEN] = feat->cbm_len; + data[PSR_INFO_IDX_CAT_FLAG] = 0; + + return true; +} + /* L3 CAT props */ static const struct feat_props l3_cat_props = { .cos_num = 1, .type[0] = PSR_CBM_TYPE_L3, .alt_type = PSR_CBM_TYPE_UNKNOWN, + .get_feat_info = cat_get_feat_info, }; static void __init parse_psr_bool(char *s, char *value, char *feature, @@ -443,10 +478,50 @@ void psr_ctxt_switch_to(struct domain *d) } } -int psr_get_cat_l3_info(unsigned int socket, uint32_t *cbm_len, - uint32_t *cos_max, uint32_t *flags) +static struct psr_socket_info *get_socket_info(unsigned int socket) { - return 0; + if ( !socket_info ) + return ERR_PTR(-ENODEV); + + if ( socket >= nr_sockets ) + return ERR_PTR(-ERANGE); + + if ( !socket_info[socket].feat_init ) + return ERR_PTR(-ENOENT); + + return socket_info + socket; +} + +int psr_get_info(unsigned int socket, enum cbm_type type, + uint32_t data[], unsigned int array_len) +{ + const struct psr_socket_info *info = get_socket_info(socket); + const struct feat_node *feat; + enum psr_feat_type feat_type; + + ASSERT(data); + + if ( IS_ERR(info) ) + return PTR_ERR(info); + + feat_type = psr_cbm_type_to_feat_type(type); + if ( feat_type >= ARRAY_SIZE(info->features) ) + return -ENOENT; + + feat = info->features[feat_type]; + if ( !feat ) + return -ENOENT; + + if ( !feat_props[feat_type] ) + { + ASSERT_UNREACHABLE(); + return -ENOENT; + } + + if ( feat_props[feat_type]->get_feat_info(feat, data, array_len) ) + return 0; + + return -EINVAL; } int psr_get_l3_cbm(struct domain *d, unsigned int socket, diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index 2f7056e..c23270d 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -175,14 +175,25 @@ long arch_do_sysctl( switch ( sysctl->u.psr_cat_op.cmd ) { case XEN_SYSCTL_PSR_CAT_get_l3_info: - ret = psr_get_cat_l3_info(sysctl->u.psr_cat_op.target, - &sysctl->u.psr_cat_op.u.l3_info.cbm_len, - &sysctl->u.psr_cat_op.u.l3_info.cos_max, - &sysctl->u.psr_cat_op.u.l3_info.flags); + { + uint32_t data[PSR_INFO_ARRAY_SIZE]; + + ret = psr_get_info(sysctl->u.psr_cat_op.target, + PSR_CBM_TYPE_L3, data, ARRAY_SIZE(data)); + if ( ret ) + break; + + sysctl->u.psr_cat_op.u.l3_info.cos_max = + data[PSR_INFO_IDX_COS_MAX]; + sysctl->u.psr_cat_op.u.l3_info.cbm_len = + data[PSR_INFO_IDX_CAT_CBM_LEN]; + sysctl->u.psr_cat_op.u.l3_info.flags = + data[PSR_INFO_IDX_CAT_FLAG]; if ( !ret && __copy_field_to_guest(u_sysctl, sysctl, u.psr_cat_op) ) ret = -EFAULT; break; + } default: ret = -EOPNOTSUPP; diff --git a/xen/include/asm-x86/psr.h b/xen/include/asm-x86/psr.h index a17e31a..8d15328 100644 --- a/xen/include/asm-x86/psr.h +++ b/xen/include/asm-x86/psr.h @@ -19,20 +19,26 @@ #include /* CAT cpuid level */ -#define PSR_CPUID_LEVEL_CAT 0x10 +#define PSR_CPUID_LEVEL_CAT 0x10 /* Resource Type Enumeration */ #define PSR_RESOURCE_TYPE_L3 0x2 /* L3 Monitoring Features */ -#define PSR_CMT_L3_OCCUPANCY 0x1 +#define PSR_CMT_L3_OCCUPANCY 0x1 /* CDP Capability */ -#define PSR_CAT_CDP_CAPABILITY (1u << 2) +#define PSR_CAT_CDP_CAPABILITY (1u << 2) /* L3 CDP Enable bit*/ #define PSR_L3_QOS_CDP_ENABLE_BIT 0x0 +/* Used by psr_get_info() */ +#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_ARRAY_SIZE 3 + struct psr_cmt_l3 { unsigned int features; unsigned int upscaling_factor; @@ -64,8 +70,8 @@ int psr_alloc_rmid(struct domain *d); void psr_free_rmid(struct domain *d); void psr_ctxt_switch_to(struct domain *d); -int psr_get_cat_l3_info(unsigned int socket, uint32_t *cbm_len, - uint32_t *cos_max, uint32_t *flags); +int psr_get_info(unsigned int socket, enum cbm_type type, + uint32_t data[], unsigned int array_len); int psr_get_l3_cbm(struct domain *d, unsigned int socket, uint64_t *cbm, enum cbm_type type); int psr_set_l3_cbm(struct domain *d, unsigned int socket,