From patchwork Wed Feb 8 08:15:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9561945 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 5963C60236 for ; Wed, 8 Feb 2017 08:22:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4CD2A28446 for ; Wed, 8 Feb 2017 08:22:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 417C42849C; Wed, 8 Feb 2017 08:22:08 +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 A017928446 for ; Wed, 8 Feb 2017 08:22:07 +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 1cbNTH-0005oS-OI; Wed, 08 Feb 2017 08:19:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cbNTG-0005nW-9r for xen-devel@lists.xenproject.org; Wed, 08 Feb 2017 08:19:22 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 95/44-01703-984DA985; Wed, 08 Feb 2017 08:19:21 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRWlGSWpSXmKPExsXS1tbhqNtxZVa EwZQF+hbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bDr8eYCnpMKk592cTawPhQrYuRk0NIoFLi SMMPVhBbQoBX4siyGVC2n8TzacvYuhi5gGoaGCW2fv/ODpJgE1CXePy1hwnEFhFQkri3ajITS BGzwCImiRWTvrOBJIQFPCTOz/8B1sAioCrRdWgfcxcjBwevgLvE9AcBEAvkJE4em8wKEuYEKl +zQA7iHneJ6ydnsExg5F3AyLCKUaM4tagstUjX0FAvqSgzPaMkNzEzR9fQwFQvN7W4ODE9NSc xqVgvOT93EyMwGBiAYAfjynbnQ4ySHExKoryMp2ZFCPEl5adUZiQWZ8QXleakFh9ilOHgUJLg ZQMGl5BgUWp6akVaZg4wLGHSEhw8SiK8hy8DpXmLCxJzizPTIVKnGBWlxCESAiCJjNI8uDZYL FxilJUS5mUEOkSIpyC1KDezBFX+FaM4B6OSMG84yBSezLwSuOmvgBYzAS2+fhpscUkiQkqqgb H0+bGN/1g8dhdq3qqpOfRIfOeekK5vwn+EGJ1tl74+mlJ59tC521zqW58nbs1o23ZKbP17sSl mR+pLt2/IuXR8FZvlol1H+J4LeLnuPuXnFnjkz/ICxySe8lyPRRPV7NmfV31/u826+ojuhwjx xPXuDp0rbBdO/vHVQrSi7KtddhZHmJBzuq8SS3FGoqEWc1FxIgAEQv+ogAIAAA== X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1486541945!83610550!7 X-Originating-IP: [134.134.136.65] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 62167 invoked from network); 8 Feb 2017 08:19:20 -0000 Received: from mga03.intel.com (HELO mga03.intel.com) (134.134.136.65) by server-6.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 8 Feb 2017 08:19:20 -0000 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP; 08 Feb 2017 00:19:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,346,1477983600"; d="scan'208";a="63203416" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.63]) by fmsmga006.fm.intel.com with ESMTP; 08 Feb 2017 00:19:17 -0800 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Wed, 8 Feb 2017 16:15:58 +0800 Message-Id: <1486541776-8406-7-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1486541776-8406-1-git-send-email-yi.y.sun@linux.intel.com> References: <1486541776-8406-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, he.chen@linux.intel.com, ian.jackson@eu.citrix.com, Yi Sun , mengxu@cis.upenn.edu, jbeulich@suse.com, chao.p.peng@linux.intel.com Subject: [Xen-devel] [PATCH v6 06/24] x86: refactor psr: 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: Konrad Rzeszutek Wilk --- v6: - adjust '{' position for switch. - define 'PSR_SOCKET_UNKNOWN = 0xFFFF' in 'enum psr_feat_type'. - use 'ERANGE' when socket id exceeds the range. - adjust value postion of macros. --- xen/arch/x86/psr.c | 75 +++++++++++++++++++++++++++++++++++++++++++++-- xen/arch/x86/sysctl.c | 14 +++++---- xen/include/asm-x86/psr.h | 19 +++++++----- 3 files changed, 93 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 89fbaaa..d4a9003 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -84,6 +84,7 @@ enum psr_feat_type { PSR_SOCKET_L3_CAT = 0, PSR_SOCKET_L3_CDP, PSR_SOCKET_L2_CAT, + PSR_SOCKET_UNKNOWN = 0xFFFF, }; /* CAT/CDP HW info data structure. */ @@ -112,6 +113,9 @@ struct feat_node; struct feat_ops { /* get_cos_max is used to get feature's cos_max. */ unsigned int (*get_cos_max)(const struct feat_node *feat); + /* get_feat_info is used to get feature HW info. */ + bool (*get_feat_info)(const struct feat_node *feat, + uint32_t data[], unsigned int array_len); }; /* @@ -179,6 +183,24 @@ static void free_feature(struct psr_socket_info *info) } } +static enum psr_feat_type psr_cbm_type_to_feat_type(enum cbm_type type) +{ + enum psr_feat_type feat_type; + + /* Judge if feature is enabled. */ + switch ( type ) + { + case PSR_CBM_TYPE_L3: + feat_type = PSR_SOCKET_L3_CAT; + break; + default: + feat_type = PSR_SOCKET_UNKNOWN; + break; + } + + return feat_type; +} + /* L3 CAT functions implementation. */ static void l3_cat_init_feature(struct cpuid_leaf regs, struct feat_node *feat, @@ -222,8 +244,22 @@ static unsigned int l3_cat_get_cos_max(const struct feat_node *feat) return feat->info.l3_cat_info.cos_max; } +static bool l3_cat_get_feat_info(const struct feat_node *feat, + uint32_t data[], unsigned int array_len) +{ + if ( !data || 3 > array_len ) + return false; + + data[CBM_LEN] = feat->info.l3_cat_info.cbm_len; + data[COS_MAX] = feat->info.l3_cat_info.cos_max; + data[PSR_FLAG] = 0; + + return true; +} + static const struct feat_ops l3_cat_ops = { .get_cos_max = l3_cat_get_cos_max, + .get_feat_info = l3_cat_get_feat_info, }; static void __init parse_psr_bool(char *s, char *value, char *feature, @@ -429,10 +465,43 @@ 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_mask ) + 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; + + if ( IS_ERR(info) ) + return PTR_ERR(info); + + feat_type = psr_cbm_type_to_feat_type(type); + list_for_each_entry(feat, &info->feat_list, list) + { + if ( feat->feature != feat_type ) + continue; + + if ( feat->ops.get_feat_info(feat, data, array_len) ) + return 0; + else + return -EINVAL; + } + + return -ENOENT; } 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 b8c30d4..e340baa 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -176,15 +176,19 @@ 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[3]; + ret = psr_get_info(sysctl->u.psr_cat_op.target, + PSR_CBM_TYPE_L3, data, 3); + + sysctl->u.psr_cat_op.u.l3_info.cbm_len = data[CBM_LEN]; + sysctl->u.psr_cat_op.u.l3_info.cos_max = data[COS_MAX]; + sysctl->u.psr_cat_op.u.l3_info.flags = data[PSR_FLAG]; if ( !ret && __copy_field_to_guest(u_sysctl, sysctl, u.psr_cat_op) ) ret = -EFAULT; break; - + } default: ret = -EOPNOTSUPP; break; diff --git a/xen/include/asm-x86/psr.h b/xen/include/asm-x86/psr.h index 57f47e9..0342a80 100644 --- a/xen/include/asm-x86/psr.h +++ b/xen/include/asm-x86/psr.h @@ -19,19 +19,24 @@ #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 +#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 +#define PSR_L3_QOS_CDP_ENABLE_BIT 0x0 + +/* Used by psr_get_info() */ +#define CBM_LEN 0 +#define COS_MAX 1 +#define PSR_FLAG 2 struct psr_cmt_l3 { unsigned int features; @@ -63,8 +68,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,