Skip to content

Commit 1c118b8

Browse files
Xiao Guangrongbonzini
authored andcommitted
KVM: MMU: avoid fast page fault fixing mmio page fault
Currently, fast page fault incorrectly tries to fix mmio page fault when the generation number is invalid (spte.gen != kvm.gen). It then returns to guest to retry the fault since it sees the last spte is nonpresent. This causes an infinite loop. Since fast page fault only works for direct mmu, the issue exists when 1) tdp is enabled. It is only triggered only on AMD host since on Intel host the mmio page fault is recognized as ept-misconfig whose handler call fault-page path with error_code = 0 2) guest paging is disabled. Under this case, the issue is hardly discovered since paging disable is short-lived and the sptes will be invalid after memslot changed for 150 times Fix it by filtering out MMIO page faults in page_fault_can_be_fast. Reported-by: Markus Trippelsdorf <[email protected]> Tested-by: Markus Trippelsdorf <[email protected]> Signed-off-by: Xiao Guangrong <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent ad81f05 commit 1c118b8

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

arch/x86/kvm/mmu.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2810,6 +2810,13 @@ static bool handle_abnormal_pfn(struct kvm_vcpu *vcpu, gva_t gva, gfn_t gfn,
28102810

28112811
static bool page_fault_can_be_fast(struct kvm_vcpu *vcpu, u32 error_code)
28122812
{
2813+
/*
2814+
* Do not fix the mmio spte with invalid generation number which
2815+
* need to be updated by slow page fault path.
2816+
*/
2817+
if (unlikely(error_code & PFERR_RSVD_MASK))
2818+
return false;
2819+
28132820
/*
28142821
* #PF can be fast only if the shadow page table is present and it
28152822
* is caused by write-protect, that means we just need change the

0 commit comments

Comments
 (0)