mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: byungchul.park@lge.com
To: mingo@kernel.org, peterz@infradead.org
Cc: linux-kernel@vger.kernel.org, Byungchul Park <byungchul.park@lge.com>
Subject: [PATCH] sched: ensure a task has a non-normalized vruntime when returning back to cfs
Date: Mon, 10 Aug 2015 18:02:55 +0900	[thread overview]
Message-ID: <1439197375-27927-1-git-send-email-byungchul.park@lge.com> (raw)

From: Byungchul Park <byungchul.park@lge.com>

current code ensures a task has a normalized vruntime when switching off
from fair class, but it does not ensure the task has a non-normalized
vruntime when switching back to the fair class.

this is an example breaking this consistency.

1. a task is in fair class and !queue
2. change its class to rt class (still !queue)
3. change its class to fair class again (stll !queue)

Signed-off-by: Byungchul Park <byungchul.park@lge.com>
---
 kernel/sched/fair.c |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index ffa70dc..df265f5 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -8150,8 +8150,22 @@ static void switched_to_fair(struct rq *rq, struct task_struct *p)
 	 */
 	se->depth = se->parent ? se->parent->depth + 1 : 0;
 #endif
-	if (!task_on_rq_queued(p))
+
+	if (!task_on_rq_queued(p)) {
+
+		/*
+		 * Ensure the task has a non-normalized vruntime when it is switched
+		 * back to the fair class with !queued, so that enqueue_entity() at
+		 * wake-up time will do the right thing.
+		 *
+		 * If it's queued, then the enqueue_entity(.flags=0) makes the task
+		 * has non-normalized vruntime, if it's !queued, then it still has
+		 * normalized vruntime.
+		 */
+		if (p->state != TASK_RUNNING)
+			se->vruntime += cfs_rq_of(se)->min_vruntime;
 		return;
+	}
 
 	/*
 	 * We were most likely switched from sched_rt, so
-- 
1.7.9.5


             reply	other threads:[~2015-08-10  9:03 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-10  9:02 byungchul.park [this message]
2015-08-10 12:14 ` Peter Zijlstra
2015-08-10 23:35   ` Byungchul Park
2015-08-11  0:06     ` Byungchul Park
2015-08-12 12:37 ` [tip:sched/core] sched: Ensure a task has a non-normalized vruntime when returning back to CFS tip-bot for Byungchul Park

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=1439197375-27927-1-git-send-email-byungchul.park@lge.com \
    --to=byungchul.park@lge.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.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®