From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S970174AbdDTLZB (ORCPT ); Thu, 20 Apr 2017 07:25:01 -0400 Received: from terminus.zytor.com ([65.50.211.136]:47019 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968092AbdDTLY7 (ORCPT ); Thu, 20 Apr 2017 07:24:59 -0400 Date: Thu, 20 Apr 2017 04:21:25 -0700 From: tip-bot for Sebastian Andrzej Siewior Message-ID: Cc: rafael.j.wysocki@intel.com, viresh.kumar@linaro.org, peterz@infradead.org, mingo@kernel.org, rostedt@goodmis.org, linux-kernel@vger.kernel.org, bigeasy@linutronix.de, tglx@linutronix.de, hpa@zytor.com Reply-To: tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, bigeasy@linutronix.de, mingo@kernel.org, rostedt@goodmis.org, rafael.j.wysocki@intel.com, viresh.kumar@linaro.org, peterz@infradead.org In-Reply-To: <20170418170552.865966021@linutronix.de> References: <20170418170552.865966021@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:smp/hotplug] cpufreq: Use cpuhp_setup_state_nocalls_cpuslocked() Git-Commit-ID: 6d7d2f1f9e6e0c2d6fb9de82ad5fbc3aed115829 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: 6d7d2f1f9e6e0c2d6fb9de82ad5fbc3aed115829 Gitweb: http://git.kernel.org/tip/6d7d2f1f9e6e0c2d6fb9de82ad5fbc3aed115829 Author: Sebastian Andrzej Siewior AuthorDate: Tue, 18 Apr 2017 19:04:48 +0200 Committer: Thomas Gleixner CommitDate: Thu, 20 Apr 2017 13:08:52 +0200 cpufreq: Use cpuhp_setup_state_nocalls_cpuslocked() cpufreq holds get_online_cpus() while invoking cpuhp_setup_state_nocalls() to make subsys_interface_register() and the registration of hotplug calls atomic versus cpu hotplug. cpuhp_setup_state_nocalls() invokes get_online_cpus() as well. This is correct, but prevents the conversion of the hotplug locking to a percpu rwsem. Use cpuhp_setup/remove_state_nocalls_cpuslocked() to avoid the nested call. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Thomas Gleixner Acked-by: "Rafael J. Wysocki" Acked-by: Viresh Kumar Cc: linux-pm@vger.kernel.org Cc: Peter Zijlstra Cc: Steven Rostedt Link: http://lkml.kernel.org/r/20170418170552.865966021@linutronix.de --- drivers/cpufreq/cpufreq.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 0e3f649..67ef7ce 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -2473,9 +2473,10 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data) goto err_if_unreg; } - ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "cpufreq:online", - cpuhp_cpufreq_online, - cpuhp_cpufreq_offline); + ret = cpuhp_setup_state_nocalls_cpuslocked(CPUHP_AP_ONLINE_DYN, + "cpufreq:online", + cpuhp_cpufreq_online, + cpuhp_cpufreq_offline); if (ret < 0) goto err_if_unreg; hp_online = ret; @@ -2519,7 +2520,7 @@ int cpufreq_unregister_driver(struct cpufreq_driver *driver) get_online_cpus(); subsys_interface_unregister(&cpufreq_interface); remove_boost_sysfs_file(); - cpuhp_remove_state_nocalls(hp_online); + cpuhp_remove_state_nocalls_cpuslocked(hp_online); write_lock_irqsave(&cpufreq_driver_lock, flags);