From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S970245AbdDTL0J (ORCPT ); Thu, 20 Apr 2017 07:26:09 -0400 Received: from terminus.zytor.com ([65.50.211.136]:33253 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S970228AbdDTL0F (ORCPT ); Thu, 20 Apr 2017 07:26:05 -0400 Date: Thu, 20 Apr 2017 04:23:27 -0700 From: tip-bot for Sebastian Andrzej Siewior Message-ID: Cc: tglx@linutronix.de, bigeasy@linutronix.de, fenghua.yu@intel.com, peterz@infradead.org, mingo@kernel.org, rostedt@goodmis.org, hpa@zytor.com, linux-kernel@vger.kernel.org Reply-To: mingo@kernel.org, peterz@infradead.org, hpa@zytor.com, rostedt@goodmis.org, bigeasy@linutronix.de, tglx@linutronix.de, fenghua.yu@intel.com, linux-kernel@vger.kernel.org In-Reply-To: <20170418170553.191578891@linutronix.de> References: <20170418170553.191578891@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: 88840592a3483951be52f3ed35f4c4348dc9eed9 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: 88840592a3483951be52f3ed35f4c4348dc9eed9 Gitweb: http://git.kernel.org/tip/88840592a3483951be52f3ed35f4c4348dc9eed9 Author: Sebastian Andrzej Siewior AuthorDate: Tue, 18 Apr 2017 19:04:52 +0200 Committer: Thomas Gleixner CommitDate: Thu, 20 Apr 2017 13:08:53 +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. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: Fenghua Yu Cc: Steven Rostedt Link: http://lkml.kernel.org/r/20170418170553.191578891@linutronix.de --- arch/x86/events/intel/cqm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/events/intel/cqm.c b/arch/x86/events/intel/cqm.c index 8c00dc0..2d4a842 100644 --- a/arch/x86/events/intel/cqm.c +++ b/arch/x86/events/intel/cqm.c @@ -1746,12 +1746,12 @@ 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();