Skip to content

Commit e70b57a

Browse files
Wanpeng Libonzini
Wanpeng Li
authored andcommitted
KVM: X86: Fix softlockup when get the current kvmclock
watchdog: BUG: soft lockup - CPU#6 stuck for 22s! [qemu-system-x86:10185] CPU: 6 PID: 10185 Comm: qemu-system-x86 Tainted: G OE 4.14.0-rc4+ #4 RIP: 0010:kvm_get_time_scale+0x4e/0xa0 [kvm] Call Trace: get_time_ref_counter+0x5a/0x80 [kvm] kvm_hv_process_stimers+0x120/0x5f0 [kvm] kvm_arch_vcpu_ioctl_run+0x4b4/0x1690 [kvm] kvm_vcpu_ioctl+0x33a/0x620 [kvm] do_vfs_ioctl+0xa1/0x5d0 SyS_ioctl+0x79/0x90 entry_SYSCALL_64_fastpath+0x1e/0xa9 This can be reproduced when running kvm-unit-tests/hyperv_stimer.flat and cpu-hotplug stress simultaneously. __this_cpu_read(cpu_tsc_khz) returns 0 (set in kvmclock_cpu_down_prep()) when the pCPU is unhotplug which results in kvm_get_time_scale() gets into an infinite loop. This patch fixes it by treating the unhotplug pCPU as not using master clock. Reviewed-by: Radim Krčmář <[email protected]> Reviewed-by: David Hildenbrand <[email protected]> Cc: Paolo Bonzini <[email protected]> Cc: Radim Krčmář <[email protected]> Signed-off-by: Wanpeng Li <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 12806ba commit e70b57a

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

arch/x86/kvm/x86.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1798,10 +1798,13 @@ u64 get_kvmclock_ns(struct kvm *kvm)
17981798
/* both __this_cpu_read() and rdtsc() should be on the same cpu */
17991799
get_cpu();
18001800

1801-
kvm_get_time_scale(NSEC_PER_SEC, __this_cpu_read(cpu_tsc_khz) * 1000LL,
1802-
&hv_clock.tsc_shift,
1803-
&hv_clock.tsc_to_system_mul);
1804-
ret = __pvclock_read_cycles(&hv_clock, rdtsc());
1801+
if (__this_cpu_read(cpu_tsc_khz)) {
1802+
kvm_get_time_scale(NSEC_PER_SEC, __this_cpu_read(cpu_tsc_khz) * 1000LL,
1803+
&hv_clock.tsc_shift,
1804+
&hv_clock.tsc_to_system_mul);
1805+
ret = __pvclock_read_cycles(&hv_clock, rdtsc());
1806+
} else
1807+
ret = ktime_get_boot_ns() + ka->kvmclock_offset;
18051808

18061809
put_cpu();
18071810

0 commit comments

Comments
 (0)