Commit 6a4d7550 authored by Nadav Har'El's avatar Nadav Har'El Committed by Avi Kivity
Browse files

KVM: nVMX: Implement VMPTRST 



This patch implements the VMPTRST instruction.

Signed-off-by: default avatarNadav Har'El <nyh@il.ibm.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 63846663

arch/x86/kvm/vmx.c

+27 −1
Original line number Diff line number Diff line
@@ -4937,6 +4937,32 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu) 
	return 1;

}



/* Emulate the VMPTRST instruction */

static int handle_vmptrst(struct kvm_vcpu *vcpu)

{

	unsigned long exit_qualification = vmcs_readl(EXIT_QUALIFICATION);

	u32 vmx_instruction_info = vmcs_read32(VMX_INSTRUCTION_INFO);

	gva_t vmcs_gva;

	struct x86_exception e;



	if (!nested_vmx_check_permission(vcpu))

		return 1;



	if (get_vmx_mem_address(vcpu, exit_qualification,

			vmx_instruction_info, &vmcs_gva))

		return 1;

	/* ok to use *_system, as nested_vmx_check_permission verified cpl=0 */

	if (kvm_write_guest_virt_system(&vcpu->arch.emulate_ctxt, vmcs_gva,

				 (void *)&to_vmx(vcpu)->nested.current_vmptr,

				 sizeof(u64), &e)) {

		kvm_inject_page_fault(vcpu, &e);

		return 1;

	}

	nested_vmx_succeed(vcpu);

	skip_emulated_instruction(vcpu);

	return 1;

}



/*

 * The exit handlers return 1 if the exit was handled fully and guest execution

 * may resume.  Otherwise they set the kvm_run parameter to indicate what needs
@@ -4961,7 +4987,7 @@ static int (*kvm_vmx_exit_handlers[])(struct kvm_vcpu *vcpu) = { 
	[EXIT_REASON_VMCLEAR]	              = handle_vmclear,

	[EXIT_REASON_VMLAUNCH]                = handle_vmx_insn,

	[EXIT_REASON_VMPTRLD]                 = handle_vmptrld,

	[EXIT_REASON_VMPTRST]                 = handle_vmx_insn,

	[EXIT_REASON_VMPTRST]                 = handle_vmptrst,

	[EXIT_REASON_VMREAD]                  = handle_vmx_insn,

	[EXIT_REASON_VMRESUME]                = handle_vmx_insn,

	[EXIT_REASON_VMWRITE]                 = handle_vmx_insn,

arch/x86/kvm/x86.c

+2 −1
Original line number Diff line number Diff line
@@ -3869,7 +3869,7 @@ static int kvm_read_guest_virt_system(struct x86_emulate_ctxt *ctxt, 
	return kvm_read_guest_virt_helper(addr, val, bytes, vcpu, 0, exception);

}



static int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt,

int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt,

				       gva_t addr, void *val,

				       unsigned int bytes,

				       struct x86_exception *exception)
@@ -3901,6 +3901,7 @@ static int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt, 
out:

	return r;

}

EXPORT_SYMBOL_GPL(kvm_write_guest_virt_system);



static int emulator_read_emulated(struct x86_emulate_ctxt *ctxt,

				  unsigned long addr,

arch/x86/kvm/x86.h

+4 −0
Original line number Diff line number Diff line
@@ -85,4 +85,8 @@ int kvm_read_guest_virt(struct x86_emulate_ctxt *ctxt, 
	gva_t addr, void *val, unsigned int bytes,

	struct x86_exception *exception);



int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt,

	gva_t addr, void *val, unsigned int bytes,

	struct x86_exception *exception);



#endif