From patchwork Thu Jul 6 01:53:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9827459 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 5263C602BD for ; Thu, 6 Jul 2017 02:09:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42928285CA for ; Thu, 6 Jul 2017 02:09:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 375B4285CB; Thu, 6 Jul 2017 02:09:31 +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 B1F69285C8 for ; Thu, 6 Jul 2017 02:09:30 +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 1dSwCL-0000uF-Fx; Thu, 06 Jul 2017 02:07:17 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dSwCK-0000sY-EG for xen-devel@lists.xenproject.org; Thu, 06 Jul 2017 02:07:16 +0000 Received: from [85.158.143.35] by server-8.bemta-6.messagelabs.com id E0/AD-03704-35B9D595; Thu, 06 Jul 2017 02:07:15 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRWlGSWpSXmKPExsXS1tYhrxs8Ozb S4N13TovvWyYzOTB6HP5whSWAMYo1My8pvyKBNWN7k2nBPeOKCXcOMjUwblDvYuTkEBKolOje 18EEYksI8EocWTaDFcIOkFh8dQJjFyMXUE0Do8TXni2MIAk2AXWJx197wBpEBJQk7q2azARSx Cwwn0ni9fkHzCAJYYEoiTNvIRpYBFQl7py+CjaVV8BTYnt/GzPEBjmJk8cmg8U5geJHrjazQ1 zkIbGx/TXTBEbeBYwMqxg1ilOLylKLdA0t9JKKMtMzSnITM3N0DQ3M9HJTi4sT01NzEpOK9ZL zczcxAsOBAQh2MN7cGHCIUZKDSUmU949+bKQQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCV6dWUA5 waLU9NSKtMwcYGDCpCU4eJREeFcLA6V5iwsSc4sz0yFSpxh1OV5N+P+NSYglLz8vVUqc1x5kh gBIUUZpHtwIWJRcYpSVEuZlBDpKiKcgtSg3swRV/hWjOAejkjBvMMgUnsy8ErhNr4COYAI6Qr ExBuSIkkSElFQDY17nhMgE7sfvpSYefhN/xO2d+/6yiKSpYmftSpX/WCUWO6Unff7U9kelZlL qt6ZQ6c92Bze0/z22Pm3mxL2zdY5umXNeOXLx93nvtTR2/rSeG5fFEr6t58bMgoIXpsJB3ucW 7DtfbfPurcwF/iTfS9duPWZZ8e3otoCpdc5sRaU9ibtiVLW3PFJiKc5INNRiLipOBACroUnuj QIAAA== X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1499306833!71936728!1 X-Originating-IP: [134.134.136.31] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39498 invoked from network); 6 Jul 2017 02:07:14 -0000 Received: from mga06.intel.com (HELO mga06.intel.com) (134.134.136.31) by server-7.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 6 Jul 2017 02:07:14 -0000 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP; 05 Jul 2017 19:07:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.40,314,1496127600"; d="scan'208"; a="1191048069" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.80]) by fmsmga002.fm.intel.com with ESMTP; 05 Jul 2017 19:07:05 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Thu, 6 Jul 2017 09:53:05 +0800 Message-Id: <1499305996-19029-13-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 12/23] x86: refactor psr: L3 CAT: set value: implement write msr 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 Continue from previous patch: 'x86: refactor psr: L3 CAT: set value: implement cos id picking flow.' We have got the feature value and COS ID to set. Then, we write MSRs of the designated feature. Till now, set value process is completed. Signed-off-by: Yi Sun --- v13: - use 'skip_prior_features'. (suggested by Jan Beulich) - add 'const' for some variables. (suggested by Jan Beulich) v12: - declare same type varaibles in one line. (suggested by Jan Beulich) - replace 'feat_type' to 'props' in 'struct cos_write_info'. (suggested by Jan Beulich) - assign the 'cos_num' to a local variable. (suggested by Jan Beulich) - use 'ASSERT_UNREACHABLE()' to record bug and return error code if feat exists but props does not exist. (suggested by Jan Beulich) v11: - rename 'write_psr_msr' to 'write_psr_msrs'. - rename 'do_write_psr_msr' to 'do_write_psr_msrs'. - change parameters and codes of 'write_psr_msrs' to handle value array. - add 'feat_type' in 'struct cos_write_info' to handle props array. - in 'do_write_psr_msrs', write value array into msrs according to 'props->type[i]'. - move 'feat->cos_reg_val' assignment and value comparison in 'write_msr' callback function out as generic codes. (suggested by Jan Beulich) - move check from 'do_write_psr_msrs' to 'write_psr_msrs'. (suggested by Jan Beulich) - change about 'cos_max'. (suggested by Jan Beulich) - change about 'feat_props'. (suggested by Jan Beulich) v10: - remove 'type' from 'write_msr' parameter list. Will add it back when implementing CDP. (suggested by Jan Beulich) - remove unnecessary casts. (suggested by Jan Beulich) - changes about 'props'. (suggested by Jan Beulich) v9: - replace feature list handling to feature array handling. (suggested by Roger Pau) - add 'array_len' in 'struct cos_write_info' and check if val array exceeds it. - modify 'write_psr_msr' flow only to set one value a time. No need to set whole feature array values. - modify patch title to indicate 'L3 CAT'. (suggested by Jan Beulich) - changes about 'uint64_t' to 'uint32_t'. (suggested by Jan Beulich) v8: - modify 'write_msr' callback function to 'void' because we have to set all features' cbm. When input cos exceeds some features' cos_max, just skip them but not break the iteration. v5: - modify commit message to provide exact patch name to continue from. (suggested by Jan Beulich) - modify return value of callback functions because we do not need them to return number of entries the feature uses. In caller, we call 'get_cos_num' to get the number of entries the feature uses. (suggested by Jan Beulich) - move type check out from callback functions to caller. (suggested by Jan Beulich) - modify variables names to make them better, e.g. 'feat_tmp' to 'feat'. (suggested by Jan Beulich) - correct code format. (suggested by Jan Beulich) v4: - create this patch to make codes easier understand. (suggested by Jan Beulich) --- xen/arch/x86/psr.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index cbe08ce..48dab60 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -113,6 +113,9 @@ static const struct feat_props { /* 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); + + /* write_msr is used to write out feature MSR register. */ + void (*write_msr)(unsigned int cos, uint32_t val, enum cbm_type type); } *feat_props[FEAT_TYPE_NUM]; /* @@ -289,11 +292,17 @@ static bool cat_get_feat_info(const struct feat_node *feat, } /* L3 CAT props */ +static void l3_cat_write_msr(unsigned int cos, uint32_t val, enum cbm_type type) +{ + wrmsrl(MSR_IA32_PSR_L3_MASK(cos), val); +} + 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, + .write_msr = l3_cat_write_msr, }; static void __init parse_psr_bool(char *s, char *value, char *feature, @@ -946,11 +955,77 @@ static int pick_avail_cos(const struct psr_socket_info *info, return -EOVERFLOW; } +static unsigned int get_socket_cpu(unsigned int socket) +{ + if ( likely(socket < nr_sockets) ) + return cpumask_any(socket_cpumask[socket]); + + return nr_cpu_ids; +} + +struct cos_write_info +{ + unsigned int cos; + struct feat_node *feature; + const uint32_t *val; + const struct feat_props *props; +}; + +static void do_write_psr_msrs(void *data) +{ + const struct cos_write_info *info = data; + struct feat_node *feat = info->feature; + const struct feat_props *props = info->props; + unsigned int i, cos = info->cos, cos_num = props->cos_num; + + for ( i = 0; i < cos_num; i++ ) + { + if ( feat->cos_reg_val[cos * cos_num + i] != info->val[i] ) + { + feat->cos_reg_val[cos * cos_num + i] = info->val[i]; + props->write_msr(cos, info->val[i], props->type[i]); + } + } +} + static int write_psr_msrs(unsigned int socket, unsigned int cos, uint32_t val[], unsigned int array_len, enum psr_feat_type feat_type) { - return -ENOENT; + int ret; + struct psr_socket_info *info = get_socket_info(socket); + struct cos_write_info data = + { + .cos = cos, + .feature = info->features[feat_type], + .props = feat_props[feat_type], + }; + + if ( cos > info->features[feat_type]->cos_max ) + return -EINVAL; + + /* Skip to the feature's value head. */ + ret = skip_prior_features(&val, &array_len, feat_type); + if ( ret ) + return ret; + + if ( array_len < feat_props[feat_type]->cos_num ) + return -ENOSPC; + + data.val = val; + + if ( socket == cpu_to_socket(smp_processor_id()) ) + do_write_psr_msrs(&data); + else + { + unsigned int cpu = get_socket_cpu(socket); + + if ( cpu >= nr_cpu_ids ) + return -ENOTSOCK; + on_selected_cpus(cpumask_of(cpu), do_write_psr_msrs, &data, 1); + } + + return 0; } int psr_set_val(struct domain *d, unsigned int socket,