Skip to content

Commit 11d4517

Browse files
yanzhao56sean-jc
authored andcommitted
KVM: x86/mmu: Warn if PFN changes on shadow-present SPTE in shadow MMU
Warn if PFN changes on shadow-present SPTE in mmu_set_spte(). KVM should _never_ change the PFN of a shadow-present SPTE. In mmu_set_spte(), there is a WARN_ON_ONCE() on pfn changes on shadow-present SPTE in mmu_spte_update() to detect this condition. However, that WARN_ON_ONCE() is not hittable since mmu_set_spte() invokes drop_spte() earlier before mmu_spte_update(), which clears SPTE to a !shadow-present state. So, before invoking drop_spte(), add a WARN_ON_ONCE() in mmu_set_spte() to warn PFN change of a shadow-present SPTE. For the spurious prefetch fault, only return RET_PF_SPURIOUS directly when PFN is not changed. When PFN changes, fall through to follow the sequence of drop_spte(), warn of PFN change, make_spte(), flush tlb, rmap_add(). Signed-off-by: Yan Zhao <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sean Christopherson <[email protected]>
1 parent 988da78 commit 11d4517

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

arch/x86/kvm/mmu/mmu.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3020,7 +3020,8 @@ static int mmu_set_spte(struct kvm_vcpu *vcpu, struct kvm_memory_slot *slot,
30203020
}
30213021

30223022
if (is_shadow_present_pte(*sptep)) {
3023-
if (prefetch && is_last_spte(*sptep, level))
3023+
if (prefetch && is_last_spte(*sptep, level) &&
3024+
pfn == spte_to_pfn(*sptep))
30243025
return RET_PF_SPURIOUS;
30253026

30263027
/*
@@ -3034,7 +3035,7 @@ static int mmu_set_spte(struct kvm_vcpu *vcpu, struct kvm_memory_slot *slot,
30343035
child = spte_to_child_sp(pte);
30353036
drop_parent_pte(vcpu->kvm, child, sptep);
30363037
flush = true;
3037-
} else if (pfn != spte_to_pfn(*sptep)) {
3038+
} else if (WARN_ON_ONCE(pfn != spte_to_pfn(*sptep))) {
30383039
drop_spte(vcpu->kvm, sptep);
30393040
flush = true;
30403041
} else

0 commit comments

Comments
 (0)