mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Chengming Zhou" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Chengming Zhou <zhouchengming@bytedance.com>,
	"Peter Zijlstra (Intel)" <peterz@infradead.org>,
	Vincent Guittot <vincent.guittot@linaro.org>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: sched/core] sched/fair: Update comments in enqueue/dequeue_entity()
Date: Tue, 23 Aug 2022 09:27:33 -0000	[thread overview]
Message-ID: <166124685390.401.5685584934311093072.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20220818124805.601-5-zhouchengming@bytedance.com>

The following commit has been merged into the sched/core branch of tip:

Commit-ID:     859f206290f345c151a6005de639ba9677bf3e18
Gitweb:        https://git.kernel.org/tip/859f206290f345c151a6005de639ba9677bf3e18
Author:        Chengming Zhou <zhouchengming@bytedance.com>
AuthorDate:    Thu, 18 Aug 2022 20:48:00 +08:00
Committer:     Peter Zijlstra <peterz@infradead.org>
CommitterDate: Tue, 23 Aug 2022 11:01:18 +02:00

sched/fair: Update comments in enqueue/dequeue_entity()

When reading the sched_avg related code, I found the comments in
enqueue/dequeue_entity() are not updated with the current code.

We don't add/subtract entity's runnable_avg from cfs_rq->runnable_avg
during enqueue/dequeue_entity(), those are done only for attach/detach.

This patch updates the comments to reflect the current code working.

Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Vincent Guittot <vincent.guittot@linaro.org>
Link: https://lore.kernel.org/r/20220818124805.601-5-zhouchengming@bytedance.com
---
 kernel/sched/fair.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index e4c0929..52de830 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -4434,7 +4434,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
 	/*
 	 * When enqueuing a sched_entity, we must:
 	 *   - Update loads to have both entity and cfs_rq synced with now.
-	 *   - Add its load to cfs_rq->runnable_avg
+	 *   - For group_entity, update its runnable_weight to reflect the new
+	 *     h_nr_running of its group cfs_rq.
 	 *   - For group_entity, update its weight to reflect the new share of
 	 *     its group cfs_rq
 	 *   - Add its new weight to cfs_rq->load.weight
@@ -4519,7 +4520,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
 	/*
 	 * When dequeuing a sched_entity, we must:
 	 *   - Update loads to have both entity and cfs_rq synced with now.
-	 *   - Subtract its load from the cfs_rq->runnable_avg.
+	 *   - For group_entity, update its runnable_weight to reflect the new
+	 *     h_nr_running of its group cfs_rq.
 	 *   - Subtract its previous weight from cfs_rq->load.weight.
 	 *   - For group entity, update its weight to reflect the new share
 	 *     of its group cfs_rq.

  reply	other threads:[~2022-08-23 11:42 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-18 12:47 [PATCH v6 0/9] sched/fair: task load tracking optimization and cleanup Chengming Zhou
2022-08-18 12:47 ` [PATCH v6 1/9] sched/fair: maintain task se depth in set_task_rq() Chengming Zhou
2022-08-23  9:27   ` [tip: sched/core] sched/fair: Maintain " tip-bot2 for Chengming Zhou
2022-08-18 12:47 ` [PATCH v6 2/9] sched/fair: remove redundant cpu_cgrp_subsys->fork() Chengming Zhou
2022-08-23  9:27   ` [tip: sched/core] sched/fair: Remove " tip-bot2 for Chengming Zhou
2022-08-18 12:47 ` [PATCH v6 3/9] sched/fair: reset sched_avg last_update_time before set_task_rq() Chengming Zhou
2022-08-23  9:27   ` [tip: sched/core] sched/fair: Reset " tip-bot2 for Chengming Zhou
2022-08-18 12:48 ` [PATCH v6 4/9] sched/fair: update comments in enqueue/dequeue_entity() Chengming Zhou
2022-08-23  9:27   ` tip-bot2 for Chengming Zhou [this message]
2022-08-18 12:48 ` [PATCH v6 5/9] sched/fair: combine detach into dequeue when migrating task Chengming Zhou
2022-08-23  9:27   ` [tip: sched/core] sched/fair: Combine " tip-bot2 for Chengming Zhou
2022-08-18 12:48 ` [PATCH v6 6/9] sched/fair: fix another detach on unattached task corner case Chengming Zhou
2022-08-23  7:06   ` Vincent Guittot
2022-08-23  9:27   ` [tip: sched/core] sched/fair: Fix " tip-bot2 for Chengming Zhou
2022-08-18 12:48 ` [PATCH v6 7/9] sched/fair: allow changing cgroup of new forked task Chengming Zhou
2022-08-23  7:54   ` Vincent Guittot
2022-08-23  9:27   ` [tip: sched/core] sched/fair: Allow " tip-bot2 for Chengming Zhou
2022-08-18 12:48 ` [PATCH v6 8/9] sched/fair: move task sched_avg attach to enqueue_task_fair() Chengming Zhou
2022-08-23  7:48   ` Vincent Guittot
2022-08-23  9:27   ` [tip: sched/core] sched/fair: Move " tip-bot2 for Chengming Zhou
2022-08-18 12:48 ` [PATCH v6 9/9] sched/fair: don't init util/runnable_avg for !fair task Chengming Zhou
2022-08-23  7:49   ` Vincent Guittot
2022-08-23  9:27   ` [tip: sched/core] sched/fair: Don't " tip-bot2 for Chengming Zhou

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=166124685390.401.5685584934311093072.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=peterz@infradead.org \
    --cc=vincent.guittot@linaro.org \
    --cc=x86@kernel.org \
    --cc=zhouchengming@bytedance.com \
    /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®