linux-kernel - [Patch] cpufreq: fix a deadlock during shutting down

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20100209091408.29971.63921.sendpatchset@localhost.localdomain>
Date:	Tue, 9 Feb 2010 04:10:41 -0500
From:	Amerigo Wang <amwang@...hat.com>
To:	linux-kernel@...r.kernel.org
Cc:	Xiaotian Feng <xtfeng@...il.com>,
	Benjamin Herrenschmidt <benh@...nel.crashing.org>,
	Dave Jones <davej@...hat.com>, cpufreq@...r.kernel.org,
	Amerigo Wang <amwang@...hat.com>,
	Prarit Bhargava <prarit@...hat.com>,
	Thomas Renninger <trenn@...e.de>, akpm@...ux-foundation.org,
	Venkatesh Pallipadi <venkatesh.pallipadi@...el.com>
Subject: [Patch] cpufreq: fix a deadlock during shutting down


Benjamin reported that, the machine deadlocks right after printing the
following when doing a shutdown:

halt/4071 is trying to acquire lock:
 (s_active){++++.+}, at: [<c0000000001ef868>] .sysfs_addrm_finish+0x58/0xc0

but task is already holding lock:
 (&per_cpu(cpu_policy_rwsem, cpu)){+.+.+.}, at: [<c0000000004cd6ac>] .lock_policy_rwsem_write+0x84/0xf4

which lock already depends on the new lock.

the existing dependency chain (in reverse order) is:

<nothing else ... machine deadlocked here>


This is because we are trying to kobject_put() a kobject while
we are holding cpu policy rwsem. So just move kobject_put()
down after releasing the rwsem.

Totally untested.

Reported-by: Xiaotian Feng <xtfeng@...il.com>
Reported-by: Benjamin Herrenschmidt <benh@...nel.crashing.org>
Signed-off-by: WANG Cong <amwang@...hat.com>
Cc: Dave Jones <davej@...hat.com>
Cc: Thomas Renninger <trenn@...e.de>
Cc: Prarit Bhargava <prarit@...hat.com>
Cc: Venkatesh Pallipadi <venkatesh.pallipadi@...el.com>

---
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 67bc2ec..222b35f 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1113,6 +1113,7 @@ static int __cpufreq_remove_dev(struct sys_device *sys_dev)
 	unsigned int cpu = sys_dev->id;
 	unsigned long flags;
 	struct cpufreq_policy *data;
+	struct kobject *kobj;
 #ifdef CONFIG_SMP
 	struct sys_device *cpu_sys_dev;
 	unsigned int j;
@@ -1192,7 +1193,7 @@ static int __cpufreq_remove_dev(struct sys_device *sys_dev)
 	if (cpufreq_driver->target)
 		__cpufreq_governor(data, CPUFREQ_GOV_STOP);
 
-	kobject_put(&data->kobj);
+	kobj = &data->kobj;
 
 	/* we need to make sure that the underlying kobj is actually
 	 * not referenced anymore by anybody before we proceed with
@@ -1207,6 +1208,7 @@ static int __cpufreq_remove_dev(struct sys_device *sys_dev)
 
 	unlock_policy_rwsem_write(cpu);
 
+	kobject_put(kobj);
 	free_cpumask_var(data->related_cpus);
 	free_cpumask_var(data->cpus);
 	kfree(data);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/