Skip to content

[rlc-10/6.12.0-211.39.1.el10_2] KVM: x86: Check for invalid/obsolete root *after* making MMU pages available #1508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmastbergen merged 1 commit into from
Aug 4, 2026
Merged

[rlc-10/6.12.0-211.39.1.el10_2] KVM: x86: Check for invalid/obsolete root *after* making MMU pages available #1508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions arch/x86/kvm/mmu/mmu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4788,16 +4788,17 @@ static int direct_page_fault(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault
if (r != RET_PF_CONTINUE)
return r;

r = RET_PF_RETRY;
write_lock(&vcpu->kvm->mmu_lock);

if (is_page_fault_stale(vcpu, fault))
goto out_unlock;

r = make_mmu_pages_available(vcpu);
if (r)
goto out_unlock;

if (is_page_fault_stale(vcpu, fault)) {
r = RET_PF_RETRY;
goto out_unlock;
}

r = direct_map(vcpu, fault);

out_unlock:
Expand Down
10 changes: 6 additions & 4 deletions arch/x86/kvm/mmu/paging_tmpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,15 +827,17 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault
}
#endif

r = RET_PF_RETRY;
write_lock(&vcpu->kvm->mmu_lock);

if (is_page_fault_stale(vcpu, fault))
goto out_unlock;

r = make_mmu_pages_available(vcpu);
if (r)
goto out_unlock;

if (is_page_fault_stale(vcpu, fault)) {
r = RET_PF_RETRY;
goto out_unlock;
}

r = FNAME(fetch)(vcpu, fault, &walker);

out_unlock:
Expand Down