diff options
| author |   Sean Christopherson <sean.j.christopherson@intel.com> | 2019-12-06 15:57:29 -0800 |
|---|---|---|
| committer |   Paolo Bonzini <pbonzini@redhat.com> | 2020-01-08 18:16:09 +0100 |
| commit | 6948199a9af969342a6faf257678616aea491fcf (patch) | |
| tree | c1c622e61f416a19ac2f8d97519506aa7cd33ef5 /arch | |
| parent | KVM: x86/mmu: WARN on an invalid root_hpa (diff) | |
| download | linux-dev-6948199a9af969342a6faf257678616aea491fcf.tar.xz linux-dev-6948199a9af969342a6faf257678616aea491fcf.zip | |
KVM: x86/mmu: WARN if root_hpa is invalid when handling a page fault
WARN if root_hpa is invalid when handling a page fault. The check on
root_hpa exists for historical reasons that no longer apply to the
current KVM code base.
Remove an equivalent debug-only warning in direct_page_fault(), whose
existence more or less confirms that root_hpa should always be valid
when handling a page fault.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kvm/mmu/mmu.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 51f81f10f9f7..7269130ea5e2 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -4172,8 +4172,6 @@ static int direct_page_fault(struct kvm_vcpu *vcpu, gpa_t gpa, u32 error_code, kvm_pfn_t pfn; int level, r; - MMU_WARN_ON(!VALID_PAGE(vcpu->arch.mmu->root_hpa)); - if (page_fault_handle_page_track(vcpu, error_code, gfn)) return RET_PF_EMULATE; @@ -5463,7 +5461,7 @@ int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u64 error_code, int r, emulation_type = 0; bool direct = vcpu->arch.mmu->direct_map; - if (!VALID_PAGE(vcpu->arch.mmu->root_hpa)) + if (WARN_ON(!VALID_PAGE(vcpu->arch.mmu->root_hpa))) return RET_PF_RETRY; /* With shadow page tables, fault_address contains a GVA or nGPA. */ |