From nobody Sun Aug 16 02:47:10 2026 X-Original-To: dev-commits-src-branches@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 4hN0jp5TrYz6pHBS for ; Sun, 16 Aug 2026 02:47:10 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hN0jp41xRz3fhg for ; Sun, 16 Aug 2026 02:47:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786848430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fz1gBp0dTcDVVRp/QsW7C6MHvnwB+UoIkM69SAdcaT0=; b=p3O7AKJLc9WpthKP3rfIkoFbPTJBR8llIPoo8cWH50EKac7TGlP++kw6iM2rQFWfSoZQZC VHP1iUrZwwT2ap0TmmVRA1/22Ffi5+kfYuDayvkMJvpvrvoswCZI+2MiJUIkaKM0nwUKkz il9QkXk6KJoI5VYNjZjOqgIhcFxfCI3R7wVUdPpKC3r2SMY+BBK2STKuPMiZvsP23JJkXP edLHUhEffp5yNI4YudWfkSEuzKYJiiSLczjw7CV869WSjWtVhhcgBGXzkmgWTVGMcW9F+L OoK9g2lSbJSvv6Jt2Fla6iW5En9zgTQXkmJ+k0utO4zMVRZ90zRkn96jjJklow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786848430; a=rsa-sha256; cv=none; b=d9vRCJjhqnGLGK2mB0drfZV77LInAMMMS03FGK8wN0faCasv14iPWuMefuC7S4Qg+PS2cZ 7lcMIphZSYORQwMLatrf++rxSkPmDCzDc4g/nrTdmfuzz+OHkcchRQkvNiJVBkZ6dqwGDV 1vbE6cfrCtIToDLues5pMfC7PhhSXT2cLkX96V6v9G7mu/xTtOf/iO/1eI9z1NwGmDcA5O 4zhZeBXVXs4pT9Fi5cnqhwOevu8/UwLero6DW2yHCcy4R7827+PTQi2DMGFKFYl545pyHT +XWCng29w6gTIpPySOQ9/fLhV8U3DnHvi5CbZG2bSoVCc/fsQ2ISLidr8vO/7w== 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=1786848430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fz1gBp0dTcDVVRp/QsW7C6MHvnwB+UoIkM69SAdcaT0=; b=p7Y4mV9Cx5DOWsp99x/ttbb1KZPsSBMBg8g3Ej6Wk+JdhnGBmJXS+ZhYi9f53n4aeLHlxv fHJ1fvuI22m6D27eFzkiJ3lopv8LTVEphHfdk3zsV8UuxS+LjS9XCAhmQ4u8jDuzWbi0uV VYd0esM+q8oCLZqHAtLrILB7j5rFaO3oVHBC0kcf6AgmXsEvDPqQT+LGVTzG7V+proTcjX zzSKvfS+plXpIF1MThoxXDy621WTSyxbsNpCLw80x04oDtEBS6vFm0RddM+NPQvIP64ONM 4hZ945GBHH4Xy9dRyCHNkLb+i7cGPZYw3SS1bD4M81kYoQvcmPfXtb49P3PrmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hN0jp2qmhz17sx for ; Sun, 16 Aug 2026 02:47:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44333 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 16 Aug 2026 02:47:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mark Johnston From: Konstantin Belousov Subject: git: a3b8ff99b546 - stable/15 - procdesc: Remove dead code List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: a3b8ff99b54679f2a1b5da7f8cf52992adb34840 Auto-Submitted: auto-generated Date: Sun, 16 Aug 2026 02:47:10 +0000 Message-Id: <6a8124ae.44333.16ce85ac@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a3b8ff99b54679f2a1b5da7f8cf52992adb34840 commit a3b8ff99b54679f2a1b5da7f8cf52992adb34840 Author: Mark Johnston AuthorDate: 2026-07-24 20:06:16 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-16 02:41:34 +0000 procdesc: Remove dead code (cherry picked from commit 9a7bd3309bec08802e8c18c03669812ec3352534) --- sys/kern/kern_exit.c | 3 ++- sys/kern/sys_procdesc.c | 22 ++++------------------ sys/sys/procdesc.h | 2 +- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index eac381f90152..7fb3f115af9d 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -683,7 +683,8 @@ exit1(struct thread *td, int rval, int signo) * exit(). */ signal_parent = 0; - if (p->p_procdesc == NULL || procdesc_exit(p)) { + procdesc_exit(p); + if (p->p_procdesc == NULL) { /* * Notify parent that we're gone. If parent has the * PS_NOCLDWAIT flag set, or if the handler is set to SIG_IGN, diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c index 9b007aa8997b..608771b9f38c 100644 --- a/sys/kern/sys_procdesc.c +++ b/sys/kern/sys_procdesc.c @@ -278,45 +278,31 @@ procdesc_free(struct procdesc *pd) * We use the proctree_lock to ensure that process exit either happens * strictly before or strictly after a concurrent call to procdesc_close(). */ -bool +void procdesc_exit(struct proc *p) { struct procdesc *pd; sx_assert(&proctree_lock, SA_XLOCKED); PROC_LOCK_ASSERT(p, MA_OWNED); - KASSERT(p->p_procdesc != NULL, ("procdesc_exit: p_procdesc NULL")); MPASS((p->p_flag & P_WEXIT) != 0); pd = p->p_procdesc; + if (pd == NULL) + return; PROCDESC_LOCK(pd); - KASSERT(pd->pd_fpcount > 0 || p->p_pptr == p->p_reaper, - ("procdesc_exit: closed && parent not reaper")); + KASSERT(pd->pd_fpcount > 0, ("%s: closed procdesc %p", __func__, pd)); pd->pd_flags |= PDF_EXITED; pd->pd_xstat = KW_EXITCODE(p->p_xexit, p->p_xsig); - /* - * If the process descriptor has been closed, then we have nothing - * to do; return 1 so that init will get SIGCHLD and do the reaping. - * Clean up the procdesc now rather than letting it happen during - * that reap. - */ - if (pd->pd_fpcount == 0) { - PROCDESC_UNLOCK(pd); - pd->pd_proc = NULL; - p->p_procdesc = NULL; - procdesc_free(pd); - return (true); - } selwakeup(&pd->pd_selinfo); KNOTE_LOCKED(&pd->pd_selinfo.si_note, NOTE_EXIT | NOTE_PDSIGCHLD); PROCDESC_UNLOCK(pd); /* Wakeup all waiters for this procdesc' process exit. */ wakeup(&p->p_procdesc); - return (false); } void diff --git a/sys/sys/procdesc.h b/sys/sys/procdesc.h index ac23dbdcb53b..bb486d9026ba 100644 --- a/sys/sys/procdesc.h +++ b/sys/sys/procdesc.h @@ -102,7 +102,7 @@ struct procdesc { /* * In-kernel interfaces to process descriptors. */ -bool procdesc_exit(struct proc *); +void procdesc_exit(struct proc *); void procdesc_fork(struct proc *p, pid_t child_pid); void procdesc_jobstate(struct proc *p); int kern_pdgetpid(struct thread *, int fd, const cap_rights_t *,