Commit 619b5072 authored by David Matlack's avatar David Matlack Committed by Marc Zyngier
Browse files

KVM: Move kvm_arch_flush_remote_tlbs_memslot() to common code 



Move kvm_arch_flush_remote_tlbs_memslot() to common code and drop
"arch_" from the name. kvm_arch_flush_remote_tlbs_memslot() is just a
range-based TLB invalidation where the range is defined by the memslot.
Now that kvm_flush_remote_tlbs_range() can be called from common code we
can just use that and drop a bunch of duplicate code from the arch
directories.

Note this adds a lockdep assertion for slots_lock being held when
calling kvm_flush_remote_tlbs_memslot(), which was previously only
asserted on x86. MIPS has calls to kvm_flush_remote_tlbs_memslot(),
but they all hold the slots_lock, so the lockdep assertion continues to
hold true.

Also drop the CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT ifdef gating
kvm_flush_remote_tlbs_memslot(), since it is no longer necessary.

Signed-off-by: default avatarDavid Matlack <dmatlack@google.com>
Signed-off-by: default avatarRaghavendra Rao Ananta <rananta@google.com>
Reviewed-by: default avatarGavin Shan <gshan@redhat.com>
Reviewed-by: default avatarShaoqin Huang <shahuang@redhat.com>
Acked-by: default avatarAnup Patel <anup@brainfault.org>
Acked-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20230811045127.3308641-7-rananta@google.com
parent d4788996

arch/arm64/kvm/arm.c

+0 −6
Original line number Diff line number Diff line
@@ -1532,12 +1532,6 @@ void kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) 


}



void kvm_arch_flush_remote_tlbs_memslot(struct kvm *kvm,

					const struct kvm_memory_slot *memslot)

{

	kvm_flush_remote_tlbs(kvm);

}



static int kvm_vm_ioctl_set_device_addr(struct kvm *kvm,

					struct kvm_arm_device_addr *dev_addr)

{

arch/mips/kvm/mips.c

+2 −8
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ void kvm_arch_flush_shadow_memslot(struct kvm *kvm, 
	/* Flush slot from GPA */

	kvm_mips_flush_gpa_pt(kvm, slot->base_gfn,

			      slot->base_gfn + slot->npages - 1);

	kvm_arch_flush_remote_tlbs_memslot(kvm, slot);

	kvm_flush_remote_tlbs_memslot(kvm, slot);

	spin_unlock(&kvm->mmu_lock);

}
@@ -235,7 +235,7 @@ void kvm_arch_commit_memory_region(struct kvm *kvm, 
		needs_flush = kvm_mips_mkclean_gpa_pt(kvm, new->base_gfn,

					new->base_gfn + new->npages - 1);

		if (needs_flush)

			kvm_arch_flush_remote_tlbs_memslot(kvm, new);

			kvm_flush_remote_tlbs_memslot(kvm, new);

		spin_unlock(&kvm->mmu_lock);

	}

}
@@ -987,12 +987,6 @@ int kvm_arch_flush_remote_tlbs(struct kvm *kvm) 
	return 1;

}



void kvm_arch_flush_remote_tlbs_memslot(struct kvm *kvm,

					const struct kvm_memory_slot *memslot)

{

	kvm_flush_remote_tlbs(kvm);

}



int kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)

{

	int r;

arch/riscv/kvm/mmu.c

+0 −6
Original line number Diff line number Diff line
@@ -406,12 +406,6 @@ void kvm_arch_sync_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot) 
{

}



void kvm_arch_flush_remote_tlbs_memslot(struct kvm *kvm,

					const struct kvm_memory_slot *memslot)

{

	kvm_flush_remote_tlbs(kvm);

}



void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free)

{

}

arch/x86/kvm/mmu/mmu.c

+1 −15
Original line number Diff line number Diff line
@@ -6666,7 +6666,7 @@ static void kvm_rmap_zap_collapsible_sptes(struct kvm *kvm, 
	 */

	if (walk_slot_rmaps(kvm, slot, kvm_mmu_zap_collapsible_spte,

			    PG_LEVEL_4K, KVM_MAX_HUGEPAGE_LEVEL - 1, true))

		kvm_arch_flush_remote_tlbs_memslot(kvm, slot);

		kvm_flush_remote_tlbs_memslot(kvm, slot);

}



void kvm_mmu_zap_collapsible_sptes(struct kvm *kvm,
@@ -6685,20 +6685,6 @@ void kvm_mmu_zap_collapsible_sptes(struct kvm *kvm, 
	}

}



void kvm_arch_flush_remote_tlbs_memslot(struct kvm *kvm,

					const struct kvm_memory_slot *memslot)

{

	/*

	 * All current use cases for flushing the TLBs for a specific memslot

	 * related to dirty logging, and many do the TLB flush out of mmu_lock.

	 * The interaction between the various operations on memslot must be

	 * serialized by slots_locks to ensure the TLB flush from one operation

	 * is observed by any other operation on the same memslot.

	 */

	lockdep_assert_held(&kvm->slots_lock);

	kvm_flush_remote_tlbs_range(kvm, memslot->base_gfn, memslot->npages);

}



void kvm_mmu_slot_leaf_clear_dirty(struct kvm *kvm,

				   const struct kvm_memory_slot *memslot)

{

arch/x86/kvm/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -12751,7 +12751,7 @@ static void kvm_mmu_slot_apply_flags(struct kvm *kvm, 
		 * See is_writable_pte() for more details (the case involving

		 * access-tracked SPTEs is particularly relevant).

		 */

		kvm_arch_flush_remote_tlbs_memslot(kvm, new);

		kvm_flush_remote_tlbs_memslot(kvm, new);

	}

}