Skip to content

Commit 285f68a

Browse files
vittyvkliuw
authored andcommitted
x86/hyperv: Protect set_hv_tscchange_cb() against getting preempted
The following issue is observed with CONFIG_DEBUG_PREEMPT when KVM loads: KVM: vmx: using Hyper-V Enlightened VMCS BUG: using smp_processor_id() in preemptible [00000000] code: systemd-udevd/488 caller is set_hv_tscchange_cb+0x16/0x80 CPU: 1 PID: 488 Comm: systemd-udevd Not tainted 5.15.0-rc5+ #396 Hardware name: Microsoft Corporation Virtual Machine/Virtual Machine, BIOS Hyper-V UEFI Release v4.0 12/17/2019 Call Trace: dump_stack_lvl+0x6a/0x9a check_preemption_disabled+0xde/0xe0 ? kvm_gen_update_masterclock+0xd0/0xd0 [kvm] set_hv_tscchange_cb+0x16/0x80 kvm_arch_init+0x23f/0x290 [kvm] kvm_init+0x30/0x310 [kvm] vmx_init+0xaf/0x134 [kvm_intel] ... set_hv_tscchange_cb() can get preempted in between acquiring smp_processor_id() and writing to HV_X64_MSR_REENLIGHTENMENT_CONTROL. This is not an issue by itself: HV_X64_MSR_REENLIGHTENMENT_CONTROL is a partition-wide MSR and it doesn't matter which particular CPU will be used to receive reenlightenment notifications. The only real problem can (in theory) be observed if the CPU whose id was acquired with smp_processor_id() goes offline before we manage to write to the MSR, the logic in hv_cpu_die() won't be able to reassign it correctly. Reported-by: Michael Kelley <[email protected]> Signed-off-by: Vitaly Kuznetsov <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Wei Liu <[email protected]>
1 parent 01ccca3 commit 285f68a

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

arch/x86/hyperv/hv_init.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ void set_hv_tscchange_cb(void (*cb)(void))
169169
struct hv_reenlightenment_control re_ctrl = {
170170
.vector = HYPERV_REENLIGHTENMENT_VECTOR,
171171
.enabled = 1,
172-
.target_vp = hv_vp_index[smp_processor_id()]
173172
};
174173
struct hv_tsc_emulation_control emu_ctrl = {.enabled = 1};
175174

@@ -183,8 +182,12 @@ void set_hv_tscchange_cb(void (*cb)(void))
183182
/* Make sure callback is registered before we write to MSRs */
184183
wmb();
185184

185+
re_ctrl.target_vp = hv_vp_index[get_cpu()];
186+
186187
wrmsrl(HV_X64_MSR_REENLIGHTENMENT_CONTROL, *((u64 *)&re_ctrl));
187188
wrmsrl(HV_X64_MSR_TSC_EMULATION_CONTROL, *((u64 *)&emu_ctrl));
189+
190+
put_cpu();
188191
}
189192
EXPORT_SYMBOL_GPL(set_hv_tscchange_cb);
190193

0 commit comments

Comments
 (0)