From patchwork Thu Jul 6 01:52: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: 9827423 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 0F8A8602BD for ; Thu, 6 Jul 2017 02:08:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F38F7285C7 for ; Thu, 6 Jul 2017 02:08:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7E31285C9; Thu, 6 Jul 2017 02:08:50 +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 680A2285C7 for ; Thu, 6 Jul 2017 02:08:50 +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 1dSwBo-0000WX-3A; Thu, 06 Jul 2017 02:06:44 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dSwBm-0000VH-FS for xen-devel@lists.xenproject.org; Thu, 06 Jul 2017 02:06:42 +0000 Received: from [193.109.254.147] by server-3.bemta-6.messagelabs.com id 3C/13-03044-13B9D595; Thu, 06 Jul 2017 02:06:41 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRWlGSWpSXmKPExsVywNykQtdwdmy kwed7TBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa0bnif9MBVdNK55fvcnSwLhUs4uRi0NIYDqj ROfCl8xdjJwcEgK8EkeWzWCFsAMkfs07wwhR1MAosaJ1JiNIgk1AXeLx1x4mEFtEQEni3qrJT CBFzALzmSRen38ANklYIEViRdcMsCIWAVWJFdtesYPYvAIeEnMnLmeE2CAncfLYZLBtnAKeEk euNoPVCAHVbGx/zTSBkXcBI8MqRvXi1KKy1CJdY72kosz0jJLcxMwcXUMDM73c1OLixPTUnMS kYr3k/NxNjMCAYACCHYwd/5wOMUpyMCmJ8v7Rj40U4kvKT6nMSCzOiC8qzUktPsQow8GhJMG7 YiZQTrAoNT21Ii0zBxiaMGkJDh4lEd7VwkBp3uKCxNzizHSI1ClGXY5XE/5/YxJiycvPS5US5 30IMkMApCijNA9uBCxOLjHKSgnzMgIdJcRTkFqUm1mCKv+KUZyDUUmYd/UMoCk8mXklcJteAR 3BBHSEYmMMyBEliQgpqQZGtt+fn/ueTt++9e4T86NrZfguBWxJy33CabXu3D719YeFbKIbVSR NXfauE16x/e/OyO957XyiV8Tr9dS6JKXnKbre2/li8+xm5+wfzw5ntLoffvbt+WSH7uer/8Td TTqeVs5QxsRjwdQ8bXKkY1eUgu+jju1RS7VirrneLmFhUN98KKnj2H0WJZbijERDLeai4kQAn cSBII4CAAA= X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1499306786!104330805!6 X-Originating-IP: [192.55.52.120] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13017 invoked from network); 6 Jul 2017 02:06:40 -0000 Received: from mga04.intel.com (HELO mga04.intel.com) (192.55.52.120) by server-12.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 6 Jul 2017 02:06:40 -0000 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Jul 2017 19:06:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.40,314,1496127600"; d="scan'208"; a="1191047834" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.80]) by fmsmga002.fm.intel.com with ESMTP; 05 Jul 2017 19:06:37 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Thu, 6 Jul 2017 09:52:58 +0800 Message-Id: <1499305996-19029-6-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1499305996-19029-1-git-send-email-yi.y.sun@linux.intel.com> References: <1499305996-19029-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 v13 05/23] x86: refactor psr: L3 CAT: implement Domain init/free and schedule flows. 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 the Domain init/free and schedule flows. - When domain init, its psr resource should be allocated. - When domain free, its psr resource should be freed too. - When domain is scheduled, its COS ID on the socket should be set into ASSOC register to make corresponding COS MSR value work. Signed-off-by: Yi Sun Reviewed-by: Jan Beulich --- v13: - modify macro name to be consistent. (suggested by Jan Beulich) - fix indenting issue. (suggested by Jan Beulich) v12: - fix coding style issue. (suggested by Jan Beulich) - in 'get_max_cos_max', invert the condition and dropping 'continue'. (suggested by Jan Beulich) - modify 'psr_assoc_cos' to directly return 'reg' value. (suggested by Jan Beulich) - modify code style. (suggested by Jan Beulich) - do not break domain creation if 'psr_cos_ids' allocation fails. (suggested by Jan Beulich) v11: - replace 'feat_init_done()' to 'feat_init' flag. (suggested by Jan Beulich) - adjust parameters positions when calling 'psr_assoc_cos'. (suggested by Jan Beulich) - add comment to explain why to check 'psr_cos_ids'. v10: - remove 'cat_get_cos_max' as 'cos_max' is a feature property now which can be directly used. (suggested by Jan Beulich) - replace 'info->feat_mask' check to 'feat_init_done'. (suggested by Jan Beulich) v9: - rename 'l3_cat_get_cos_max' to 'cat_get_cos_max' to cover all CAT/CDP features. (suggested by Roger Pau) - replace feature list handling to feature array handling. (suggested by Roger Pau) - implement 'psr_alloc_cos' to match 'psr_free_cos'. (suggested by Wei Liu) - use 'psr_alloc_feat_enabled'. (suggested by Wei Liu) - fix coding style issue. (suggested by Wei Liu) - remove 'inline'. (suggested by Jan Beulich) - modify patch title to indicate 'L3 CAT'. (suggested by Jan Beulich) - remove 'psr_cos_ids' check in 'psr_free_cos'. (suggested by Jan Beulich) v6: - change 'PSR_ASSOC_REG_POS' to 'PSR_ASSOC_REG_SHIFT'. (suggested by Konrad Rzeszutek Wilk) v5: - rename 'feat_tmp' to 'feat'. (suggested by Jan Beulich) - define 'PSR_ASSOC_REG_POS'. (suggested by Jan Beulich) v4: - create this patch to make codes easier to understand. (suggested by Jan Beulich) --- xen/arch/x86/domain.c | 3 +-- xen/arch/x86/psr.c | 67 ++++++++++++++++++++++++++++++++++++++++++++--- xen/include/asm-x86/psr.h | 2 +- 3 files changed, 65 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 49388f4..68b8481 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -489,8 +489,7 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags, } spin_lock_init(&d->arch.e820_lock); - if ( (rc = psr_domain_init(d)) != 0 ) - goto fail; + psr_domain_init(d); if ( is_hvm_domain(d) ) { diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 5980275..bebc679 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -50,6 +50,8 @@ */ #define MAX_COS_REG_CNT 128 +#define ASSOC_REG_SHIFT 32 + /* * Every PSR feature uses some COS registers for each COS ID, e.g. CDP uses 2 * COS registers (DATA and CODE) for one COS ID, but CAT uses 1 COS register. @@ -372,11 +374,37 @@ void psr_free_rmid(struct domain *d) d->arch.psr_rmid = 0; } -static inline void psr_assoc_init(void) +static unsigned int get_max_cos_max(const struct psr_socket_info *info) +{ + unsigned int cos_max = 0, i; + + for ( i = 0; i < ARRAY_SIZE(info->features); i++ ) + { + const struct feat_node *feat = info->features[i]; + + if ( feat ) + cos_max = max(feat->cos_max, cos_max); + } + + return cos_max; +} + +static void psr_assoc_init(void) { struct psr_assoc *psra = &this_cpu(psr_assoc); - if ( psr_cmt_enabled() ) + if ( psr_alloc_feat_enabled() ) + { + unsigned int socket = cpu_to_socket(smp_processor_id()); + const struct psr_socket_info *info = socket_info + socket; + unsigned int cos_max = get_max_cos_max(info); + + if ( info->feat_init ) + psra->cos_mask = ((1ull << get_count_order(cos_max)) - 1) << + ASSOC_REG_SHIFT; + } + + if ( psr_cmt_enabled() || psra->cos_mask ) rdmsrl(MSR_IA32_PSR_ASSOC, psra->val); } @@ -385,6 +413,13 @@ static inline void psr_assoc_rmid(uint64_t *reg, unsigned int rmid) *reg = (*reg & ~rmid_mask) | (rmid & rmid_mask); } +static uint64_t psr_assoc_cos(uint64_t reg, unsigned int cos, + uint64_t cos_mask) +{ + return (reg & ~cos_mask) | + (((uint64_t)cos << ASSOC_REG_SHIFT) & cos_mask); +} + void psr_ctxt_switch_to(struct domain *d) { struct psr_assoc *psra = &this_cpu(psr_assoc); @@ -393,6 +428,14 @@ void psr_ctxt_switch_to(struct domain *d) if ( psr_cmt_enabled() ) psr_assoc_rmid(®, d->arch.psr_rmid); + /* If domain's 'psr_cos_ids' is NULL, we set default value for it. */ + if ( psra->cos_mask ) + reg = psr_assoc_cos(reg, + (d->arch.psr_cos_ids ? + d->arch.psr_cos_ids[cpu_to_socket(smp_processor_id())] : + 0), + psra->cos_mask); + if ( reg != psra->val ) { wrmsrl(MSR_IA32_PSR_ASSOC, reg); @@ -418,14 +461,30 @@ int psr_set_l3_cbm(struct domain *d, unsigned int socket, return 0; } -int psr_domain_init(struct domain *d) +/* Called with domain lock held, no extra lock needed for 'psr_cos_ids' */ +static void psr_free_cos(struct domain *d) { - return 0; + xfree(d->arch.psr_cos_ids); + d->arch.psr_cos_ids = NULL; +} + +static void psr_alloc_cos(struct domain *d) +{ + d->arch.psr_cos_ids = xzalloc_array(unsigned int, nr_sockets); + if ( !d->arch.psr_cos_ids ) + printk(XENLOG_WARNING "Failed to alloc psr_cos_ids!\n"); +} + +void psr_domain_init(struct domain *d) +{ + if ( psr_alloc_feat_enabled() ) + psr_alloc_cos(d); } void psr_domain_free(struct domain *d) { psr_free_rmid(d); + psr_free_cos(d); } static void __init init_psr(void) diff --git a/xen/include/asm-x86/psr.h b/xen/include/asm-x86/psr.h index 8141336..a17e31a 100644 --- a/xen/include/asm-x86/psr.h +++ b/xen/include/asm-x86/psr.h @@ -71,7 +71,7 @@ int psr_get_l3_cbm(struct domain *d, unsigned int socket, int psr_set_l3_cbm(struct domain *d, unsigned int socket, uint64_t cbm, enum cbm_type type); -int psr_domain_init(struct domain *d); +void psr_domain_init(struct domain *d); void psr_domain_free(struct domain *d); #endif /* __ASM_PSR_H__ */