|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen stable-4.3] Nested VMX: CR emulation fix up
commit 6a64987e1176e69eadfa91b9be23479991e6aeb5
Author: Yang Zhang <yang.z.zhang@xxxxxxxxx>
AuthorDate: Mon Dec 9 14:33:33 2013 +0100
Commit: Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Dec 9 14:33:33 2013 +0100
Nested VMX: CR emulation fix up
This patch fixs two issues:
1. The CR_READ_SHADOW should only cover the value that L2 wirtes to
CR when L2 is running. But currently, L0 wirtes wrong value to
it during virtual vmentry and L2's CR access emualtion.
2. L2 changed cr[0/4] in a way that did not change any of L1's shadowed
bits, but did change L0 shadowed bits. In this case, the effective cr[0/4]
value that L1 would like to write into the hardware is consist of
the L2-owned bits from the new value combined with the L1-owned bits
from L1's guest cr[0/4].
Signed-off-by: Yang Zhang <yang.z.zhang@xxxxxxxxx>
Acked-by: Eddie Dong <eddie.dong@xxxxxxxxx>
master commit: ef17e127c4111d8e01fe208495d83d15e8834cce
master date: 2013-12-06 11:08:20 +0100
---
xen/arch/x86/hvm/hvm.c | 13 +++++++---
xen/arch/x86/hvm/vmx/vmx.c | 13 ++++++++-
xen/arch/x86/hvm/vmx/vvmx.c | 44 +++++++++++++++++++++++++++++++++++
xen/include/asm-x86/hvm/nestedhvm.h | 8 ++++++
xen/include/asm-x86/hvm/vcpu.h | 3 ++
xen/include/asm-x86/hvm/vmx/vvmx.h | 1 +
6 files changed, 76 insertions(+), 6 deletions(-)
diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index a4d7af0..7efa274 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -1745,6 +1745,13 @@ void hvm_shadow_handle_cd(struct vcpu *v, unsigned long
value)
}
}
+static void hvm_update_cr(struct vcpu *v, unsigned int cr, unsigned long value)
+{
+ v->arch.hvm_vcpu.guest_cr[cr] = value;
+ nestedhvm_set_cr(v, cr, value);
+ hvm_update_guest_cr(v, cr);
+}
+
int hvm_set_cr0(unsigned long value)
{
struct vcpu *v = current;
@@ -1840,8 +1847,7 @@ int hvm_set_cr0(unsigned long value)
hvm_funcs.handle_cd )
hvm_funcs.handle_cd(v, value);
- v->arch.hvm_vcpu.guest_cr[0] = value;
- hvm_update_guest_cr(v, 0);
+ hvm_update_cr(v, 0, value);
if ( (value ^ old_value) & X86_CR0_PG ) {
if ( !nestedhvm_vmswitch_in_progress(v) &&
nestedhvm_vcpu_in_guestmode(v) )
@@ -1922,8 +1928,7 @@ int hvm_set_cr4(unsigned long value)
goto gpf;
}
- v->arch.hvm_vcpu.guest_cr[4] = value;
- hvm_update_guest_cr(v, 4);
+ hvm_update_cr(v, 4, value);
hvm_memory_event_cr4(value, old_cr);
/*
diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 32751d2..9346a54 100644
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -1156,6 +1156,11 @@ static void vmx_update_guest_cr(struct vcpu *v, unsigned
int cr)
vmx_update_cpu_exec_control(v);
}
+ if ( !nestedhvm_vcpu_in_guestmode(v) )
+ __vmwrite(CR0_READ_SHADOW, v->arch.hvm_vcpu.guest_cr[0]);
+ else
+ nvmx_set_cr_read_shadow(v, 0);
+
if ( !(v->arch.hvm_vcpu.guest_cr[0] & X86_CR0_TS) )
{
if ( v != current )
@@ -1204,7 +1209,6 @@ static void vmx_update_guest_cr(struct vcpu *v, unsigned
int cr)
v->arch.hvm_vcpu.hw_cr[0] =
v->arch.hvm_vcpu.guest_cr[0] | hw_cr0_mask;
__vmwrite(GUEST_CR0, v->arch.hvm_vcpu.hw_cr[0]);
- __vmwrite(CR0_READ_SHADOW, v->arch.hvm_vcpu.guest_cr[0]);
/* Changing CR0 can change some bits in real CR4. */
vmx_update_guest_cr(v, 4);
@@ -1229,6 +1233,12 @@ static void vmx_update_guest_cr(struct vcpu *v, unsigned
int cr)
v->arch.hvm_vcpu.hw_cr[4] = HVM_CR4_HOST_MASK;
if ( paging_mode_hap(v->domain) )
v->arch.hvm_vcpu.hw_cr[4] &= ~X86_CR4_PAE;
+
+ if ( !nestedhvm_vcpu_in_guestmode(v) )
+ __vmwrite(CR4_READ_SHADOW, v->arch.hvm_vcpu.guest_cr[4]);
+ else
+ nvmx_set_cr_read_shadow(v, 4);
+
v->arch.hvm_vcpu.hw_cr[4] |= v->arch.hvm_vcpu.guest_cr[4];
if ( v->arch.hvm_vmx.vmx_realmode )
v->arch.hvm_vcpu.hw_cr[4] |= X86_CR4_VME;
@@ -1248,7 +1258,6 @@ static void vmx_update_guest_cr(struct vcpu *v, unsigned
int cr)
v->arch.hvm_vcpu.hw_cr[4] &= ~X86_CR4_SMEP;
}
__vmwrite(GUEST_CR4, v->arch.hvm_vcpu.hw_cr[4]);
- __vmwrite(CR4_READ_SHADOW, v->arch.hvm_vcpu.guest_cr[4]);
break;
default:
BUG();
diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c
index 5f07fbb..fd841ae 100644
--- a/xen/arch/x86/hvm/vmx/vvmx.c
+++ b/xen/arch/x86/hvm/vmx/vvmx.c
@@ -1047,6 +1047,8 @@ static void load_shadow_guest_state(struct vcpu *v)
vvmcs_to_shadow_bulk(v, ARRAY_SIZE(vmcs_gstate_field),
vmcs_gstate_field);
+ nvcpu->guest_cr[0] = __get_vvmcs(vvmcs, CR0_READ_SHADOW);
+ nvcpu->guest_cr[4] = __get_vvmcs(vvmcs, CR4_READ_SHADOW);
hvm_set_cr0(__get_vvmcs(vvmcs, GUEST_CR0));
hvm_set_cr4(__get_vvmcs(vvmcs, GUEST_CR4));
hvm_set_cr3(__get_vvmcs(vvmcs, GUEST_CR3));
@@ -2447,3 +2449,45 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs,
return ( nvcpu->nv_vmexit_pending == 1 );
}
+void nvmx_set_cr_read_shadow(struct vcpu *v, unsigned int cr)
+{
+ unsigned long cr_field, read_shadow_field, mask_field;
+
+ switch ( cr )
+ {
+ case 0:
+ cr_field = GUEST_CR0;
+ read_shadow_field = CR0_READ_SHADOW;
+ mask_field = CR0_GUEST_HOST_MASK;
+ break;
+ case 4:
+ cr_field = GUEST_CR4;
+ read_shadow_field = CR4_READ_SHADOW;
+ mask_field = CR4_GUEST_HOST_MASK;
+ break;
+ default:
+ gdprintk(XENLOG_WARNING, "Set read shadow for CR%d.\n", cr);
+ return;
+ }
+
+ if ( !nestedhvm_vmswitch_in_progress(v) )
+ {
+ unsigned long virtual_cr_mask =
+ __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, mask_field);
+
+ /*
+ * We get here when L2 changed cr in a way that did not change
+ * any of L1's shadowed bits (see nvmx_n2_vmexit_handler),
+ * but did change L0 shadowed bits. So we first calculate the
+ * effective cr value that L1 would like to write into the
+ * hardware. It consists of the L2-owned bits from the new
+ * value combined with the L1-owned bits from L1's guest cr.
+ */
+ v->arch.hvm_vcpu.guest_cr[cr] &= ~virtual_cr_mask;
+ v->arch.hvm_vcpu.guest_cr[cr] |= virtual_cr_mask &
+ __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, cr_field);
+ }
+
+ /* nvcpu.guest_cr is what L2 write to cr actually. */
+ __vmwrite(read_shadow_field, v->arch.hvm_vcpu.nvcpu.guest_cr[cr]);
+}
diff --git a/xen/include/asm-x86/hvm/nestedhvm.h
b/xen/include/asm-x86/hvm/nestedhvm.h
index 649c511..d8124cf 100644
--- a/xen/include/asm-x86/hvm/nestedhvm.h
+++ b/xen/include/asm-x86/hvm/nestedhvm.h
@@ -68,4 +68,12 @@ void nestedhvm_vmcx_flushtlb(struct p2m_domain *p2m);
bool_t nestedhvm_is_n2(struct vcpu *v);
+static inline void nestedhvm_set_cr(struct vcpu *v, unsigned int cr,
+ unsigned long value)
+{
+ if ( !nestedhvm_vmswitch_in_progress(v) &&
+ nestedhvm_vcpu_in_guestmode(v) )
+ v->arch.hvm_vcpu.nvcpu.guest_cr[cr] = value;
+}
+
#endif /* _HVM_NESTEDHVM_H */
diff --git a/xen/include/asm-x86/hvm/vcpu.h b/xen/include/asm-x86/hvm/vcpu.h
index caf5f9a..2a5e134 100644
--- a/xen/include/asm-x86/hvm/vcpu.h
+++ b/xen/include/asm-x86/hvm/vcpu.h
@@ -102,6 +102,9 @@ struct nestedvcpu {
*/
bool_t nv_ioport80;
bool_t nv_ioportED;
+
+ /* L2's control-resgister, just as the L2 sees them. */
+ unsigned long guest_cr[5];
};
#define vcpu_nestedhvm(v) ((v)->arch.hvm_vcpu.nvcpu)
diff --git a/xen/include/asm-x86/hvm/vmx/vvmx.h
b/xen/include/asm-x86/hvm/vmx/vvmx.h
index 848be75..c17a440 100644
--- a/xen/include/asm-x86/hvm/vmx/vvmx.h
+++ b/xen/include/asm-x86/hvm/vmx/vvmx.h
@@ -223,6 +223,7 @@ void nvmx_idtv_handling(void);
u64 nvmx_get_tsc_offset(struct vcpu *v);
int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs,
unsigned int exit_reason);
+void nvmx_set_cr_read_shadow(struct vcpu *v, unsigned int cr);
uint64_t nept_get_ept_vpid_cap(void);
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.3
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |