Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b445ad4 authored by Paul Mackerras's avatar Paul Mackerras Committed by Alexander Graf
Browse files

KVM: PPC: Book3S HV: Make a HPTE removal function available 



This makes a HPTE removal function, kvmppc_do_h_remove(), available
outside book3s_hv_rm_mmu.c.  This will be used by the HPT writing
code.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 44e5f6be

arch/powerpc/include/asm/kvm_book3s.h

+3 −0
Original line number Diff line number Diff line
@@ -160,6 +160,9 @@ extern long kvmppc_virtmode_h_enter(struct kvm_vcpu *vcpu, unsigned long flags, 
extern long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,

			long pte_index, unsigned long pteh, unsigned long ptel,

			pgd_t *pgdir, bool realmode, unsigned long *idx_ret);

extern long kvmppc_do_h_remove(struct kvm *kvm, unsigned long flags,

			unsigned long pte_index, unsigned long avpn,

			unsigned long *hpret);

extern long kvmppc_hv_get_dirty_log(struct kvm *kvm,

			struct kvm_memory_slot *memslot, unsigned long *map);

arch/powerpc/kvm/book3s_hv_rm_mmu.c

+13 −6
Original line number Diff line number Diff line
@@ -365,11 +365,10 @@ static inline int try_lock_tlbie(unsigned int *lock) 
	return old == 0;

}



long kvmppc_h_remove(struct kvm_vcpu *vcpu, unsigned long flags,

long kvmppc_do_h_remove(struct kvm *kvm, unsigned long flags,

			unsigned long pte_index, unsigned long avpn,

		     unsigned long va)

			unsigned long *hpret)

{

	struct kvm *kvm = vcpu->kvm;

	unsigned long *hpte;

	unsigned long v, r, rb;

	struct revmap_entry *rev;
@@ -411,10 +410,18 @@ long kvmppc_h_remove(struct kvm_vcpu *vcpu, unsigned long flags, 
	note_hpte_modification(kvm, rev);

	unlock_hpte(hpte, 0);



	vcpu->arch.gpr[4] = v;

	vcpu->arch.gpr[5] = r;

	hpret[0] = v;

	hpret[1] = r;

	return H_SUCCESS;

}

EXPORT_SYMBOL_GPL(kvmppc_do_h_remove);



long kvmppc_h_remove(struct kvm_vcpu *vcpu, unsigned long flags,

		     unsigned long pte_index, unsigned long avpn)

{

	return kvmppc_do_h_remove(vcpu->kvm, flags, pte_index, avpn,

				  &vcpu->arch.gpr[4]);

}



long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu)

{