Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47c0152e authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: VMX: use vmcs_set/clear_bits for CPU-based execution controls 



Reviewed-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4306f200

arch/x86/kvm/vmx.c

+8 −22
Original line number Diff line number Diff line
@@ -5459,26 +5459,20 @@ static bool nested_exit_on_nmi(struct kvm_vcpu *vcpu) 


static void enable_irq_window(struct kvm_vcpu *vcpu)

{

	u32 cpu_based_vm_exec_control;



	cpu_based_vm_exec_control = vmcs_read32(CPU_BASED_VM_EXEC_CONTROL);

	cpu_based_vm_exec_control |= CPU_BASED_VIRTUAL_INTR_PENDING;

	vmcs_write32(CPU_BASED_VM_EXEC_CONTROL, cpu_based_vm_exec_control);

	vmcs_set_bits(CPU_BASED_VM_EXEC_CONTROL,

		      CPU_BASED_VIRTUAL_INTR_PENDING);

}



static void enable_nmi_window(struct kvm_vcpu *vcpu)

{

	u32 cpu_based_vm_exec_control;



	if (!cpu_has_virtual_nmis() ||

	    vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) & GUEST_INTR_STATE_STI) {

		enable_irq_window(vcpu);

		return;

	}



	cpu_based_vm_exec_control = vmcs_read32(CPU_BASED_VM_EXEC_CONTROL);

	cpu_based_vm_exec_control |= CPU_BASED_VIRTUAL_NMI_PENDING;

	vmcs_write32(CPU_BASED_VM_EXEC_CONTROL, cpu_based_vm_exec_control);

	vmcs_set_bits(CPU_BASED_VM_EXEC_CONTROL,

		      CPU_BASED_VIRTUAL_NMI_PENDING);

}



static void vmx_inject_irq(struct kvm_vcpu *vcpu)
@@ -6137,12 +6131,8 @@ static int handle_tpr_below_threshold(struct kvm_vcpu *vcpu) 


static int handle_interrupt_window(struct kvm_vcpu *vcpu)

{

	u32 cpu_based_vm_exec_control;



	/* clear pending irq */

	cpu_based_vm_exec_control = vmcs_read32(CPU_BASED_VM_EXEC_CONTROL);

	cpu_based_vm_exec_control &= ~CPU_BASED_VIRTUAL_INTR_PENDING;

	vmcs_write32(CPU_BASED_VM_EXEC_CONTROL, cpu_based_vm_exec_control);

	vmcs_clear_bits(CPU_BASED_VM_EXEC_CONTROL,

			CPU_BASED_VIRTUAL_INTR_PENDING);



	kvm_make_request(KVM_REQ_EVENT, vcpu);
@@ -6408,12 +6398,8 @@ static int handle_ept_misconfig(struct kvm_vcpu *vcpu) 


static int handle_nmi_window(struct kvm_vcpu *vcpu)

{

	u32 cpu_based_vm_exec_control;



	/* clear pending NMI */

	cpu_based_vm_exec_control = vmcs_read32(CPU_BASED_VM_EXEC_CONTROL);

	cpu_based_vm_exec_control &= ~CPU_BASED_VIRTUAL_NMI_PENDING;

	vmcs_write32(CPU_BASED_VM_EXEC_CONTROL, cpu_based_vm_exec_control);

	vmcs_clear_bits(CPU_BASED_VM_EXEC_CONTROL,

			CPU_BASED_VIRTUAL_NMI_PENDING);

	++vcpu->stat.nmi_window_exits;

	kvm_make_request(KVM_REQ_EVENT, vcpu);