From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1425598AbdEZIlC (ORCPT ); Fri, 26 May 2017 04:41:02 -0400 Received: from terminus.zytor.com ([65.50.211.136]:48893 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422836AbdEZIk5 (ORCPT ); Fri, 26 May 2017 04:40:57 -0400 Date: Fri, 26 May 2017 01:38:24 -0700 From: tip-bot for Sebastian Andrzej Siewior Message-ID: Cc: peterz@infradead.org, mingo@kernel.org, paulmck@linux.vnet.ibm.com, fenghua.yu@intel.com, bigeasy@linutronix.de, hpa@zytor.com, tglx@linutronix.de, rostedt@goodmis.org, linux-kernel@vger.kernel.org Reply-To: linux-kernel@vger.kernel.org, rostedt@goodmis.org, tglx@linutronix.de, hpa@zytor.com, bigeasy@linutronix.de, peterz@infradead.org, fenghua.yu@intel.com, paulmck@linux.vnet.ibm.com, mingo@kernel.org In-Reply-To: <20170524081548.075604046@linutronix.de> References: <20170524081548.075604046@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:smp/hotplug] perf/x86/intel/cqm: Use cpuhp_setup_state_cpuslocked() Git-Commit-ID: 04b247c2ebdd6ba1c46c7c22546229a89760b43a 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: 04b247c2ebdd6ba1c46c7c22546229a89760b43a Gitweb: http://git.kernel.org/tip/04b247c2ebdd6ba1c46c7c22546229a89760b43a Author: Sebastian Andrzej Siewior AuthorDate: Wed, 24 May 2017 10:15:24 +0200 Committer: Thomas Gleixner CommitDate: Fri, 26 May 2017 10:10:40 +0200 perf/x86/intel/cqm: Use cpuhp_setup_state_cpuslocked() intel_cqm_init() holds get_online_cpus() while registerring the hotplug callbacks. cpuhp_setup_state() invokes get_online_cpus() as well. This is correct, but prevents the conversion of the hotplug locking to a percpu rwsem. Use cpuhp_setup_state_cpuslocked() to avoid the nested call. Convert *_online_cpus() to the new interfaces while at it. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Cc: Paul E. McKenney Cc: Fenghua Yu Cc: Peter Zijlstra Cc: Steven Rostedt Link: http://lkml.kernel.org/r/20170524081548.075604046@linutronix.de --- arch/x86/events/intel/cqm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/x86/events/intel/cqm.c b/arch/x86/events/intel/cqm.c index 8c00dc0..2521f77 100644 --- a/arch/x86/events/intel/cqm.c +++ b/arch/x86/events/intel/cqm.c @@ -1682,7 +1682,7 @@ static int __init intel_cqm_init(void) * * Also, check that the scales match on all cpus. */ - get_online_cpus(); + cpus_read_lock(); for_each_online_cpu(cpu) { struct cpuinfo_x86 *c = &cpu_data(cpu); @@ -1746,14 +1746,14 @@ static int __init intel_cqm_init(void) * Setup the hot cpu notifier once we are sure cqm * is enabled to avoid notifier leak. */ - cpuhp_setup_state(CPUHP_AP_PERF_X86_CQM_STARTING, - "perf/x86/cqm:starting", - intel_cqm_cpu_starting, NULL); - cpuhp_setup_state(CPUHP_AP_PERF_X86_CQM_ONLINE, "perf/x86/cqm:online", - NULL, intel_cqm_cpu_exit); - + cpuhp_setup_state_cpuslocked(CPUHP_AP_PERF_X86_CQM_STARTING, + "perf/x86/cqm:starting", + intel_cqm_cpu_starting, NULL); + cpuhp_setup_state_cpuslocked(CPUHP_AP_PERF_X86_CQM_ONLINE, + "perf/x86/cqm:online", + NULL, intel_cqm_cpu_exit); out: - put_online_cpus(); + cpus_read_unlock(); if (ret) { kfree(str);