From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Egger Subject: [PATCH 06/12] Nested Virtualization: trap Date: Mon, 20 Dec 2010 17:06:53 +0100 Message-ID: <201012201706.55016.Christoph.Egger@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_e83DNKk3s/7V8B2" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: "xen-devel@lists.xensource.com" List-Id: xen-devel@lists.xenproject.org --Boundary-00=_e83DNKk3s/7V8B2 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline -- ---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 --Boundary-00=_e83DNKk3s/7V8B2 Content-Type: text/x-diff; charset="iso 8859-15"; name="xen_nh06_trap.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen_nh06_trap.diff" Content-Description: xen_nh06_trap.diff # HG changeset patch # User cegger # Date 1292839436 -3600 When injecting an exception into L2 guest, inject a #VMEXIT if L1 guest intercepts the exception Signed-off-by: Christoph Egger diff -r 6e4fc6e272a7 -r 2ec7ded683f7 xen/arch/x86/hvm/hvm.c --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1087,6 +1087,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_vmswitch_in_progress(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; diff -r 6e4fc6e272a7 -r 2ec7ded683f7 xen/include/asm-x86/hvm/hvm.h --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -278,11 +278,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) { --Boundary-00=_e83DNKk3s/7V8B2 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --Boundary-00=_e83DNKk3s/7V8B2--