Commit 44bcc922 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-arm-for-4-7-take2' of... 

Merge tag 'kvm-arm-for-4-7-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-next

KVM/ARM Changes for v4.7 take 2

"The GIC is dead; Long live the GIC"

This set of changes include the new vgic, which is a reimplementation of
our horribly broken legacy vgic implementation.  The two implementations
will live side-by-side (with the new being the configured default) for
one kernel release and then we'll remove it.

Also fixes a non-critical issue with virtual abort injection to guests.
parents 9842df62 35a2d585

arch/arm/include/asm/kvm_host.h

+6 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ 


#define KVM_MAX_VCPUS VGIC_V2_MAX_CPUS



#define KVM_REQ_VCPU_EXIT	8



u32 *kvm_vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num, u32 mode);

int __attribute_const__ kvm_target_cpu(void);

int kvm_reset_vcpu(struct kvm_vcpu *vcpu);
@@ -226,6 +228,10 @@ static inline void kvm_arch_mmu_notifier_invalidate_page(struct kvm *kvm, 


struct kvm_vcpu *kvm_arm_get_running_vcpu(void);

struct kvm_vcpu __percpu **kvm_get_running_vcpus(void);

void kvm_arm_halt_guest(struct kvm *kvm);

void kvm_arm_resume_guest(struct kvm *kvm);

void kvm_arm_halt_vcpu(struct kvm_vcpu *vcpu);

void kvm_arm_resume_vcpu(struct kvm_vcpu *vcpu);



int kvm_arm_copy_coproc_indices(struct kvm_vcpu *vcpu, u64 __user *uindices);

unsigned long kvm_arm_num_coproc_regs(struct kvm_vcpu *vcpu);

arch/arm/include/asm/kvm_mmio.h

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ struct kvm_decode { 
	bool sign_extend;

};



void kvm_mmio_write_buf(void *buf, unsigned int len, unsigned long data);

unsigned long kvm_mmio_read_buf(const void *buf, unsigned int len);



int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run);

int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,

		 phys_addr_t fault_ipa);

arch/arm/kvm/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -46,6 +46,13 @@ config KVM_ARM_HOST 
	---help---

	  Provides host support for ARM processors.



config KVM_NEW_VGIC

	bool "New VGIC implementation"

	depends on KVM

	default y

	---help---

	  uses the new VGIC implementation



source drivers/vhost/Kconfig



endif # VIRTUALIZATION

arch/arm/kvm/Makefile

+11 −0
Original line number Diff line number Diff line
@@ -21,7 +21,18 @@ obj-$(CONFIG_KVM_ARM_HOST) += hyp/ 
obj-y += kvm-arm.o init.o interrupts.o

obj-y += arm.o handle_exit.o guest.o mmu.o emulate.o reset.o

obj-y += coproc.o coproc_a15.o coproc_a7.o mmio.o psci.o perf.o



ifeq ($(CONFIG_KVM_NEW_VGIC),y)

obj-y += $(KVM)/arm/vgic/vgic.o

obj-y += $(KVM)/arm/vgic/vgic-init.o

obj-y += $(KVM)/arm/vgic/vgic-irqfd.o

obj-y += $(KVM)/arm/vgic/vgic-v2.o

obj-y += $(KVM)/arm/vgic/vgic-mmio.o

obj-y += $(KVM)/arm/vgic/vgic-mmio-v2.o

obj-y += $(KVM)/arm/vgic/vgic-kvm-device.o

else

obj-y += $(KVM)/arm/vgic.o

obj-y += $(KVM)/arm/vgic-v2.o

obj-y += $(KVM)/arm/vgic-v2-emul.o

endif

obj-y += $(KVM)/arm/arch_timer.o

arch/arm/kvm/arm.c

+22 −15
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ static void update_vttbr(struct kvm *kvm) 
static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu)

{

	struct kvm *kvm = vcpu->kvm;

	int ret;

	int ret = 0;



	if (likely(vcpu->arch.has_run_once))

		return 0;
@@ -482,9 +482,9 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu) 
	 * interrupts from the virtual timer with a userspace gic.

	 */

	if (irqchip_in_kernel(kvm) && vgic_initialized(kvm))

		kvm_timer_enable(kvm);

		ret = kvm_timer_enable(vcpu);



	return 0;

	return ret;

}



bool kvm_arch_intc_initialized(struct kvm *kvm)
@@ -492,30 +492,37 @@ bool kvm_arch_intc_initialized(struct kvm *kvm) 
	return vgic_initialized(kvm);

}



static void kvm_arm_halt_guest(struct kvm *kvm) __maybe_unused;

static void kvm_arm_resume_guest(struct kvm *kvm) __maybe_unused;



static void kvm_arm_halt_guest(struct kvm *kvm)

void kvm_arm_halt_guest(struct kvm *kvm)

{

	int i;

	struct kvm_vcpu *vcpu;



	kvm_for_each_vcpu(i, vcpu, kvm)

		vcpu->arch.pause = true;

	force_vm_exit(cpu_all_mask);

	kvm_make_all_cpus_request(kvm, KVM_REQ_VCPU_EXIT);

}



static void kvm_arm_resume_guest(struct kvm *kvm)

void kvm_arm_halt_vcpu(struct kvm_vcpu *vcpu)

{

	int i;

	struct kvm_vcpu *vcpu;

	vcpu->arch.pause = true;

	kvm_vcpu_kick(vcpu);

}



	kvm_for_each_vcpu(i, vcpu, kvm) {

void kvm_arm_resume_vcpu(struct kvm_vcpu *vcpu)

{

	struct swait_queue_head *wq = kvm_arch_vcpu_wq(vcpu);



	vcpu->arch.pause = false;

	swake_up(wq);

}



void kvm_arm_resume_guest(struct kvm *kvm)

{

	int i;

	struct kvm_vcpu *vcpu;



	kvm_for_each_vcpu(i, vcpu, kvm)

		kvm_arm_resume_vcpu(vcpu);

}



static void vcpu_sleep(struct kvm_vcpu *vcpu)

CRA Git | Maintained and supported by SUSTech CRA and CCSE