# HG changeset patch
# User Eddie Dong <eddie.dong@xxxxxxxxx>
# Date 1307607849 -28800
# Node ID c880f0642b4014b1f13b3a05ddc8ebb140c8c1a1
# Parent fcdfd43259d6f6d25ba80d0480bdf3d9cc2ddb87
Emulation of guest vmptrld
Signed-off-by: Qing He <qing.he@xxxxxxxxx>
Signed-off-by: Eddie Dong <eddie.dong@xxxxxxxxx>
diff -r fcdfd43259d6 -r c880f0642b40 xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c Thu Jun 09 16:24:09 2011 +0800
+++ b/xen/arch/x86/hvm/vmx/vmx.c Thu Jun 09 16:24:09 2011 +0800
@@ -2444,11 +2444,15 @@ asmlinkage void vmx_vmexit_handler(struc
update_guest_eip();
break;
+ case EXIT_REASON_VMPTRLD:
+ if ( nvmx_handle_vmptrld(regs) == X86EMUL_OKAY )
+ update_guest_eip();
+ break;
+
case EXIT_REASON_MWAIT_INSTRUCTION:
case EXIT_REASON_MONITOR_INSTRUCTION:
case EXIT_REASON_VMCLEAR:
case EXIT_REASON_VMLAUNCH:
- case EXIT_REASON_VMPTRLD:
case EXIT_REASON_VMPTRST:
case EXIT_REASON_VMREAD:
case EXIT_REASON_VMRESUME:
diff -r fcdfd43259d6 -r c880f0642b40 xen/arch/x86/hvm/vmx/vvmx.c
--- a/xen/arch/x86/hvm/vmx/vvmx.c Thu Jun 09 16:24:09 2011 +0800
+++ b/xen/arch/x86/hvm/vmx/vvmx.c Thu Jun 09 16:24:09 2011 +0800
@@ -352,6 +352,25 @@ static void vmreturn(struct cpu_user_reg
regs->eflags = eflags;
}
+static void __map_io_bitmap(struct vcpu *v, u64 vmcs_reg)
+{
+ struct nestedvmx *nvmx = &vcpu_2_nvmx(v);
+ unsigned long gpa;
+ int index;
+
+ index = vmcs_reg == IO_BITMAP_A ? 0 : 1;
+ if (nvmx->iobitmap[index])
+ hvm_unmap_guest_frame (nvmx->iobitmap[index]);
+ gpa = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, vmcs_reg);
+ nvmx->iobitmap[index] = hvm_map_guest_frame_ro (gpa >> PAGE_SHIFT);
+}
+
+static inline void map_io_bitmap_all(struct vcpu *v)
+{
+ __map_io_bitmap (v, IO_BITMAP_A);
+ __map_io_bitmap (v, IO_BITMAP_B);
+}
+
/*
* VMX instructions handling
*/
@@ -360,6 +379,7 @@ int nvmx_handle_vmxon(struct cpu_user_re
{
struct vcpu *v=current;
struct nestedvmx *nvmx = &vcpu_2_nvmx(v);
+ struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v);
struct vmx_inst_decoded decode;
unsigned long gpa = 0;
int rc;
@@ -368,7 +388,22 @@ int nvmx_handle_vmxon(struct cpu_user_re
if ( rc != X86EMUL_OKAY )
return rc;
+ if ( nvmx->vmxon_region_pa )
+ gdprintk(XENLOG_WARNING,
+ "vmxon again: orig %lx new %lx\n",
+ nvmx->vmxon_region_pa, gpa);
+
nvmx->vmxon_region_pa = gpa;
+
+ /*
+ * `fork' the host vmcs to shadow_vmcs
+ * vmcs_lock is not needed since we are on current
+ */
+ nvcpu->nv_n1vmcx = v->arch.hvm_vmx.vmcs;
+ __vmpclear(virt_to_maddr(v->arch.hvm_vmx.vmcs));
+ memcpy(nvcpu->nv_n2vmcx, v->arch.hvm_vmx.vmcs, PAGE_SIZE);
+ __vmptrld(virt_to_maddr(v->arch.hvm_vmx.vmcs));
+ v->arch.hvm_vmx.launched = 0;
vmreturn(regs, VMSUCCEED);
return X86EMUL_OKAY;
@@ -390,3 +425,34 @@ int nvmx_handle_vmxoff(struct cpu_user_r
return X86EMUL_OKAY;
}
+int nvmx_handle_vmptrld(struct cpu_user_regs *regs)
+{
+ struct vcpu *v = current;
+ struct vmx_inst_decoded decode;
+ struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v);
+ unsigned long gpa = 0;
+ int rc;
+
+ rc = decode_vmx_inst(regs, &decode, &gpa, 0);
+ if ( rc != X86EMUL_OKAY )
+ return rc;
+
+ if ( gpa == vcpu_2_nvmx(v).vmxon_region_pa || gpa & 0xfff )
+ {
+ vmreturn(regs, VMFAIL_INVALID);
+ goto out;
+ }
+
+ if ( nvcpu->nv_vvmcxaddr == VMCX_EADDR )
+ {
+ nvcpu->nv_vvmcx = hvm_map_guest_frame_rw (gpa >> PAGE_SHIFT);
+ nvcpu->nv_vvmcxaddr = gpa;
+ map_io_bitmap_all (v);
+ }
+
+ vmreturn(regs, VMSUCCEED);
+
+out:
+ return X86EMUL_OKAY;
+}
+
diff -r fcdfd43259d6 -r c880f0642b40 xen/include/asm-x86/hvm/vmx/vvmx.h
--- a/xen/include/asm-x86/hvm/vmx/vvmx.h Thu Jun 09 16:24:09 2011 +0800
+++ b/xen/include/asm-x86/hvm/vmx/vvmx.h Thu Jun 09 16:24:09 2011 +0800
@@ -152,5 +152,8 @@ enum vvmcs_encoding_type {
u64 __get_vvmcs(void *vvmcs, u32 vmcs_encoding);
void __set_vvmcs(void *vvmcs, u32 vmcs_encoding, u64 val);
+void nvmx_destroy_vmcs(struct vcpu *v);
+int nvmx_handle_vmptrld(struct cpu_user_regs *regs);
+
#endif /* __ASM_X86_HVM_VVMX_H__ */
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home