From patchwork Fri Feb 19 15:23:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 80652 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1JFQ9tH015868 for ; Fri, 19 Feb 2010 15:26:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754362Ab0BSPX3 (ORCPT ); Fri, 19 Feb 2010 10:23:29 -0500 Received: from va3ehsobe003.messaging.microsoft.com ([216.32.180.13]:30088 "EHLO VA3EHSOBE003.bigfish.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752460Ab0BSPX0 (ORCPT ); Fri, 19 Feb 2010 10:23:26 -0500 Received: from mail135-va3-R.bigfish.com (10.7.14.253) by VA3EHSOBE003.bigfish.com (10.7.40.23) with Microsoft SMTP Server id 8.1.240.5; Fri, 19 Feb 2010 15:23:23 +0000 Received: from mail135-va3 (localhost [127.0.0.1]) by mail135-va3-R.bigfish.com (Postfix) with ESMTP id 86C00BF80D4; Fri, 19 Feb 2010 15:23:23 +0000 (UTC) X-SpamScore: -2 X-BigFish: VPS-2(zz936eMab9bhzz1202hzzz32i6bh87h43j62h) X-Spam-TCS-SCL: 1:0 X-FB-DOMAIN-IP-MATCH: fail Received: from mail135-va3 (localhost.localdomain [127.0.0.1]) by mail135-va3 (MessageSwitch) id 1266593002848592_29865; Fri, 19 Feb 2010 15:23:22 +0000 (UTC) Received: from VA3EHSMHS020.bigfish.com (unknown [10.7.14.241]) by mail135-va3.bigfish.com (Postfix) with ESMTP id BA861173804E; Fri, 19 Feb 2010 15:23:22 +0000 (UTC) Received: from ausb3extmailp01.amd.com (163.181.251.8) by VA3EHSMHS020.bigfish.com (10.7.99.30) with Microsoft SMTP Server (TLS) id 14.0.482.39; Fri, 19 Feb 2010 15:23:20 +0000 Received: from ausb3twp02.amd.com ([163.181.250.38]) by ausb3extmailp01.amd.com (Switch-3.2.7/Switch-3.2.7) with ESMTP id o1JFPu6Y007401; Fri, 19 Feb 2010 09:26:00 -0600 X-WSS-ID: 0KY3HEP-02-7NE-02 X-M-MSG: Received: from sausexbh2.amd.com (SAUSEXBH2.amd.com [163.181.22.102]) by ausb3twp02.amd.com (Tumbleweed MailGate 3.7.2) with ESMTP id 2AA85FCC1DF; Fri, 19 Feb 2010 09:23:12 -0600 (CST) Received: from sausexmb1.amd.com ([163.181.3.156]) by sausexbh2.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 19 Feb 2010 09:23:17 -0600 Received: from seurexmb1.amd.com ([165.204.9.130]) by sausexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 19 Feb 2010 09:23:16 -0600 Received: from lemmy.osrc.amd.com ([165.204.15.93]) by seurexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 19 Feb 2010 16:23:12 +0100 Received: by lemmy.osrc.amd.com (Postfix, from userid 41430) id 73AECC9A97; Fri, 19 Feb 2010 16:23:12 +0100 (CET) From: Joerg Roedel To: Avi Kivity , Marcelo Tosatti CC: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Joerg Roedel , stable@kernel.org Subject: [PATCH 03/11] KVM: SVM: Fix schedule-while-atomic on nested exception handling Date: Fri, 19 Feb 2010 16:23:02 +0100 Message-ID: <1266592990-8911-4-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1266592990-8911-1-git-send-email-joerg.roedel@amd.com> References: <1266592990-8911-1-git-send-email-joerg.roedel@amd.com> X-OriginalArrivalTime: 19 Feb 2010 15:23:12.0683 (UTC) FILETIME=[734867B0:01CAB177] MIME-Version: 1.0 X-Reverse-DNS: unknown Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 19 Feb 2010 15:26:10 +0000 (UTC) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index f87fc98..6dc7a41 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -128,6 +128,7 @@ static void svm_flush_tlb(struct kvm_vcpu *vcpu); static void svm_complete_interrupts(struct vcpu_svm *svm); static int nested_svm_exit_handled(struct vcpu_svm *svm); +static int nested_svm_intercept(struct vcpu_svm *svm); static int nested_svm_vmexit(struct vcpu_svm *svm); static int nested_svm_check_exception(struct vcpu_svm *svm, unsigned nr, bool has_error_code, u32 error_code); @@ -1378,6 +1379,8 @@ static int nested_svm_check_permissions(struct vcpu_svm *svm) static int nested_svm_check_exception(struct vcpu_svm *svm, unsigned nr, bool has_error_code, u32 error_code) { + int vmexit; + if (!is_nested(svm)) return 0; @@ -1386,7 +1389,11 @@ static int nested_svm_check_exception(struct vcpu_svm *svm, unsigned nr, svm->vmcb->control.exit_info_1 = error_code; svm->vmcb->control.exit_info_2 = svm->vcpu.arch.cr2; - return nested_svm_exit_handled(svm); + vmexit = nested_svm_intercept(svm); + if (vmexit == NESTED_EXIT_DONE) + svm->nested.exit_required = true; + + return vmexit; } /* This function returns true if it is save to enable the irq window */ @@ -1516,7 +1523,7 @@ static int nested_svm_exit_special(struct vcpu_svm *svm) /* * If this function returns true, this #vmexit was already handled */ -static int nested_svm_exit_handled(struct vcpu_svm *svm) +static int nested_svm_intercept(struct vcpu_svm *svm) { u32 exit_code = svm->vmcb->control.exit_code; int vmexit = NESTED_EXIT_HOST; @@ -1562,9 +1569,17 @@ static int nested_svm_exit_handled(struct vcpu_svm *svm) } } - if (vmexit == NESTED_EXIT_DONE) { + return vmexit; +} + +static int nested_svm_exit_handled(struct vcpu_svm *svm) +{ + int vmexit; + + vmexit = nested_svm_intercept(svm); + + if (vmexit == NESTED_EXIT_DONE) nested_svm_vmexit(svm); - } return vmexit; }