sched: Make class_schedulers avoid pushing current, and get rid of proxy_tag_curr()

With proxy-execution, the scheduler selects the donor, but for
blocked donors, we end up running the lock owner.

This caused some complexity, because the class schedulers make
sure to remove the task they pick from their pushable task
lists, which prevents the donor from being migrated, but there
wasn't then anything to prevent rq->curr from being migrated
if rq->curr != rq->donor.

This was sort of hacked around by calling proxy_tag_curr() on
the rq->curr task if we were running something other then the
donor. proxy_tag_curr() did a dequeue/enqueue pair on the
rq->curr task, allowing the class schedulers to remove it from
their pushable list.

The dequeue/enqueue pair was wasteful, and additonally K Prateek
highlighted that we didn't properly undo things when we stopped
proxying, leaving the lock owner off the pushable list.

After some alternative approaches were considered, Peter
suggested just having the RT/DL classes just avoid migrating
when task_on_cpu().

So rework pick_next_pushable_dl_task() and the rt
pick_next_pushable_task() functions so that they skip over the
first pushable task if it is on_cpu.

Then just drop all of the proxy_tag_curr() logic.

Fixes: be39617e38e0 ("sched: Fix proxy/current (push,pull)ability")
Closes: https://lore.kernel.org/lkml/e735cae0-2cc9-4bae-b761-fcb082ed3e94@amd.com/
Reported-by: K Prateek Nayak <kprateek.nayak@amd.com>
Suggested-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: John Stultz <jstultz@google.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://patch.msgid.link/20260324191337.1841376-2-jstultz@google.com

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 7c7d4bf686d71e10b960677f4dc37ee2932d7284..29741685762d5ee7d23c1c1c688021287aa59137 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -6702,23 +6702,6 @@ find_proxy_task(struct rq *rq, struct task_struct *donor, struct rq_flags *rf)
 }
 #endif /* SCHED_PROXY_EXEC */
 
-static inline void proxy_tag_curr(struct rq *rq, struct task_struct *owner)
-{
-       if (!sched_proxy_exec())
-               return;
-       /*
-        * pick_next_task() calls set_next_task() on the chosen task
-        * at some point, which ensures it is not push/pullable.
-        * However, the chosen/donor task *and* the mutex owner form an
-        * atomic pair wrt push/pull.
-        *
-        * Make sure owner we run is not pushable. Unfortunately we can
-        * only deal with that by means of a dequeue/enqueue cycle. :-/
-        */
-       dequeue_task(rq, owner, DEQUEUE_NOCLOCK | DEQUEUE_SAVE);
-       enqueue_task(rq, owner, ENQUEUE_NOCLOCK | ENQUEUE_RESTORE);
-}
-
 /*
  * __schedule() is the main scheduler function.
  *
@@ -6871,9 +6854,6 @@ keep_resched:
                 */
                RCU_INIT_POINTER(rq->curr, next);
 
-               if (!task_current_donor(rq, next))
-                       proxy_tag_curr(rq, next);
-
                /*
                 * The membarrier system call requires each architecture
                 * to have a full memory barrier after updating
@@ -6907,10 +6887,6 @@ keep_resched:
                /* Also unlocks the rq: */
                rq = context_switch(rq, prev, next, &rf);
        } else {
-               /* In case next was already curr but just got blocked_donor */
-               if (!task_current_donor(rq, next))
-                       proxy_tag_curr(rq, next);
-
                rq_unpin_lock(rq, &rf);
                __balance_callbacks(rq, NULL);
                raw_spin_rq_unlock_irq(rq);

diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index 9e253a825f39741db2b443f24db6dee7a0490c40..27359a1e995f968e84f5e2fc22868f4505f925d4 100644 (file)
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -2805,12 +2805,26 @@ static int find_later_rq(struct task_struct *task)
 
 static struct task_struct *pick_next_pushable_dl_task(struct rq *rq)
 {
-       struct task_struct *p;
+       struct task_struct *i, *p = NULL;
+       struct rb_node *next_node;
 
        if (!has_pushable_dl_tasks(rq))
                return NULL;
 
-       p = __node_2_pdl(rb_first_cached(&rq->dl.pushable_dl_tasks_root));
+       next_node = rb_first_cached(&rq->dl.pushable_dl_tasks_root);
+       while (next_node) {
+               i = __node_2_pdl(next_node);
+               /* make sure task isn't on_cpu (possible with proxy-exec) */
+               if (!task_on_cpu(rq, i)) {
+                       p = i;
+                       break;
+               }
+
+               next_node = rb_next(next_node);
+       }
+
+       if (!p)
+               return NULL;
 
        WARN_ON_ONCE(rq->cpu != task_cpu(p));
        WARN_ON_ONCE(task_current(rq, p));

diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index 3d823f5ffe2c8bef3bc7255bed9b23f103f63515..4e5f1957b91b13b2174692b58ae58fed4a9f960d 100644 (file)
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -1858,13 +1858,22 @@ static int find_lowest_rq(struct task_struct *task)
 
 static struct task_struct *pick_next_pushable_task(struct rq *rq)
 {
-       struct task_struct *p;
+       struct plist_head *head = &rq->rt.pushable_tasks;
+       struct task_struct *i, *p = NULL;
 
        if (!has_pushable_tasks(rq))
                return NULL;
 
-       p = plist_first_entry(&rq->rt.pushable_tasks,
-                             struct task_struct, pushable_tasks);
+       plist_for_each_entry(i, head, pushable_tasks) {
+               /* make sure task isn't on_cpu (possible with proxy-exec) */
+               if (!task_on_cpu(rq, i)) {
+                       p = i;
+                       break;
+               }
+       }
+
+       if (!p)
+               return NULL;
 
        BUG_ON(rq->cpu != task_cpu(p));
        BUG_ON(task_current(rq, p));