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 6/9] sched: Bypass bandwitdh checks with runtime disabled RT_GROUP_SCHED
Date: Mon, 16 Dec 2024 21:13:02 +0100 [thread overview]
Message-ID: <20241216201305.19761-7-mkoutny@suse.com> (raw)
In-Reply-To: <20241216201305.19761-1-mkoutny@suse.com>
When RT_GROUPs are compiled but not exposed, their bandwidth cannot
be configured (and it is not initialized for non-root task_groups neither).
Therefore bypass any checks of task vs task_group bandwidth.
This will achieve behavior very similar to setups that have
!CONFIG_RT_GROUP_SCHED and attach cpu controller to cgroup v2 hierarchy.
(On a related note, this may allow having RT tasks with
CONFIG_RT_GROUP_SCHED and cgroup v2 hierarchy.)
Signed-off-by: Michal Koutný <mkoutny@suse.com>
---
kernel/sched/core.c | 6 +++++-
kernel/sched/rt.c | 2 +-
kernel/sched/syscalls.c | 3 ++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index dfd2778622b8b..6e21e0885557d 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -9158,11 +9158,15 @@ static int cpu_cgroup_can_attach(struct cgroup_taskset *tset)
struct task_struct *task;
struct cgroup_subsys_state *css;
+ if (!rt_group_sched_enabled())
+ goto scx_check;
+
cgroup_taskset_for_each(task, css, tset) {
if (!sched_rt_can_attach(css_tg(css), task))
return -EINVAL;
}
-#endif
+scx_check:
+#endif /* CONFIG_RT_GROUP_SCHED */
return scx_cgroup_can_attach(tset);
}
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index 923ec978ff756..161d91f7479b4 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -2866,7 +2866,7 @@ static int sched_rt_global_constraints(void)
int sched_rt_can_attach(struct task_group *tg, struct task_struct *tsk)
{
/* Don't accept real-time tasks when there is no way for them to run */
- if (rt_task(tsk) && tg->rt_bandwidth.rt_runtime == 0)
+ if (rt_group_sched_enabled() && rt_task(tsk) && tg->rt_bandwidth.rt_runtime == 0)
return 0;
return 1;
diff --git a/kernel/sched/syscalls.c b/kernel/sched/syscalls.c
index 77d0d4a2b68da..80382f5d53a44 100644
--- a/kernel/sched/syscalls.c
+++ b/kernel/sched/syscalls.c
@@ -644,7 +644,8 @@ int __sched_setscheduler(struct task_struct *p,
* Do not allow real-time tasks into groups that have no runtime
* assigned.
*/
- if (rt_bandwidth_enabled() && rt_policy(policy) &&
+ if (rt_group_sched_enabled() &&
+ rt_bandwidth_enabled() && rt_policy(policy) &&
task_group(p)->rt_bandwidth.rt_runtime == 0 &&
!task_group_is_autogroup(task_group(p))) {
retval = -EPERM;
--
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 ` Michal Koutný [this message]
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 ` [RFC PATCH 8/9] sched: Add RT_GROUP WARN checks for non-root task_groups Michal Koutný
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-7-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