From: Yuyang Du <yuyang.du@intel.com>
To: peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org
Cc: umgwanakikbuti@gmail.com, bsegall@google.com, pjt@google.com,
morten.rasmussen@arm.com, vincent.guittot@linaro.org,
dietmar.eggemann@arm.com, Yuyang Du <yuyang.du@intel.com>
Subject: [PATCH v3 3/5] sched/fair: Skip detach sched avgs for new task when changing task groups
Date: Wed, 1 Jun 2016 11:41:04 +0800 [thread overview]
Message-ID: <1464752466-3494-4-git-send-email-yuyang.du@intel.com> (raw)
In-Reply-To: <1464752466-3494-1-git-send-email-yuyang.du@intel.com>
Newly forked task has not been enqueued, so should not be removed from
cfs_rq. To do so, we need to pass the fork information all the way
from sched_move_task() to task_move_group_fair().
Signed-off-by: Yuyang Du <yuyang.du@intel.com>
---
kernel/sched/auto_group.c | 2 +-
kernel/sched/core.c | 8 ++++----
kernel/sched/fair.c | 8 ++++++--
kernel/sched/sched.h | 4 ++--
4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
index a5d966c..15f2eb7 100644
--- a/kernel/sched/auto_group.c
+++ b/kernel/sched/auto_group.c
@@ -143,7 +143,7 @@ autogroup_move_group(struct task_struct *p, struct autogroup *ag)
goto out;
for_each_thread(p, t)
- sched_move_task(t);
+ sched_move_task(t, false);
out:
unlock_task_sighand(p, &flags);
autogroup_kref_put(prev);
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 7f2cae4..ae5b8a8 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -7724,7 +7724,7 @@ void sched_offline_group(struct task_group *tg)
* by now. This function just updates tsk->se.cfs_rq and tsk->se.parent to
* reflect its new group.
*/
-void sched_move_task(struct task_struct *tsk)
+void sched_move_task(struct task_struct *tsk, bool fork)
{
struct task_group *tg;
int queued, running;
@@ -7753,7 +7753,7 @@ void sched_move_task(struct task_struct *tsk)
#ifdef CONFIG_FAIR_GROUP_SCHED
if (tsk->sched_class->task_move_group)
- tsk->sched_class->task_move_group(tsk);
+ tsk->sched_class->task_move_group(tsk, fork);
else
#endif
set_task_rq(tsk, task_cpu(tsk));
@@ -8186,7 +8186,7 @@ static void cpu_cgroup_css_free(struct cgroup_subsys_state *css)
static void cpu_cgroup_fork(struct task_struct *task)
{
- sched_move_task(task);
+ sched_move_task(task, true);
}
static int cpu_cgroup_can_attach(struct cgroup_taskset *tset)
@@ -8213,7 +8213,7 @@ static void cpu_cgroup_attach(struct cgroup_taskset *tset)
struct cgroup_subsys_state *css;
cgroup_taskset_for_each(task, css, tset)
- sched_move_task(task);
+ sched_move_task(task, false);
}
#ifdef CONFIG_FAIR_GROUP_SCHED
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 89513b6..0b4914d 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -8457,9 +8457,13 @@ void init_cfs_rq(struct cfs_rq *cfs_rq)
}
#ifdef CONFIG_FAIR_GROUP_SCHED
-static void task_move_group_fair(struct task_struct *p)
+static void task_move_group_fair(struct task_struct *p, bool fork)
{
- detach_task_cfs_rq(p);
+ /*
+ * Newly forked task should not be removed from any cfs_rq
+ */
+ if (!fork)
+ detach_task_cfs_rq(p);
set_task_rq(p, task_cpu(p));
attach_task_cfs_rq(p);
/*
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 72f1f30..c139ec4 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -343,7 +343,7 @@ extern void sched_online_group(struct task_group *tg,
extern void sched_destroy_group(struct task_group *tg);
extern void sched_offline_group(struct task_group *tg);
-extern void sched_move_task(struct task_struct *tsk);
+extern void sched_move_task(struct task_struct *tsk, bool fork);
#ifdef CONFIG_FAIR_GROUP_SCHED
extern int sched_group_set_shares(struct task_group *tg, unsigned long shares);
@@ -1247,7 +1247,7 @@ struct sched_class {
void (*update_curr) (struct rq *rq);
#ifdef CONFIG_FAIR_GROUP_SCHED
- void (*task_move_group) (struct task_struct *p);
+ void (*task_move_group) (struct task_struct *p, bool fork);
#endif
};
--
1.7.9.5
next prev parent reply other threads:[~2016-06-01 11:39 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-01 3:41 [PATCH v3 0/5] sched/fair: Fix attach and detach sched avgs for task group change or sched class change Yuyang Du
2016-06-01 3:41 ` [PATCH v3 1/5] sched/fair: Clean up attach_entity_load_avg() Yuyang Du
2016-06-01 3:41 ` [PATCH v3 2/5] sched/fair: Skip detach and attach new group task Yuyang Du
2016-06-01 12:20 ` Vincent Guittot
2016-06-01 19:21 ` Yuyang Du
2016-06-02 7:29 ` Vincent Guittot
2016-06-01 23:41 ` Yuyang Du
2016-06-02 7:40 ` Vincent Guittot
2016-06-01 23:50 ` Yuyang Du
2016-06-01 3:41 ` Yuyang Du [this message]
2016-06-01 3:41 ` [PATCH v3 4/5] sched/fair: Move load and util avgs from wake_up_new_task() to sched_fork() Yuyang Du
2016-06-01 12:24 ` Vincent Guittot
2016-06-01 18:58 ` Yuyang Du
2016-06-01 3:41 ` [PATCH v3 5/5] sched/fair: Add inline to detach_entity_load_evg() Yuyang Du
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=1464752466-3494-4-git-send-email-yuyang.du@intel.com \
--to=yuyang.du@intel.com \
--cc=bsegall@google.com \
--cc=dietmar.eggemann@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=morten.rasmussen@arm.com \
--cc=peterz@infradead.org \
--cc=pjt@google.com \
--cc=umgwanakikbuti@gmail.com \
--cc=vincent.guittot@linaro.org \
/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
all inboxes | Powered by JetHome®