From: "Michal Koutný" <mkoutny@suse.com>
To: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Juri Lelli <juri.lelli@redhat.com>,
Vincent Guittot <vincent.guittot@linaro.org>,
Dietmar Eggemann <dietmar.eggemann@arm.com>,
Steven Rostedt <rostedt@goodmis.org>,
Ben Segall <bsegall@google.com>, Mel Gorman <mgorman@suse.de>,
Valentin Schneider <vschneid@redhat.com>,
Frederic Weisbecker <fweisbecker@suse.com>
Subject: [RFC PATCH 8/9] sched: Add RT_GROUP WARN checks for non-root task_groups
Date: Mon, 16 Dec 2024 21:13:04 +0100 [thread overview]
Message-ID: <20241216201305.19761-9-mkoutny@suse.com> (raw)
In-Reply-To: <20241216201305.19761-1-mkoutny@suse.com>
With CONFIG_RT_GROUP_SCHED but runtime disabling of RT_GROUPs we expect
the existence of the root task_group only and all rt_sched_entity'ies
should be queued on root's rt_rq.
If we get a non-root RT_GROUP something went wrong.
Signed-off-by: Michal Koutný <mkoutny@suse.com>
---
kernel/sched/rt.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index db7cdc82003bd..deacd46e27823 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -178,11 +178,14 @@ static inline struct task_struct *rt_task_of(struct sched_rt_entity *rt_se)
static inline struct rq *rq_of_rt_rq(struct rt_rq *rt_rq)
{
+ /* Cannot fold with non-CONFIG_RT_GROUP_SCHED version, layout */
+ WARN_ON(!rt_group_sched_enabled() && rt_rq->tg != &root_task_group);
return rt_rq->rq;
}
static inline struct rt_rq *rt_rq_of_se(struct sched_rt_entity *rt_se)
{
+ WARN_ON(!rt_group_sched_enabled() && rt_se->rt_rq->tg != &root_task_group);
return rt_se->rt_rq;
}
@@ -190,6 +193,7 @@ static inline struct rq *rq_of_rt_se(struct sched_rt_entity *rt_se)
{
struct rt_rq *rt_rq = rt_se->rt_rq;
+ WARN_ON(!rt_group_sched_enabled() && rt_rq->tg != &root_task_group);
return rt_rq->rq;
}
@@ -506,8 +510,10 @@ 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())
+ if (!rt_group_sched_enabled()) {
+ WARN_ON(tg != &root_task_group);
return NULL;
+ }
do {
tg = list_entry_rcu(tg->list.next,
@@ -2609,8 +2615,9 @@ static int task_is_throttled_rt(struct task_struct *p, int cpu)
{
struct rt_rq *rt_rq;
-#ifdef CONFIG_RT_GROUP_SCHED
+#ifdef CONFIG_RT_GROUP_SCHED // XXX maybe add task_rt_rq(), see also sched_rt_period_rt_rq
rt_rq = task_group(p)->rt_rq[cpu];
+ WARN_ON(!rt_group_sched_enabled() && rt_rq->tg != &root_task_group);
#else
rt_rq = &cpu_rq(cpu)->rt;
#endif
@@ -2720,6 +2727,9 @@ static int tg_rt_schedulable(struct task_group *tg, void *data)
tg->rt_bandwidth.rt_runtime && tg_has_rt_tasks(tg))
return -EBUSY;
+ if (WARN_ON(!rt_group_sched_enabled() && tg != &root_task_group))
+ return -EBUSY;
+
total = to_ratio(period, runtime);
/*
--
2.47.1
next prev parent reply other threads:[~2024-12-16 20:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-16 20:12 [RFC PATCH 0/9] Add kernel cmdline option for rt_group_sched Michal Koutný
2024-12-16 20:12 ` [RFC PATCH 1/9] sched: Convert CONFIG_RT_GROUP_SCHED macros to code conditions Michal Koutný
2024-12-16 20:12 ` [RFC PATCH 2/9] sched: Remove unneeed macro wrap Michal Koutný
2024-12-16 20:12 ` [RFC PATCH 3/9] sched: Always initialize rt_rq's task_group Michal Koutný
2024-12-16 20:13 ` [RFC PATCH 4/9] sched: Add commadline option for RT_GROUP_SCHED toggling Michal Koutný
2024-12-16 20:13 ` [RFC PATCH 5/9] sched: Skip non-root task_groups with disabled RT_GROUP_SCHED Michal Koutný
2024-12-16 20:13 ` [RFC PATCH 6/9] sched: Bypass bandwitdh checks with runtime " Michal Koutný
2024-12-16 20:13 ` [RFC PATCH 7/9] sched: Do not construct nor expose RT_GROUP_SCHED structures if disabled Michal Koutný
2024-12-16 20:13 ` Michal Koutný [this message]
2024-12-16 20:13 ` [RFC PATCH 9/9] sched: Add annotations to RT_GROUP_SCHED fields Michal Koutný
2025-01-07 19:28 ` [RFC PATCH 0/9] Add kernel cmdline option for rt_group_sched Michal Koutný
2025-01-07 19:41 ` Peter Zijlstra
2025-01-10 10:04 ` Michal Koutný
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=20241216201305.19761-9-mkoutny@suse.com \
--to=mkoutny@suse.com \
--cc=bsegall@google.com \
--cc=cgroups@vger.kernel.org \
--cc=dietmar.eggemann@arm.com \
--cc=fweisbecker@suse.com \
--cc=juri.lelli@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mgorman@suse.de \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox