From patchwork Wed Jul 7 17:16:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 110678 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o67HGoag011787 for ; Wed, 7 Jul 2010 17:16:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754663Ab0GGRQs (ORCPT ); Wed, 7 Jul 2010 13:16:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1025 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753162Ab0GGRQr (ORCPT ); Wed, 7 Jul 2010 13:16:47 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o67HGlXY031143 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 7 Jul 2010 13:16:47 -0400 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o67HGkC3022249; Wed, 7 Jul 2010 13:16:47 -0400 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id 88DEC18D3C6; Wed, 7 Jul 2010 20:16:46 +0300 (IDT) From: Gleb Natapov To: avi@redhat.com, mtosatti@redhat.com Cc: kvm@vger.kernel.org Subject: [PATCH 3/3] Reenter guest after instruction emulation failure if emulation was due to access to non-mmio address. Date: Wed, 7 Jul 2010 20:16:46 +0300 Message-Id: <1278523006-21645-3-git-send-email-gleb@redhat.com> In-Reply-To: <1278523006-21645-1-git-send-email-gleb@redhat.com> References: <1278523006-21645-1-git-send-email-gleb@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 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]); Wed, 07 Jul 2010 17:16:51 +0000 (UTC) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 7070b41..dd7b241 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4000,6 +4000,8 @@ int emulate_instruction(struct kvm_vcpu *vcpu, if (r) { if (kvm_mmu_unprotect_page_virt(vcpu, cr2)) return EMULATE_DONE; + if (!kvm_is_error_hva(gfn_to_hva(vcpu->kvm, cr2))) + return EMULATE_DONE; if (emulation_type & EMULTYPE_SKIP) return EMULATE_FAIL; return handle_emulation_failure(vcpu); @@ -4026,6 +4028,8 @@ restart: */ if (kvm_mmu_unprotect_page_virt(vcpu, cr2)) return EMULATE_DONE; + if (!kvm_is_error_hva(gfn_to_hva(vcpu->kvm, cr2))) + return EMULATE_DONE; return handle_emulation_failure(vcpu); }