From patchwork Wed Dec 14 04:07:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9474003 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 D324C60823 for ; Wed, 14 Dec 2016 11:12:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA7352871F for ; Wed, 14 Dec 2016 11:12:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF1EE28721; Wed, 14 Dec 2016 11:12:01 +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=-2.7 required=2.0 tests=BAYES_00, DATE_IN_PAST_06_12, 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 E4BF72871E for ; Wed, 14 Dec 2016 11:11:59 +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 1cH7RZ-0004uh-JK; Wed, 14 Dec 2016 11:09:53 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cH7RY-0004td-1W for xen-devel@lists.xenproject.org; Wed, 14 Dec 2016 11:09:52 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id 5C/3E-09053-F7821585; Wed, 14 Dec 2016 11:09:51 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRWlGSWpSXmKPExsXS1tYhoVunERh hsKJfzeL7lslMDowehz9cYQlgjGLNzEvKr0hgzZj5axVjwSX1igWnRBsYb8p2MXJyCAlUSFw4 u5kFxJYQ4JU4smwGK4TtJzFn3Vf2LkYuoJoGRomraxaDJdgE1CUef+1hArFFBJQk7q2azARSx CzQzSSx8uFWsEnCAh4Sb25/B7NZBFQlXrb+ZQaxeQXcJf607IXaJidx8thkoKEcHJxA9f+2JE Ic5C5xsfcd+wRG3gWMDKsYNYpTi8pSi3SNjPWSijLTM0pyEzNzdA0NzPRyU4uLE9NTcxKTivW S83M3MQKDgQEIdjD+mR94iFGSg0lJlJfrakCEEF9SfkplRmJxRnxRaU5q8SFGGQ4OJQneWeqB EUKCRanpqRVpmTnAsIRJS3DwKInwBqkApXmLCxJzizPTIVKnGBWlxHlXgvQJgCQySvPg2mCxc IlRVkqYlxHoECGegtSi3MwSVPlXjOIcjErCvBtApvBk5pXATX8FtJgJaLHoEn+QxSWJCCmpBk abWA3VaLOLxZc/mK5qFzD9+vNlTZ7AkmMraiQXLjp09rf2vnz9mDOGoo1mPLu4lgYezIlTtLT eYnbi6/p3TzLFJF794b0UmNvcta7spbH1zQdxcQZTovnD/B8KVx15H/AuXt7yOse97H9hDd4p F0+q3GQ/YHw75avZNvNOU/41/Icf/l70RVWJpTgj0VCLuag4EQCz0EeUgAIAAA== X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1481713769!48240089!7 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzkwOTcx\n X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16763 invoked from network); 14 Dec 2016 11:09:50 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-12.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 14 Dec 2016 11:09:50 -0000 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP; 14 Dec 2016 03:09:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,346,1477983600"; d="scan'208";a="39863204" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.63]) by orsmga004.jf.intel.com with ESMTP; 14 Dec 2016 03:09:47 -0800 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Wed, 14 Dec 2016 12:07:46 +0800 Message-Id: <1481688484-5093-7-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1481688484-5093-1-git-send-email-yi.y.sun@linux.intel.com> References: <1481688484-5093-1-git-send-email-yi.y.sun@linux.intel.com> Cc: 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 v4 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 --- xen/arch/x86/psr.c | 48 ++++++++++++++++++++++++++++++++++++++++++++--- xen/arch/x86/sysctl.c | 14 +++++++++----- xen/include/asm-x86/psr.h | 9 +++++++-- 3 files changed, 61 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 746c90e..095b3a7 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -115,6 +115,9 @@ struct feat_ops { struct psr_socket_info *info); /* get_max_cos_max is used to get feature's cos_max. */ unsigned int (*get_max_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, enum cbm_type type, + uint32_t dat[], uint32_t array_len); }; @@ -220,9 +223,24 @@ static unsigned int l3_cat_get_max_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, + enum cbm_type type, + uint32_t dat[], uint32_t array_len) +{ + if ( !dat || 3 > array_len || type != PSR_CBM_TYPE_L3 ) + return false; + + dat[CBM_LEN] = feat->info.l3_cat_info.cbm_len; + dat[COS_MAX] = feat->info.l3_cat_info.cos_max; + dat[CDP_FLAG] = 0; + + return true; +} + struct feat_ops l3_cat_ops = { .init_feature = l3_cat_init_feature, .get_max_cos_max = l3_cat_get_max_cos_max, + .get_feat_info = l3_cat_get_feat_info, }; static void __init parse_psr_bool(char *s, char *value, char *feature, @@ -426,10 +444,34 @@ 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 dat[], uint32_t array_len) +{ + struct psr_socket_info *info = get_socket_info(socket); + struct feat_node *feat_tmp; + + if ( IS_ERR(info) ) + return PTR_ERR(info); + + list_for_each_entry(feat_tmp, &info->feat_list, list) + if ( feat_tmp->ops.get_feat_info(feat_tmp, type, dat, array_len) ) + return 0; + + 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..168ed45 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 dat[3]; + ret = psr_get_info(sysctl->u.psr_cat_op.target, + PSR_CBM_TYPE_L3, dat, 3); + + sysctl->u.psr_cat_op.u.l3_info.cbm_len = dat[CBM_LEN]; + sysctl->u.psr_cat_op.u.l3_info.cos_max = dat[COS_MAX]; + sysctl->u.psr_cat_op.u.l3_info.flags = dat[CDP_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..c872fff 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 CDP_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 dat[], uint32_t 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,