Skip to content

Commit

Permalink
sched: Remove unnecessary RCU exclusion
Browse files Browse the repository at this point in the history
As Nick pointed out, and realized by myself when doing:
   sched: Fix balance vs hotplug race
the patch:
   sched: for_each_domain() vs RCU

is wrong, sched_domains are freed after synchronize_sched(), which
means disabling preemption is enough.

Reported-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Dec 9, 2009
1 parent 6cecd08 commit fb58bac
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions kernel/sched_fair.c
Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 +1403,6 @@ static int select_task_rq_fair(struct task_struct *p, int sd_flag, int wake_flag
new_cpu = prev_cpu;
}

rcu_read_lock();
for_each_domain(cpu, tmp) {
/*
* If power savings logic is enabled for a domain, see if we
Expand Down Expand Up @@ -1484,10 +1483,8 @@ static int select_task_rq_fair(struct task_struct *p, int sd_flag, int wake_flag
update_shares(tmp);
}

if (affine_sd && wake_affine(affine_sd, p, sync)) {
new_cpu = cpu;
goto out;
}
if (affine_sd && wake_affine(affine_sd, p, sync))
return cpu;

while (sd) {
int load_idx = sd->forkexec_idx;
Expand Down Expand Up @@ -1528,8 +1525,6 @@ static int select_task_rq_fair(struct task_struct *p, int sd_flag, int wake_flag
/* while loop will break here if sd == NULL */
}

out:
rcu_read_unlock();
return new_cpu;
}
#endif /* CONFIG_SMP */
Expand Down

0 comments on commit fb58bac

Please sign in to comment.