From nobody Mon Oct 13 00:30:04 2025 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 4clJCJ4pTWz6BVy7; Mon, 13 Oct 2025 00:30:04 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4clJCJ49XCz48tT; Mon, 13 Oct 2025 00:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760315404; 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=sLf3lkTgoS14cJzT2JY786Mmp7+R+gnx6cKmV7p6g1s=; b=MOa47Aixx45VcvVYJfF+MRvfPDor+o3SVX0Tg42u0c/ooxghWJ6QDD2bXvtC9j1WVXI8ye W4v7yqgtVaV2BVuC+vSTJsozks7630bzSU7MgAPqxUaSeIgjEX4zmsDgs2GA0SFMMpF5Gi 45UoDhuty77YSpmnHttveeYF7N9Q+fs2vo+HFpDFZ5Vswy1nxt7HP+96T7oKYFTNqrbZVd U0AQw687juUjhGBK7MB+fW62oved3ekZHngQ+1tSF/R1vGfhiMN2FvK1M3APQoi+TCd3u9 9JjNWfQPe6k2CMfRGps/dhJtnRkIAOyiEO5prCTMniGTJWaW20i287dxPjUWlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760315404; 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=sLf3lkTgoS14cJzT2JY786Mmp7+R+gnx6cKmV7p6g1s=; b=rwNZQCiuTRvnZJCV9Hb7zPIyJ5MI4VDBDHQ7mosIEScvBZ3Gk0AwhqhN9iE7gQEzh/qPZ/ 66tM8C5JuFrB70KTjLM55C7IhrgZoGU/M6tghNFrbyNoD2g/YFklz5ndtppszW3L/HDwlT lZvU4VD1ABr7cgR2uBBrZIXqnC5pGm0UTPEXbsHY6Avrl8DjCl7Wd3bJFn7pEXR1vIhP6u sWv2leth3PeCgYEZHTTyywAQF3buU3ztDmuNGYXEi0e6SqYL98xxyxWR6XJX1UScg7HiwH aRhhzIumIRJ+GiGa/PrQWZCX3WNz7sSlBhqWEwdoQ4eEtYqG/rRjbZHH6UyP2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760315404; a=rsa-sha256; cv=none; b=q1F0qmMUByn/1AdopB1O10OaHapUl9sxZFp2LcIq+K1lcjXzGN5UCtxx3XDQsVo78NZ3nv FXv2KDr9TD6J4n4c6hkE5sNp+bIDrVKaOY8bKLxfphl6MwpCsOAH3Aa52K8n29t7/gg4H1 gM202e+yLGY9RBYgh9TzauoleIJ9op+KZyp3nSM4u++i8HNmUsTMoFxeb1T8X9ERcHJ8Am Sn3iERXpWK/Yn/5reAhBRM2fkv/+a1gNZYia5RWF/ywgVEdzuU6jlMawaCo3Hp/2bcQesK RqKcgByQnNifTeX5d97oAO5WCADPVhGzNT8erLicyc5oLcCwWfPBnQaSXTAw7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4clJCJ3Ykyzk74; Mon, 13 Oct 2025 00:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59D0U4Ww042364; Mon, 13 Oct 2025 00:30:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59D0U4Wt042359; Mon, 13 Oct 2025 00:30:04 GMT (envelope-from git) Date: Mon, 13 Oct 2025 00:30:04 GMT Message-Id: <202510130030.59D0U4Wt042359@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f0f57fde342d - stable/14 - kern_exit.c: do not leak reaper bitmap busy bits 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 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/14 X-Git-Reftype: branch X-Git-Commit: f0f57fde342d79aec17ef56406aa08bb1eaa1f79 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f0f57fde342d79aec17ef56406aa08bb1eaa1f79 commit f0f57fde342d79aec17ef56406aa08bb1eaa1f79 Author: Konstantin Belousov AuthorDate: 2025-10-01 03:17:31 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-13 00:23:42 +0000 kern_exit.c: do not leak reaper bitmap busy bits PR: 289917 (cherry picked from commit f19ef352ec63f9fcc10076a263b8ce402ba31379) --- sys/kern/kern_exit.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 0c3070f2e360..6f772b488b79 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -129,6 +129,27 @@ proc_realparent(struct proc *child) return (parent); } +static void +reaper_clear(struct proc *p, struct proc *rp) +{ + struct proc *p1; + bool clear; + + sx_assert(&proctree_lock, SX_XLOCKED); + LIST_REMOVE(p, p_reapsibling); + if (p->p_reapsubtree == 1) + return; + clear = true; + LIST_FOREACH(p1, &rp->p_reaplist, p_reapsibling) { + if (p1->p_reapsubtree == p->p_reapsubtree) { + clear = false; + break; + } + } + if (clear) + proc_id_clear(PROC_ID_REAP, p->p_reapsubtree); +} + void reaper_abandon_children(struct proc *p, bool exiting) { @@ -140,7 +161,7 @@ reaper_abandon_children(struct proc *p, bool exiting) return; p1 = p->p_reaper; LIST_FOREACH_SAFE(p2, &p->p_reaplist, p_reapsibling, ptmp) { - LIST_REMOVE(p2, p_reapsibling); + reaper_clear(p2, p); p2->p_reaper = p1; p2->p_reapsubtree = p->p_reapsubtree; LIST_INSERT_HEAD(&p1->p_reaplist, p2, p_reapsibling); @@ -154,27 +175,6 @@ reaper_abandon_children(struct proc *p, bool exiting) p->p_treeflag &= ~P_TREE_REAPER; } -static void -reaper_clear(struct proc *p) -{ - struct proc *p1; - bool clear; - - sx_assert(&proctree_lock, SX_LOCKED); - LIST_REMOVE(p, p_reapsibling); - if (p->p_reapsubtree == 1) - return; - clear = true; - LIST_FOREACH(p1, &p->p_reaper->p_reaplist, p_reapsibling) { - if (p1->p_reapsubtree == p->p_reapsubtree) { - clear = false; - break; - } - } - if (clear) - proc_id_clear(PROC_ID_REAP, p->p_reapsubtree); -} - void proc_clear_orphan(struct proc *p) { @@ -974,7 +974,7 @@ proc_reap(struct thread *td, struct proc *p, int *status, int options) sx_xunlock(PIDHASHLOCK(p->p_pid)); LIST_REMOVE(p, p_sibling); reaper_abandon_children(p, true); - reaper_clear(p); + reaper_clear(p, p->p_reaper); PROC_LOCK(p); proc_clear_orphan(p); PROC_UNLOCK(p);