From patchwork Fri Aug 7 09:49:47 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 39839 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n779tth8031466 for ; Fri, 7 Aug 2009 09:55:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757208AbZHGJul (ORCPT ); Fri, 7 Aug 2009 05:50:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757200AbZHGJul (ORCPT ); Fri, 7 Aug 2009 05:50:41 -0400 Received: from outbound-dub.frontbridge.com ([213.199.154.16]:18900 "EHLO IE1EHSOBE005.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755944AbZHGJuL (ORCPT ); Fri, 7 Aug 2009 05:50:11 -0400 Received: from mail108-dub-R.bigfish.com (10.5.252.3) by IE1EHSOBE005.bigfish.com (10.5.252.25) with Microsoft SMTP Server id 8.1.340.0; Fri, 7 Aug 2009 09:50:12 +0000 Received: from mail108-dub (localhost.localdomain [127.0.0.1]) by mail108-dub-R.bigfish.com (Postfix) with ESMTP id 5AC76638121; Fri, 7 Aug 2009 09:50:11 +0000 (UTC) X-SpamScore: 3 X-BigFish: VPS3(zzzz1202hzzz32i203h43j65h) X-Spam-TCS-SCL: 4:0 Received: by mail108-dub (MessageSwitch) id 124963861170680_9535; Fri, 7 Aug 2009 09:50:11 +0000 (UCT) Received: from svlb1extmailp01.amd.com (unknown [139.95.251.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail108-dub.bigfish.com (Postfix) with ESMTP id 98610CD0050; Fri, 7 Aug 2009 09:50:10 +0000 (UTC) Received: from svlb1twp01.amd.com ([139.95.250.34]) by svlb1extmailp01.amd.com (Switch-3.2.7/Switch-3.2.7) with ESMTP id n779o3X7010846; Fri, 7 Aug 2009 02:50:06 -0700 X-WSS-ID: 0KO03BE-03-0WZ-01 Received: from SSVLEXBH2.amd.com (ssvlexbh2.amd.com [139.95.53.183]) by svlb1twp01.amd.com (Tumbleweed MailGate 3.5.1) with ESMTP id 243C8884944; Fri, 7 Aug 2009 02:50:01 -0700 (PDT) Received: from SSVLEXMB1.amd.com ([139.95.53.181]) by SSVLEXBH2.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 7 Aug 2009 02:50:04 -0700 Received: from SF30EXMB1.amd.com ([172.20.6.49]) by SSVLEXMB1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 7 Aug 2009 02:50:03 -0700 Received: from seurexmb1.amd.com ([165.204.9.130]) by SF30EXMB1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 7 Aug 2009 11:49:54 +0200 Received: from lemmy.amd.com ([165.204.15.93]) by seurexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 7 Aug 2009 11:49:51 +0200 Received: by lemmy.amd.com (Postfix, from userid 41430) id F2266C9F81; Fri, 7 Aug 2009 11:49:50 +0200 (CEST) From: Joerg Roedel To: Avi Kivity CC: Alexander Graf , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Joerg Roedel Subject: [PATCH 20/21] kvm/svm: check for nested VINTR flag in svm_interrupt_allowed Date: Fri, 7 Aug 2009 11:49:47 +0200 Message-ID: <1249638588-10982-21-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1249638588-10982-1-git-send-email-joerg.roedel@amd.com> References: <1249638588-10982-1-git-send-email-joerg.roedel@amd.com> X-OriginalArrivalTime: 07 Aug 2009 09:49:51.0358 (UTC) FILETIME=[689969E0:01CA1744] MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Not checking for this flag breaks any nested hypervisor that does not set VINTR. So fix it with this patch. Signed-off-by: Joerg Roedel --- arch/x86/kvm/svm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 089310d..8b32cc8 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -2467,7 +2467,7 @@ static int svm_interrupt_allowed(struct kvm_vcpu *vcpu) return (vmcb->save.rflags & X86_EFLAGS_IF) && !(vmcb->control.int_state & SVM_INTERRUPT_SHADOW_MASK) && gif_set(svm) && - !is_nested(svm); + !(is_nested(svm) && (svm->vcpu.arch.hflags & HF_VINTR_MASK)); } static void enable_irq_window(struct kvm_vcpu *vcpu)