mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-20 09:31:09 +00:00
Code Issues Releases Wiki Activity

KVM: MMU audit: audit_mappings tweaks

Browse source 
- 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 <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Marcelo Tosatti 2009-06-10 12:27:07 -03:00 committed by Avi Kivity
parent 48fc03174b
commit 2aaf65e8c4
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/x86/kvm/mmu.c
View file

@ -3117,6 +3117,11 @@ static void audit_mappings_page(struct kvm_vcpu *vcpu, u64 page_pte,
pfn_t pfn = gfn_to_pfn(vcpu->kvm, gfn); pfn_t pfn = gfn_to_pfn(vcpu->kvm, gfn);
hpa_t hpa = (hpa_t)pfn << PAGE_SHIFT; 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) if (is_shadow_present_pte(ent)
&& (ent & PT64_BASE_ADDR_MASK) != hpa) && (ent & PT64_BASE_ADDR_MASK) != hpa)
printk(KERN_ERR "xx audit error: (%s) levels %d" printk(KERN_ERR "xx audit error: (%s) levels %d"
@ -3288,7 +3293,8 @@ static void kvm_mmu_audit(struct kvm_vcpu *vcpu, const char *msg)
audit_msg = msg; audit_msg = msg;
audit_rmap(vcpu); audit_rmap(vcpu);
audit_write_protection(vcpu); audit_write_protection(vcpu);
audit_mappings(vcpu); if (strcmp("pre pte write", audit_msg) != 0)
audit_mappings(vcpu);
audit_writable_sptes_have_rmaps(vcpu); audit_writable_sptes_have_rmaps(vcpu);
dbg = olddbg; dbg = olddbg;
} }