From: Yi Wang <wang.yi59@zte.com.cn>
To: mingo@redhat.com
Cc: peterz@infradead.org, linux-kernel@vger.kernel.org,
wang.yi59@zte.com.cn, zhong.weidong@zte.com.cn,
liu.yi24@zte.com.cn
Subject: [PATCH] sched/numa: fix choosing isolated CPUs when task_numa_migrate()
Date: Mon, 22 Oct 2018 11:05:16 +0800 [thread overview]
Message-ID: <1540177516-38613-1-git-send-email-wang.yi59@zte.com.cn> (raw)
When trying to migrate to a CPU in task_numa_migrate(), we invoke
task_numa_find_cpu() to choose a spot, in which function we skip
the CPU which is not in cpus_allowed, but forgot to concern the
isolated CPUs, and this may cause the task would run on the isolcpus.
This patch fixes this issue by checking the load_balance_mask.
Signed-off-by: Yi Wang <wang.yi59@zte.com.cn>
Reviewed-by: Yi Liu <liu.yi24@zte.com.cn>
---
kernel/sched/fair.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 908c9cd..0fa0cee 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -1709,6 +1709,7 @@ static void task_numa_compare(struct task_numa_env *env,
rcu_read_unlock();
}
+static int is_cpu_load_balance(int cpu);
static void task_numa_find_cpu(struct task_numa_env *env,
long taskimp, long groupimp)
{
@@ -1731,6 +1732,9 @@ static void task_numa_find_cpu(struct task_numa_env *env,
if (!cpumask_test_cpu(cpu, &env->p->cpus_allowed))
continue;
+ if (!is_cpu_load_balance(cpu))
+ continue;
+
env->dst_cpu = cpu;
task_numa_compare(env, taskimp, groupimp, maymove);
}
@@ -8528,6 +8532,12 @@ static int should_we_balance(struct lb_env *env)
return balance_cpu == env->dst_cpu;
}
+static int is_cpu_load_balance(int cpu)
+{
+ struct cpumask *cpus = this_cpu_cpumask_var_ptr(load_balance_mask);
+
+ return cpumask_test_cpu(cpu, cpus);
+}
+
/*
* Check this_cpu to ensure it is balanced within domain. Attempt to move
* tasks if there is an imbalance.
--
1.8.3.1
next reply other threads:[~2018-10-22 3:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-22 3:05 Yi Wang [this message]
2018-10-23 17:36 ` [PATCH] sched/numa: fix choosing isolated CPUs when task_numa_migrate() Srikar Dronamraju
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1540177516-38613-1-git-send-email-wang.yi59@zte.com.cn \
--to=wang.yi59@zte.com.cn \
--cc=linux-kernel@vger.kernel.org \
--cc=liu.yi24@zte.com.cn \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=zhong.weidong@zte.com.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).