Nested Virtualization: trap
PATCH 6/13 Nested Virtualization: trap
Signature · 7 lines
-- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632
# HG changeset patch
# User cegger
# Date 1287134070 -7200
When injecting an exception into L2 guest, inject a #VMEXIT if L1 guest intercepts the exception
Signed-off-by Christoph Egger <[email protected]>
xen/arch/x86/hvm/hvm.c +41 -0
@@ -966,6 +966,47 @@ void hvm_triple_fault(void)domain_shutdown (v->domain, SHUTDOWN_reboot); } +void hvm_inject_exception (unsigned int trapnr,int errcode,unsigned long cr2) +{ +struct vcpu *v = current; + +if ( !nestedhvm_enabled (v->domain) ) { + hvm_funcs.inject_exception (trapnr, errcode, cr2); +return ; + } + +if (nestedhvm_vmentry_emulate (v) ) { + hvm_funcs.inject_exception (trapnr, errcode, cr2); +return ; + } + +if ( !nestedhvm_vcpu_in_guestmode (v) ) { + hvm_funcs.inject_exception (trapnr, errcode, cr2); +return ; + } + +if (nhvm_vmcx_guest_intercepts_trap (v, trapnr) ) + { +enum nestedhvm_vmexits nsret; + + nsret =nhvm_vcpu_vmexit_trap (v, trapnr, errcode, cr2); + +switch (nsret) { +case NESTEDHVM_VMEXIT_DONE : +case NESTEDHVM_VMEXIT_ERROR :/* L1 guest will crash L2 guest */ +return ; +case NESTEDHVM_VMEXIT_HOST : +case NESTEDHVM_VMEXIT_CONTINUE : +case NESTEDHVM_VMEXIT_FATALERROR : +default : +gdprintk (XENLOG_ERR ,"unexpected nestedhvm error %i\n" , nsret); +return ; + } + } + + hvm_funcs.inject_exception (trapnr, errcode, cr2); +} +bool_t hvm_hap_nested_page_fault (unsigned long gfn) {p2m_type_t p2mt;
xen/include/asm-x86/hvm/hvm.h +1 -5
@@ -282,11 +282,7 @@ void hvm_migrate_timers(struct vcpu *v);void hvm_do_resume (struct vcpu *v);void hvm_migrate_pirqs (struct vcpu *v); -static inline void -hvm_inject_exception (unsigned int trapnr,int errcode,unsigned long cr2) -{ - hvm_funcs.inject_exception (trapnr, errcode, cr2); -} +void hvm_inject_exception (unsigned int trapnr,int errcode,unsigned long cr2);static inline int hvm_event_pending (struct vcpu *v) {
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel