Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cf853c5 authored by Lan Tianyu's avatar Lan Tianyu Committed by Paolo Bonzini
Browse files

KVM/MMU: Move tlb flush in kvm_set_pte_rmapp() to kvm_mmu_notifier_change_pte() 



This patch is to move tlb flush in kvm_set_pte_rmapp() to
kvm_mmu_notifier_change_pte() in order to avoid redundant tlb flush.

Signed-off-by: default avatarLan Tianyu <Tianyu.Lan@microsoft.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 748c0e31

arch/x86/kvm/mmu.c

+2 −6
Original line number Diff line number Diff line
@@ -1776,10 +1776,7 @@ static int kvm_set_pte_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_head, 
		}

	}



	if (need_flush)

		kvm_flush_remote_tlbs(kvm);



	return 0;

	return need_flush;

}



struct slot_rmap_walk_iterator {
@@ -1915,8 +1912,7 @@ int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end) 


int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte)

{

	kvm_handle_hva(kvm, hva, (unsigned long)&pte, kvm_set_pte_rmapp);

	return 0;

	return kvm_handle_hva(kvm, hva, (unsigned long)&pte, kvm_set_pte_rmapp);

}



static int kvm_age_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_head,

virt/kvm/kvm_main.c

+4 −1
Original line number Diff line number Diff line
@@ -354,7 +354,10 @@ static void kvm_mmu_notifier_change_pte(struct mmu_notifier *mn, 
	idx = srcu_read_lock(&kvm->srcu);

	spin_lock(&kvm->mmu_lock);

	kvm->mmu_notifier_seq++;

	kvm_set_spte_hva(kvm, address, pte);



	if (kvm_set_spte_hva(kvm, address, pte))

		kvm_flush_remote_tlbs(kvm);



	spin_unlock(&kvm->mmu_lock);

	srcu_read_unlock(&kvm->srcu, idx);

}