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

KVM: PPC: Convert to the gfn-based MMU notifier callbacks 



Move PPC to the gfn-base MMU notifier APIs, and update all 15 bajillion
PPC-internal hooks to work with gfns instead of hvas.

No meaningful functional change intended, though the exact order of
operations is slightly different since the memslot lookups occur before
calling into arch code.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210402005658.3024832-6-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d923ff25

arch/powerpc/include/asm/kvm_book3s.h

+6 −6
Original line number Diff line number Diff line
@@ -210,11 +210,11 @@ extern void kvmppc_free_pgtable_radix(struct kvm *kvm, pgd_t *pgd, 
				      unsigned int lpid);

extern int kvmppc_radix_init(void);

extern void kvmppc_radix_exit(void);

extern int kvm_unmap_radix(struct kvm *kvm, struct kvm_memory_slot *memslot,

extern bool kvm_unmap_radix(struct kvm *kvm, struct kvm_memory_slot *memslot,

			    unsigned long gfn);

extern int kvm_age_radix(struct kvm *kvm, struct kvm_memory_slot *memslot,

extern bool kvm_age_radix(struct kvm *kvm, struct kvm_memory_slot *memslot,

			  unsigned long gfn);

extern int kvm_test_age_radix(struct kvm *kvm, struct kvm_memory_slot *memslot,

extern bool kvm_test_age_radix(struct kvm *kvm, struct kvm_memory_slot *memslot,

			       unsigned long gfn);

extern long kvmppc_hv_get_dirty_log_radix(struct kvm *kvm,

			struct kvm_memory_slot *memslot, unsigned long *map);

arch/powerpc/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
#include <linux/mmu_notifier.h>



#define KVM_ARCH_WANT_MMU_NOTIFIER

#define KVM_ARCH_WANT_NEW_MMU_NOTIFIER_APIS



#define HPTEG_CACHE_NUM			(1 << 15)

#define HPTEG_HASH_BITS_PTE		13

arch/powerpc/include/asm/kvm_ppc.h

+4 −5
Original line number Diff line number Diff line
@@ -281,11 +281,10 @@ struct kvmppc_ops { 
				     const struct kvm_memory_slot *old,

				     const struct kvm_memory_slot *new,

				     enum kvm_mr_change change);

	int (*unmap_hva_range)(struct kvm *kvm, unsigned long start,

			   unsigned long end);

	int (*age_hva)(struct kvm *kvm, unsigned long start, unsigned long end);

	int (*test_age_hva)(struct kvm *kvm, unsigned long hva);

	void (*set_spte_hva)(struct kvm *kvm, unsigned long hva, pte_t pte);

	bool (*unmap_gfn_range)(struct kvm *kvm, struct kvm_gfn_range *range);

	bool (*age_gfn)(struct kvm *kvm, struct kvm_gfn_range *range);

	bool (*test_age_gfn)(struct kvm *kvm, struct kvm_gfn_range *range);

	bool (*set_spte_gfn)(struct kvm *kvm, struct kvm_gfn_range *range);

	void (*free_memslot)(struct kvm_memory_slot *slot);

	int (*init_vm)(struct kvm *kvm);

	void (*destroy_vm)(struct kvm *kvm);

arch/powerpc/kvm/book3s.c

+8 −10
Original line number Diff line number Diff line
@@ -834,26 +834,24 @@ void kvmppc_core_commit_memory_region(struct kvm *kvm, 
	kvm->arch.kvm_ops->commit_memory_region(kvm, mem, old, new, change);

}



int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end,

			unsigned flags)

bool kvm_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range)

{

	return kvm->arch.kvm_ops->unmap_hva_range(kvm, start, end);

	return kvm->arch.kvm_ops->unmap_gfn_range(kvm, range);

}



int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end)

bool kvm_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range)

{

	return kvm->arch.kvm_ops->age_hva(kvm, start, end);

	return kvm->arch.kvm_ops->age_gfn(kvm, range);

}



int kvm_test_age_hva(struct kvm *kvm, unsigned long hva)

bool kvm_test_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range)

{

	return kvm->arch.kvm_ops->test_age_hva(kvm, hva);

	return kvm->arch.kvm_ops->test_age_gfn(kvm, range);

}



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

bool kvm_set_spte_gfn(struct kvm *kvm, struct kvm_gfn_range *range)

{

	kvm->arch.kvm_ops->set_spte_hva(kvm, hva, pte);

	return 0;

	return kvm->arch.kvm_ops->set_spte_gfn(kvm, range);

}



int kvmppc_core_init_vm(struct kvm *kvm)

arch/powerpc/kvm/book3s.h

+4 −6
Original line number Diff line number Diff line
@@ -9,12 +9,10 @@ 


extern void kvmppc_core_flush_memslot_hv(struct kvm *kvm,

					 struct kvm_memory_slot *memslot);

extern int kvm_unmap_hva_range_hv(struct kvm *kvm, unsigned long start,

				  unsigned long end);

extern int kvm_age_hva_hv(struct kvm *kvm, unsigned long start,

			  unsigned long end);

extern int kvm_test_age_hva_hv(struct kvm *kvm, unsigned long hva);

extern void kvm_set_spte_hva_hv(struct kvm *kvm, unsigned long hva, pte_t pte);

extern bool kvm_unmap_gfn_range_hv(struct kvm *kvm, struct kvm_gfn_range *range);

extern bool kvm_age_gfn_hv(struct kvm *kvm, struct kvm_gfn_range *range);

extern bool kvm_test_age_gfn_hv(struct kvm *kvm, struct kvm_gfn_range *range);

extern bool kvm_set_spte_gfn_hv(struct kvm *kvm, struct kvm_gfn_range *range);



extern int kvmppc_mmu_init_pr(struct kvm_vcpu *vcpu);

extern void kvmppc_mmu_destroy_pr(struct kvm_vcpu *vcpu);