sched: move p->nr_cpus_allowed to select_task_rq
PATCH 1/1 sched: move p->nr_cpus_allowed to select_task_rq
Move p->nr_cpus_allowed check into kernel/sched/core.c: select_task_rq(). This change will make fair.c, rt.c, and deadline.c all start with the same logic.
Suggested-by Steven Rostedt <[email protected]>
Signed-off-by Wanpeng Li <[email protected]>
--- kernel/sched/core.c | 3 ++- kernel/sched/deadline.c | 3 --- kernel/sched/fair.c | 3 --- kernel/sched/rt.c | 3 --- 4 files changed, 2 insertions(+), 10 deletions(-)
kernel/sched/core.c +2 -1
@@ -1411,7 +1411,8 @@ out:static inline int select_task_rq (struct task_struct *p,int cpu,int sd_flags,int wake_flags) { - cpu = p->sched_class->select_task_rq (p, cpu, sd_flags, wake_flags); +if (p->nr_cpus_allowed >1 ) + cpu = p->sched_class->select_task_rq (p, cpu, sd_flags, wake_flags);/* * In order not to call set_task_cpu() on a blocking task we need
kernel/sched/deadline.c +0 -3
@@ -928,9 +928,6 @@ select_task_rq_dl(struct task_struct *p, int cpu, int sd_flag, int flags)struct task_struct *curr;struct rq *rq; -if (p->nr_cpus_allowed ==1 ) - goto out; -if (sd_flag !=SD_BALANCE_WAKE ) goto out;
kernel/sched/fair.c +0 -3
@@ -4723,9 +4723,6 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_fint want_affine =0 ;int sync = wake_flags &WF_SYNC ; -if (p->nr_cpus_allowed ==1 ) -return prev_cpu; -if (sd_flag &SD_BALANCE_WAKE ) want_affine =cpumask_test_cpu (cpu,tsk_cpus_allowed (p));
kernel/sched/rt.c +0 -3
@@ -1301,9 +1301,6 @@ select_task_rq_rt(struct task_struct *p, int cpu, int sd_flag, int flags)struct task_struct *curr;struct rq *rq; -if (p->nr_cpus_allowed ==1 ) - goto out; -/* For anything but wake ups, just return the task_cpu */ if (sd_flag !=SD_BALANCE_WAKE && sd_flag !=SD_BALANCE_FORK ) goto out;
Signature · 1 line
1.9.1
Quoted 4 lines · On Wed, 5 Nov 2014 09:14:37 +0800 Wanpeng Li <[email protected]>…
Move
p->nr_cpus_allowedcheck intokernel/sched/core.c:select_task_rq(). This change will makefair.c,rt.c, anddeadline.call start with the same logic.
Acked-by Steven Rostedt <[email protected]>
-- Steve
Quoted 10 lines
Suggested-by Steven Rostedt <[email protected]>Signed-off-by Wanpeng Li <[email protected]>--- kernel/sched/core.c | 3 ++- kernel/sched/deadline.c | 3 --- kernel/sched/fair.c | 3 --- kernel/sched/rt.c | 3 --- 4 files changed, 2 insertions(+), 10 deletions(-)
tip-bot for Wanpeng Li
merge bot[tip:sched/core] sched: Move p-> nr_cpus_allowed check to select_task_rq()
In reply to Wanpeng Lisched: Move p->nr_cpus_allowed check to select_task_rq()
Commit-ID: 6c1d9410f007a26d13173cf17204cfd965f49b83 Gitweb: http://git.kernel.org/tip/6c1d9410f007a26d13173cf17204cfd965f49b83 Author: Wanpeng Li <[email protected]> AuthorDate: Wed, 5 Nov 2014 09:14:37 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 16 Nov 2014 10:58:55 +0100
sched: Move p->nr_cpus_allowed check to select_task_rq()
Move the p->nr_cpus_allowed check into kernel/sched/core.c: select_task_rq(). This change will make fair.c, rt.c, and deadline.c all start with the same logic.
Suggested-and-Acked-by Steven Rostedt <[email protected]>
Signed-off-by Wanpeng Li <[email protected]>
Signed-off-by Peter Zijlstra (Intel) <[email protected]>
Cc "pang.xunlei" <[email protected]>
Cc Linus Torvalds <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- kernel/sched/core.c | 3 ++- kernel/sched/deadline.c | 3 --- kernel/sched/fair.c | 3 --- kernel/sched/rt.c | 3 --- 4 files changed, 2 insertions(+), 10 deletions(-)
kernel/sched/core.c +2 -1
@@ -1411,7 +1411,8 @@ out:static inline int select_task_rq (struct task_struct *p,int cpu,int sd_flags,int wake_flags) { - cpu = p->sched_class->select_task_rq (p, cpu, sd_flags, wake_flags); +if (p->nr_cpus_allowed >1 ) + cpu = p->sched_class->select_task_rq (p, cpu, sd_flags, wake_flags);/* * In order not to call set_task_cpu() on a blocking task we need
kernel/sched/deadline.c +0 -3
@@ -928,9 +928,6 @@ select_task_rq_dl(struct task_struct *p, int cpu, int sd_flag, int flags)struct task_struct *curr;struct rq *rq; -if (p->nr_cpus_allowed ==1 ) - goto out; -if (sd_flag !=SD_BALANCE_WAKE ) goto out;
kernel/sched/fair.c +0 -3
@@ -4730,9 +4730,6 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_fint want_affine =0 ;int sync = wake_flags &WF_SYNC ; -if (p->nr_cpus_allowed ==1 ) -return prev_cpu; -if (sd_flag &SD_BALANCE_WAKE ) want_affine =cpumask_test_cpu (cpu,tsk_cpus_allowed (p));
kernel/sched/rt.c +0 -3
@@ -1301,9 +1301,6 @@ select_task_rq_rt(struct task_struct *p, int cpu, int sd_flag, int flags)struct task_struct *curr;struct rq *rq; -if (p->nr_cpus_allowed ==1 ) - goto out; -/* For anything but wake ups, just return the task_cpu */ if (sd_flag !=SD_BALANCE_WAKE && sd_flag !=SD_BALANCE_FORK ) goto out;