public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Peter Zijlstra <peterz@infradead.org>
To: Rik van Riel <riel@surriel.com>
Cc: linux-kernel@vger.kernel.org, kernel-team@fb.com, pjt@google.com,
	dietmar.eggemann@arm.com, mingo@redhat.com,
	morten.rasmussen@arm.com, tglx@linutronix.de,
	mgorman@techsingularity.net, vincent.guittot@linaro.org
Subject: Re: [PATCH 03/14] sched,fair: redefine runnable_load_avg as the sum of task_h_load
Date: Mon, 29 Jul 2019 22:26:08 +0200	[thread overview]
Message-ID: <20190729202608.GT31398@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20190722173348.9241-4-riel@surriel.com>

On Mon, Jul 22, 2019 at 01:33:37PM -0400, Rik van Riel wrote:
> @@ -263,8 +258,8 @@ ___update_load_avg(struct sched_avg *sa, unsigned long load, unsigned long runna
>  
>  int __update_load_avg_blocked_se(u64 now, struct sched_entity *se)
>  {
> -	if (___update_load_sum(now, &se->avg, 0, 0, 0)) {
> -		___update_load_avg(&se->avg, se_weight(se), se_runnable(se));
> +	if (___update_load_sum(now, &se->avg, 0, 0)) {
> +		___update_load_avg(&se->avg, se_weight(se));
>  		return 1;
>  	}
>  

The comment above that needs adjustment too, I think.

--- a/kernel/sched/pelt.c
+++ b/kernel/sched/pelt.c
@@ -234,28 +234,13 @@ ___update_load_avg(struct sched_avg *sa,
 /*
  * sched_entity:
  *
- *   task:
- *     se_runnable() == se_weight()
- *
- *   group: [ see update_cfs_group() ]
- *     se_weight()   = tg->weight * grq->load_avg / tg->load_avg
- *     se_runnable() = se_weight(se) * grq->runnable_load_avg / grq->load_avg
- *
  *   load_sum := runnable_sum
  *   load_avg = se_weight(se) * runnable_avg
  *
- *   runnable_load_sum := runnable_sum
- *   runnable_load_avg = se_runnable(se) * runnable_avg
- *
- * XXX collapse load_sum and runnable_load_sum
- *
  * cfq_rq:
  *
  *   load_sum = \Sum se_weight(se) * se->avg.load_sum
  *   load_avg = \Sum se->avg.load_avg
- *
- *   runnable_load_sum = \Sum se_runnable(se) * se->avg.runnable_load_sum
- *   runnable_load_avg = \Sum se->avg.runable_load_avg
  */
 
 int __update_load_avg_blocked_se(u64 now, struct sched_entity *se)

  parent reply	other threads:[~2019-07-29 20:26 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-22 17:33 [PATCH RFC v3 0/14] sched,fair: flatten CPU controller runqueues Rik van Riel
2019-07-22 17:33 ` [PATCH 01/14] sched: introduce task_se_h_load helper Rik van Riel
2019-08-12 17:40   ` Dietmar Eggemann
2019-07-22 17:33 ` [PATCH 02/14] sched: change /proc/sched_debug fields Rik van Riel
2019-07-22 17:33 ` [PATCH 03/14] sched,fair: redefine runnable_load_avg as the sum of task_h_load Rik van Riel
2019-07-29 20:05   ` Peter Zijlstra
2019-07-29 21:13     ` Rik van Riel
2019-07-29 20:11   ` Peter Zijlstra
2019-07-29 20:26   ` Peter Zijlstra [this message]
2019-07-22 17:33 ` [PATCH 04/14] sched,fair: move runnable_load_avg to cfs_rq Rik van Riel
2019-07-30  8:55   ` Peter Zijlstra
2019-07-22 17:33 ` [PATCH 06/14] sched,cfs: use explicit cfs_rq of parent se helper Rik van Riel
2019-07-22 17:33 ` [PATCH 07/14] sched,cfs: fix zero length timeslice calculation Rik van Riel
2019-07-22 17:33 ` [PATCH 08/14] sched,fair: simplify timeslice length code Rik van Riel
2019-07-22 17:33 ` [PATCH 09/14] sched,fair: refactor enqueue/dequeue_entity Rik van Riel
2019-07-30  9:36   ` Peter Zijlstra
2019-07-30 12:58     ` Rik van Riel
2019-07-31  9:35     ` Peter Zijlstra
2019-07-31 15:03       ` Rik van Riel
2019-07-31 15:30         ` Peter Zijlstra
2019-07-22 17:33 ` [PATCH 10/14] sched,fair: add helper functions for flattened runqueue Rik van Riel
2019-07-22 17:33 ` [PATCH 11/14] sched,fair: flatten hierarchical runqueues Rik van Riel
2019-07-22 17:33 ` [PATCH 12/14] sched,fair: track cfs_rq->max_h_load for more legitimate h_weight Rik van Riel
2019-07-22 17:33 ` [PATCH 13/14] sched,fair: flatten update_curr functionality Rik van Riel
2019-07-22 17:33 ` [PATCH 14/14] sched,fair: propagate sum_exec_runtime up the hierarchy Rik van Riel
2019-07-30 16:29 ` [PATCH RFC v3 0/14] sched,fair: flatten CPU controller runqueues Peter Zijlstra
2019-07-30 18:27   ` Rik van Riel

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=20190729202608.GT31398@hirez.programming.kicks-ass.net \
    --to=peterz@infradead.org \
    --cc=dietmar.eggemann@arm.com \
    --cc=kernel-team@fb.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mgorman@techsingularity.net \
    --cc=mingo@redhat.com \
    --cc=morten.rasmussen@arm.com \
    --cc=pjt@google.com \
    --cc=riel@surriel.com \
    --cc=tglx@linutronix.de \
    --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