mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Michal Koutný" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: mkoutny@suse.com, "Peter Zijlstra (Intel)" <peterz@infradead.org>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: sched/core] sched: Skip non-root task_groups with disabled RT_GROUP_SCHED
Date: Tue, 08 Apr 2025 19:05:34 -0000	[thread overview]
Message-ID: <174413913474.31282.12084749501873134831.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250310170442.504716-6-mkoutny@suse.com>

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

Commit-ID:     61d3164fec2ed283645dc17fcc51959e8f361e18
Gitweb:        https://git.kernel.org/tip/61d3164fec2ed283645dc17fcc51959e8f361e18
Author:        Michal Koutný <mkoutny@suse.com>
AuthorDate:    Mon, 10 Mar 2025 18:04:37 +01:00
Committer:     Peter Zijlstra <peterz@infradead.org>
CommitterDate: Tue, 08 Apr 2025 20:55:53 +02:00

sched: Skip non-root task_groups with disabled RT_GROUP_SCHED

First, we want to prevent placement of RT tasks on non-root rt_rqs which
we achieve in the task migration code that'd fall back to
root_task_group's rt_rq.

Second, we want to work with only root_task_group's rt_rq when iterating
all "real" rt_rqs when RT_GROUP is disabled. To achieve this we keep
root_task_group as the first one on the task_groups and break out
quickly.

Signed-off-by: Michal Koutný <mkoutny@suse.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20250310170442.504716-6-mkoutny@suse.com
---
 kernel/sched/core.c  |  2 +-
 kernel/sched/rt.c    |  9 ++++++---
 kernel/sched/sched.h |  7 +++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 58d093a..32fb4c1 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -9020,7 +9020,7 @@ void sched_online_group(struct task_group *tg, struct task_group *parent)
 	unsigned long flags;
 
 	spin_lock_irqsave(&task_group_lock, flags);
-	list_add_rcu(&tg->list, &task_groups);
+	list_add_tail_rcu(&tg->list, &task_groups);
 
 	/* Root should already exist: */
 	WARN_ON(!parent);
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index 1af3996..efa22ba 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -495,6 +495,9 @@ typedef struct task_group *rt_rq_iter_t;
 
 static inline struct task_group *next_task_group(struct task_group *tg)
 {
+	if (!rt_group_sched_enabled())
+		return NULL;
+
 	do {
 		tg = list_entry_rcu(tg->list.next,
 			typeof(struct task_group), list);
@@ -507,9 +510,9 @@ static inline struct task_group *next_task_group(struct task_group *tg)
 }
 
 #define for_each_rt_rq(rt_rq, iter, rq)					\
-	for (iter = container_of(&task_groups, typeof(*iter), list);	\
-		(iter = next_task_group(iter)) &&			\
-		(rt_rq = iter->rt_rq[cpu_of(rq)]);)
+	for (iter = &root_task_group;					\
+		iter && (rt_rq = iter->rt_rq[cpu_of(rq)]);		\
+		iter = next_task_group(iter))
 
 #define for_each_sched_rt_entity(rt_se) \
 	for (; rt_se; rt_se = rt_se->parent)
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index d1e591f..898aab7 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -2165,6 +2165,13 @@ static inline void set_task_rq(struct task_struct *p, unsigned int cpu)
 #endif
 
 #ifdef CONFIG_RT_GROUP_SCHED
+	/*
+	 * p->rt.rt_rq is NULL initially and it is easier to assign
+	 * root_task_group's rt_rq than switching in rt_rq_of_se()
+	 * Clobbers tg(!)
+	 */
+	if (!rt_group_sched_enabled())
+		tg = &root_task_group;
 	p->rt.rt_rq  = tg->rt_rq[cpu];
 	p->rt.parent = tg->rt_se[cpu];
 #endif

  reply	other threads:[~2025-04-08 19:05 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-10 17:04 [PATCH v2 00/10] Add kernel cmdline option for rt_group_sched Michal Koutný
2025-03-10 17:04 ` [PATCH v2 01/10] sched: Convert CONFIG_RT_GROUP_SCHED macros to code conditions Michal Koutný
2025-04-08 19:05   ` [tip: sched/core] " tip-bot2 for Michal Koutný
2025-03-10 17:04 ` [PATCH v2 02/10] sched: Remove unneeed macro wrap Michal Koutný
2025-04-08 19:05   ` [tip: sched/core] " tip-bot2 for Michal Koutný
2025-03-10 17:04 ` [PATCH v2 03/10] sched: Always initialize rt_rq's task_group Michal Koutný
2025-04-08 19:05   ` [tip: sched/core] " tip-bot2 for Michal Koutný
2025-03-10 17:04 ` [PATCH v2 04/10] sched: Add commadline option for RT_GROUP_SCHED toggling Michal Koutný
2025-04-08 19:05   ` [tip: sched/core] " tip-bot2 for Michal Koutný
2025-03-10 17:04 ` [PATCH v2 05/10] sched: Skip non-root task_groups with disabled RT_GROUP_SCHED Michal Koutný
2025-04-08 19:05   ` tip-bot2 for Michal Koutný [this message]
2025-03-10 17:04 ` [PATCH v2 06/10] sched: Bypass bandwitdh checks with runtime " Michal Koutný
2025-04-02 12:02   ` Peter Zijlstra
2025-04-03 12:20     ` Michal Koutný
2025-04-08 19:05   ` [tip: sched/core] " tip-bot2 for Michal Koutný
2025-03-10 17:04 ` [PATCH v2 07/10] sched: Do not construct nor expose RT_GROUP_SCHED structures if disabled Michal Koutný
2025-04-08 19:05   ` [tip: sched/core] " tip-bot2 for Michal Koutný
2025-03-10 17:04 ` [PATCH v2 08/10] sched: Add RT_GROUP WARN checks for non-root task_groups Michal Koutný
2025-04-08 19:05   ` [tip: sched/core] " tip-bot2 for Michal Koutný
2025-03-10 17:04 ` [PATCH v2 09/10] sched: Add annotations to RT_GROUP_SCHED fields Michal Koutný
2025-04-08 19:05   ` [tip: sched/core] " tip-bot2 for Michal Koutný
2025-03-10 17:04 ` [PATCH v2 10/10] sched: Add deprecation warning for users of RT_GROUP_SCHED Michal Koutný
2025-04-17 12:13   ` Michal Koutný
2025-05-02 14:48     ` Michal Koutný
2025-03-24 18:10 ` [PATCH v2 00/10] Add kernel cmdline option for rt_group_sched Michal Koutný
2025-04-01 11:05 ` Peter Zijlstra
2025-04-03 12:17   ` Michal Koutný
2025-04-07  5:57     ` Juri Lelli

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=174413913474.31282.12084749501873134831.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mkoutny@suse.com \
    --cc=peterz@infradead.org \
    --cc=x86@kernel.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

all inboxes | Powered by JetHome®