From 6778948f9de86c3cfaf36725a7c87dcff9ba247f Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Mon, 11 Dec 2023 08:20:59 +0000
Subject: [PATCH] kernel_5.10 no rt
---
kernel/kernel/sched/deadline.c | 47 +++++++++++++++--------------------------------
1 files changed, 15 insertions(+), 32 deletions(-)
diff --git a/kernel/kernel/sched/deadline.c b/kernel/kernel/sched/deadline.c
index 61d3c34..fa92656 100644
--- a/kernel/kernel/sched/deadline.c
+++ b/kernel/kernel/sched/deadline.c
@@ -565,7 +565,7 @@
static inline bool need_pull_dl_task(struct rq *rq, struct task_struct *prev)
{
- return rq->online && dl_task(prev);
+ return dl_task(prev);
}
static DEFINE_PER_CPU(struct callback_head, dl_push_head);
@@ -1922,7 +1922,7 @@
static int pick_dl_task(struct rq *rq, struct task_struct *p, int cpu)
{
if (!task_running(rq, p) &&
- cpumask_test_cpu(cpu, &p->cpus_mask))
+ cpumask_test_cpu(cpu, p->cpus_ptr))
return 1;
return 0;
}
@@ -2012,8 +2012,8 @@
return this_cpu;
}
- best_cpu = cpumask_any_and_distribute(later_mask,
- sched_domain_span(sd));
+ best_cpu = cpumask_first_and(later_mask,
+ sched_domain_span(sd));
/*
* Last chance: if a CPU being in both later_mask
* and current sd span is valid, that becomes our
@@ -2035,7 +2035,7 @@
if (this_cpu != -1)
return this_cpu;
- cpu = cpumask_any_distribute(later_mask);
+ cpu = cpumask_any(later_mask);
if (cpu < nr_cpu_ids)
return cpu;
@@ -2072,7 +2072,7 @@
/* Retry if something changed. */
if (double_lock_balance(rq, later_rq)) {
if (unlikely(task_rq(task) != rq ||
- !cpumask_test_cpu(later_rq->cpu, &task->cpus_mask) ||
+ !cpumask_test_cpu(later_rq->cpu, task->cpus_ptr) ||
task_running(rq, task) ||
!dl_task(task) ||
!task_on_rq_queued(task))) {
@@ -2139,9 +2139,6 @@
return 0;
retry:
- if (is_migration_disabled(next_task))
- return 0;
-
if (WARN_ON(next_task == rq->curr))
return 0;
@@ -2219,7 +2216,7 @@
static void pull_dl_task(struct rq *this_rq)
{
int this_cpu = this_rq->cpu, cpu;
- struct task_struct *p, *push_task;
+ struct task_struct *p;
bool resched = false;
struct rq *src_rq;
u64 dmin = LONG_MAX;
@@ -2249,7 +2246,6 @@
continue;
/* Might drop this_rq->lock */
- push_task = NULL;
double_lock_balance(this_rq, src_rq);
/*
@@ -2281,28 +2277,17 @@
src_rq->curr->dl.deadline))
goto skip;
- if (is_migration_disabled(p)) {
- trace_sched_migrate_pull_tp(p);
- push_task = get_push_task(src_rq);
- } else {
- deactivate_task(src_rq, p, 0);
- set_task_cpu(p, this_cpu);
- activate_task(this_rq, p, 0);
- dmin = p->dl.deadline;
- resched = true;
- }
+ resched = true;
+
+ deactivate_task(src_rq, p, 0);
+ set_task_cpu(p, this_cpu);
+ activate_task(this_rq, p, 0);
+ dmin = p->dl.deadline;
/* Is there any other task even earlier? */
}
skip:
double_unlock_balance(this_rq, src_rq);
-
- if (push_task) {
- raw_spin_unlock(&this_rq->lock);
- stop_one_cpu_nowait(src_rq->cpu, push_cpu_stop,
- push_task, &src_rq->push_work);
- raw_spin_lock(&this_rq->lock);
- }
}
if (resched)
@@ -2326,8 +2311,7 @@
}
static void set_cpus_allowed_dl(struct task_struct *p,
- const struct cpumask *new_mask,
- u32 flags)
+ const struct cpumask *new_mask)
{
struct root_domain *src_rd;
struct rq *rq;
@@ -2356,7 +2340,7 @@
raw_spin_unlock(&src_dl_b->lock);
}
- set_cpus_allowed_common(p, new_mask, flags);
+ set_cpus_allowed_common(p, new_mask);
}
/* Assumes rq->lock is held */
@@ -2554,7 +2538,6 @@
.rq_online = rq_online_dl,
.rq_offline = rq_offline_dl,
.task_woken = task_woken_dl,
- .find_lock_rq = find_lock_later_rq,
#endif
.task_tick = task_tick_dl,
--
Gitblit v1.6.2