From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753318AbcGSHWf (ORCPT ); Tue, 19 Jul 2016 03:22:35 -0400 Received: from terminus.zytor.com ([198.137.202.10]:46028 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752761AbcGSHWa (ORCPT ); Tue, 19 Jul 2016 03:22:30 -0400 Date: Tue, 19 Jul 2016 00:21:52 -0700 From: tip-bot for Richard Cochran Message-ID: Cc: bigeasy@linutronix.de, linux-kernel@vger.kernel.org, marc.zyngier@arm.com, hpa@zytor.com, tglx@linutronix.de, rcochran@linutronix.de, christoffer.dall@linaro.org, gleb@kernel.org, rkrcmar@redhat.com, anna-maria@linutronix.de, peterz@infradead.org, pbonzini@redhat.com, torvalds@linux-foundation.org, mingo@kernel.org Reply-To: torvalds@linux-foundation.org, mingo@kernel.org, gleb@kernel.org, pbonzini@redhat.com, rkrcmar@redhat.com, peterz@infradead.org, anna-maria@linutronix.de, rcochran@linutronix.de, christoffer.dall@linaro.org, hpa@zytor.com, marc.zyngier@arm.com, tglx@linutronix.de, bigeasy@linutronix.de, linux-kernel@vger.kernel.org In-Reply-To: <20160713153336.634155707@linutronix.de> References: <20160713153336.634155707@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:smp/hotplug] arm/kvm/arch_timer: Convert to hotplug state machine Git-Commit-ID: b3c9950a5c75983c0a2fcc93760f53ba52da3c85 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b3c9950a5c75983c0a2fcc93760f53ba52da3c85 Gitweb: http://git.kernel.org/tip/b3c9950a5c75983c0a2fcc93760f53ba52da3c85 Author: Richard Cochran AuthorDate: Wed, 13 Jul 2016 17:16:47 +0000 Committer: Ingo Molnar CommitDate: Fri, 15 Jul 2016 10:40:27 +0200 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: Richard Cochran Signed-off-by: Anna-Maria Gleixner Reviewed-by: Sebastian Andrzej Siewior Cc: Christoffer Dall Cc: Gleb Natapov Cc: Linus Torvalds Cc: Marc Zyngier Cc: Paolo Bonzini Cc: Peter Zijlstra Cc: Radim Krcmar Cc: Thomas Gleixner 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: Ingo Molnar --- include/linux/cpuhotplug.h | 1 + virt/kvm/arm/arch_timer.c | 35 +++++++++++------------------------ 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index ff37cac..88986c9 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -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, diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index e2d5b6f..4fde8c7 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -405,26 +405,17 @@ 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 NOTIFY_OK; + kvm_timer_init_interrupt(NULL); + return 0; } -static struct notifier_block kvm_timer_cpu_nb = { - .notifier_call = kvm_timer_cpu_notify, -}; +static int kvm_timer_dying_cpu(unsigned int cpu) +{ + disable_percpu_irq(host_vtimer_irq); + return 0; +} int kvm_timer_hyp_init(void) { @@ -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());