Commit cae083c4 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-x86-mmu-6.14' of https://github.com/kvm-x86/linux into HEAD 

KVM x86 MMU changes for 6.14:

 - Add a comment to kvm_mmu_do_page_fault() to explain why KVM performs a
   direct call to kvm_tdp_page_fault() when RETPOLINE is enabled.
parents 7a9164dc 2d5faa6a

arch/x86/kvm/mmu/mmu_internal.h

+4 −0
Original line number Diff line number Diff line
@@ -321,6 +321,10 @@ static inline int kvm_mmu_do_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, 
		fault.slot = kvm_vcpu_gfn_to_memslot(vcpu, fault.gfn);

	}



	/*

	 * With retpoline being active an indirect call is rather expensive,

	 * so do a direct call in the most common case.

	 */

	if (IS_ENABLED(CONFIG_MITIGATION_RETPOLINE) && fault.is_tdp)

		r = kvm_tdp_page_fault(vcpu, &fault);

	else