Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2254133ybg; Sun, 27 Oct 2019 14:28:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqxPIiwTYWI4b6eR4Rz5PZjrn2cnsFAxp7VnhStpeVlh5g7K+IGWsAZn96YCAE/cF2zmAu3H X-Received: by 2002:a17:906:40d:: with SMTP id d13mr13532737eja.272.1572211730820; Sun, 27 Oct 2019 14:28:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572211730; cv=none; d=google.com; s=arc-20160816; b=vtpJvKBvmcq+wHFnGgVslrDsPJOwthoFUCNg30xOfR8pedH4KgH9nlknRCV5RoqKAn YjgJuTZhQzGMvMtY78gNedH9U5w1sP2AGn7t3Tae0p9lNxMUS+t63t30NVIhmc546x21 QsKMQyGx7Cqy8tWh6hoPEtfTrZXnDmDuvZqFSWNfookJNsvjEtDcP6qTSXDLswoomMv2 oDYyZTnfA5NncRGzGbaxjM9/7n/8AJ0RqPWTLevVoPnOjBdoKF4qeRmlEUqb95QA1qb3 KlU+G2EICsWSXqaEyiZabSelNwBymgU0enwUzmhchPvImzoD7dWM9XyfgPzGIEX0D6dl MpAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hPMAX8uMDhbbeV4MO4RZLmhz7MSymSb8TiPQNqVCOws=; b=g5IgWrwjW6f88dJC0Pw3xaIb97gxsK1+a07hY32ND55q3KYfZqgBf6BAPqYeIrQdIp tdeGFjJd8Ree0HZxX5k06KzQ5guFEs7cCNbu4vk+WZCbRVFjwXJ7qd8mnsu0ChD8nLFB hgS5nW4P7ljyOa69bEuLbOh+2Dk6gcERu3+e6cTaLyoMxQfsBNnXqL06QV+v/nxz//xC y9ShcfDYfbqUTRCk177ZWZJRYHEye1F3ezIY7CvL64HSCvqWyGh4LM1B3yezN1sAnB5C IKE/MntJCtjdFQGPPZusLQa7fDwDnCkqs9xOFuHavKUc+wss7Cdw1N+MFXcAhixi9Xzw hvdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GYeb7yId; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k63si6620553edc.347.2019.10.27.14.28.27; Sun, 27 Oct 2019 14:28:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GYeb7yId; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731362AbfJ0V1C (ORCPT + 99 others); Sun, 27 Oct 2019 17:27:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:47664 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731951AbfJ0VZr (ORCPT ); Sun, 27 Oct 2019 17:25:47 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D5C3D21D81; Sun, 27 Oct 2019 21:25:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211545; bh=ajNWyUIB9j30wVqpM3yEv3nGoOtf1fhGnU0PTi2r/uM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GYeb7yIdzLXM4OpttIrCEzCR+i5fCX5xPEtrAa22vM7dVOt9O2b9vCUNhjp6c1CmQ sBNIdQ9NO4RMwbsBVmmlmSx/tEkBYE4vX2ia5/mI2jQIw1WnZRARGWmX+0s2WOZAbT so2lU1oPTS6aHtp3u1/J4X/ra4YKxN/coD0EBkTQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , "Rafael J. Wysocki" , Viresh Kumar Subject: [PATCH 5.3 190/197] cpufreq: Avoid cpufreq_suspend() deadlock on system shutdown Date: Sun, 27 Oct 2019 22:01:48 +0100 Message-Id: <20191027203406.745335828@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rafael J. Wysocki commit 65650b35133ff20f0c9ef0abd5c3c66dbce3ae57 upstream. It is incorrect to set the cpufreq syscore shutdown callback pointer to cpufreq_suspend(), because that function cannot be run in the syscore stage of system shutdown for two reasons: (a) it may attempt to carry out actions depending on devices that have already been shut down at that point and (b) the RCU synchronization carried out by it may not be able to make progress then. The latter issue has been present since commit 45975c7d21a1 ("rcu: Define RCU-sched API in terms of RCU for Tree RCU PREEMPT builds"), but the former one has been there since commit 90de2a4aa9f3 ("cpufreq: suspend cpufreq governors on shutdown") regardless. Fix that by dropping cpufreq_syscore_ops altogether and making device_shutdown() call cpufreq_suspend() directly before shutting down devices, which is along the lines of what system-wide power management does. Fixes: 45975c7d21a1 ("rcu: Define RCU-sched API in terms of RCU for Tree RCU PREEMPT builds") Fixes: 90de2a4aa9f3 ("cpufreq: suspend cpufreq governors on shutdown") Reported-by: Ville Syrjälä Tested-by: Ville Syrjälä Signed-off-by: Rafael J. Wysocki Acked-by: Viresh Kumar Cc: 4.0+ # 4.0+ Signed-off-by: Greg Kroah-Hartman --- drivers/base/core.c | 3 +++ drivers/cpufreq/cpufreq.c | 10 ---------- 2 files changed, 3 insertions(+), 10 deletions(-) --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include @@ -3150,6 +3151,8 @@ void device_shutdown(void) wait_for_device_probe(); device_block_probing(); + cpufreq_suspend(); + spin_lock(&devices_kset->list_lock); /* * Walk the devices list backward, shutting down each in turn. --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -2746,14 +2746,6 @@ int cpufreq_unregister_driver(struct cpu } EXPORT_SYMBOL_GPL(cpufreq_unregister_driver); -/* - * Stop cpufreq at shutdown to make sure it isn't holding any locks - * or mutexes when secondary CPUs are halted. - */ -static struct syscore_ops cpufreq_syscore_ops = { - .shutdown = cpufreq_suspend, -}; - struct kobject *cpufreq_global_kobject; EXPORT_SYMBOL(cpufreq_global_kobject); @@ -2765,8 +2757,6 @@ static int __init cpufreq_core_init(void cpufreq_global_kobject = kobject_create_and_add("cpufreq", &cpu_subsys.dev_root->kobj); BUG_ON(!cpufreq_global_kobject); - register_syscore_ops(&cpufreq_syscore_ops); - return 0; } module_param(off, int, 0444);