From patchwork Thu Jan 19 06:01:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9525221 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 8E62160437 for ; Thu, 19 Jan 2017 06:05:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B4302860C for ; Thu, 19 Jan 2017 06:05:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 700C72862A; Thu, 19 Jan 2017 06:05:29 +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 E1CAD2860C for ; Thu, 19 Jan 2017 06:05:28 +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 1cU5oI-0006qG-Sz; Thu, 19 Jan 2017 06:02:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cU5oI-0006pe-EX for xen-devel@lists.xenproject.org; Thu, 19 Jan 2017 06:02:58 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 65/36-14551-19650885; Thu, 19 Jan 2017 06:02:57 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPLMWRWlGSWpSXmKPExsVywNykWHdiWEO Ewc+XTBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa0br+62sBcv0K05u6GRuYNys3MXIxSEkMJ1R 4uGvPqYuRk4OCQFeiSPLZrBC2P4Su/t3s0AUNTBKHPi9mx0kwSagLvH4aw9Yg4iAksS9VZOZQ IqYBbqZJFY+3MoCkhAG6m5ZtJ0NxGYRUJXY0nuIuYuRg4NXwF3i5U9xiAVyEiePTQZbxingIX Fl/gWw+UJAJVtWXGKawMi7gJFhFaNGcWpRWWqRrqG5XlJRZnpGSW5iZo6uoYGxXm5qcXFiemp OYlKxXnJ+7iZGYEAwAMEOxpenPQ8xSnIwKYny2ls2RAjxJeWnVGYkFmfEF5XmpBYfYpTh4FCS 4FUNBcoJFqWmp1akZeYAQxMmLcHBoyTCywyS5i0uSMwtzkyHSJ1iVJQS530cApQQAElklObBt cHi4RKjrJQwLyPQIUI8BalFuZklqPKvGMU5GJWEeUVBxvNk5pXATX8FtJgJaLGVcj3I4pJEhJ RUA+O6povPWGrErJyXz3kSUZAyzZw36p1Pt822mV1Z033FdzwR2MFq++vDQ8M53nwyvjf67b8 uFPLd9X/xeq2Gm9uv75rqzLZSwYqbsbJE8+9uVUGGfxeW3dZ/2u44cW71Kpm81C8PlR5eNVRx i3vx78K2cEv/WiU7nZk1CVGv6vrCciSPr1516Z8SS3FGoqEWc1FxIgAdFLKVggIAAA== X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1484805772!81354767!3 X-Originating-IP: [192.55.52.115] 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 32834 invoked from network); 19 Jan 2017 06:02:56 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (192.55.52.115) by server-8.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 19 Jan 2017 06:02:56 -0000 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Jan 2017 22:02:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,252,1477983600"; d="scan'208";a="215119477" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.63]) by fmsmga004.fm.intel.com with ESMTP; 18 Jan 2017 22:02:53 -0800 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Thu, 19 Jan 2017 14:01:08 +0800 Message-Id: <1484805686-7249-7-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1484805686-7249-1-git-send-email-yi.y.sun@linux.intel.com> References: <1484805686-7249-1-git-send-email-yi.y.sun@linux.intel.com> Cc: wei.liu2@citrix.com, konrad.wilk@oracle.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 RESEND v5 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 --- v5: - add function 'psr_cbm_type_to_feat_type' to covert 'cbm_type' to 'psr_feat_type'. This is part of codes to move type check out from callback functions. - remove type check from feature callback functions. - rename 'dat[]' to 'data[]' - check if feature type match in caller of feature callback function. --- xen/arch/x86/psr.c | 73 +++++++++++++++++++++++++++++++++++++++++++++-- xen/arch/x86/sysctl.c | 14 +++++---- xen/include/asm-x86/psr.h | 9 ++++-- 3 files changed, 86 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 7f06235..319bfcc 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -109,6 +109,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); }; /* @@ -177,6 +180,23 @@ 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 = 0xFFFF; + break; + } + + return feat_type; +} + /* L3 CAT functions implementation. */ static void l3_cat_init_feature(struct cpuid_leaf_regs regs, struct feat_node *feat, @@ -218,8 +238,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, @@ -425,10 +459,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(-ENOTSOCK); + + 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 14e7dc7..d90db78 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..e3b18bc 100644 --- a/xen/include/asm-x86/psr.h +++ b/xen/include/asm-x86/psr.h @@ -33,6 +33,11 @@ /* L3 CDP Enable bit*/ #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; unsigned int upscaling_factor; @@ -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,