From patchwork Thu Dec 31 03:03:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haozhong Zhang X-Patchwork-Id: 7935271 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 46AAE9F3CD for ; Thu, 31 Dec 2015 03:07:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 632E32025A for ; Thu, 31 Dec 2015 03:07:06 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 40C81201FE for ; Thu, 31 Dec 2015 03:07:05 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aETXq-0000Tu-QO; Thu, 31 Dec 2015 03:04:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aETXo-0000O8-Tf for xen-devel@lists.xen.org; Thu, 31 Dec 2015 03:04:53 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 50/7A-07165-45B94865; Thu, 31 Dec 2015 03:04:52 +0000 X-Env-Sender: haozhong.zhang@intel.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1451531090!13981318!1 X-Originating-IP: [192.55.52.88] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjU1LjUyLjg4ID0+IDM3NDcyNQ==\n X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35601 invoked from network); 31 Dec 2015 03:04:51 -0000 Received: from mga01.intel.com (HELO mga01.intel.com) (192.55.52.88) by server-13.tower-27.messagelabs.com with SMTP; 31 Dec 2015 03:04:51 -0000 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP; 30 Dec 2015 19:04:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,503,1444719600"; d="scan'208";a="626001770" Received: from hz-desktop.sh.intel.com (HELO localhost) ([10.239.13.40]) by FMSMGA003.fm.intel.com with ESMTP; 30 Dec 2015 19:04:48 -0800 From: Haozhong Zhang To: xen-devel@lists.xen.org, Jan Beulich , Boris Ostrovsky , Kevin Tian Date: Thu, 31 Dec 2015 11:03:36 +0800 Message-Id: <1451531020-29964-10-git-send-email-haozhong.zhang@intel.com> X-Mailer: git-send-email 2.4.8 In-Reply-To: <1451531020-29964-1-git-send-email-haozhong.zhang@intel.com> References: <1451531020-29964-1-git-send-email-haozhong.zhang@intel.com> Cc: Haozhong Zhang , Keir Fraser , Suravee Suthikulpanit , Andrew Cooper , Aravind Gopalakrishnan , Jun Nakajima Subject: [Xen-devel] [PATCH v3 09/13] x86/hvm: Replace architecture TSC scaling by a common function X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch implements a common function hvm_scale_tsc() to scale TSC by using TSC scaling information collected by architecture code. Signed-off-by: Haozhong Zhang Reviewed-by: Kevin Tian (except the mul64 part) Reviewed-by: Boris Ostrovsky Acked-by: Jan Beulich --- Changes in v3: (addressing Boris Ostrovsky's comments) * Remove unnecessary assertions in hvm_scale_tsc(). * Move math64 stuffs to a standalone patch and state their origination. xen/arch/x86/hvm/hvm.c | 15 +++++++++++++-- xen/arch/x86/hvm/svm/svm.c | 12 ------------ xen/arch/x86/time.c | 2 +- xen/include/asm-x86/hvm/hvm.h | 3 +-- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 3bf99b1..a900b4c 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -302,6 +302,17 @@ int hvm_set_guest_pat(struct vcpu *v, u64 guest_pat) return 1; } +u64 hvm_scale_tsc(const struct vcpu *v, u64 tsc) +{ + u64 ratio = v->arch.hvm_vcpu.tsc_scaling_ratio; + + if ( !hvm_funcs.tsc_scaling_supported || + ratio == hvm_funcs.default_tsc_scaling_ratio ) + return tsc; + + return mul_u64_u64_shr(tsc, ratio, hvm_funcs.tsc_scaling_ratio_frac_bits); +} + bool_t hvm_validate_tsc_scaling_ratio(uint32_t gtsc_khz) { u64 ratio; @@ -352,7 +363,7 @@ void hvm_set_guest_tsc_fixed(struct vcpu *v, u64 guest_tsc, u64 at_tsc) { tsc = at_tsc ?: rdtsc(); if ( cpu_has_tsc_ratio ) - tsc = hvm_funcs.scale_tsc(v, tsc); + tsc = hvm_scale_tsc(v, tsc); } delta_tsc = guest_tsc - tsc; @@ -384,7 +395,7 @@ u64 hvm_get_guest_tsc_fixed(struct vcpu *v, uint64_t at_tsc) { tsc = at_tsc ?: rdtsc(); if ( cpu_has_tsc_ratio ) - tsc = hvm_funcs.scale_tsc(v, tsc); + tsc = hvm_scale_tsc(v, tsc); } return tsc + v->arch.hvm_vcpu.cache_tsc_offset; diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index b58f1e8..71538c8 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -804,16 +804,6 @@ static uint64_t scale_tsc(uint64_t host_tsc, uint64_t ratio) return scaled_host_tsc; } -static uint64_t svm_scale_tsc(struct vcpu *v, uint64_t tsc) -{ - struct domain *d = v->domain; - - if ( !cpu_has_tsc_ratio || d->arch.vtsc ) - return tsc; - - return scale_tsc(tsc, v->arch.hvm_vcpu.tsc_scaling_ratio); -} - static uint64_t svm_get_tsc_offset(uint64_t host_tsc, uint64_t guest_tsc, uint64_t ratio) { @@ -2276,8 +2266,6 @@ static struct hvm_function_table __initdata svm_function_table = { .nhvm_intr_blocked = nsvm_intr_blocked, .nhvm_hap_walk_L1_p2m = nsvm_hap_walk_L1_p2m, - .scale_tsc = svm_scale_tsc, - .default_tsc_scaling_ratio = DEFAULT_TSC_RATIO, .max_tsc_scaling_ratio = ~TSC_RATIO_RSVD_BITS, .tsc_scaling_ratio_frac_bits = 32, diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index e69d9de..8d391e0 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -817,7 +817,7 @@ static void __update_vcpu_system_time(struct vcpu *v, int force) { if ( has_hvm_container_domain(d) && cpu_has_tsc_ratio ) { - tsc_stamp = hvm_funcs.scale_tsc(v, t->local_tsc_stamp); + tsc_stamp = hvm_scale_tsc(v, t->local_tsc_stamp); _u.tsc_to_system_mul = d->arch.vtsc_to_ns.mul_frac; _u.tsc_shift = d->arch.vtsc_to_ns.shift; } diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 6b49da8..05894ee 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -225,8 +225,6 @@ struct hvm_function_table { bool_t (*altp2m_vcpu_emulate_ve)(struct vcpu *v); int (*altp2m_vcpu_emulate_vmfunc)(struct cpu_user_regs *regs); - uint64_t (*scale_tsc)(struct vcpu *v, uint64_t tsc); - /* Architecture function to setup TSC scaling ratio */ void (*setup_tsc_scaling)(struct vcpu *v); }; @@ -264,6 +262,7 @@ void hvm_set_guest_tsc_fixed(struct vcpu *v, u64 guest_tsc, u64 at_tsc); u64 hvm_get_guest_tsc_fixed(struct vcpu *v, u64 at_tsc); #define hvm_get_guest_tsc(v) hvm_get_guest_tsc_fixed(v, 0) +u64 hvm_scale_tsc(const struct vcpu *v, u64 tsc); bool_t hvm_validate_tsc_scaling_ratio(uint32_t gtsc_khz); void hvm_setup_tsc_scaling(struct vcpu *v);