From patchwork Tue May 5 08:14:33 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 21831 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 n458FTbf027320 for ; Tue, 5 May 2009 08:15:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756881AbZEEIOw (ORCPT ); Tue, 5 May 2009 04:14:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756511AbZEEIOw (ORCPT ); Tue, 5 May 2009 04:14:52 -0400 Received: from mx2.redhat.com ([66.187.237.31]:39540 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756881AbZEEIOj (ORCPT ); Tue, 5 May 2009 04:14:39 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n458Eesn029587 for ; Tue, 5 May 2009 04:14:40 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n458EdSf028354; Tue, 5 May 2009 04:14:39 -0400 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n458Ece8008563; Tue, 5 May 2009 04:14:38 -0400 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id A9F1318D466; Tue, 5 May 2009 11:14:35 +0300 (IDT) From: Gleb Natapov To: avi@redhat.com Cc: kvm@vger.kernel.org, Gleb Natapov Subject: [PATCH 7/9] Drop interrupt shadow when single stepping should be done only on VMX. Date: Tue, 5 May 2009 11:14:33 +0300 Message-Id: <1241511275-2261-7-git-send-email-gleb@redhat.com> In-Reply-To: <1241511275-2261-1-git-send-email-gleb@redhat.com> References: <1241511275-2261-1-git-send-email-gleb@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org The problem exists only on VMX. Also currently we skip this step if there is pending exception. The patch fixes this too. Signed-off-by: Gleb Natapov --- arch/x86/kvm/vmx.c | 8 ++++++++ arch/x86/kvm/x86.c | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 092a3ee..44647e6 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -3361,6 +3361,14 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) if (test_bit(VCPU_REGS_RIP, (unsigned long *)&vcpu->arch.regs_dirty)) vmcs_writel(GUEST_RIP, vcpu->arch.regs[VCPU_REGS_RIP]); + /* When single-stepping over STI and MOV SS, we must clear the + * corresponding interruptibility bits in the guest state. Otherwise + * vmentry fails as it then expects bit 14 (BS) in pending debug + * exceptions being set, but that's not correct for the guest debugging + * case. */ + if (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP) + vmx_drop_interrupt_shadow(vcpu); + /* * Loading guest fpu may have cleared host cr0.ts */ diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index bce49da..4ba00ab 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3129,9 +3129,6 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu) static void inject_pending_irq(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) { - if (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP) - kvm_x86_ops->drop_interrupt_shadow(vcpu); - /* try to reinject previous events if any */ if (vcpu->arch.nmi_injected) { kvm_x86_ops->set_nmi(vcpu);