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

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

KVM x86 MMU changes for 6.19:

 - Skip the costly "zap all SPTEs" on an MMIO generation wrap if MMIO SPTE
   caching is disabled, as there can't be any relevant SPTEs to zap.

 - Relocate a misplace export.
parents b0bf3d67 6422060a

arch/x86/kvm/mmu/mmu.c

+4 −1
Original line number Diff line number Diff line
@@ -6863,6 +6863,7 @@ void kvm_zap_gfn_range(struct kvm *kvm, gfn_t gfn_start, gfn_t gfn_end) 


	write_unlock(&kvm->mmu_lock);

}

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_zap_gfn_range);



static bool slot_rmap_write_protect(struct kvm *kvm,

				    struct kvm_rmap_head *rmap_head,
@@ -7204,7 +7205,6 @@ static bool kvm_mmu_zap_collapsible_spte(struct kvm *kvm, 


	return need_tlb_flush;

}

EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_zap_gfn_range);



static void kvm_rmap_zap_collapsible_sptes(struct kvm *kvm,

					   const struct kvm_memory_slot *slot)
@@ -7364,6 +7364,9 @@ void kvm_mmu_invalidate_mmio_sptes(struct kvm *kvm, u64 gen) 
{

	WARN_ON_ONCE(gen & KVM_MEMSLOT_GEN_UPDATE_IN_PROGRESS);



	if (!enable_mmio_caching)

		return;



	gen &= MMIO_SPTE_GEN_MASK;



	/*