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

Commit 99b83ac8 authored by Wanpeng Li's avatar Wanpeng Li Committed by Paolo Bonzini
Browse files

KVM: nVMX: emulate the INVVPID instruction 



Add the INVVPID instruction emulation.

Reviewed-by: default avatarWincy Van <fanwenyi0529@gmail.com>
Signed-off-by: default avatarWanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent dd5f5341

arch/x86/include/asm/vmx.h

+1 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ enum vmcs_field { 
#define VMX_EPT_EXTENT_CONTEXT_BIT		(1ull << 25)

#define VMX_EPT_EXTENT_GLOBAL_BIT		(1ull << 26)



#define VMX_VPID_INVVPID_BIT                    (1ull << 0) /* (32 - 32) */

#define VMX_VPID_EXTENT_SINGLE_CONTEXT_BIT      (1ull << 9) /* (41 - 32) */

#define VMX_VPID_EXTENT_GLOBAL_CONTEXT_BIT      (1ull << 10) /* (42 - 32) */

arch/x86/kvm/vmx.c

+60 −1
Original line number Diff line number Diff line
@@ -442,6 +442,7 @@ struct nested_vmx { 
	u32 nested_vmx_misc_low;

	u32 nested_vmx_misc_high;

	u32 nested_vmx_ept_caps;

	u32 nested_vmx_vpid_caps;

};



#define POSTED_INTR_ON  0
@@ -2612,6 +2613,8 @@ static void nested_vmx_setup_ctls_msrs(struct vcpu_vmx *vmx) 
	} else

		vmx->nested.nested_vmx_ept_caps = 0;



	vmx->nested.nested_vmx_vpid_caps = 0;



	if (enable_unrestricted_guest)

		vmx->nested.nested_vmx_secondary_ctls_high |=

			SECONDARY_EXEC_UNRESTRICTED_GUEST;
@@ -7329,10 +7332,66 @@ static int handle_invept(struct kvm_vcpu *vcpu) 


static int handle_invvpid(struct kvm_vcpu *vcpu)

{

	struct vcpu_vmx *vmx = to_vmx(vcpu);

	u32 vmx_instruction_info;

	unsigned long type, types;

	gva_t gva;

	struct x86_exception e;

	int vpid;



	if (!(vmx->nested.nested_vmx_secondary_ctls_high &

	      SECONDARY_EXEC_ENABLE_VPID) ||

			!(vmx->nested.nested_vmx_vpid_caps & VMX_VPID_INVVPID_BIT)) {

		kvm_queue_exception(vcpu, UD_VECTOR);

		return 1;

	}



	if (!nested_vmx_check_permission(vcpu))

		return 1;



	vmx_instruction_info = vmcs_read32(VMX_INSTRUCTION_INFO);

	type = kvm_register_readl(vcpu, (vmx_instruction_info >> 28) & 0xf);



	types = (vmx->nested.nested_vmx_vpid_caps >> 8) & 0x7;



	if (!(types & (1UL << type))) {

		nested_vmx_failValid(vcpu,

			VMXERR_INVALID_OPERAND_TO_INVEPT_INVVPID);

		return 1;

	}



	/* according to the intel vmx instruction reference, the memory

	 * operand is read even if it isn't needed (e.g., for type==global)

	 */

	if (get_vmx_mem_address(vcpu, vmcs_readl(EXIT_QUALIFICATION),

			vmx_instruction_info, false, &gva))

		return 1;

	if (kvm_read_guest_virt(&vcpu->arch.emulate_ctxt, gva, &vpid,

				sizeof(u32), &e)) {

		kvm_inject_page_fault(vcpu, &e);

		return 1;

	}



	switch (type) {

	case VMX_VPID_EXTENT_ALL_CONTEXT:

		if (get_vmcs12(vcpu)->virtual_processor_id == 0) {

			nested_vmx_failValid(vcpu,

				VMXERR_INVALID_OPERAND_TO_INVEPT_INVVPID);

			return 1;

		}

		vmx_flush_tlb(vcpu);

		nested_vmx_succeed(vcpu);

		break;

	default:

		/* Trap single context invalidation invvpid calls */

		BUG_ON(1);

		break;

	}



	skip_emulated_instruction(vcpu);

	return 1;

}



static int handle_pml_full(struct kvm_vcpu *vcpu)

{

	unsigned long exit_qualification;