From: Paolo Bonzini <pbonzini@redhat.com>
To: Prarit Bhargava <prarit@redhat.com>, linux-kernel@vger.kernel.org
Cc: "Radim Krčmář" <rkrcmar@redhat.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Ingo Molnar" <mingo@redhat.com>,
"H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, "Len Brown" <len.brown@intel.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
"Borislav Petkov" <bp@suse.de>,
"Adrian Hunter" <adrian.hunter@intel.com>,
"Christopher S. Hall" <christopher.s.hall@intel.com>,
"David Woodhouse" <dwmw2@infradead.org>,
kvm@vger.kernel.org
Subject: Re: [PATCH v2] x86, clock: Fix kvm guest tsc initialization
Date: Thu, 8 Sep 2016 16:42:46 +0200 [thread overview]
Message-ID: <81d948f7-8c4a-12c5-f645-20619b2321ec@redhat.com> (raw)
In-Reply-To: <1473344128-30342-1-git-send-email-prarit@redhat.com>
On 08/09/2016 16:15, Prarit Bhargava wrote:
> When booting a kvm guest on AMD with the latest kernel the following
> messages are displayed in the boot log:
>
> tsc: Unable to calibrate against PIT
> tsc: HPET/PMTIMER calibration failed
>
> aa297292d708 ("x86/tsc: Enumerate SKL cpu_khz and tsc_khz via CPUID")
> introduced a change to account for a difference in cpu and tsc frequencies for
> Intel SKL processors. Before this change the native tsc set
> x86_platform.calibrate_tsc to native_calibrate_tsc() which is a hardware
> calibration of the tsc, and in tsc_init() executed
>
> tsc_khz = x86_platform.calibrate_tsc();
> cpu_khz = tsc_khz;
>
> The kvm code changed x86_platform.calibrate_tsc to kvm_get_tsc_khz() and
> executed the same tsc_init() function. This meant that KVM guests did not
> execute the native hardware calibration function.
>
> After aa297292d708, there are separate native calibrations for cpu_khz and
> tsc_khz. The code sets x86_platform.calibrate_tsc to native_calibrate_tsc()
> which is now an Intel specific calibration function, and
> x86_platform.calibrate_cpu to native_calibrate_cpu() which is the "old"
> native_calibrate_tsc() function (ie, the native hardware calibration
> function).
>
> tsc_init() now does
>
> cpu_khz = x86_platform.calibrate_cpu();
> tsc_khz = x86_platform.calibrate_tsc();
> if (tsc_khz == 0)
> tsc_khz = cpu_khz;
> else if (abs(cpu_khz - tsc_khz) * 10 > tsc_khz)
> cpu_khz = tsc_khz;
>
> The kvm code should not call the hardware initialization in
> native_calibrate_cpu(), as it isn't applicable for kvm and it didn't do that
> prior to aa297292d708.
>
> This patch resolves this issue by setting x86_platform.calibrate_cpu to
> kvm_get_tsc_khz().
>
> v2: I had originally set x86_platform.calibrate_cpu to
> cpu_khz_from_cpuid(), however, pbonzini pointed out that the CPUID leaf
> in that function is not available in KVM. I have changed the function
> pointer to kvm_get_tsc_khz().
>
> Fixes: aa297292d708 ("x86/tsc: Enumerate SKL cpu_khz and tsc_khz via CPUID")
> Signed-off-by: Prarit Bhargava <prarit@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: "Radim Krčmář" <rkrcmar@redhat.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: x86@kernel.org
> Cc: Len Brown <len.brown@intel.com>
> Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>
> Cc: Borislav Petkov <bp@suse.de>
> Cc: Adrian Hunter <adrian.hunter@intel.com>
> Cc: "Christopher S. Hall" <christopher.s.hall@intel.com>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Cc: kvm@vger.kernel.org
> ---
> arch/x86/kernel/kvmclock.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
> index 1d39bfbd26bb..3692249a70f1 100644
> --- a/arch/x86/kernel/kvmclock.c
> +++ b/arch/x86/kernel/kvmclock.c
> @@ -289,6 +289,7 @@ void __init kvmclock_init(void)
> put_cpu();
>
> x86_platform.calibrate_tsc = kvm_get_tsc_khz;
> + x86_platform.calibrate_cpu = kvm_get_tsc_khz;
> x86_platform.get_wallclock = kvm_get_wallclock;
> x86_platform.set_wallclock = kvm_set_wallclock;
> #ifdef CONFIG_X86_LOCAL_APIC
>
Applied to kvm/master, thanks (commit
a4497a86fb9b855c5ac8503fdc959393b00bb643). I'll probably send a pull
request to Linus only next week though.
Paolo
prev parent reply other threads:[~2016-09-08 14:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-08 13:07 [PATCH] x86, clock: Fix kvm guest tsc initialization Prarit Bhargava
2016-09-08 13:33 ` Paolo Bonzini
2016-09-08 13:46 ` Prarit Bhargava
2016-09-08 14:15 ` [PATCH v2] " Prarit Bhargava
2016-09-08 14:42 ` Paolo Bonzini [this message]
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=81d948f7-8c4a-12c5-f645-20619b2321ec@redhat.com \
--to=pbonzini@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=bp@suse.de \
--cc=christopher.s.hall@intel.com \
--cc=dwmw2@infradead.org \
--cc=hpa@zytor.com \
--cc=kvm@vger.kernel.org \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=prarit@redhat.com \
--cc=rkrcmar@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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).