All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chengming Zhou <zhouchengming@bytedance.com>
To: vincent.guittot@linaro.org, dietmar.eggemann@arm.com,
	mingo@redhat.com, peterz@infradead.org, rostedt@goodmis.org,
	bsegall@google.com, vschneid@redhat.com
Cc: linux-kernel@vger.kernel.org, tj@kernel.org,
	Chengming Zhou <zhouchengming@bytedance.com>
Subject: [PATCH v6 6/9] sched/fair: fix another detach on unattached task corner case
Date: Thu, 18 Aug 2022 20:48:02 +0800	[thread overview]
Message-ID: <20220818124805.601-7-zhouchengming@bytedance.com> (raw)
In-Reply-To: <20220818124805.601-1-zhouchengming@bytedance.com>

commit 7dc603c9028e ("sched/fair: Fix PELT integrity for new tasks")
fixed two load tracking problems for new task, including detach on
unattached new task problem.

There still left another detach on unattached task problem for the task
which has been woken up by try_to_wake_up() and waiting for actually
being woken up by sched_ttwu_pending().

try_to_wake_up(p)
  cpu = select_task_rq(p)
  if (task_cpu(p) != cpu)
    set_task_cpu(p, cpu)
      migrate_task_rq_fair()
        remove_entity_load_avg()       --> unattached
        se->avg.last_update_time = 0;
      __set_task_cpu()
  ttwu_queue(p, cpu)
    ttwu_queue_wakelist()
      __ttwu_queue_wakelist()

task_change_group_fair()
  detach_task_cfs_rq()
    detach_entity_cfs_rq()
      detach_entity_load_avg()   --> detach on unattached task
  set_task_rq()
  attach_task_cfs_rq()
    attach_entity_cfs_rq()
      attach_entity_load_avg()

The reason of this problem is similar, we should check in detach_entity_cfs_rq()
that se->avg.last_update_time != 0, before do detach_entity_load_avg().

Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com>
---
 kernel/sched/fair.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 1eb3fb3d95c3..eba8a64f905a 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -11721,6 +11721,17 @@ static void detach_entity_cfs_rq(struct sched_entity *se)
 {
 	struct cfs_rq *cfs_rq = cfs_rq_of(se);
 
+#ifdef CONFIG_SMP
+	/*
+	 * In case the task sched_avg hasn't been attached:
+	 * - A forked task which hasn't been woken up by wake_up_new_task().
+	 * - A task which has been woken up by try_to_wake_up() but is
+	 *   waiting for actually being woken up by sched_ttwu_pending().
+	 */
+	if (!se->avg.last_update_time)
+		return;
+#endif
+
 	/* Catch up with the cfs_rq and remove our load when we leave */
 	update_load_avg(cfs_rq, se, 0);
 	detach_entity_load_avg(cfs_rq, se);
-- 
2.37.2


  parent reply	other threads:[~2022-08-18 12:49 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: sched/core] sched/fair: Update " tip-bot2 for Chengming Zhou
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 ` Chengming Zhou [this message]
2022-08-23  7:06   ` [PATCH v6 6/9] sched/fair: fix another detach on unattached task corner case 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=20220818124805.601-7-zhouchengming@bytedance.com \
    --to=zhouchengming@bytedance.com \
    --cc=bsegall@google.com \
    --cc=dietmar.eggemann@arm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=rostedt@goodmis.org \
    --cc=tj@kernel.org \
    --cc=vincent.guittot@linaro.org \
    --cc=vschneid@redhat.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.