Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sched_urgent_for_v5.15_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Borislav Petkov:
- Make sure the idle timer expires in hardirq context, on PREEMPT_RT
- Make sure the run-queue balance callback is invoked only on the
outgoing CPU
* tag 'sched_urgent_for_v5.15_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched: Prevent balance_push() on remote runqueues
sched/idle: Make the idle timer expire in hard interrupt context
+5
-5
+3
-3
kernel/sched/core.c
+3
-3
kernel/sched/core.c
···
8836
8836
struct task_struct *push_task = rq->curr;
8837
8837
8838
8838
lockdep_assert_rq_held(rq);
8839
-
SCHED_WARN_ON(rq->cpu != smp_processor_id());
8840
8839
8841
8840
/*
8842
8841
* Ensure the thing is persistent until balance_push_set(.on = false);
···
8843
8844
rq->balance_callback = &balance_push_callback;
8844
8845
8845
8846
/*
8846
-
* Only active while going offline.
8847
+
* Only active while going offline and when invoked on the outgoing
8848
+
* CPU.
8847
8849
*/
8848
-
if (!cpu_dying(rq->cpu))
8850
+
if (!cpu_dying(rq->cpu) || rq != this_rq())
8849
8851
return;
8850
8852
8851
8853
/*
+2
-2
kernel/sched/idle.c
+2
-2
kernel/sched/idle.c
···
379
379
cpuidle_use_deepest_state(latency_ns);
380
380
381
381
it.done = 0;
382
-
hrtimer_init_on_stack(&it.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
382
+
hrtimer_init_on_stack(&it.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_HARD);
383
383
it.timer.function = idle_inject_timer_fn;
384
384
hrtimer_start(&it.timer, ns_to_ktime(duration_ns),
385
-
HRTIMER_MODE_REL_PINNED);
385
+
HRTIMER_MODE_REL_PINNED_HARD);
386
386
387
387
while (!READ_ONCE(it.done))
388
388
do_idle();