Re: [Patch] cpufreq: fix a deadlock during shutting down

[Xiaotian Feng]

On Tue, Feb 9, 2010 at 5:10 PM, Amerigo Wang <amwang@xxxxxxxxxx> wrote:
>
> 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@xxxxxxxxx>
> Reported-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
> Signed-off-by: WANG Cong <amwang@xxxxxxxxxx>
> Cc: Dave Jones <davej@xxxxxxxxxx>
> Cc: Thomas Renninger <trenn@xxxxxxx>
> Cc: Prarit Bhargava <prarit@xxxxxxxxxx>
> Cc: Venkatesh Pallipadi <venkatesh.pallipadi@xxxxxxxxx>
>
> ---
> 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

Then kernel will wait_for_completion(&data->kobj_unregister); forever.....

> @@ -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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/