From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753323AbcGSHXJ (ORCPT ); Tue, 19 Jul 2016 03:23:09 -0400 Received: from terminus.zytor.com ([198.137.202.10]:46050 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753071AbcGSHXF (ORCPT ); Tue, 19 Jul 2016 03:23:05 -0400 Date: Tue, 19 Jul 2016 00:22:26 -0700 From: tip-bot for Richard Cochran Message-ID: Cc: hpa@zytor.com, bigeasy@linutronix.de, james.hogan@imgtec.com, rcochran@linutronix.de, alexander.shishkin@linux.intel.com, acme@kernel.org, torvalds@linux-foundation.org, peterz@infradead.org, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, anna-maria@linutronix.de Reply-To: peterz@infradead.org, tglx@linutronix.de, mingo@kernel.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, anna-maria@linutronix.de, hpa@zytor.com, acme@kernel.org, alexander.shishkin@linux.intel.com, james.hogan@imgtec.com, bigeasy@linutronix.de, rcochran@linutronix.de In-Reply-To: <20160713153336.717395164@linutronix.de> References: <20160713153336.717395164@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:smp/hotplug] metag/perf: Convert to hotplug state machine Git-Commit-ID: 04d045a681122c806e4f17754ed48e2b19af5d80 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: 04d045a681122c806e4f17754ed48e2b19af5d80 Gitweb: http://git.kernel.org/tip/04d045a681122c806e4f17754ed48e2b19af5d80 Author: Richard Cochran AuthorDate: Wed, 13 Jul 2016 17:16:49 +0000 Committer: Ingo Molnar CommitDate: Fri, 15 Jul 2016 10:40:27 +0200 metag/perf: 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: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: James Hogan Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-metag@vger.kernel.org Cc: rt@linutronix.de Link: http://lkml.kernel.org/r/20160713153336.717395164@linutronix.de Signed-off-by: Ingo Molnar --- arch/metag/kernel/perf/perf_event.c | 26 +++++++------------------- include/linux/cpuhotplug.h | 1 + 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/arch/metag/kernel/perf/perf_event.c b/arch/metag/kernel/perf/perf_event.c index 33a365f..052cba2 100644 --- a/arch/metag/kernel/perf/perf_event.c +++ b/arch/metag/kernel/perf/perf_event.c @@ -806,25 +806,16 @@ static struct metag_pmu _metag_pmu = { }; /* PMU CPU hotplug notifier */ -static int metag_pmu_cpu_notify(struct notifier_block *b, unsigned long action, - void *hcpu) +static int metag_pmu_starting_cpu(unsigned int cpu) { - unsigned int cpu = (unsigned int)hcpu; struct cpu_hw_events *cpuc = &per_cpu(cpu_hw_events, cpu); - if ((action & ~CPU_TASKS_FROZEN) != CPU_STARTING) - return NOTIFY_DONE; - memset(cpuc, 0, sizeof(struct cpu_hw_events)); raw_spin_lock_init(&cpuc->pmu_lock); - return NOTIFY_OK; + return 0; } -static struct notifier_block metag_pmu_notifier = { - .notifier_call = metag_pmu_cpu_notify, -}; - /* PMU Initialisation */ static int __init init_hw_perf_events(void) { @@ -876,16 +867,13 @@ static int __init init_hw_perf_events(void) metag_out32(0, PERF_COUNT(0)); metag_out32(0, PERF_COUNT(1)); - for_each_possible_cpu(cpu) { - struct cpu_hw_events *cpuc = &per_cpu(cpu_hw_events, cpu); + cpuhp_setup_state(CPUHP_AP_PERF_METAG_STARTING, + "AP_PERF_METAG_STARTING", metag_pmu_starting_cpu, + NULL); - memset(cpuc, 0, sizeof(struct cpu_hw_events)); - raw_spin_lock_init(&cpuc->pmu_lock); - } - - register_cpu_notifier(&metag_pmu_notifier); ret = perf_pmu_register(&pmu, metag_pmu->name, PERF_TYPE_RAW); -out: + if (ret) + cpuhp_remove_state_nocalls(CPUHP_AP_PERF_METAG_STARTING); return ret; } early_initcall(init_hw_perf_events); diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 88986c9..990052c 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -34,6 +34,7 @@ enum cpuhp_state { CPUHP_AP_PERF_X86_CQM_STARTING, CPUHP_AP_PERF_X86_CSTATE_STARTING, CPUHP_AP_PERF_XTENSA_STARTING, + CPUHP_AP_PERF_METAG_STARTING, CPUHP_AP_ARM_VFP_STARTING, CPUHP_AP_PERF_ARM_STARTING, CPUHP_AP_ARM_ARCH_TIMER_STARTING,