Commit db0d70e6 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86/mmu: Move kvm_arch_flush_shadow_{all,memslot}() to mmu.c 



Move x86's implementation of kvm_arch_flush_shadow_{all,memslot}() into
mmu.c, and make kvm_mmu_zap_all() static as it was globally visible only
for kvm_arch_flush_shadow_all().  This will allow refactoring
kvm_arch_flush_shadow_memslot() to call kvm_mmu_zap_all() directly without
having to expose kvm_mmu_zap_all_fast() outside of mmu.c.  Keeping
everything in mmu.c will also likely simplify supporting TDX, which
intends to do zap only relevant SPTEs on memslot updates.

No functional change intended.

Suggested-by: default avatarYan Zhao <yan.y.zhao@intel.com>
Tested-by: default avatarYongwei Ma <yongwei.ma@intel.com>
Link: https://lore.kernel.org/r/20230729013535.1070024-13-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3cca6b26

arch/x86/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -1853,7 +1853,6 @@ void kvm_mmu_zap_collapsible_sptes(struct kvm *kvm, 
				   const struct kvm_memory_slot *memslot);

void kvm_mmu_slot_leaf_clear_dirty(struct kvm *kvm,

				   const struct kvm_memory_slot *memslot);

void kvm_mmu_zap_all(struct kvm *kvm);

void kvm_mmu_invalidate_mmio_sptes(struct kvm *kvm, u64 gen);

void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned long kvm_nr_mmu_pages);

arch/x86/kvm/mmu/mmu.c

+12 −1
Original line number Diff line number Diff line
@@ -6678,7 +6678,7 @@ void kvm_mmu_slot_leaf_clear_dirty(struct kvm *kvm, 
	 */

}



void kvm_mmu_zap_all(struct kvm *kvm)

static void kvm_mmu_zap_all(struct kvm *kvm)

{

	struct kvm_mmu_page *sp, *node;

	LIST_HEAD(invalid_list);
@@ -6703,6 +6703,17 @@ void kvm_mmu_zap_all(struct kvm *kvm) 
	write_unlock(&kvm->mmu_lock);

}



void kvm_arch_flush_shadow_all(struct kvm *kvm)

{

	kvm_mmu_zap_all(kvm);

}



void kvm_arch_flush_shadow_memslot(struct kvm *kvm,

				   struct kvm_memory_slot *slot)

{

	kvm_page_track_flush_slot(kvm, slot);

}



void kvm_mmu_invalidate_mmio_sptes(struct kvm *kvm, u64 gen)

{

	WARN_ON_ONCE(gen & KVM_MEMSLOT_GEN_UPDATE_IN_PROGRESS);

arch/x86/kvm/x86.c

+0 −11
Original line number Diff line number Diff line
@@ -12802,17 +12802,6 @@ void kvm_arch_commit_memory_region(struct kvm *kvm, 
		kvm_arch_free_memslot(kvm, old);

}



void kvm_arch_flush_shadow_all(struct kvm *kvm)

{

	kvm_mmu_zap_all(kvm);

}



void kvm_arch_flush_shadow_memslot(struct kvm *kvm,

				   struct kvm_memory_slot *slot)

{

	kvm_page_track_flush_slot(kvm, slot);

}



static inline bool kvm_guest_apic_has_interrupt(struct kvm_vcpu *vcpu)

{

	return (is_guest_mode(vcpu) &&