From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gleb Natapov Subject: [PATCH] do not call gva_to_gpa on physical address Date: Wed, 14 Jul 2010 18:38:58 +0300 Message-ID: <20100714153858.GI4689@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: kvm@vger.kernel.org To: mtosatti@redhat.com, avi@redhat.com Return-path: Received: from mx1.redhat.com ([209.132.183.28]:65350 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752975Ab0GNPjA (ORCPT ); Wed, 14 Jul 2010 11:39:00 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o6EFd0jJ017731 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 14 Jul 2010 11:39:00 -0400 Content-Disposition: inline Sender: kvm-owner@vger.kernel.org List-ID: When tdp is enabled cr2 passed to emulator is pga not gva, so no need to call gva_to_gpa on it. Signed-off-by: Gleb Natapov diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index fb08316..721bf0a 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3944,10 +3944,13 @@ static bool reexecute_instruction(struct kvm_vcpu *vcpu, gva_t gva) if (kvm_mmu_unprotect_page_virt(vcpu, gva)) return true; - gpa = kvm_mmu_gva_to_gpa_system(vcpu, gva, NULL); + if (!tdp_enabled) { + gpa = kvm_mmu_gva_to_gpa_system(vcpu, gva, NULL); - if (gpa == UNMAPPED_GVA) - return true; /* let cpu generate fault */ + if (gpa == UNMAPPED_GVA) + return true; /* let cpu generate fault */ + } else + gpa = gva; if (!kvm_is_error_hva(gfn_to_hva(vcpu->kvm, gpa >> PAGE_SHIFT))) return true; -- Gleb.