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

KVM: x86/mmu: Add typedefs for rmap/iter handlers 



Add typedefs for the MMU handlers that are invoked when walking the MMU
SPTEs (rmaps in legacy MMU) to act on a host virtual address range.

No functional change intended.

Cc: Ben Gardon <bgardon@google.com>
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210226010329.1766033-5-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e12b785e

arch/x86/kvm/mmu/mmu.c

+10 −17
Original line number Diff line number Diff line
@@ -1424,17 +1424,15 @@ static void slot_rmap_walk_next(struct slot_rmap_walk_iterator *iterator) 
	     slot_rmap_walk_okay(_iter_);				\

	     slot_rmap_walk_next(_iter_))



static __always_inline int

kvm_handle_hva_range(struct kvm *kvm,

typedef int (*rmap_handler_t)(struct kvm *kvm, struct kvm_rmap_head *rmap_head,

			      struct kvm_memory_slot *slot, gfn_t gfn,

			      int level, unsigned long data);



static __always_inline int kvm_handle_hva_range(struct kvm *kvm,

						unsigned long start,

						unsigned long end,

						unsigned long data,

		     int (*handler)(struct kvm *kvm,

				    struct kvm_rmap_head *rmap_head,

				    struct kvm_memory_slot *slot,

				    gfn_t gfn,

				    int level,

				    unsigned long data))

						rmap_handler_t handler)

{

	struct kvm_memslots *slots;

	struct kvm_memory_slot *memslot;
@@ -1473,12 +1471,7 @@ kvm_handle_hva_range(struct kvm *kvm, 
}



static int kvm_handle_hva(struct kvm *kvm, unsigned long hva,

			  unsigned long data,

			  int (*handler)(struct kvm *kvm,

					 struct kvm_rmap_head *rmap_head,

					 struct kvm_memory_slot *slot,

					 gfn_t gfn, int level,

					 unsigned long data))

			  unsigned long data, rmap_handler_t handler)

{

	return kvm_handle_hva_range(kvm, hva, hva + 1, data, handler);

}

arch/x86/kvm/mmu/tdp_mmu.c

+9 −11
Original line number Diff line number Diff line
@@ -877,17 +877,15 @@ int kvm_tdp_mmu_map(struct kvm_vcpu *vcpu, gpa_t gpa, u32 error_code, 
	return ret;

}



static __always_inline int

kvm_tdp_mmu_handle_hva_range(struct kvm *kvm,

typedef int (*tdp_handler_t)(struct kvm *kvm, struct kvm_memory_slot *slot,

			     struct kvm_mmu_page *root, gfn_t start, gfn_t end,

			     unsigned long data);



static __always_inline int kvm_tdp_mmu_handle_hva_range(struct kvm *kvm,

							unsigned long start,

							unsigned long end,

							unsigned long data,

			     int (*handler)(struct kvm *kvm,

					    struct kvm_memory_slot *slot,

					    struct kvm_mmu_page *root,

					    gfn_t start,

					    gfn_t end,

					    unsigned long data))

							tdp_handler_t handler)

{

	struct kvm_memslots *slots;

	struct kvm_memory_slot *memslot;