Skip to content

Commit 302deb1

Browse files
committed
Merge tag 'sched-urgent-2025-04-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar: - Fix a nonsensical Kconfig combination - Remove an unnecessary rseq-notification * tag 'sched-urgent-2025-04-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: rseq: Eliminate useless task_work on execve sched/isolation: Make CONFIG_CPU_ISOLATION depend on CONFIG_SMP
2 parents 6f110a5 + 169eae7 commit 302deb1

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

fs/exec.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1864,9 +1864,9 @@ static int bprm_execve(struct linux_binprm *bprm)
18641864
goto out;
18651865

18661866
sched_mm_cid_after_execve(current);
1867+
rseq_execve(current);
18671868
/* execve succeeded */
18681869
current->in_execve = 0;
1869-
rseq_execve(current);
18701870
user_events_execve(current);
18711871
acct_update_integrals(current);
18721872
task_numa_free(current, false);
@@ -1883,6 +1883,7 @@ static int bprm_execve(struct linux_binprm *bprm)
18831883
force_fatal_sig(SIGSEGV);
18841884

18851885
sched_mm_cid_after_execve(current);
1886+
rseq_set_notify_resume(current);
18861887
current->in_execve = 0;
18871888

18881889
return retval;

init/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ endmenu # "CPU/Task time and stats accounting"
714714

715715
config CPU_ISOLATION
716716
bool "CPU isolation"
717-
depends on SMP || COMPILE_TEST
717+
depends on SMP
718718
default y
719719
help
720720
Make sure that CPUs running critical tasks are not disturbed by

kernel/sched/core.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10703,7 +10703,6 @@ void sched_mm_cid_after_execve(struct task_struct *t)
1070310703
smp_mb();
1070410704
t->last_mm_cid = t->mm_cid = mm_cid_get(rq, t, mm);
1070510705
}
10706-
rseq_set_notify_resume(t);
1070710706
}
1070810707

1070910708
void sched_mm_cid_fork(struct task_struct *t)

0 commit comments

Comments
 (0)