From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Nadav Har'El" Subject: [PATCH 21/24] Correct handling of exception injection Date: Sun, 13 Jun 2010 15:33:19 +0300 Message-ID: <201006131233.o5DCXJqT013143@rice.haifa.ibm.com> References: <1276431753-nyh@il.ibm.com> Cc: kvm@vger.kernel.org To: avi@redhat.com Return-path: Received: from mtagate6.de.ibm.com ([195.212.17.166]:59685 "EHLO mtagate6.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753443Ab0FMMdX (ORCPT ); Sun, 13 Jun 2010 08:33:23 -0400 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate6.de.ibm.com (8.13.1/8.13.1) with ESMTP id o5DCXMCp011976 for ; Sun, 13 Jun 2010 12:33:22 GMT Received: from d12av01.megacenter.de.ibm.com (d12av01.megacenter.de.ibm.com [9.149.165.212]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o5DCXLdH839762 for ; Sun, 13 Jun 2010 14:33:21 +0200 Received: from d12av01.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av01.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id o5DCXLMU005287 for ; Sun, 13 Jun 2010 14:33:21 +0200 Sender: kvm-owner@vger.kernel.org List-ID: Similar to the previous patch, but concerning injection of exceptions rather than external interrupts. Signed-off-by: Nadav Har'El --- --- .before/arch/x86/kvm/vmx.c 2010-06-13 15:01:30.000000000 +0300 +++ .after/arch/x86/kvm/vmx.c 2010-06-13 15:01:30.000000000 +0300 @@ -1564,6 +1564,9 @@ static void skip_emulated_instruction(st vmx_set_interrupt_shadow(vcpu, 0); } +static int nested_vmx_check_exception(struct kvm_vcpu *vcpu, unsigned nr, + bool has_error_code, u32 error_code); + static void vmx_queue_exception(struct kvm_vcpu *vcpu, unsigned nr, bool has_error_code, u32 error_code, bool reinject) @@ -1571,6 +1574,9 @@ static void vmx_queue_exception(struct k struct vcpu_vmx *vmx = to_vmx(vcpu); u32 intr_info = nr | INTR_INFO_VALID_MASK; + if (nested_vmx_check_exception(vcpu, nr, has_error_code, error_code)) + return; + if (has_error_code) { vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE, error_code); intr_info |= INTR_INFO_DELIVER_CODE_MASK; @@ -3670,6 +3676,9 @@ static void vmx_inject_nmi(struct kvm_vc { struct vcpu_vmx *vmx = to_vmx(vcpu); + if (vmx->nested.nested_mode) + return; + if (!cpu_has_virtual_nmis()) { /* * Tracking the NMI-blocked state in software is built upon @@ -6513,6 +6522,26 @@ static int nested_vmx_vmexit(struct kvm_ return 0; } +static int nested_vmx_check_exception(struct kvm_vcpu *vcpu, unsigned nr, + bool has_error_code, u32 error_code) +{ + if (!to_vmx(vcpu)->nested.nested_mode) + return 0; + if (!nested_vmx_exit_handled(vcpu, false)) + return 0; + nested_vmx_vmexit(vcpu, false); + if (!nested_map_current(vcpu)) + return 1; + get_shadow_vmcs(vcpu)->vm_exit_reason = EXIT_REASON_EXCEPTION_NMI; + get_shadow_vmcs(vcpu)->vm_exit_intr_info = (nr + | INTR_TYPE_HARD_EXCEPTION | INTR_INFO_VALID_MASK + | (has_error_code ? INTR_INFO_DELIVER_CODE_MASK : 0)); + if (has_error_code) + get_shadow_vmcs(vcpu)->vm_exit_intr_error_code = error_code; + nested_unmap_current(vcpu); + return 1; +} + static struct kvm_x86_ops vmx_x86_ops = { .cpu_has_kvm_support = cpu_has_kvm_support, .disabled_by_bios = vmx_disabled_by_bios,