From nobody Tue Jun 9 21:17:24 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 4gZhZD10cCz6gfvs for ; Tue, 09 Jun 2026 21:17:24 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gZhZD0WDNz47BR for ; Tue, 09 Jun 2026 21:17:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781039844; 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=22AQ6mOeaUnfOe/P7bpG7CXYXBwgYqWjGPxFvqyrM9w=; b=IWwD1oYCE3tVkwI0CA5mhgUSzn1dxFidqOMOPNEUtIe/TuY12dEwOY71J0Ar5Yb8wA2wX4 oTXv0WO5ZH79tQ01EdzLMcQjMj3G85T1Syyl3kHxwMWRXLjjUmjcMrEevZvT7CgdK+Hkt8 V9y+YpGH3qiywsMwFK34qkNzV4QQT++L3GVNpAbTW7WUpAhR8VVXkvXYdkR9QhAKdo0f3P gamMHMUyNWhkAXjtmL1qseGdgtwM8m90iOXyYW13WbVinx70kOWkUaS9ATVqEqbuPPO29H W7rpuhu37NV5F6EuJAH+BbLi7Q9BXBnMxU4la6Q8bfwz9TrRomDPoDSWvNaaXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781039844; a=rsa-sha256; cv=none; b=lwwSdw7Ji/qJ3Au2PghQOj5Y6/iTUXDGLDDjDHveQthcvcK8CQXMKZhM/3/7OtX3fo5/HY xsJObfe1INqhpdFYQY5/NqjM+nSdoJoEmeYQY9cH5FposyG+cBCmfoulIlaZ7w3in0Ir6G z76ofbtpnxFc/+jmoOwHP36rO6lxSlUSQ5r6RhpRBb0OujRJDgCibNXDYlmq/6ZdTbvgf+ AuTPEhYZAO+7IONcZHHW1VsuQoM7gQcbHdJHQf89sSBcS7HkZjQbytLsCCXfzN6glXQABO EfQnkZuV3xdAuxBpOio7KBTzM7cTN9gmMH6PHJqkTyDWVnYQ5HCAoHqhzIwe1w== 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=1781039844; 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=22AQ6mOeaUnfOe/P7bpG7CXYXBwgYqWjGPxFvqyrM9w=; b=RCA8jg89nhAb1QQOI/6XFxe4Q3Uagou3igHi/jpbbqWo+OMn9E1iRvR6Fvtft8wJTVZ77K XIZNCvt2w9kOgoGfopaJgJ2DfDHKsDVQxskkITgqM44eymo2cUV+/OHKI01qLsCnr9dL26 QAtA5zx9QZLg/6eehrlXP2tnQFT20TsRGdHbcWQUws6ehBUtMlFd9uSc21LLKxeHvHSD3F J/cZkhoSA3wQMW7jTgo57F+CSTVAK50G71YeNo5pAAF3k9+X0/flD4twNRQAgnR0bQFjyP gLs1hTnWzVEQc35pUFDVtvfRFCCbWI6nvyjZ8BHi3gizYPbsCsUvf4Pfns1/OQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gZhZD05pfzs56 for ; Tue, 09 Jun 2026 21:17:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 245d0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Jun 2026 21:17:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 85a65e393092 - main - proc: add tree ref count 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: 85a65e3930924429903e09832d177f8aa09dfb47 Auto-Submitted: auto-generated Date: Tue, 09 Jun 2026 21:17:24 +0000 Message-Id: <6a2882e4.245d0.2f8dfa80@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=85a65e3930924429903e09832d177f8aa09dfb47 commit 85a65e3930924429903e09832d177f8aa09dfb47 Author: Konstantin Belousov AuthorDate: 2026-06-06 18:02:29 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-09 21:11:45 +0000 proc: add tree ref count Owning the reference prevents reuse of the struct proc. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57492 --- sys/kern/kern_exit.c | 2 +- sys/kern/kern_fork.c | 3 ++- sys/kern/kern_proc.c | 1 + sys/sys/proc.h | 7 +++++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 63e46dcf46f7..2f94386c9101 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -1107,7 +1107,7 @@ proc_reap(struct thread *td, struct proc *p, int *status, int options) KASSERT(FIRST_THREAD_IN_PROC(p), ("proc_reap: no residual thread!")); - uma_zfree(proc_zone, p); + PROC_TREE_UNREF(p); atomic_add_int(&nprocs, -1); } diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 2fb4d9d4274d..5318a737ea35 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1051,6 +1051,7 @@ fork1(struct thread *td, struct fork_req *fr) pages = kstack_pages; /* Allocate new proc. */ newproc = uma_zalloc(proc_zone, M_WAITOK); + PROC_TREE_REF(newproc); td2 = FIRST_THREAD_IN_PROC(newproc); if (td2 == NULL) { td2 = thread_alloc(pages); @@ -1131,7 +1132,7 @@ fail1: fail2: if (vm2 != NULL) vmspace_free(vm2); - uma_zfree(proc_zone, newproc); + PROC_TREE_UNREF(newproc); if ((flags & RFPROCDESC) != 0 && fp_procdesc != NULL) { fdclose(td, fp_procdesc, *fr->fr_pd_fd); fdrop(fp_procdesc, td); diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 43cb1f95b4ef..68845e5aa679 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -279,6 +279,7 @@ proc_init(void *mem, int size, int flags) p->p_pgrp = NULL; TAILQ_INIT(&p->p_kqtim_stop); STAILQ_INIT(&p->p_ktr); + refcount_init(&p->p_tree_refcnt, 0); return (0); } diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 5f017e6ece2c..ff6e944a5ad2 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -779,6 +779,7 @@ struct proc { TAILQ_HEAD(, kq_timer_cb_data) p_kqtim_stop; /* (c) */ LIST_ENTRY(proc) p_jaillist; /* (d) Jail process linkage. */ u_int p_asig; /* (c) ASYNCEXIT pending signal. */ + u_int p_tree_refcnt; /* (e) proctree refcount */ }; #define p_session p_pgrp->pg_session @@ -804,6 +805,12 @@ struct proc { #define PROC_PROFUNLOCK(p) mtx_unlock_spin(&(p)->p_profmtx) #define PROC_PROFLOCK_ASSERT(p, type) mtx_assert(&(p)->p_profmtx, (type)) +#define PROC_TREE_REF(p) refcount_acquire(&(p)->p_tree_refcnt) +#define PROC_TREE_UNREF(p) do { \ + if (refcount_release(&(p)->p_tree_refcnt)) \ + uma_zfree(proc_zone, p); \ +} while (0) + /* These flags are kept in p_flag. */ #define P_ADVLOCK 0x00000001 /* Process may hold a POSIX advisory lock. */