Skip to content

Commit 347201c

Browse files
sean-jcgregkh
authored andcommitted
KVM: x86: Retry page fault if MMU reload is pending and root has no sp
[ Upstream commit 18c841e ] Play nice with a NULL shadow page when checking for an obsolete root in the page fault handler by flagging the page fault as stale if there's no shadow page associated with the root and KVM_REQ_MMU_RELOAD is pending. Invalidating memslots, which is the only case where _all_ roots need to be reloaded, requests all vCPUs to reload their MMUs while holding mmu_lock for lock. The "special" roots, e.g. pae_root when KVM uses PAE paging, are not backed by a shadow page. Running with TDP disabled or with nested NPT explodes spectaculary due to dereferencing a NULL shadow page pointer. Skip the KVM_REQ_MMU_RELOAD check if there is a valid shadow page for the root. Zapping shadow pages in response to guest activity, e.g. when the guest frees a PGD, can trigger KVM_REQ_MMU_RELOAD even if the current vCPU isn't using the affected root. I.e. KVM_REQ_MMU_RELOAD can be seen with a completely valid root shadow page. This is a bit of a moot point as KVM currently unloads all roots on KVM_REQ_MMU_RELOAD, but that will be cleaned up in the future. Fixes: a955cad ("KVM: x86/mmu: Retry page fault if root is invalidated by memslot update") Cc: stable@vger.kernel.org Cc: Maxim Levitsky <mlevitsk@redhat.com> Signed-off-by: Sean Christopherson <seanjc@google.com> Message-Id: <20211209060552.2956723-2-seanjc@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent a9340eb commit 347201c

1 file changed

Lines changed: 15 additions & 1 deletion

File tree

arch/x86/kvm/mmu/mmu.c

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4005,7 +4005,21 @@ static bool kvm_faultin_pfn(struct kvm_vcpu *vcpu, bool prefault, gfn_t gfn,
40054005
static bool is_page_fault_stale(struct kvm_vcpu *vcpu,
40064006
kvm_pfn_t pfn, unsigned long mmu_seq, hva_t hva)
40074007
{
4008-
if (is_obsolete_sp(vcpu->kvm, to_shadow_page(vcpu->arch.mmu->root_hpa)))
4008+
struct kvm_mmu_page *sp = to_shadow_page(vcpu->arch.mmu->root_hpa);
4009+
4010+
/* Special roots, e.g. pae_root, are not backed by shadow pages. */
4011+
if (sp && is_obsolete_sp(vcpu->kvm, sp))
4012+
return true;
4013+
4014+
/*
4015+
* Roots without an associated shadow page are considered invalid if
4016+
* there is a pending request to free obsolete roots. The request is
4017+
* only a hint that the current root _may_ be obsolete and needs to be
4018+
* reloaded, e.g. if the guest frees a PGD that KVM is tracking as a
4019+
* previous root, then __kvm_mmu_prepare_zap_page() signals all vCPUs
4020+
* to reload even if no vCPU is actively using the root.
4021+
*/
4022+
if (!sp && kvm_test_request(KVM_REQ_MMU_RELOAD, vcpu))
40094023
return true;
40104024

40114025
return !is_noslot_pfn(pfn) &&

0 commit comments

Comments
 (0)