From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
To: Haozhong Zhang <haozhong.zhang@intel.com>,
xen-devel@lists.xen.org, Jan Beulich <jbeulich@suse.com>,
Kevin Tian <kevin.tian@intel.com>
Cc: Jun Nakajima <jun.nakajima@intel.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Keir Fraser <keir@xen.org>,
Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>,
Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Subject: Re: [PATCH v3 08/13] x86/hvm: Setup TSC scaling ratio
Date: Mon, 4 Jan 2016 13:40:01 -0500 [thread overview]
Message-ID: <568ABC81.80006@oracle.com> (raw)
In-Reply-To: <1451531020-29964-9-git-send-email-haozhong.zhang@intel.com>
On 12/30/2015 10:03 PM, Haozhong Zhang wrote:
> This patch adds a field tsc_scaling_ratio in struct hvm_vcpu to
> record the TSC scaling ratio, and sets it up when tsc_set_info() is
> called for a vcpu or when a vcpu is restored or reset.
>
> Before applying the TSC scaling ratio to CPU, we check its validity in
> tsc_set_info(). If an invalid ratio is given, we will leave the default
> value in tsc_scaling_ratio (i.e. ratio = 1) and setup guest TSC as if no
> TSC scaling is used:
> * For TSC_MODE_FAULT,
> - if a user-specified TSC frequency is given, we will set the guest
> TSC frequency to it; otherwise, we set it to the host TSC frequency.
> - if guest TSC frequency does not equal to host TSC frequency, we will
> emulate guest TSC (i.e. d->arch.vtsc is set to 1). In both cases,
> guest TSC runs in the guest TSC frequency.
> * For TSC_MODE_PVRDTSCP,
> - we set the guest TSC frequency to the host TSC frequency.
> - guest rdtsc is executed natively in the host TSC frequency as
> before.
> - if rdtscp is not available to guest, it will be emulated; otherwise,
> it will be executed natively. In both cases, guest rdtscp gets TSC
> in the host TSC frequency as before.
>
> Signed-off-by: Haozhong Zhang <haozhong.zhang@intel.com>
> Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> ---
> Changes in v3:
> (addressing Boris Ostrovsky's comments)
> * Remove redundant checks.
> * Update comments in tsc_set_info(): during initial boot -> during domain creation.
> (addressing Kevin Tian's comments)
> * Add a validation step to check TSC scaling ratio before applying it
> to the hardware. If the validation fails, we will fallback to Xen's
> original way to handle guest TSC. hvm_setup_tsc_scaling() is always
> called when the validation succeeds, so it shoud never fail now.
>
> xen/arch/x86/hvm/hvm.c | 41 +++++++++++++++++++++++++++++++++++++++
> xen/arch/x86/hvm/svm/svm.c | 6 ++++--
> xen/arch/x86/time.c | 19 +++++++++++++++---
> xen/include/asm-x86/hvm/hvm.h | 6 ++++++
> xen/include/asm-x86/hvm/svm/svm.h | 3 ---
> xen/include/asm-x86/hvm/vcpu.h | 2 ++
> 6 files changed, 69 insertions(+), 8 deletions(-)
>
> diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
> index 3648a44..3bf99b1 100644
> --- a/xen/arch/x86/hvm/hvm.c
> +++ b/xen/arch/x86/hvm/hvm.c
> @@ -65,6 +65,7 @@
> #include <asm/mtrr.h>
> #include <asm/apic.h>
> #include <asm/vm_event.h>
> +#include <asm/math64.h>
> #include <public/sched.h>
> #include <public/hvm/ioreq.h>
> #include <public/version.h>
> @@ -301,6 +302,42 @@ int hvm_set_guest_pat(struct vcpu *v, u64 guest_pat)
> return 1;
> }
>
> +bool_t hvm_validate_tsc_scaling_ratio(uint32_t gtsc_khz)
> +{
> + u64 ratio;
> +
> + if ( !hvm_funcs.tsc_scaling_supported )
> + return FALSE;
> +
> + ratio = mul_u64_u32_div(1ULL << hvm_funcs.tsc_scaling_ratio_frac_bits,
> + gtsc_khz, cpu_khz);
> +
> + return (!ratio || ratio > hvm_funcs.max_tsc_scaling_ratio) ? FALSE : TRUE;
> +}
> +
> +void hvm_setup_tsc_scaling(struct vcpu *v)
> +{
> + u64 ratio;
> +
> + if ( !hvm_funcs.tsc_scaling_supported )
> + return;
> +
> + /*
> + * The multiplication of the first two terms may overflow a 64-bit
> + * integer, so use mul_u64_u32_div() instead to keep precision.
> + */
> + ratio = mul_u64_u32_div(1ULL << hvm_funcs.tsc_scaling_ratio_frac_bits,
> + v->domain->arch.tsc_khz, cpu_khz);
> +
> + if ( ratio == 0 || ratio > hvm_funcs.max_tsc_scaling_ratio )
> + return;
> +
> + v->arch.hvm_vcpu.tsc_scaling_ratio = ratio;
> +
> + if ( hvm_funcs.setup_tsc_scaling )
> + hvm_funcs.setup_tsc_scaling(v);
> +}
Would be nice to factor out common code. E.g. replace
hvm_validate_tsc_scaling_ratio() with something like get_ratio() which
returns zero if gtsc_khz is bogus?
-boris
next prev parent reply other threads:[~2016-01-04 18:40 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-31 3:03 [PATCH v3 00/13] Add VMX TSC scaling support Haozhong Zhang
2015-12-31 3:03 ` [PATCH v3 01/13] x86/time.c: Use correct guest TSC frequency in tsc_set_info() Haozhong Zhang
2016-01-04 17:44 ` Boris Ostrovsky
2015-12-31 3:03 ` [PATCH v3 02/13] x86/time.c: Use correct guest TSC frequency in tsc_get_info() Haozhong Zhang
2016-01-04 17:48 ` Boris Ostrovsky
2016-01-05 0:32 ` Haozhong Zhang
2016-01-08 9:05 ` Jan Beulich
2016-01-08 9:12 ` Haozhong Zhang
2015-12-31 3:03 ` [PATCH v3 03/13] x86/hvm: Scale host TSC when setting/getting guest TSC Haozhong Zhang
2016-01-08 9:15 ` Jan Beulich
2016-01-08 14:04 ` Haozhong Zhang
2015-12-31 3:03 ` [PATCH v3 04/13] x86/time.c: Scale host TSC in pvclock properly Haozhong Zhang
2016-01-04 18:09 ` Boris Ostrovsky
2016-01-05 0:59 ` Haozhong Zhang
2016-01-05 16:15 ` Boris Ostrovsky
2016-01-06 0:56 ` Haozhong Zhang
2016-01-08 9:20 ` Jan Beulich
2016-01-08 13:22 ` Haozhong Zhang
2016-01-08 13:43 ` Jan Beulich
2016-01-08 13:50 ` Haozhong Zhang
2015-12-31 3:03 ` [PATCH v3 05/13] svm: Remove redundant TSC scaling in svm_set_tsc_offset() Haozhong Zhang
2016-01-08 9:22 ` Jan Beulich
2016-01-08 13:24 ` Haozhong Zhang
2015-12-31 3:03 ` [PATCH v3 06/13] x86/hvm: Collect information of TSC scaling ratio Haozhong Zhang
2015-12-31 3:03 ` [PATCH v3 07/13] x86: Add functions for 64-bit integer arithmetic Haozhong Zhang
2016-01-04 18:26 ` Boris Ostrovsky
2016-01-05 1:15 ` Haozhong Zhang
2016-01-05 16:21 ` Boris Ostrovsky
2016-01-08 9:34 ` Jan Beulich
2016-01-08 13:48 ` Haozhong Zhang
2015-12-31 3:03 ` [PATCH v3 08/13] x86/hvm: Setup TSC scaling ratio Haozhong Zhang
2016-01-04 18:40 ` Boris Ostrovsky [this message]
2016-01-05 1:20 ` Haozhong Zhang
2016-01-08 9:44 ` Jan Beulich
2016-01-08 13:55 ` Haozhong Zhang
2016-01-08 14:04 ` Jan Beulich
2016-01-08 14:10 ` Haozhong Zhang
2015-12-31 3:03 ` [PATCH v3 09/13] x86/hvm: Replace architecture TSC scaling by a common function Haozhong Zhang
2016-01-04 18:42 ` Boris Ostrovsky
2016-01-12 16:44 ` Jan Beulich
2015-12-31 3:03 ` [PATCH v3 10/13] x86/hvm: Move saving/loading vcpu's TSC to common code Haozhong Zhang
2015-12-31 3:03 ` [PATCH v3 11/13] x86/hvm: Detect TSC scaling through hvm_funcs Haozhong Zhang
2015-12-31 3:03 ` [PATCH v3 12/13] vmx: Add VMX RDTSC(P) scaling support Haozhong Zhang
2016-01-12 16:48 ` Jan Beulich
2016-01-14 4:52 ` Haozhong Zhang
2016-01-14 9:05 ` Jan Beulich
2016-01-14 9:47 ` Haozhong Zhang
2015-12-31 3:03 ` [PATCH v3 13/13] docs: Add descriptions of TSC scaling in xl.cfg and tscmode.txt Haozhong Zhang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=568ABC81.80006@oracle.com \
--to=boris.ostrovsky@oracle.com \
--cc=Aravind.Gopalakrishnan@amd.com \
--cc=andrew.cooper3@citrix.com \
--cc=haozhong.zhang@intel.com \
--cc=jbeulich@suse.com \
--cc=jun.nakajima@intel.com \
--cc=keir@xen.org \
--cc=kevin.tian@intel.com \
--cc=suravee.suthikulpanit@amd.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).