mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 15:20:41 +00:00
KVM: VMX: Limit iterations with emulator_invalid_guest_state
Otherwise, if the guest ends up looping, we never exit the srcu critical section, which causes synchronize_srcu() to hang. Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
parent
f0495f9b99
commit
b8405c184b
1 changed files with 2 additions and 1 deletions
|
@ -4977,11 +4977,12 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu)
|
||||||
int ret = 1;
|
int ret = 1;
|
||||||
u32 cpu_exec_ctrl;
|
u32 cpu_exec_ctrl;
|
||||||
bool intr_window_requested;
|
bool intr_window_requested;
|
||||||
|
unsigned count = 130;
|
||||||
|
|
||||||
cpu_exec_ctrl = vmcs_read32(CPU_BASED_VM_EXEC_CONTROL);
|
cpu_exec_ctrl = vmcs_read32(CPU_BASED_VM_EXEC_CONTROL);
|
||||||
intr_window_requested = cpu_exec_ctrl & CPU_BASED_VIRTUAL_INTR_PENDING;
|
intr_window_requested = cpu_exec_ctrl & CPU_BASED_VIRTUAL_INTR_PENDING;
|
||||||
|
|
||||||
while (!guest_state_valid(vcpu)) {
|
while (!guest_state_valid(vcpu) && count-- != 0) {
|
||||||
if (intr_window_requested
|
if (intr_window_requested
|
||||||
&& (kvm_get_rflags(&vmx->vcpu) & X86_EFLAGS_IF))
|
&& (kvm_get_rflags(&vmx->vcpu) & X86_EFLAGS_IF))
|
||||||
return handle_interrupt_window(&vmx->vcpu);
|
return handle_interrupt_window(&vmx->vcpu);
|
||||||
|
|
Loading…
Reference in a new issue