From patchwork Tue Jun 2 21:36:59 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 27564 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 n52Liihj009435 for ; Tue, 2 Jun 2009 21:44:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753263AbZFBVoi (ORCPT ); Tue, 2 Jun 2009 17:44:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753208AbZFBVoi (ORCPT ); Tue, 2 Jun 2009 17:44:38 -0400 Received: from mx2.redhat.com ([66.187.237.31]:45323 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753100AbZFBVoh (ORCPT ); Tue, 2 Jun 2009 17:44:37 -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 n52Lid75028086; Tue, 2 Jun 2009 17:44:39 -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 n52LibIL022022; Tue, 2 Jun 2009 17:44:38 -0400 Received: from amt.cnet (vpn-10-3.str.redhat.com [10.32.10.3]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n52LiZEL026317; Tue, 2 Jun 2009 17:44:36 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id D5AC3274E8A; Tue, 2 Jun 2009 18:44:10 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.3/8.14.3/Submit) id n52Li8LJ009748; Tue, 2 Jun 2009 18:44:08 -0300 Message-Id: <20090602214227.199310641@localhost.localdomain> References: <20090602213655.640083007@localhost.localdomain> User-Agent: quilt/0.46-1 Date: Tue, 02 Jun 2009 18:36:59 -0300 From: Marcelo Tosatti To: avi@redhat.com, sheng@linux.intel.com Cc: kvm@vger.kernel.org, Marcelo Tosatti Subject: [patch 4/4] KVM: MMU audit: audit_mappings tweaks Content-Disposition: inline; filename=mmu-audit-4 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 - Fail early in case gfn_to_pfn returns is_error_pfn. - For the pre pte write case, avoid spurious "gva is valid but spte is notrap" messages (the emulation code does the guest write first, so this particular case is OK). Signed-off-by: Marcelo Tosatti Index: kvm/arch/x86/kvm/mmu.c =================================================================== --- kvm.orig/arch/x86/kvm/mmu.c +++ kvm/arch/x86/kvm/mmu.c @@ -3089,6 +3089,11 @@ static void audit_mappings_page(struct k pfn_t pfn = gfn_to_pfn(vcpu->kvm, gfn); hpa_t hpa = (hpa_t)pfn << PAGE_SHIFT; + if (is_error_pfn(pfn)) { + kvm_release_pfn_clean(pfn); + continue; + } + if (is_shadow_present_pte(ent) && (ent & PT64_BASE_ADDR_MASK) != hpa) printk(KERN_ERR "xx audit error: (%s) levels %d" @@ -3256,7 +3261,8 @@ static void kvm_mmu_audit(struct kvm_vcp audit_msg = msg; audit_rmap(vcpu); audit_write_protection(vcpu); - audit_mappings(vcpu); + if (strcmp("pre pte write", audit_msg)) + audit_mappings(vcpu); audit_writable_sptes_have_rmaps(vcpu); dbg = olddbg; }