diff options
| author | Sean Christopherson <seanjc@google.com> | 2022-04-23 03:47:48 +0000 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-05-12 09:51:43 -0400 |
| commit | 8d5265b1016369836c0735ed40933e179f186630 (patch) | |
| tree | e75ec8387cedeea09c18db6aa0f41062e98f6726 /arch/x86/kvm | |
| parent | 8a009d5bca0af7385880123d12081713f7066904 (diff) | |
| download | linux-8d5265b1016369836c0735ed40933e179f186630.tar.bz2 | |
KVM: x86/mmu: Use IS_ENABLED() to avoid RETPOLINE for TDP page faults
Use IS_ENABLED() instead of an #ifdef to activate the anti-RETPOLINE fast
path for TDP page faults. The generated code is identical, and the #ifdef
makes it dangerously difficult to extend the logic (guess who forgot to
add an "else" inside the #ifdef and ran through the page fault handler
twice).
No functional or binary change intented.
Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20220423034752.1161007-9-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/mmu/mmu_internal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kvm/mmu/mmu_internal.h b/arch/x86/kvm/mmu/mmu_internal.h index c0c85cbfa159..9caa747ee033 100644 --- a/arch/x86/kvm/mmu/mmu_internal.h +++ b/arch/x86/kvm/mmu/mmu_internal.h @@ -248,10 +248,10 @@ static inline int kvm_mmu_do_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, .req_level = PG_LEVEL_4K, .goal_level = PG_LEVEL_4K, }; -#ifdef CONFIG_RETPOLINE - if (fault.is_tdp) + + if (IS_ENABLED(CONFIG_RETPOLINE) && fault.is_tdp) return kvm_tdp_page_fault(vcpu, &fault); -#endif + return vcpu->arch.mmu->page_fault(vcpu, &fault); } |