KVM: x86/mmu: Move kvm_arch_flush_remote_tlbs_memslot() to mmu.c (b3594ffb) · Commits · 戴 / test

Move kvm_arch_flush_remote_tlbs_memslot() from x86.c to mmu.c in preparation for calling kvm_flush_remote_tlbs_with_address() instead of kvm_flush_remote_tlbs(). The with_address() variant is statically defined in mmu.c, arguably kvm_arch_flush_remote_tlbs_memslot() belongs in mmu.c anyways, and defining kvm_arch_flush_remote_tlbs_memslot() in mmu.c will allow the compiler to inline said function when a future patch consolidates open coded variants of the function. No functional change intended. Signed-off-by:

Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com>

arch/x86/kvm/mmu/mmu.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -5934,6 +5934,17 @@ void kvm_mmu_zap_collapsible_sptes(struct kvm *kvm,
		spin_unlock(&kvm->mmu_lock);
		}

		void kvm_arch_flush_remote_tlbs_memslot(struct kvm *kvm,
		struct kvm_memory_slot *memslot)
		{
		/*
		* All the TLBs can be flushed out of mmu lock, see the comments in
		* kvm_mmu_slot_remove_write_access().
		*/
		lockdep_assert_held(&kvm->slots_lock);
		kvm_flush_remote_tlbs(kvm);
		}

		void kvm_mmu_slot_leaf_clear_dirty(struct kvm *kvm,
		struct kvm_memory_slot *memslot)
		{

arch/x86/kvm/x86.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -4768,17 +4768,6 @@ void kvm_arch_sync_dirty_log(struct kvm kvm, struct kvm_memory_slot memslot)
		kvm_x86_ops->flush_log_dirty(kvm);
		}

		void kvm_arch_flush_remote_tlbs_memslot(struct kvm *kvm,
		struct kvm_memory_slot *memslot)
		{
		/*
		* All the TLBs can be flushed out of mmu lock, see the comments in
		* kvm_mmu_slot_remove_write_access().
		*/
		lockdep_assert_held(&kvm->slots_lock);
		kvm_flush_remote_tlbs(kvm);
		}

		int kvm_vm_ioctl_irq_line(struct kvm kvm, struct kvm_irq_level irq_event,
		bool line_status)
		{

Admin message