提交 50c668d6 编写于 作者: I Ingo Molnar

Revert "cpumask: use work_on_cpu in acpi-cpufreq.c for drv_read and drv_write"

This reverts commit 7503bfba.

Dieter Ries reported bootup soft-hangs and bisected it back to
this commit, and reverting this commit gave him a working system.

The commit introduces work_on_cpu() use into the cpufreq code,
but that is subtly problematic from a lock hierarchy POV: the
hotplug-cpu lock is an highlevel lock that is taken before
lowlevel locks, and in this codepath we are called with the
policy lock taken.

Dieter did not have lockdep enabled so we dont have a nice stack
trace proof for this, but using work_on_cpu() in such a lowlevel
place certainly looks wrong, so we revert the patch.

work_on_cpu() needs to be reworked to be more generally usable.
Reported-by: NDieter Ries <clip2@gmx.de>
Tested-by: NDieter Ries <clip2@gmx.de>
Signed-off-by: NIngo Molnar <mingo@elte.hu>
上级 2bc13797
......@@ -150,9 +150,8 @@ struct drv_cmd {
u32 val;
};
static long do_drv_read(void *_cmd)
static void do_drv_read(struct drv_cmd *cmd)
{
struct drv_cmd *cmd = _cmd;
u32 h;
switch (cmd->type) {
......@@ -167,12 +166,10 @@ static long do_drv_read(void *_cmd)
default:
break;
}
return 0;
}
static long do_drv_write(void *_cmd)
static void do_drv_write(struct drv_cmd *cmd)
{
struct drv_cmd *cmd = _cmd;
u32 lo, hi;
switch (cmd->type) {
......@@ -189,23 +186,30 @@ static long do_drv_write(void *_cmd)
default:
break;
}
return 0;
}
static void drv_read(struct drv_cmd *cmd)
{
cpumask_t saved_mask = current->cpus_allowed;
cmd->val = 0;
work_on_cpu(cpumask_any(cmd->mask), do_drv_read, cmd);
set_cpus_allowed_ptr(current, cmd->mask);
do_drv_read(cmd);
set_cpus_allowed_ptr(current, &saved_mask);
}
static void drv_write(struct drv_cmd *cmd)
{
cpumask_t saved_mask = current->cpus_allowed;
unsigned int i;
for_each_cpu(i, cmd->mask) {
work_on_cpu(i, do_drv_write, cmd);
set_cpus_allowed_ptr(current, cpumask_of(i));
do_drv_write(cmd);
}
set_cpus_allowed_ptr(current, &saved_mask);
return;
}
static u32 get_cur_val(const struct cpumask *mask)
......@@ -231,15 +235,10 @@ static u32 get_cur_val(const struct cpumask *mask)
return 0;
}
if (unlikely(!alloc_cpumask_var(&cmd.mask, GFP_KERNEL)))
return 0;
cpumask_copy(cmd.mask, mask);
drv_read(&cmd);
free_cpumask_var(cmd.mask);
dprintk("get_cur_val = %u\n", cmd.val);
return cmd.val;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册