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

Commit b3c9950a authored by Richard Cochran's avatar Richard Cochran Committed by Ingo Molnar
Browse files

arm/kvm/arch_timer: Convert to hotplug state machine 



Install the callbacks via the state machine and let the core invoke
the callbacks on the already online CPUs.

Signed-off-by: default avatarRichard Cochran <rcochran@linutronix.de>
Signed-off-by: default avatarAnna-Maria Gleixner <anna-maria@linutronix.de>
Reviewed-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Christoffer Dall <christoffer.dall@linaro.org>
Cc: Gleb Natapov <gleb@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Radim Krcmar <rkrcmar@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: kvm@vger.kernel.org
Cc: kvmarm@lists.cs.columbia.edu
Cc: linux-arm-kernel@lists.infradead.org
Cc: rt@linutronix.de
Link: http://lkml.kernel.org/r/20160713153336.634155707@linutronix.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 42ec50b5

include/linux/cpuhotplug.h

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ enum cpuhp_state { 
	CPUHP_AP_MIPS_GIC_TIMER_STARTING,

	CPUHP_AP_KVM_STARTING,

	CPUHP_AP_KVM_ARM_VGIC_STARTING,

	CPUHP_AP_KVM_ARM_TIMER_STARTING,

	CPUHP_AP_LEDTRIG_STARTING,

	CPUHP_AP_NOTIFY_STARTING,

	CPUHP_AP_ONLINE,

virt/kvm/arm/arch_timer.c

+11 −24
Original line number Diff line number Diff line
@@ -405,27 +405,18 @@ u64 kvm_arm_timer_get_reg(struct kvm_vcpu *vcpu, u64 regid) 
	return (u64)-1;

}



static int kvm_timer_cpu_notify(struct notifier_block *self,

				unsigned long action, void *cpu)

static int kvm_timer_starting_cpu(unsigned int cpu)

{

	switch (action) {

	case CPU_STARTING:

	case CPU_STARTING_FROZEN:

	kvm_timer_init_interrupt(NULL);

		break;

	case CPU_DYING:

	case CPU_DYING_FROZEN:

		disable_percpu_irq(host_vtimer_irq);

		break;

	return 0;

}



	return NOTIFY_OK;

static int kvm_timer_dying_cpu(unsigned int cpu)

{

	disable_percpu_irq(host_vtimer_irq);

	return 0;

}



static struct notifier_block kvm_timer_cpu_nb = {

	.notifier_call = kvm_timer_cpu_notify,

};



int kvm_timer_hyp_init(void)

{

	struct arch_timer_kvm_info *info;
@@ -449,12 +440,6 @@ int kvm_timer_hyp_init(void) 
		goto out;

	}



	err = __register_cpu_notifier(&kvm_timer_cpu_nb);

	if (err) {

		kvm_err("Cannot register timer CPU notifier\n");

		goto out_free;

	}



	wqueue = create_singlethread_workqueue("kvm_arch_timer");

	if (!wqueue) {

		err = -ENOMEM;
@@ -462,8 +447,10 @@ int kvm_timer_hyp_init(void) 
	}



	kvm_info("virtual timer IRQ%d\n", host_vtimer_irq);

	on_each_cpu(kvm_timer_init_interrupt, NULL, 1);



	cpuhp_setup_state(CPUHP_AP_KVM_ARM_TIMER_STARTING,

			  "AP_KVM_ARM_TIMER_STARTING", kvm_timer_starting_cpu,

			  kvm_timer_dying_cpu);

	goto out;

out_free:

	free_percpu_irq(host_vtimer_irq, kvm_get_running_vcpus());