Commit 302deb10 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 6f110a5e 169eae77

fs/exec.c

+2 −1
Original line number Diff line number Diff line
@@ -1864,9 +1864,9 @@ static int bprm_execve(struct linux_binprm *bprm) 
		goto out;



	sched_mm_cid_after_execve(current);

	rseq_execve(current);

	/* execve succeeded */

	current->in_execve = 0;

	rseq_execve(current);

	user_events_execve(current);

	acct_update_integrals(current);

	task_numa_free(current, false);
@@ -1883,6 +1883,7 @@ static int bprm_execve(struct linux_binprm *bprm) 
		force_fatal_sig(SIGSEGV);



	sched_mm_cid_after_execve(current);

	rseq_set_notify_resume(current);

	current->in_execve = 0;



	return retval;

init/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ endmenu # "CPU/Task time and stats accounting" 


config CPU_ISOLATION

	bool "CPU isolation"

	depends on SMP || COMPILE_TEST

	depends on SMP

	default y

	help

	  Make sure that CPUs running critical tasks are not disturbed by

kernel/sched/core.c

+0 −1
Original line number Diff line number Diff line
@@ -10703,7 +10703,6 @@ void sched_mm_cid_after_execve(struct task_struct *t) 
		smp_mb();

		t->last_mm_cid = t->mm_cid = mm_cid_get(rq, t, mm);

	}

	rseq_set_notify_resume(t);

}



void sched_mm_cid_fork(struct task_struct *t)