Skip to content

Commit 2f1b518

Browse files
Wanpeng Ligregkh
Wanpeng Li
authored andcommitted
KVM: X86: Fix softlockup when get the current kvmclock
[ Upstream commit e70b57a ] 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ář <rkrcmar@redhat.com> Reviewed-by: David Hildenbrand <david@redhat.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Radim Krčmář <rkrcmar@redhat.com> Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9a44743 commit 2f1b518

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

arch/x86/kvm/x86.c

+7-4
Original file line numberDiff line numberDiff line change
@@ -1795,10 +1795,13 @@ u64 get_kvmclock_ns(struct kvm *kvm)
17951795
/* both __this_cpu_read() and rdtsc() should be on the same cpu */
17961796
get_cpu();
17971797

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

18031806
put_cpu();
18041807

0 commit comments

Comments
 (0)