Make the audit code aware of largepages.
Signed-off-by: Marcelo Tosatti <mtosa...@redhat.com>
Index: kvm/arch/x86/kvm/mmu.c
===================================================================
--- kvm.orig/arch/x86/kvm/mmu.c
+++ kvm/arch/x86/kvm/mmu.c
@@ -3033,12 +3033,11 @@ static void __mmu_spte_walk(struct kvm *
u64 ent = sp->spt[i];
if (is_shadow_present_pte(ent)) {
- if (sp->role.level > 1 && !is_large_pte(ent)) {
+ if (!is_last_spte(ent, sp->role.level)) {
struct kvm_mmu_page *child;
child = page_header(ent & PT64_BASE_ADDR_MASK);
__mmu_spte_walk(kvm, child, fn);
- }
- if (sp->role.level == 1)
+ } else
fn(kvm, sp, &sp->spt[i]);
}
}
@@ -3083,10 +3082,9 @@ static void audit_mappings_page(struct k
continue;
va = canonicalize(va);
- if (level > 1) {
- if (is_shadow_present_pte(ent))
- audit_mappings_page(vcpu, ent, va, level - 1);
- } else {
+ if (is_shadow_present_pte(ent) && !is_last_spte(ent, level))
+ audit_mappings_page(vcpu, ent, va, level - 1);
+ else {
gpa_t gpa = vcpu->arch.mmu.gva_to_gpa(vcpu, va);
gfn_t gfn = gpa >> PAGE_SHIFT;
pfn_t pfn = gfn_to_pfn(vcpu->kvm, gfn);
@@ -3183,7 +3181,8 @@ void inspect_spte_has_rmap(struct kvm *k
return;
}
- rmapp = gfn_to_rmap(kvm, rev_sp->gfns[sptep - rev_sp->spt], 0);
+ rmapp = gfn_to_rmap(kvm, rev_sp->gfns[sptep - rev_sp->spt],
+ is_large_pte(*sptep));
if (!*rmapp) {
if (!printk_ratelimit())
return;
--
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
