linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Quentin Perret <qperret@google.com>
To: mingo@redhat.com, peterz@infradead.org,
	vincent.guittot@linaro.org, dietmar.eggemann@arm.com,
	qais.yousef@arm.com, rickyiu@google.com, wvw@google.com,
	patrick.bellasi@matbug.net, xuewen.yan94@gmail.com
Cc: linux-kernel@vger.kernel.org, kernel-team@android.com,
	qperret@google.com
Subject: [PATCH v3 1/3] sched: Fix UCLAMP_FLAG_IDLE setting
Date: Wed, 23 Jun 2021 12:34:39 +0000	[thread overview]
Message-ID: <20210623123441.592348-2-qperret@google.com> (raw)
In-Reply-To: <20210623123441.592348-1-qperret@google.com>

The UCLAMP_FLAG_IDLE flag is set on a runqueue when dequeueing the last
active task to maintain the last uclamp.max and prevent blocked util
from suddenly becoming visible.

However, there is an asymmetry in how the flag is set and cleared which
can lead to having the flag set whilst there are active tasks on the rq.
Specifically, the flag is cleared in the uclamp_rq_inc() path, which is
called at enqueue time, but set in uclamp_rq_dec_id() which is called
both when dequeueing a task _and_ in the update_uclamp_active() path. As
a result, when both uclamp_rq_{dec,ind}_id() are called from
update_uclamp_active(), the flag ends up being set but not cleared,
hence leaving the runqueue in a broken state.

Fix this by clearing the flag in uclamp_idle_reset() which is also
called in both paths to ensure things remain symmetrical.

Fixes: e496187da710 ("sched/uclamp: Enforce last task's UCLAMP_MAX")
Reported-by: Rick Yiu <rickyiu@google.com>
Reviewed-by: Qais Yousef <qais.yousef@arm.com>
Signed-off-by: Quentin Perret <qperret@google.com>
---
 kernel/sched/core.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 4ca80df205ce..e514a093a0ba 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -980,6 +980,7 @@ static inline void uclamp_idle_reset(struct rq *rq, enum uclamp_id clamp_id,
 	if (!(rq->uclamp_flags & UCLAMP_FLAG_IDLE))
 		return;
 
+	rq->uclamp_flags &= ~UCLAMP_FLAG_IDLE;
 	WRITE_ONCE(rq->uclamp[clamp_id].value, clamp_value);
 }
 
@@ -1252,10 +1253,6 @@ static inline void uclamp_rq_inc(struct rq *rq, struct task_struct *p)
 
 	for_each_clamp_id(clamp_id)
 		uclamp_rq_inc_id(rq, p, clamp_id);
-
-	/* Reset clamp idle holding when there is one RUNNABLE task */
-	if (rq->uclamp_flags & UCLAMP_FLAG_IDLE)
-		rq->uclamp_flags &= ~UCLAMP_FLAG_IDLE;
 }
 
 static inline void uclamp_rq_dec(struct rq *rq, struct task_struct *p)
-- 
2.32.0.288.g62a8d224e6-goog


  reply	other threads:[~2021-06-23 12:34 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-23 12:34 [PATCH v3 0/3] sched: A few uclamp fixes and tweaks Quentin Perret
2021-06-23 12:34 ` Quentin Perret [this message]
2021-06-30 14:58   ` [PATCH v3 1/3] sched: Fix UCLAMP_FLAG_IDLE setting Qais Yousef
2021-06-30 15:45     ` Quentin Perret
2021-07-01 10:07       ` Quentin Perret
2021-07-01 11:08         ` Qais Yousef
2021-07-01 12:43           ` Quentin Perret
2021-07-01 14:57             ` Qais Yousef
2021-07-01 15:20               ` Quentin Perret
2021-07-01 17:59                 ` Qais Yousef
2021-07-02 11:54                   ` Quentin Perret
2021-07-01 11:06       ` Qais Yousef
2021-06-23 12:34 ` [PATCH v3 2/3] sched: Skip priority checks with SCHED_FLAG_KEEP_PARAMS Quentin Perret
2021-06-30 16:01   ` Qais Yousef
2021-06-23 12:34 ` [PATCH v3 3/3] sched: Introduce RLIMIT_UCLAMP Quentin Perret
2021-07-01 10:50   ` Qais Yousef
2021-07-01 12:05     ` Quentin Perret
2021-07-01 17:52       ` Qais Yousef
2021-07-02 12:28         ` Quentin Perret
2021-07-08 11:36           ` Qais Yousef
2021-07-19 11:44             ` Quentin Perret
2021-07-26 16:22               ` Qais Yousef

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=20210623123441.592348-2-qperret@google.com \
    --to=qperret@google.com \
    --cc=dietmar.eggemann@arm.com \
    --cc=kernel-team@android.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=patrick.bellasi@matbug.net \
    --cc=peterz@infradead.org \
    --cc=qais.yousef@arm.com \
    --cc=rickyiu@google.com \
    --cc=vincent.guittot@linaro.org \
    --cc=wvw@google.com \
    --cc=xuewen.yan94@gmail.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;
as well as URLs for NNTP newsgroup(s).