From patchwork Fri Jan 14 15:45:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 479391 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0EFjZ91022424 for ; Fri, 14 Jan 2011 15:45:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757737Ab1ANPpb (ORCPT ); Fri, 14 Jan 2011 10:45:31 -0500 Received: from tx2ehsobe004.messaging.microsoft.com ([65.55.88.14]:31639 "EHLO TX2EHSOBE008.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756857Ab1ANPpa (ORCPT ); Fri, 14 Jan 2011 10:45:30 -0500 Received: from mail107-tx2-R.bigfish.com (10.9.14.246) by TX2EHSOBE008.bigfish.com (10.9.40.28) with Microsoft SMTP Server id 14.1.225.8; Fri, 14 Jan 2011 15:45:29 +0000 Received: from mail107-tx2 (localhost.localdomain [127.0.0.1]) by mail107-tx2-R.bigfish.com (Postfix) with ESMTP id 7F33BAE88BE; Fri, 14 Jan 2011 15:45:29 +0000 (UTC) X-SpamScore: -2 X-BigFish: VPS-2(zzbb2cKzz1202hzz8275bhz32i668h62h) X-Spam-TCS-SCL: 1:0 X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:ausb3twp01.amd.com; RD:none; EFVD:NLI Received: from mail107-tx2 (localhost.localdomain [127.0.0.1]) by mail107-tx2 (MessageSwitch) id 1295019929353990_2237; Fri, 14 Jan 2011 15:45:29 +0000 (UTC) Received: from TX2EHSMHS044.bigfish.com (unknown [10.9.14.235]) by mail107-tx2.bigfish.com (Postfix) with ESMTP id 493477C0054; Fri, 14 Jan 2011 15:45:29 +0000 (UTC) Received: from ausb3twp01.amd.com (163.181.249.108) by TX2EHSMHS044.bigfish.com (10.9.99.144) with Microsoft SMTP Server id 14.1.225.8; Fri, 14 Jan 2011 15:45:28 +0000 X-WSS-ID: 0LF0RRN-01-IN9-02 X-M-MSG: Received: from sausexedgep02.amd.com (sausexedgep02-ext.amd.com [163.181.249.73]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ausb3twp01.amd.com (Tumbleweed MailGate 3.7.2) with ESMTP id 22B7C1028717; Fri, 14 Jan 2011 09:45:23 -0600 (CST) Received: from sausexhtp01.amd.com (163.181.3.165) by sausexedgep02.amd.com (163.181.36.59) with Microsoft SMTP Server (TLS) id 8.3.106.1; Fri, 14 Jan 2011 09:49:00 -0600 Received: from storexhtp02.amd.com (172.24.4.4) by sausexhtp01.amd.com (163.181.3.165) with Microsoft SMTP Server (TLS) id 8.3.83.0; Fri, 14 Jan 2011 09:45:06 -0600 Received: from gwo.osrc.amd.com (165.204.16.204) by storexhtp02.amd.com (172.24.4.4) with Microsoft SMTP Server id 8.3.83.0; Fri, 14 Jan 2011 10:45:05 -0500 Received: from lemmy.osrc.amd.com (lemmy.osrc.amd.com [165.204.15.93]) by gwo.osrc.amd.com (Postfix) with ESMTP id 5DC0949C1F7; Fri, 14 Jan 2011 15:45:04 +0000 (GMT) Received: by lemmy.osrc.amd.com (Postfix, from userid 1000) id 47E2AFFC47; Fri, 14 Jan 2011 16:45:04 +0100 (CET) From: Joerg Roedel To: Avi Kivity , Marcelo Tosatti CC: , , Joerg Roedel Subject: [PATCH 2/2] KVM: SVM: Add support for perf-kvm Date: Fri, 14 Jan 2011 16:45:02 +0100 Message-ID: <1295019902-31339-3-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1295019902-31339-1-git-send-email-joerg.roedel@amd.com> References: <1295019902-31339-1-git-send-email-joerg.roedel@amd.com> MIME-Version: 1.0 X-OriginatorOrg: amd.com 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.6 (demeter1.kernel.org [140.211.167.41]); Fri, 14 Jan 2011 15:45:36 +0000 (UTC) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 54ce246..73a8f1d 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -3645,13 +3645,21 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu) local_irq_disable(); - stgi(); - vcpu->arch.cr2 = svm->vmcb->save.cr2; vcpu->arch.regs[VCPU_REGS_RAX] = svm->vmcb->save.rax; vcpu->arch.regs[VCPU_REGS_RSP] = svm->vmcb->save.rsp; vcpu->arch.regs[VCPU_REGS_RIP] = svm->vmcb->save.rip; + if (unlikely(svm->vmcb->control.exit_code == SVM_EXIT_NMI)) + kvm_before_handle_nmi(&svm->vcpu); + + stgi(); + + /* Any pending NMI will happen here */ + + if (unlikely(svm->vmcb->control.exit_code == SVM_EXIT_NMI)) + kvm_after_handle_nmi(&svm->vcpu); + sync_cr8_to_lapic(vcpu); svm->next_rip = 0;