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

Commit 9befad23 authored by James Hogan's avatar James Hogan Committed by Paolo Bonzini
Browse files

MIPS: KVM: Don't indirect KVM functions 



Several KVM module functions are indirected so that they can be accessed
from tlb.c which is statically built into the kernel. This is no longer
necessary as the relevant bits of code have moved into mmu.c which is
part of the KVM module, so drop the indirections.

Note: is_error_pfn() is defined inline in kvm_host.h, so didn't actually
require the KVM module to be loaded for it to work anyway.

Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 403015b3

arch/mips/include/asm/kvm_host.h

+0 −3
Original line number Diff line number Diff line
@@ -93,9 +93,6 @@ 
#define KVM_INVALID_ADDR		0xdeadbeef



extern atomic_t kvm_mips_instance;

extern kvm_pfn_t (*kvm_mips_gfn_to_pfn)(struct kvm *kvm, gfn_t gfn);

extern void (*kvm_mips_release_pfn_clean)(kvm_pfn_t pfn);

extern bool (*kvm_mips_is_error_pfn)(kvm_pfn_t pfn);



struct kvm_vm_stat {

	u32 remote_tlb_flush;

arch/mips/kvm/mips.c

+1 −17
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ void kvm_mips_free_vcpus(struct kvm *kvm) 
	/* Put the pages we reserved for the guest pmap */

	for (i = 0; i < kvm->arch.guest_pmap_npages; i++) {

		if (kvm->arch.guest_pmap[i] != KVM_INVALID_PAGE)

			kvm_mips_release_pfn_clean(kvm->arch.guest_pmap[i]);

			kvm_release_pfn_clean(kvm->arch.guest_pmap[i]);

	}

	kfree(kvm->arch.guest_pmap);
@@ -1645,18 +1645,6 @@ static int __init kvm_mips_init(void) 


	register_die_notifier(&kvm_mips_csr_die_notifier);



	/*

	 * On MIPS, kernel modules are executed from "mapped space", which

	 * requires TLBs. The TLB handling code is statically linked with

	 * the rest of the kernel (tlb.c) to avoid the possibility of

	 * double faulting. The issue is that the TLB code references

	 * routines that are part of the the KVM module, which are only

	 * available once the module is loaded.

	 */

	kvm_mips_gfn_to_pfn = gfn_to_pfn;

	kvm_mips_release_pfn_clean = kvm_release_pfn_clean;

	kvm_mips_is_error_pfn = is_error_pfn;



	return 0;

}
@@ -1664,10 +1652,6 @@ static void __exit kvm_mips_exit(void) 
{

	kvm_exit();



	kvm_mips_gfn_to_pfn = NULL;

	kvm_mips_release_pfn_clean = NULL;

	kvm_mips_is_error_pfn = NULL;



	unregister_die_notifier(&kvm_mips_csr_die_notifier);

}

arch/mips/kvm/mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ static int kvm_mips_map_page(struct kvm *kvm, gfn_t gfn) 
		return 0;



	srcu_idx = srcu_read_lock(&kvm->srcu);

	pfn = kvm_mips_gfn_to_pfn(kvm, gfn);

	pfn = gfn_to_pfn(kvm, gfn);



	if (kvm_mips_is_error_pfn(pfn)) {

	if (is_error_pfn(pfn)) {

		kvm_err("Couldn't get pfn for gfn %#llx!\n", gfn);

		err = -EFAULT;

		goto out;

arch/mips/kvm/tlb.c

+0 −10
Original line number Diff line number Diff line
@@ -35,16 +35,6 @@ 
atomic_t kvm_mips_instance;

EXPORT_SYMBOL_GPL(kvm_mips_instance);



/* These function pointers are initialized once the KVM module is loaded */

kvm_pfn_t (*kvm_mips_gfn_to_pfn)(struct kvm *kvm, gfn_t gfn);

EXPORT_SYMBOL_GPL(kvm_mips_gfn_to_pfn);



void (*kvm_mips_release_pfn_clean)(kvm_pfn_t pfn);

EXPORT_SYMBOL_GPL(kvm_mips_release_pfn_clean);



bool (*kvm_mips_is_error_pfn)(kvm_pfn_t pfn);

EXPORT_SYMBOL_GPL(kvm_mips_is_error_pfn);



static u32 kvm_mips_get_kernel_asid(struct kvm_vcpu *vcpu)

{

	int cpu = smp_processor_id();