git: 037c104ca4a7 - stable/13 - Ensure "init" (PID 1) also executes userret() initially

From: Olivier Certner <>
Date: Thu, 21 Dec 2023 13:43:51 UTC
The branch stable/13 has been updated by olce:


commit 037c104ca4a71b7510799c6fff5fa031c070319f
Author:     Olivier Certner <>
AuthorDate: 2023-10-10 17:36:20 +0000
Commit:     Olivier Certner <>
CommitDate: 2023-12-21 13:39:18 +0000

    Ensure "init" (PID 1) also executes userret() initially
    Calling userret() from fork_return() misses the first return to
    userspace of the "init" (PID 1) process.  The latter is indeed created
    by fork1() followed by a call to cpu_fork_kthread_handler() call that
    replaces fork_return() by start_init() as the function to execute after
    A new process' initial return to userspace in the end always happens
    through returning from fork_exit(), so move userret() there instead to
    fix the omission.
    This problem was discovered as part of a revamp of scheduling priorities
    that lead to experimenting with asserting and sometimes resetting
    priorities in sched_userret(), in the course of which the author
    stumbled on panics being triggered only in init() or only in other
    processes, depending on the modifications to sched_userret().  This
    change currently has no practical effect but will have some in the near
    Reviewed by:            markj, kib
    Sponsored by:           The FreeBSD Foundation
    Differential Revision:
    (cherry picked from commit eac624207ccf3a16225368d226861b06e3631d0d)
    Approved by:    markj (mentor)
 sys/kern/kern_fork.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 59ffcce70966..114eeeb2a943 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -1161,9 +1161,15 @@ fork_exit(void (*callout)(void *, struct trapframe *), void *arg,
 	mtx_assert(&Giant, MA_NOTOWNED);
+	/*
+	 * Now going to return to userland.
+	 */
 	if (p->p_sysent->sv_schedtail != NULL)
 	td->td_pflags &= ~TDP_FORKING;
+	userret(td, frame);
@@ -1214,8 +1220,6 @@ fork_return(struct thread *td, struct trapframe *frame)
 	if (!prison_isalive(td->td_ucred->cr_prison))
 		exit1(td, 0, SIGKILL);
-	userret(td, frame);
 #ifdef KTRACE
 		ktrsysret(td->td_sa.code, 0, 0);