From patchwork Wed May 3 08:44:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9709017 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 9581260385 for ; Wed, 3 May 2017 08:56:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75A2028606 for ; Wed, 3 May 2017 08:56:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6981D28609; Wed, 3 May 2017 08:56:30 +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 EDB9428602 for ; Wed, 3 May 2017 08:56:29 +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 1d5q37-0000q5-Lh; Wed, 03 May 2017 08:54:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5q36-0000o7-93 for xen-devel@lists.xenproject.org; Wed, 03 May 2017 08:54:16 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id AA/D7-02006-7BA99095; Wed, 03 May 2017 08:54:15 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRWlGSWpSXmKPExsXS1tYhobtlFme kwd8VLBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8amS74FZwwqNizaztLA+F6li5GLQ0hgOqNE 85I5jF2MnBwSArwSR5bNYIWw/SW+nn7HDFHUwChx88tLJpAEm4C6xOOvPWC2iICSxL1Vk5lAi pgFdjJJrDv9HaiDg0NYIEri7m9HkBoWAVWJ9W+/MIPYvAKeEnseP4BaJidx8thksGWcQPHnXz ayg9hCAh4Sh569Z5rAyLuAkWEVo3pxalFZapGusV5SUWZ6RkluYmaOrqGBqV5uanFxYnpqTmJ SsV5yfu4mRmAwMADBDsa9/5wOMUpyMCmJ8qq/Yo8U4kvKT6nMSCzOiC8qzUktPsQow8GhJMH7 cCZnpJBgUWp6akVaZg4wLGHSEhw8SiK8XSBp3uKCxNzizHSI1ClGRSlx3ukgCQGQREZpHlwbL BYuMcpKCfMyAh0ixFOQWpSbWYIq/4pRnINRSZg3GWQKT2ZeCdz0V0CLmYAWN8tygCwuSURIST UwRt4vaWTKvTs5Vm/hLCVPrSKL1C8HXj/yS/dnN175aWLTxBfXuD/vuD43/OgJ/UeXsu2Y5d+ brIt/KFPf2z/VeVLCaqWNwfn7dlg/XKV61Xlm0InElb6q+yU2bpt6N7x4c8XbOukXn+dazFz6 9gGbbdW/uHm6xsWb3zkamCzjen7z5f5F5yZNVFNiKc5INNRiLipOBAA22lEWgAIAAA== X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1493801620!75519330!13 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.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10635 invoked from network); 3 May 2017 08:54:11 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-2.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 3 May 2017 08:54:11 -0000 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 May 2017 01:54:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,283,1491289200"; d="scan'208";a="852347631" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.39]) by FMSMGA003.fm.intel.com with ESMTP; 03 May 2017 01:54:08 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Wed, 3 May 2017 16:44:12 +0800 Message-Id: <1493801063-38513-13-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1493801063-38513-1-git-send-email-yi.y.sun@linux.intel.com> References: <1493801063-38513-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, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v11 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 --- 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 | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 9693506..9b8428d 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -107,6 +107,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[PSR_SOCKET_FEAT_NUM]; /* @@ -275,9 +278,15 @@ 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 struct feat_props l3_cat_props = { .cos_num = 1, .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, @@ -885,11 +894,87 @@ 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; + uint32_t *val; + enum psr_feat_type feat_type; +}; + +static void do_write_psr_msrs(void *data) +{ + struct cos_write_info *info = data; + unsigned int cos = info->cos; + struct feat_node *feat = info->feature; + const struct feat_props *props = feat_props[info->feat_type]; + unsigned int i; + + for ( i = 0; i < props->cos_num; i++ ) + { + if ( feat->cos_reg_val[cos * props->cos_num + i] != info->val[i] ) + { + feat->cos_reg_val[cos * props->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; + unsigned int i; + struct psr_socket_info *info = get_socket_info(socket); + struct cos_write_info data = + { + .cos = cos, + .feature = info->features[feat_type], + .feat_type = feat_type, + }; + + if ( cos > info->features[feat_type]->cos_max ) + return -EINVAL; + + /* Skip to the feature's value head. */ + for ( i = 0; i < feat_type; i++ ) + { + if ( !info->features[i] ) + continue; + + if ( array_len <= feat_props[feat_type]->cos_num ) + return -ENOSPC; + + array_len -= feat_props[feat_type]->cos_num; + + val += feat_props[feat_type]->cos_num; + } + + 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; } /* The whole set process is protected by domctl_lock. */