From patchwork Thu Dec 31 03:03:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haozhong Zhang X-Patchwork-Id: 7935341 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BB32DBEEE5 for ; Thu, 31 Dec 2015 03:07:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E6A50201FE for ; Thu, 31 Dec 2015 03:07:31 +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 D319520211 for ; Thu, 31 Dec 2015 03:07:30 +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 1aETXX-0000Jv-JB; Thu, 31 Dec 2015 03:04:35 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aETXW-0000Jq-AI for xen-devel@lists.xen.org; Thu, 31 Dec 2015 03:04:34 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 0C/BF-21571-14B94865; Thu, 31 Dec 2015 03:04:33 +0000 X-Env-Sender: haozhong.zhang@intel.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1451531069!7367736!2 X-Originating-IP: [192.55.52.120] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 55572 invoked from network); 31 Dec 2015 03:04:32 -0000 Received: from mga04.intel.com (HELO mga04.intel.com) (192.55.52.120) by server-3.tower-21.messagelabs.com with SMTP; 31 Dec 2015 03:04:32 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP; 30 Dec 2015 19:04:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,503,1444719600"; d="scan'208";a="881364406" Received: from hz-desktop.sh.intel.com (HELO localhost) ([10.239.13.40]) by orsmga002.jf.intel.com with ESMTP; 30 Dec 2015 19:04:30 -0800 From: Haozhong Zhang To: xen-devel@lists.xen.org, Jan Beulich , Boris Ostrovsky , Kevin Tian Date: Thu, 31 Dec 2015 11:03:29 +0800 Message-Id: <1451531020-29964-3-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 02/13] x86/time.c: Use correct guest TSC frequency in tsc_get_info() 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 When the TSC mode of a HVM container is TSC_MODE_DEFAULT or TSC_MODE_PVRDTSCP and no TSC emulation is used, the existing tsc_get_info() uses the host TSC frequency (cpu_khz) as the guest TSC frequency. However, tsc_set_info() may set the guest TSC frequency to a value different than the host. In order to keep consistent to tsc_set_info(), this patch makes tsc_get_info() use the value set by tsc_set_info() as the guest TSC frequency. Signed-off-by: Haozhong Zhang Reviewed-by: Boris Ostrovsky --- Changes in v3: (addressing Boris Ostrovsky's comments) * Use this_cpu(cpu_time).tsc_scale for both scaling and non-scaling cases. xen/arch/x86/time.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 0059b6a..d83f068 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1749,6 +1749,9 @@ void tsc_get_info(struct domain *d, uint32_t *tsc_mode, uint64_t *elapsed_nsec, uint32_t *gtsc_khz, uint32_t *incarnation) { + bool_t enable_tsc_scaling = has_hvm_container_domain(d) && + cpu_has_tsc_ratio; + *incarnation = d->arch.incarnation; *tsc_mode = d->arch.tsc_mode; @@ -1769,7 +1772,7 @@ void tsc_get_info(struct domain *d, uint32_t *tsc_mode, } tsc = rdtsc(); *elapsed_nsec = scale_delta(tsc, &d->arch.vtsc_to_ns); - *gtsc_khz = cpu_khz; + *gtsc_khz = enable_tsc_scaling ? d->arch.tsc_khz : cpu_khz; break; case TSC_MODE_PVRDTSCP: if ( d->arch.vtsc ) @@ -1780,9 +1783,9 @@ void tsc_get_info(struct domain *d, uint32_t *tsc_mode, else { tsc = rdtsc(); - *elapsed_nsec = scale_delta(tsc, &d->arch.vtsc_to_ns) - + *elapsed_nsec = scale_delta(tsc, &this_cpu(cpu_time).tsc_scale) - d->arch.vtsc_offset; - *gtsc_khz = 0; /* ignored by tsc_set_info */ + *gtsc_khz = enable_tsc_scaling ? d->arch.tsc_khz : 0; } break; }