mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-08-09 06:14:34 +02:00
cpuset_can_attach() currently adds the bandwidth of all migrating
SCHED_DEADLINE tasks to sum_migrate_dl_bw. If the source and destination
cpuset effective CPU masks do not overlap, the whole sum is then
reserved in the destination root domain.
set_cpus_allowed_dl(), however, subtracts bandwidth from the source
root domain only when the affinity change really moves the task between
root domains. A DL task can move between cpusets that are still in the
same root domain, so including that task in sum_migrate_dl_bw can reserve
destination bandwidth without a matching source-side subtraction.
Share the root-domain move test with set_cpus_allowed_dl(). Keep
nr_migrate_dl_tasks counting all migrating deadline tasks for cpuset DL
task accounting, but add to sum_migrate_dl_bw only for tasks that need a
root-domain bandwidth move. Keep using the destination cpuset effective
CPU mask and leave the broader can_attach()/attach() transaction model
unchanged.
Fixes: 2ef269ef1a ("cgroup/cpuset: Free DL BW in case can_attach() fails")
Cc: stable@vger.kernel.org # v6.10+
Signed-off-by: Guopeng Zhang <zhangguopeng@kylinos.cn>
Reviewed-by: Waiman Long <longman@redhat.com>
Acked-by: Juri Lelli <juri.lelli@redhat.com>
Tested-by: Juri Lelli <juri.lelli@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
77 lines
2.2 KiB
C
77 lines
2.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _LINUX_SCHED_DEADLINE_H
|
|
#define _LINUX_SCHED_DEADLINE_H
|
|
|
|
/*
|
|
* SCHED_DEADLINE tasks has negative priorities, reflecting
|
|
* the fact that any of them has higher prio than RT and
|
|
* NORMAL/BATCH tasks.
|
|
*/
|
|
|
|
#include <linux/sched.h>
|
|
|
|
static inline bool dl_prio(int prio)
|
|
{
|
|
return unlikely(prio < MAX_DL_PRIO);
|
|
}
|
|
|
|
/*
|
|
* Returns true if a task has a priority that belongs to DL class. PI-boosted
|
|
* tasks will return true. Use dl_policy() to ignore PI-boosted tasks.
|
|
*/
|
|
static inline bool dl_task(struct task_struct *p)
|
|
{
|
|
return dl_prio(p->prio);
|
|
}
|
|
|
|
static inline bool dl_time_before(u64 a, u64 b)
|
|
{
|
|
return (s64)(a - b) < 0;
|
|
}
|
|
|
|
struct root_domain;
|
|
extern void dl_add_task_root_domain(struct task_struct *p);
|
|
extern void dl_clear_root_domain(struct root_domain *rd);
|
|
extern void dl_clear_root_domain_cpu(int cpu);
|
|
/*
|
|
* Return whether moving DL task @p to @new_mask requires moving DL
|
|
* bandwidth accounting between root domains. This helper is specific to
|
|
* DL bandwidth move accounting semantics and is shared by
|
|
* cpuset_can_attach() and set_cpus_allowed_dl() so both paths use the
|
|
* same source root-domain test.
|
|
*/
|
|
extern bool dl_task_needs_bw_move(struct task_struct *p,
|
|
const struct cpumask *new_mask);
|
|
|
|
extern u64 dl_cookie;
|
|
extern bool dl_bw_visited(int cpu, u64 cookie);
|
|
|
|
static inline bool dl_server(struct sched_dl_entity *dl_se)
|
|
{
|
|
return dl_se->dl_server;
|
|
}
|
|
|
|
static inline struct task_struct *dl_task_of(struct sched_dl_entity *dl_se)
|
|
{
|
|
BUG_ON(dl_server(dl_se));
|
|
return container_of(dl_se, struct task_struct, dl);
|
|
}
|
|
|
|
/*
|
|
* Regarding the deadline, a task with implicit deadline has a relative
|
|
* deadline == relative period. A task with constrained deadline has a
|
|
* relative deadline <= relative period.
|
|
*
|
|
* We support constrained deadline tasks. However, there are some restrictions
|
|
* applied only for tasks which do not have an implicit deadline. See
|
|
* update_dl_entity() to know more about such restrictions.
|
|
*
|
|
* The dl_is_implicit() returns true if the task has an implicit deadline.
|
|
*/
|
|
static inline bool dl_is_implicit(struct sched_dl_entity *dl_se)
|
|
{
|
|
return dl_se->dl_deadline == dl_se->dl_period;
|
|
}
|
|
|
|
#endif /* _LINUX_SCHED_DEADLINE_H */
|