diff options
| -rw-r--r-- | xen/arch/x86/hvm/svm/svm.c | 24 | ||||
| -rw-r--r-- | xen/include/asm-x86/hvm/svm/nestedsvm.h | 2 |
2 files changed, 15 insertions, 11 deletions
diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index db7b06346b..e74984e9c5 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1797,15 +1797,17 @@ static void svm_vmexit_do_vmrun(struct cpu_user_regs *regs, struct vcpu *v, uint64_t vmcbaddr) { - if (!nestedhvm_enabled(v->domain)) { + if ( !nsvm_efer_svm_enabled(v) ) + { gdprintk(XENLOG_ERR, "VMRUN: nestedhvm disabled, injecting #UD\n"); hvm_inject_hw_exception(TRAP_invalid_op, HVM_DELIVER_NO_ERROR_CODE); return; } - if (!nestedsvm_vmcb_map(v, vmcbaddr)) { - gdprintk(XENLOG_ERR, "VMRUN: mapping vmcb failed, injecting #UD\n"); - hvm_inject_hw_exception(TRAP_invalid_op, HVM_DELIVER_NO_ERROR_CODE); + if ( !nestedsvm_vmcb_map(v, vmcbaddr) ) + { + gdprintk(XENLOG_ERR, "VMRUN: mapping vmcb failed, injecting #GP\n"); + hvm_inject_hw_exception(TRAP_gp_fault, HVM_DELIVER_NO_ERROR_CODE); return; } @@ -1851,7 +1853,8 @@ svm_vmexit_do_vmload(struct vmcb_struct *vmcb, if ( (inst_len = __get_instruction_length(v, INSTR_VMLOAD)) == 0 ) return; - if (!nestedhvm_enabled(v->domain)) { + if ( !nsvm_efer_svm_enabled(v) ) + { gdprintk(XENLOG_ERR, "VMLOAD: nestedhvm disabled, injecting #UD\n"); ret = TRAP_invalid_op; goto inject; @@ -1861,8 +1864,8 @@ svm_vmexit_do_vmload(struct vmcb_struct *vmcb, if ( !page ) { gdprintk(XENLOG_ERR, - "VMLOAD: mapping failed, injecting #UD\n"); - ret = TRAP_invalid_op; + "VMLOAD: mapping failed, injecting #GP\n"); + ret = TRAP_gp_fault; goto inject; } @@ -1892,7 +1895,8 @@ svm_vmexit_do_vmsave(struct vmcb_struct *vmcb, if ( (inst_len = __get_instruction_length(v, INSTR_VMSAVE)) == 0 ) return; - if (!nestedhvm_enabled(v->domain)) { + if ( !nsvm_efer_svm_enabled(v) ) + { gdprintk(XENLOG_ERR, "VMSAVE: nestedhvm disabled, injecting #UD\n"); ret = TRAP_invalid_op; goto inject; @@ -1902,8 +1906,8 @@ svm_vmexit_do_vmsave(struct vmcb_struct *vmcb, if ( !page ) { gdprintk(XENLOG_ERR, - "VMSAVE: mapping vmcb failed, injecting #UD\n"); - ret = TRAP_invalid_op; + "VMSAVE: mapping vmcb failed, injecting #GP\n"); + ret = TRAP_gp_fault; goto inject; } diff --git a/xen/include/asm-x86/hvm/svm/nestedsvm.h b/xen/include/asm-x86/hvm/svm/nestedsvm.h index fa83023242..b6ed9e417c 100644 --- a/xen/include/asm-x86/hvm/svm/nestedsvm.h +++ b/xen/include/asm-x86/hvm/svm/nestedsvm.h @@ -94,7 +94,7 @@ struct nestedsvm { #define vcpu_nestedsvm(v) (vcpu_nestedhvm(v).u.nsvm) /* True when l1 guest enabled SVM in EFER */ -#define hvm_svm_enabled(v) \ +#define nsvm_efer_svm_enabled(v) \ (!!((v)->arch.hvm_vcpu.guest_efer & EFER_SVME)) int nestedsvm_vmcb_map(struct vcpu *v, uint64_t vmcbaddr); |