public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Paul Turner <pjt@google.com>
To: linux-kernel@vger.kernel.org
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Ingo Molnar <mingo@elte.hu>, Mike Galbraith <efault@gmx.de>
Subject: [patch 1/1] sched: update_curr versus correct cfs_rq in check_preempt_wakeup
Date: Fri, 01 Jul 2011 17:52:23 -0700	[thread overview]
Message-ID: <20110702005228.481583467@google.com> (raw)
In-Reply-To: 20110702005222.262883892@google.com

[-- Attachment #1: fix_check_preempt_wakeup.patch --]
[-- Type: text/plain, Size: 838 bytes --]

We update_curr() versus the current entity as the preemption decision is based
on the relative vruntime.  However, update_curr() is not hierarchical and in
the group scheduling case find_matching_se() will have us making the
comparison on a cfs_rq different to the one just updated.

Signed-off-by: Paul Turner <pjt@google.com>
---
 kernel/sched_fair.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: tip2/kernel/sched_fair.c
===================================================================
--- tip2.orig/kernel/sched_fair.c
+++ tip2/kernel/sched_fair.c
@@ -1919,8 +1919,8 @@ static void check_preempt_wakeup(struct 
 	if (!sched_feat(WAKEUP_PREEMPT))
 		return;
 
-	update_curr(cfs_rq);
 	find_matching_se(&se, &pse);
+	update_curr(cfs_rq_of(se));
 	BUG_ON(!pse);
 	if (wakeup_preempt_entity(se, pse) == 1) {
 		/*



       reply	other threads:[~2011-07-02  0:55 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20110702005222.262883892@google.com>
2011-07-02  0:52 ` Paul Turner [this message]
2011-07-02  9:08   ` [patch 1/1] sched: update_curr versus correct cfs_rq in check_preempt_wakeup Ingo Molnar
2011-07-02  9:57     ` Peter Zijlstra
2011-07-02 10:27       ` Ingo Molnar
2011-07-06  2:07         ` Paul Turner
2011-07-21 18:27           ` [tip:sched/core] sched: update correct entity's runtime in check_preempt_wakeup() tip-bot for Paul Turner
2011-07-06  1:54       ` [patch 1/1] sched: update_curr versus correct cfs_rq in check_preempt_wakeup Paul Turner

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=20110702005228.481583467@google.com \
    --to=pjt@google.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=efault@gmx.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    /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