UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM: x86/mmu: Cleanup sanity check of SPTEs at SP free 

Massage the error message for the sanity check on SPTEs when freeing a
shadow page to be more verbose, and to print out all shadow-present SPTEs,
not just the first SPTE encountered.  Printing all SPTEs can be quite
valuable for debug, e.g. highlights whether the leak is a one-off or
widepsread, or possibly the result of memory corruption (something else
in the kernel stomping on KVM's SPTEs).

Opportunistically move the MMU_WARN_ON() into the helper itself, which
will allow a future cleanup to use BUILD_BUG_ON_INVALID() as the stub for
MMU_WARN_ON().  BUILD_BUG_ON_INVALID() works as intended and results in
the compiler complaining about is_empty_shadow_page() not being declared.

Link: https://lore.kernel.org/r/20230729004722.1056172-6-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson 2023-07-28 17:47:15 -07:00 committed by Paolo Bonzini
parent 242a6dd8da
commit 58da926caa
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/x86/kvm/mmu/mmu.c
View File

@ -1689,21 +1689,19 @@ bool kvm_test_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range)
return young; return young;
} }
#ifdef MMU_DEBUG static void kvm_mmu_check_sptes_at_free(struct kvm_mmu_page *sp)
static int is_empty_shadow_page(u64 *spt)
{ {
#ifdef MMU_DEBUG
int i; int i;
for (i = 0; i < SPTE_ENT_PER_PAGE; i++) { for (i = 0; i < SPTE_ENT_PER_PAGE; i++) {
if (is_shadow_present_pte(spt[i])) { if (MMU_WARN_ON(is_shadow_present_pte(sp->spt[i])))
printk(KERN_ERR "%s: %p %llx\n", __func__, pr_err_ratelimited("SPTE %llx (@ %p) for gfn %llx shadow-present at free",
&spt[i], spt[i]); sp->spt[i], &sp->spt[i],
return 0; kvm_mmu_page_get_gfn(sp, i));
}
} }
return 1;
}
#endif #endif
}
/* /*
* This value is the sum of all of the kvm instances's * This value is the sum of all of the kvm instances's
@ -1731,7 +1729,8 @@ static void kvm_unaccount_mmu_page(struct kvm *kvm, struct kvm_mmu_page *sp)
static void kvm_mmu_free_shadow_page(struct kvm_mmu_page *sp) static void kvm_mmu_free_shadow_page(struct kvm_mmu_page *sp)
{ {
MMU_WARN_ON(!is_empty_shadow_page(sp->spt)); kvm_mmu_check_sptes_at_free(sp);
hlist_del(&sp->hash_link); hlist_del(&sp->hash_link);
list_del(&sp->link); list_del(&sp->link);
free_page((unsigned long)sp->spt); free_page((unsigned long)sp->spt);