x86, clock: Fix kvm guest tsc initialization
Subsystems (3)
PATCH 1/1 x86, clock: Fix kvm guest tsc initialization
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. Setting x86_platform.calibrate_cpu to NULL is not appropriate as cpu_khz_from_cpuid() must be called to get the correct value of cpu_khz on Intel KVM guests.
This patch resolves this issue by setting x86_platform.calibrate_cpu to cpu_khz_from_cpuid() for KVM guests, which allows Intel KVM guests to get the right cpu frequency.
--- arch/x86/include/asm/tsc.h | 1 + arch/x86/kernel/kvmclock.c | 1 + arch/x86/kernel/tsc.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-)
arch/x86/include/asm/tsc.h +1 -0
@@ -37,6 +37,7 @@ extern int unsynchronized_tsc(void);extern int check_tsc_unstable (void );extern unsigned long native_calibrate_cpu (void );extern unsigned long native_calibrate_tsc (void ); +extern unsigned long cpu_khz_from_cpuid (void );extern unsigned long long native_sched_clock_from_tsc (u64 tsc);extern int tsc_clocksource_reliable;
arch/x86/kernel/kvmclock.c +1 -0
@@ -289,6 +289,7 @@ void __init kvmclock_init(void)put_cpu (); x86_platform.calibrate_tsc = kvm_get_tsc_khz; + x86_platform.calibrate_cpu = cpu_khz_from_cpuid; x86_platform.get_wallclock = kvm_get_wallclock; x86_platform.set_wallclock = kvm_set_wallclock;#ifdef CONFIG_X86_LOCAL_APIC
arch/x86/kernel/tsc.c +1 -1
@@ -699,7 +699,7 @@ unsigned long native_calibrate_tsc(void)return crystal_khz * ebx_numerator / eax_denominator; } -static unsigned long cpu_khz_from_cpuid (void ) +unsigned long cpu_khz_from_cpuid (void ) {unsigned int eax_base_mhz, ebx_max_mhz, ecx_bus_mhz, edx;
Signature · 1 line
1.7.9.3
Paolo Bonzini
maintainerQuoted 32 lines · Prarit Bhargava
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 SKLcpu_khzandtsc_khzvia 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 tonative_calibrate_tsc()which is a hardware calibration of the tsc, and intsc_init()executedtsc_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 sametsc_init()function. This meant that KVM guests did not execute the native hardware calibration function.After
aa297292d708, there are separate native calibrations forcpu_khzandtsc_khz. The code sets x86_platform.calibrate_tsc tonative_calibrate_tsc()which is now an Intel specific calibration function , and x86_platform.calibrate_cpu tonative_calibrate_cpu()which is the "old"native_calibrate_tsc()function (ie, the native hardware calibration function). [...]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 toaa297292d708. Setting x86_platform.calibrate_cpu to NULL is not appropriate ascpu_khz_from_cpuid()must be called to get the correct value ofcpu_khzon Intel KVM guests.
Quoted 3 lines
This patch resolves this issue by setting x86_platform.calibrate_cpu to
cpu_khz_from_cpuid()for KVM guests, which allows Intel KVM guests to get the right cpu frequency.
KVM guests don't have that CPUID leaf at all. kvm_get_tsc_khz can double as x86_platform.calibrate_cpu too for KVM guests, restoring the behavior prior to aa297292d708.
Thanks,
Paolo
Quoted 59 lines
Fixes aa297292d708 ("x86/tsc: Enumerate SKL cpu_khz and tsc_khz via CPUID")Signed-off-by Prarit Bhargava <[email protected]>Cc Paolo Bonzini <[email protected]>Cc "Radim Krčmář" <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Len Brown <[email protected]>Cc "Peter Zijlstra (Intel)" <[email protected]>Cc Borislav Petkov <[email protected]>Cc Adrian Hunter <[email protected]>Cc "Christopher S. Hall" <[email protected]>Cc David Woodhouse <[email protected]>--- arch/x86/include/asm/tsc.h | 1 + arch/x86/kernel/kvmclock.c | 1 + arch/x86/kernel/tsc.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-)arch/x86/include/asm/tsc.h +1
-0@@ -37,6 +37,7 @@ extern int unsynchronized_tsc(void);extern int check_tsc_unstable (void );extern unsigned long native_calibrate_cpu (void );extern unsigned long native_calibrate_tsc (void ); +extern unsigned long cpu_khz_from_cpuid (void );extern unsigned long long native_sched_clock_from_tsc (u64 tsc);extern int tsc_clocksource_reliable;arch/x86/kernel/kvmclock.c +1
-0@@ -289,6 +289,7 @@ void __init kvmclock_init(void)put_cpu (); x86_platform.calibrate_tsc = kvm_get_tsc_khz; + x86_platform.calibrate_cpu = cpu_khz_from_cpuid; x86_platform.get_wallclock = kvm_get_wallclock; x86_platform.set_wallclock = kvm_set_wallclock;#ifdef CONFIG_X86_LOCAL_APIC arch/x86/kernel/tsc.c +1
-1@@ -699,7 +699,7 @@ unsigned long native_calibrate_tsc(void)return crystal_khz * ebx_numerator / eax_denominator; } -static unsigned long cpu_khz_from_cpuid (void ) +unsigned long cpu_khz_from_cpuid (void ) {unsigned int eax_base_mhz, ebx_max_mhz, ecx_bus_mhz, edx;
Quoted 35 lines · Paolo Bonzini
Quoted 32 lines · Prarit Bhargava
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 SKLcpu_khzandtsc_khzvia 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 tonative_calibrate_tsc()which is a hardware calibration of the tsc, and intsc_init()executedtsc_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 sametsc_init()function. This meant that KVM guests did not execute the native hardware calibration function.After
aa297292d708, there are separate native calibrations forcpu_khzandtsc_khz. The code sets x86_platform.calibrate_tsc tonative_calibrate_tsc()which is now an Intel specific calibration function , and x86_platform.calibrate_cpu tonative_calibrate_cpu()which is the "old"native_calibrate_tsc()function (ie, the native hardware calibration function). [...]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 toaa297292d708. Setting x86_platform.calibrate_cpu to NULL is not appropriate ascpu_khz_from_cpuid()must be called to get the correct value ofcpu_khzon Intel KVM guests.
Quoted 7 lines
Quoted 3 lines
This patch resolves this issue by setting x86_platform.calibrate_cpu to
cpu_khz_from_cpuid()for KVM guests, which allows Intel KVM guests to get the right cpu frequency.KVM guests don't have that CPUID leaf at all.
kvm_get_tsc_khzcan double as x86_platform.calibrate_cpu too for KVM guests, restoring the behavior prior toaa297292d708.
Thanks Paolo -- v2 coming shortly.
P.
PATCH v2 1/1 x86, clock: Fix kvm guest tsc initialization
In reply to Paolo BonziniWhen 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().
--- arch/x86/kernel/kvmclock.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kernel/kvmclock.c +1 -0
@@ -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
Signature · 1 line
1.7.9.3
Quoted 72 lines · Prarit Bhargava
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 SKLcpu_khzandtsc_khzvia 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 tonative_calibrate_tsc()which is a hardware calibration of the tsc, and intsc_init()executedtsc_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 sametsc_init()function. This meant that KVM guests did not execute the native hardware calibration function.After
aa297292d708, there are separate native calibrations forcpu_khzandtsc_khz. The code sets x86_platform.calibrate_tsc tonative_calibrate_tsc()which is now an Intel specific calibration function, and x86_platform.calibrate_cpu tonative_calibrate_cpu()which is the "old"native_calibrate_tsc()function (ie, the native hardware calibration function).
tsc_init()now doescpu_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 toaa297292d708.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 tokvm_get_tsc_khz().Fixes aa297292d708 ("x86/tsc: Enumerate SKL cpu_khz and tsc_khz via CPUID")Signed-off-by Prarit Bhargava <[email protected]>Cc Paolo Bonzini <[email protected]>Cc "Radim Krčmář" <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Len Brown <[email protected]>Cc "Peter Zijlstra (Intel)" <[email protected]>Cc Borislav Petkov <[email protected]>Cc Adrian Hunter <[email protected]>Cc "Christopher S. Hall" <[email protected]>Cc David Woodhouse <[email protected]>--- arch/x86/kernel/kvmclock.c | 1 + 1 file changed, 1 insertion(+)arch/x86/kernel/kvmclock.c +0
-0
arch/x86/kernel/kvmclock.c void __init kvmclock_init(void) · line 295
Quoted 7 lines
arch/x86/kernel/kvmclock.c +1
-0@@ -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