Commit 2ba9f0d8 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Alexander Graf
Browse files

kvm: powerpc: book3s: Support building HV and PR KVM as module 



Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
[agraf: squash in compile fix]
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent dba291f2

arch/powerpc/kvm/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ config KVM_BOOK3S_64 
	  If unsure, say N.



config KVM_BOOK3S_64_HV

	bool "KVM support for POWER7 and PPC970 using hypervisor mode in host"

	tristate "KVM support for POWER7 and PPC970 using hypervisor mode in host"

	depends on KVM_BOOK3S_64

	select KVM_BOOK3S_HV_POSSIBLE

	select MMU_NOTIFIER
@@ -94,8 +94,8 @@ config KVM_BOOK3S_64_HV 
	  If unsure, say N.



config KVM_BOOK3S_64_PR

	bool "KVM support without using hypervisor mode in host"

	depends on KVM_BOOK3S_64 && !KVM_BOOK3S_64_HV

	tristate "KVM support without using hypervisor mode in host"

	depends on KVM_BOOK3S_64

	select KVM_BOOK3S_PR_POSSIBLE

	---help---

	  Support running guest kernels in virtual machines on processors

arch/powerpc/kvm/Makefile

+8 −3
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ kvm-objs-$(CONFIG_KVM_E500MC) := $(kvm-e500mc-objs) 
kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HANDLER) := \

	book3s_64_vio_hv.o



kvm-book3s_64-objs-$(CONFIG_KVM_BOOK3S_64_PR) := \

kvm-pr-y := \

	fpu.o \

	book3s_paired_singles.o \

	book3s_pr.o \
@@ -76,7 +76,7 @@ kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HANDLER) += \ 
	book3s_rmhandlers.o

endif



kvm-book3s_64-objs-$(CONFIG_KVM_BOOK3S_64_HV)  += \

kvm-hv-y += \

	book3s_hv.o \

	book3s_hv_interrupts.o \

	book3s_64_mmu_hv.o
@@ -84,13 +84,15 @@ kvm-book3s_64-objs-$(CONFIG_KVM_BOOK3S_64_HV) += \ 
kvm-book3s_64-builtin-xics-objs-$(CONFIG_KVM_XICS) := \

	book3s_hv_rm_xics.o



kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HV) += \

ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HANDLER) += \

	book3s_hv_rmhandlers.o \

	book3s_hv_rm_mmu.o \

	book3s_hv_ras.o \

	book3s_hv_builtin.o \

	book3s_hv_cma.o \

	$(kvm-book3s_64-builtin-xics-objs-y)

endif



kvm-book3s_64-objs-$(CONFIG_KVM_XICS) += \

	book3s_xics.o
@@ -131,4 +133,7 @@ obj-$(CONFIG_KVM_E500MC) += kvm.o 
obj-$(CONFIG_KVM_BOOK3S_64) += kvm.o

obj-$(CONFIG_KVM_BOOK3S_32) += kvm.o



obj-$(CONFIG_KVM_BOOK3S_64_PR) += kvm-pr.o

obj-$(CONFIG_KVM_BOOK3S_64_HV) += kvm-hv.o



obj-y += $(kvm-book3s_64-builtin-objs-y)

arch/powerpc/kvm/book3s.c

+11 −1
Original line number Diff line number Diff line
@@ -170,28 +170,32 @@ void kvmppc_book3s_queue_irqprio(struct kvm_vcpu *vcpu, unsigned int vec) 
	printk(KERN_INFO "Queueing interrupt %x\n", vec);

#endif

}



EXPORT_SYMBOL_GPL(kvmppc_book3s_queue_irqprio);



void kvmppc_core_queue_program(struct kvm_vcpu *vcpu, ulong flags)

{

	/* might as well deliver this straight away */

	kvmppc_inject_interrupt(vcpu, BOOK3S_INTERRUPT_PROGRAM, flags);

}

EXPORT_SYMBOL_GPL(kvmppc_core_queue_program);



void kvmppc_core_queue_dec(struct kvm_vcpu *vcpu)

{

	kvmppc_book3s_queue_irqprio(vcpu, BOOK3S_INTERRUPT_DECREMENTER);

}

EXPORT_SYMBOL_GPL(kvmppc_core_queue_dec);



int kvmppc_core_pending_dec(struct kvm_vcpu *vcpu)

{

	return test_bit(BOOK3S_IRQPRIO_DECREMENTER, &vcpu->arch.pending_exceptions);

}

EXPORT_SYMBOL_GPL(kvmppc_core_pending_dec);



void kvmppc_core_dequeue_dec(struct kvm_vcpu *vcpu)

{

	kvmppc_book3s_dequeue_irqprio(vcpu, BOOK3S_INTERRUPT_DECREMENTER);

}

EXPORT_SYMBOL_GPL(kvmppc_core_dequeue_dec);



void kvmppc_core_queue_external(struct kvm_vcpu *vcpu,

                                struct kvm_interrupt *irq)
@@ -329,6 +333,7 @@ int kvmppc_core_prepare_to_enter(struct kvm_vcpu *vcpu) 


	return 0;

}

EXPORT_SYMBOL_GPL(kvmppc_core_prepare_to_enter);



pfn_t kvmppc_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn, bool writing,

			bool *writable)
@@ -354,6 +359,7 @@ pfn_t kvmppc_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn, bool writing, 


	return gfn_to_pfn_prot(vcpu->kvm, gfn, writing, writable);

}

EXPORT_SYMBOL_GPL(kvmppc_gfn_to_pfn);



static int kvmppc_xlate(struct kvm_vcpu *vcpu, ulong eaddr, bool data,

			bool iswrite, struct kvmppc_pte *pte)
@@ -421,6 +427,7 @@ int kvmppc_st(struct kvm_vcpu *vcpu, ulong *eaddr, int size, void *ptr, 


	return EMULATE_DONE;

}

EXPORT_SYMBOL_GPL(kvmppc_st);



int kvmppc_ld(struct kvm_vcpu *vcpu, ulong *eaddr, int size, void *ptr,

		      bool data)
@@ -451,6 +458,7 @@ int kvmppc_ld(struct kvm_vcpu *vcpu, ulong *eaddr, int size, void *ptr, 
mmio:

	return EMULATE_DO_MMIO;

}

EXPORT_SYMBOL_GPL(kvmppc_ld);



int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)

{
@@ -706,6 +714,7 @@ void kvmppc_set_msr(struct kvm_vcpu *vcpu, u64 msr) 
{

	kvmppc_ops->set_msr(vcpu, msr);

}

EXPORT_SYMBOL_GPL(kvmppc_set_msr);



int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)

{
@@ -787,6 +796,7 @@ int kvm_unmap_hva(struct kvm *kvm, unsigned long hva) 
{

	return kvmppc_ops->unmap_hva(kvm, hva);

}

EXPORT_SYMBOL_GPL(kvm_unmap_hva);



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

{

arch/powerpc/kvm/book3s_emulate.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ int kvmppc_core_emulate_op_pr(struct kvm_run *run, struct kvm_vcpu *vcpu, 
			vcpu->arch.mmu.tlbie(vcpu, addr, large);

			break;

		}

#ifdef CONFIG_KVM_BOOK3S_64_PR

#ifdef CONFIG_PPC_BOOK3S_64

		case OP_31_XOP_FAKE_SC1:

		{

			/* SC 1 papr hypercalls */

arch/powerpc/kvm/book3s_hv.c

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include <linux/vmalloc.h>

#include <linux/highmem.h>

#include <linux/hugetlb.h>

#include <linux/module.h>



#include "book3s.h"
@@ -2215,3 +2216,4 @@ static void kvmppc_book3s_exit_hv(void) 


module_init(kvmppc_book3s_init_hv);

module_exit(kvmppc_book3s_exit_hv);

MODULE_LICENSE("GPL");