From nobody Sun Jun 21 11:47:59 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gjqMh0CY6z6jZYM for ; Sun, 21 Jun 2026 11:48:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gjqMg5Dqwz3WFt for ; Sun, 21 Jun 2026 11:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782042479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8lvGAMqr1pl2635YQdSn8QihDd3LAZCp8BKzRZtfB34=; b=SnD0UZPJnEbdnS4sbvBMQev9u1v6ISDQTc4F5FmMevVlSvjF8sJswCfG6+o7FhwCDoc2IT gGouWLQk+ZCAur19UdqFB1VanalWax+BtT+sBtVD1FElrqHbKJnpFPvGlsrOpHV94l78Fo D1/jKs68mTzE4zp12f/+gLUr6Pjvg5jbIkCySejOI2VqmK283GitUn2b8ihARI2jQeXQRx pt8KWPmmjDx5baNqs2/mO7ngxbnpXm8yjEuRZOz7cwiHwbVAUE5c3I/eiVDODzJDKOmpKv Tal4KJp8n4da51AckyQKDq8jzLtA29ZVmire4uAw0cYnKEmd7wBi5whtvOkLSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782042479; a=rsa-sha256; cv=none; b=gHFytIWuSDdu11k/oa1GPmBMMlrFUqGiolZzQvtbs/DAf355yN4lqyibckHU2RmHuQjGfP 2Ei/tTeLUhm8dqoNKArXnXUY/pyHFL3eT4TmXTs6SThf4IZRCYEWiBp9KAnmgLHdverdIM IomoFaTqmPc91j94EeHcMyf27aESJJIPdqCrCzD2Jw+xtUvlrV3zt0GlqU6RwCEVjL5mPy 6pFCEwz1pXoZzjP2IRfrrhguW2mYOofTBJuq7V42OH5+TEDb1tTZ/xJcJJft+FVcYTkMpR oS/qzKC+/HqB8UCBHleEuLaVkdrt1QGOo+S7akXHlQc4HbD1cBddmGe1dZoReA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782042479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8lvGAMqr1pl2635YQdSn8QihDd3LAZCp8BKzRZtfB34=; b=VYJLk2cp6suxWlnSUSU9u7MZ+IGq6+WpT9dMpQZsOlR8dSFNYrV0uWI273IkhERd+h29VX Ov9v7umg8MlBdaRicOdOUKo68FFSlwUaW2/Fabevx0EVmM4vfdvM5z/LxuyZbS+eCxxPzh WYOebUI5LvXx+fUhlrgbz3wqyreS+Bo2y28QpuAwyFTaOPIcpAQNU4nSj5mCrKVQB3WRy2 Ae71Q/8ClR5HRpZHhVRQ7UIJ2tw3x/duddh7rIZ8+TD6sB9IAGv1cgDyZXZgrSfnigJEL8 Y6hEuRztsX7GVJHo96/KkAR6C+YBFWLRISAT7npHDLzeUdvG1gmIVDXV0HqSjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gjqMg457Rz1Df9 for ; Sun, 21 Jun 2026 11:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 269ac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 21 Jun 2026 11:47:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 450fe67d19eb - main - execve_block_pass(9): a helper to wait for the execblock to pass List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 450fe67d19eb2ea8e27109214ff21064fdcf808c Auto-Submitted: auto-generated Date: Sun, 21 Jun 2026 11:47:59 +0000 Message-Id: <6a37cf6f.269ac.41f3bc1f@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=450fe67d19eb2ea8e27109214ff21064fdcf808c commit 450fe67d19eb2ea8e27109214ff21064fdcf808c Author: Konstantin Belousov AuthorDate: 2026-06-17 19:06:50 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-21 11:46:52 +0000 execve_block_pass(9): a helper to wait for the execblock to pass Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57497 --- sys/kern/kern_exec.c | 20 ++++++++++++++++---- sys/sys/imgact.h | 1 + 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 7c25dc60960d..15570eee4c37 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -441,6 +441,21 @@ execve_unblock(struct thread *td, struct proc *p) } } +void +execve_block_pass(struct thread *td) +{ + struct proc *p; + + MPASS(td == curthread); + p = td->td_proc; + PROC_LOCK_ASSERT(p, MA_OWNED); + + while (p->p_execblock != 0) { + p->p_flag |= P_INEXEC_WAIT; + msleep(&p->p_execblock, &p->p_mtx, 0, "exeblk", 0); + } +} + /* * In-kernel implementation of execve(). All arguments are assumed to be * userspace pointers from the passed thread. @@ -496,10 +511,7 @@ do_execve(struct thread *td, struct image_args *args, struct mac *mac_p, PROC_LOCK(p); KASSERT((p->p_flag & P_INEXEC) == 0, ("%s(): process already has P_INEXEC flag", __func__)); - while (p->p_execblock != 0) { - p->p_flag |= P_INEXEC_WAIT; - msleep(&p->p_execblock, &p->p_mtx, 0, "exeblk", 0); - } + execve_block_pass(td); p->p_flag |= P_INEXEC; PROC_UNLOCK(p); diff --git a/sys/sys/imgact.h b/sys/sys/imgact.h index dbb76a1d9b93..bf0453beec1f 100644 --- a/sys/sys/imgact.h +++ b/sys/sys/imgact.h @@ -127,6 +127,7 @@ void post_execve(struct thread *td, int error, struct vmspace *oldvmspace); bool execve_block(struct thread *td, struct proc *p); void execve_block_wait(struct thread *td, struct proc *p); void execve_unblock(struct thread *td, struct proc *p); +void execve_block_pass(struct thread *td); #endif #endif /* !_SYS_IMGACT_H_ */