sched/fair: Fix wrong cpu selecting from isolated domain
PATCH 1/1 sched/fair: Fix wrong cpu selecting from isolated domain
We've met problems that occasionally tasks with full cpumask (e.g. by putting it into a cpuset or setting to full affinity) were migrated to our isolated cpus in production environment.
After some analysis, we found that it is due to the current select_idle_smt() not considering the sched_domain mask.
Fix it by checking the valid domain mask in select_idle_smt().
--- kernel/sched/fair.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
kernel/sched/fair.c +5 -4
@@ -6075,7 +6075,7 @@ static int select_idle_core(struct task_struct *p, struct sched_domain *sd, int/* * Scan the local SMT mask for idle CPUs. */ -static int select_idle_smt (struct task_struct *p,int target) +static int select_idle_smt (struct task_struct *p,struct sched_domain *sd,int target) {int cpu;
@@ -6083,7 +6083,8 @@ static int select_idle_smt(struct task_struct *p, int target)return -1 ;for_each_cpu (cpu,cpu_smt_mask (target)) { -if (!cpumask_test_cpu (cpu, p->cpus_ptr)) +if (!cpumask_test_cpu (cpu, p->cpus_ptr) || + !cpumask_test_cpu (cpu,sched_domain_span (sd)))continue ;if (available_idle_cpu (cpu) ||sched_idle_cpu (cpu))return cpu;
@@ -6099,7 +6100,7 @@ static inline int select_idle_core(struct task_struct *p, struct sched_domain *sreturn -1 ; } -static inline int select_idle_smt (struct task_struct *p,int target) +static inline int select_idle_smt (struct task_struct *p,struct sched_domain *sd,int target) {return -1 ; }
@@ -6274,7 +6275,7 @@ static int select_idle_sibling(struct task_struct *p, int prev, int target)if ((unsigned )i < nr_cpumask_bits)return i; - i =select_idle_smt (p, target); + i =select_idle_smt (p, sd, target);if ((unsigned )i < nr_cpumask_bits)return i;
Signature · 1 line
1.8.3.1
Quoted 30 lines · Xunlei Pang
We've met problems that occasionally tasks with full cpumask (e.g. by putting it into a cpuset or setting to full affinity) were migrated to our isolated cpus in production environment.
After some analysis, we found that it is due to the current
select_idle_smt()not considering thesched_domainmask.Fix it by checking the valid domain mask in
select_idle_smt().Fixes 10e2f1acd010 ("sched/core: Rewrite and improve select_idle_siblings())Reported-by Wetp Zhang <[email protected]>Signed-off-by Xunlei Pang <[email protected]>--- kernel/sched/fair.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)kernel/sched/fair.c +1
-1@@ -6075,7 +6075,7 @@ static int select_idle_core(struct task_struct *p, struct sched_domain *sd, int/* * Scan the local SMT mask for idle CPUs. */ -static int select_idle_smt (struct task_struct *p,int target) +static int select_idle_smt (struct task_struct *p,struct sched_domain *sd,int target) {int cpu;
kernel/sched/fair.c static int select_idle_smt(struct task_struct *p, int target) · line 6088
Quoted 7 lines
kernel/sched/fair.c +2
-1@@ -6083,7 +6083,8 @@ static int select_idle_smt(struct task_struct *p, int target)return -1 ;for_each_cpu (cpu,cpu_smt_mask (target)) { -if (!cpumask_test_cpu (cpu, p->cpus_ptr)) +if (!cpumask_test_cpu (cpu, p->cpus_ptr) || + !cpumask_test_cpu (cpu,sched_domain_span (sd)))continue ;
Don't think this is right thing to do. What if this task had set a cpumask that doesn't cover all the cpus in this sched_domain_span(sd)
cpu_smt_mask(target) would already limit to the sched_domain_span(sd) so I am not sure how this can help?
Signature · 2 lines
Thanks and Regards Srikar Dronamraju
Quoted 34 lines · Srikar Dronamraju
Quoted 32 lines · Xunlei Pang
We've met problems that occasionally tasks with full cpumask (e.g. by putting it into a cpuset or setting to full affinity) were migrated to our isolated cpus in production environment.
After some analysis, we found that it is due to the current
select_idle_smt()not considering thesched_domainmask.Fix it by checking the valid domain mask in
select_idle_smt().Fixes 10e2f1acd010 ("sched/core: Rewrite and improve select_idle_siblings())Reported-by Wetp Zhang <[email protected]>Signed-off-by Xunlei Pang <[email protected]>--- kernel/sched/fair.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)kernel/sched/fair.c +1
-1@@ -6075,7 +6075,7 @@ static int select_idle_core(struct task_struct *p, struct sched_domain *sd, int/* * Scan the local SMT mask for idle CPUs. */ -static int select_idle_smt (struct task_struct *p,int target) +static int select_idle_smt (struct task_struct *p,struct sched_domain *sd,int target) {int cpu;@@ -6083,7 +6083,8 @@ static int select_idle_smt(struct task_struct *p, int target)return -1 ;
Quoted 8 lines
kernel/sched/fair.c static int select_idle_smt(struct task_struct *p, int target) · line 6088
Quoted 5 lines
kernel/sched/fair.c +2
-1for_each_cpu (cpu,cpu_smt_mask (target)) { -if (!cpumask_test_cpu (cpu, p->cpus_ptr)) +if (!cpumask_test_cpu (cpu, p->cpus_ptr) || + !cpumask_test_cpu (cpu,sched_domain_span (sd)))continue ;Don't think this is right thing to do. What if this task had set a cpumask that doesn't cover all the cpus in this
sched_domain_span(sd)
It doesn't matter, without this patch, it selects an idle cpu from:
"cpu_smt_mask(target) and p->cpus_ptr"
with this patch, it selects an idle cpu from:
"cpu_smt_mask(target) and p->cpus_ptr and sched_domain_span(sd)"
Quoted 5 lines
cpu_smt_mask(target)would already limit to thesched_domain_span(sd)so I am not sure how this can help?
Here is an example:
CPU0 and CPU16 are hyper-thread pair, CPU16 is domain isolated. So its sd_llc doesn't contain CPU16, and cpu_smt_mask(0) is 0 and 16.
Then we have @target is 0, select_idle_smt() may return the isolated(and idle) CPU16 without this patch.
Quoted 35 lines · xunlei
Quoted 34 lines · Srikar Dronamraju
Quoted 32 lines · Xunlei Pang
We've met problems that occasionally tasks with full cpumask (e.g. by putting it into a cpuset or setting to full affinity) were migrated to our isolated cpus in production environment.
After some analysis, we found that it is due to the current
select_idle_smt()not considering thesched_domainmask.Fix it by checking the valid domain mask in
select_idle_smt().Fixes 10e2f1acd010 ("sched/core: Rewrite and improve select_idle_siblings())Reported-by Wetp Zhang <[email protected]>Signed-off-by Xunlei Pang <[email protected]>--- kernel/sched/fair.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)kernel/sched/fair.c +1
-1@@ -6075,7 +6075,7 @@ static int select_idle_core(struct task_struct *p, struct sched_domain *sd, int/* * Scan the local SMT mask for idle CPUs. */ -static int select_idle_smt (struct task_struct *p,int target) +static int select_idle_smt (struct task_struct *p,struct sched_domain *sd,int target) {int cpu;@@ -6083,7 +6083,8 @@ static int select_idle_smt(struct task_struct *p, int target)return -1 ;
Quoted 8 lines
Quoted 8 lines
kernel/sched/fair.c static int select_idle_smt(struct task_struct *p, int target) · line 6088
Quoted 5 lines
kernel/sched/fair.c +2
-1for_each_cpu (cpu,cpu_smt_mask (target)) { -if (!cpumask_test_cpu (cpu, p->cpus_ptr)) +if (!cpumask_test_cpu (cpu, p->cpus_ptr) || + !cpumask_test_cpu (cpu,sched_domain_span (sd)))continue ;Don't think this is right thing to do. What if this task had set a cpumask that doesn't cover all the cpus in this
sched_domain_span(sd)
ah, right I missed the 'or' part.
Quoted 13 lines
It doesn't matter, without this patch, it selects an idle cpu from:
"cpu_smt_mask(target)andp->cpus_ptr"with this patch, it selects an idle cpu from:
"cpu_smt_mask(target)andp->cpus_ptrandsched_domain_span(sd)"Quoted 5 lines
cpu_smt_mask(target)would already limit to thesched_domain_span(sd)so I am not sure how this can help?
Quoted 6 lines
Here is an example:
CPU0 and CPU16 are hyper-thread pair, CPU16 is domain isolated. So itssd_llcdoesn't contain CPU16, andcpu_smt_mask(0)is 0 and 16.Then we have @target is 0,
select_idle_smt()may return the isolated(and idle) CPU16 without this patch.
Okay.
Signature · 2 lines
Thanks and Regards Srikar Dronamraju
Quoted 31 lines · Xunlei Pang
We've met problems that occasionally tasks with full cpumask (e.g. by putting it into a cpuset or setting to full affinity) were migrated to our isolated cpus in production environment.
After some analysis, we found that it is due to the current
select_idle_smt()not considering thesched_domainmask.Fix it by checking the valid domain mask in
select_idle_smt().Fixes 10e2f1acd010 ("sched/core: Rewrite and improve select_idle_siblings())Reported-by Wetp Zhang <[email protected]>Signed-off-by Xunlei Pang <[email protected]>--- kernel/sched/fair.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)kernel/sched/fair.c +1
-1@@ -6075,7 +6075,7 @@ static int select_idle_core(struct task_struct *p, struct sched_domain *sd, int/* * Scan the local SMT mask for idle CPUs. */ -static int select_idle_smt (struct task_struct *p,int target) +static int select_idle_smt (struct task_struct *p,struct sched_domain *sd,int target) {int cpu;
kernel/sched/fair.c static int select_idle_smt(struct task_struct *p, int target) · line 6087
Quoted 6 lines
kernel/sched/fair.c +2
-1@@ -6083,7 +6083,8 @@ static int select_idle_smt(struct task_struct *p, int target)return -1 ;for_each_cpu (cpu,cpu_smt_mask (target)) { -if (!cpumask_test_cpu (cpu, p->cpus_ptr)) +if (!cpumask_test_cpu (cpu, p->cpus_ptr) || + !cpumask_test_cpu (cpu,sched_domain_span (sd)))
Maybe the following change could be better, :) for_each_cpu_and(cpu, cpu_smt_mask(target), sched_domain_span(sd)) keep a similar style with select_idle_core/cpu, and could reduce loops.
Just an option.
Quoted 34 lines · Jiang Biao
Quoted 33 lines · Xunlei Pang
We've met problems that occasionally tasks with full cpumask (e.g. by putting it into a cpuset or setting to full affinity) were migrated to our isolated cpus in production environment.
After some analysis, we found that it is due to the current
select_idle_smt()not considering thesched_domainmask.Fix it by checking the valid domain mask in
select_idle_smt().Fixes 10e2f1acd010 ("sched/core: Rewrite and improve select_idle_siblings())Reported-by Wetp Zhang <[email protected]>Signed-off-by Xunlei Pang <[email protected]>--- kernel/sched/fair.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)kernel/sched/fair.c +1
-1@@ -6075,7 +6075,7 @@ static int select_idle_core(struct task_struct *p, struct sched_domain *sd, int/* * Scan the local SMT mask for idle CPUs. */ -static int select_idle_smt (struct task_struct *p,int target) +static int select_idle_smt (struct task_struct *p,struct sched_domain *sd,int target) {int cpu;@@ -6083,7 +6083,8 @@ static int select_idle_smt(struct task_struct *p, int target)return -1 ;
Quoted 8 lines
kernel/sched/fair.c static int select_idle_smt(struct task_struct *p, int target) · line 6087
Quoted 4 lines
kernel/sched/fair.c +2
-1for_each_cpu (cpu,cpu_smt_mask (target)) { -if (!cpumask_test_cpu (cpu, p->cpus_ptr)) +if (!cpumask_test_cpu (cpu, p->cpus_ptr) || + !cpumask_test_cpu (cpu,sched_domain_span (sd)))Maybe the following change could be better, :)
for_each_cpu_and(cpu, cpu_smt_mask(target), sched_domain_span(sd))keep a similar style with select_idle_core/cpu, and could reduce loops.
I thought that, but given that smt mask is usually small, the original code may run a bit faster?
Quoted 3 lines
Just an option.
Reviewed-by Jiang Biao <[email protected]>
Thanks :-)
Quoted 45 lines · xunlei
Quoted 34 lines · Jiang Biao
Quoted 33 lines · Xunlei Pang
We've met problems that occasionally tasks with full cpumask (e.g. by putting it into a cpuset or setting to full affinity) were migrated to our isolated cpus in production environment.
After some analysis, we found that it is due to the current
select_idle_smt()not considering thesched_domainmask.Fix it by checking the valid domain mask in
select_idle_smt().Fixes 10e2f1acd010 ("sched/core: Rewrite and improve select_idle_siblings())Reported-by Wetp Zhang <[email protected]>Signed-off-by Xunlei Pang <[email protected]>--- kernel/sched/fair.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)kernel/sched/fair.c +1
-1@@ -6075,7 +6075,7 @@ static int select_idle_core(struct task_struct *p, struct sched_domain *sd, int/* * Scan the local SMT mask for idle CPUs. */ -static int select_idle_smt (struct task_struct *p,int target) +static int select_idle_smt (struct task_struct *p,struct sched_domain *sd,int target) {int cpu;@@ -6083,7 +6083,8 @@ static int select_idle_smt(struct task_struct *p, int target)return -1 ;Quoted 8 lines
kernel/sched/fair.c static int select_idle_smt(struct task_struct *p, int target) · line 6087
Quoted 4 lines
kernel/sched/fair.c +2
-1for_each_cpu (cpu,cpu_smt_mask (target)) { -if (!cpumask_test_cpu (cpu, p->cpus_ptr)) +if (!cpumask_test_cpu (cpu, p->cpus_ptr) || + !cpumask_test_cpu (cpu,sched_domain_span (sd)))Maybe the following change could be better, :)
for_each_cpu_and(cpu, cpu_smt_mask(target), sched_domain_span(sd))keep a similar style with select_idle_core/cpu, and could reduce loops.
Quoted 2 lines
I thought that, but given that smt mask is usually small, the original code may run a bit faster?
Not sure. :)
It's OK for me.
Regards,
Jiang
Quoted 50 lines · Xunlei Pang
We've met problems that occasionally tasks with full cpumask (e.g. by putting it into a cpuset or setting to full affinity) were migrated to our isolated cpus in production environment.
After some analysis, we found that it is due to the current
select_idle_smt()not considering thesched_domainmask.Fix it by checking the valid domain mask in
select_idle_smt().Fixes 10e2f1acd010 ("sched/core: Rewrite and improve select_idle_siblings())Reported-by Wetp Zhang <[email protected]>Signed-off-by Xunlei Pang <[email protected]>--- kernel/sched/fair.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)kernel/sched/fair.c +4
-3@@ -6075,7 +6075,7 @@ static int select_idle_core(struct task_struct *p, struct sched_domain *sd, int/* * Scan the local SMT mask for idle CPUs. */ -static int select_idle_smt (struct task_struct *p,int target) +static int select_idle_smt (struct task_struct *p,struct sched_domain *sd,int target) {int cpu;@@ -6083,7 +6083,8 @@ static int select_idle_smt(struct task_struct *p, int target)return -1 ;for_each_cpu (cpu,cpu_smt_mask (target)) { -if (!cpumask_test_cpu (cpu, p->cpus_ptr)) +if (!cpumask_test_cpu (cpu, p->cpus_ptr) || + !cpumask_test_cpu (cpu,sched_domain_span (sd)))continue ;if (available_idle_cpu (cpu) ||sched_idle_cpu (cpu))return cpu;@@ -6099,7 +6100,7 @@ static inline int select_idle_core(struct task_struct *p, struct sched_domain *sreturn -1 ; } -static inline int select_idle_smt (struct task_struct *p,int target) +static inline int select_idle_smt (struct task_struct *p,struct sched_domain *sd,int target) {return -1 ; }
kernel/sched/fair.c static int select_idle_sibling(struct task_struct *p, int prev, int target) · line 6281
Quoted 8 lines
kernel/sched/fair.c +1
-1@@ -6274,7 +6275,7 @@ static int select_idle_sibling(struct task_struct *p, int prev, int target)if ((unsigned )i < nr_cpumask_bits)return i; - i =select_idle_smt (p, target); + i =select_idle_smt (p, sd, target);if ((unsigned )i < nr_cpumask_bits)return i;
Hi Peter, any other comments?