Skip to contentSkip to conversation

scheduler fix

GIT PULL Merged Ingo Molnar 2 participants 2 messages Feb 28, 2025 – Mar 1, 2025 Scheduler

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest sched/urgent Git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-urgent-2025-02-28

# HEAD: 82c387ef7568c0d96a918a5a78d9cad6256cfa15 sched/core: Prevent rescheduling when interrupts are disabled

Prevent cond_resched() based preemption when interrupts are disabled, on PREEMPT_NONE and PREEMPT_VOLUNTARY kernels.

Thanks,

Ingo

------------------>
Thomas Gleixner (1):
sched/core: Prevent rescheduling when interrupts are disabled

 kernel/sched/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/core.c +1 -1
index 9aecd914ac69..67189907214d 100644
@@ -7285,7 +7285,7 @@ void rt_mutex_setprio(struct task_struct *p, struct task_struct *pi_task)
 #if !defined(CONFIG_PREEMPTION) || defined(CONFIG_PREEMPT_DYNAMIC)
 int __sched __cond_resched(void)
 {
-	if (should_resched(0)) {
+	if (should_resched(0) && !irqs_disabled()) {
 		preempt_schedule_common();
 		return 1;
 	}
merge bot Merged
#1 lore raw
The pull request you sent on Fri, 28 Feb 2025 20:20:33 +0100:

The pull request you sent on Fri, 28 Feb 2025 20:20:33 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-urgent-2025-02-28

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/d203484f2556f47a435cda36ceb9dd83adc9056e

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html