Skip to content

Commit c9dfd3f

Browse files
wanpeng libonzini
wanpeng li
authored andcommitted
KVM: nVMX: Hold KVM's srcu lock when syncing vmcs12->shadow
For the duration of mapping eVMCS, it derefences ->memslots without holding ->srcu or ->slots_lock when accessing hv assist page. This patch fixes it by moving nested_sync_vmcs12_to_shadow to prepare_guest_switch, where the SRCU is already taken. It can be reproduced by running kvm's evmcs_test selftest. ============================= warning: suspicious rcu usage 5.6.0-rc1+ #53 tainted: g w ioe ----------------------------- ./include/linux/kvm_host.h:623 suspicious rcu_dereference_check() usage! other info that might help us debug this: rcu_scheduler_active = 2, debug_locks = 1 1 lock held by evmcs_test/8507: #0: ffff9ddd156d00d0 (&vcpu->mutex){+.+.}, at: kvm_vcpu_ioctl+0x85/0x680 [kvm] stack backtrace: cpu: 6 pid: 8507 comm: evmcs_test tainted: g w ioe 5.6.0-rc1+ #53 hardware name: dell inc. optiplex 7040/0jctf8, bios 1.4.9 09/12/2016 call trace: dump_stack+0x68/0x9b kvm_read_guest_cached+0x11d/0x150 [kvm] kvm_hv_get_assist_page+0x33/0x40 [kvm] nested_enlightened_vmentry+0x2c/0x60 [kvm_intel] nested_vmx_handle_enlightened_vmptrld.part.52+0x32/0x1c0 [kvm_intel] nested_sync_vmcs12_to_shadow+0x439/0x680 [kvm_intel] vmx_vcpu_run+0x67a/0xe60 [kvm_intel] vcpu_enter_guest+0x35e/0x1bc0 [kvm] kvm_arch_vcpu_ioctl_run+0x40b/0x670 [kvm] kvm_vcpu_ioctl+0x370/0x680 [kvm] ksys_ioctl+0x235/0x850 __x64_sys_ioctl+0x16/0x20 do_syscall_64+0x77/0x780 entry_syscall_64_after_hwframe+0x49/0xbe Signed-off-by: Wanpeng Li <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 7455a83 commit c9dfd3f

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

arch/x86/kvm/vmx/vmx.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,6 +1175,10 @@ void vmx_prepare_switch_to_guest(struct kvm_vcpu *vcpu)
11751175
vmx->guest_msrs[i].mask);
11761176

11771177
}
1178+
1179+
if (vmx->nested.need_vmcs12_to_shadow_sync)
1180+
nested_sync_vmcs12_to_shadow(vcpu);
1181+
11781182
if (vmx->guest_state_loaded)
11791183
return;
11801184

@@ -6482,8 +6486,11 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)
64826486
vmcs_write32(PLE_WINDOW, vmx->ple_window);
64836487
}
64846488

6485-
if (vmx->nested.need_vmcs12_to_shadow_sync)
6486-
nested_sync_vmcs12_to_shadow(vcpu);
6489+
/*
6490+
* We did this in prepare_switch_to_guest, because it needs to
6491+
* be within srcu_read_lock.
6492+
*/
6493+
WARN_ON_ONCE(vmx->nested.need_vmcs12_to_shadow_sync);
64876494

64886495
if (kvm_register_is_dirty(vcpu, VCPU_REGS_RSP))
64896496
vmcs_writel(GUEST_RSP, vcpu->arch.regs[VCPU_REGS_RSP]);

0 commit comments

Comments
 (0)