From nobody Sat Jun 6 20:07:29 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 4gXq8x5Zwxz6gKVy for ; Sat, 06 Jun 2026 20:07:29 +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 4gXq8x3NKVz46Dj for ; Sat, 06 Jun 2026 20:07:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780776449; 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=KiFYTC5EXP3E4ItXOaa8tNPe0kHNkOwD4JNZNb+vaQE=; b=KsjTtq/eky0InWv5/prS+2qBZ1jK7vCkB9IwVFn/gEnol2LuB6LLKmvmPu58wW5J8gZLjY ancGoWD0JERUD3bJG+PklLl+Qlqktyy1rD9g8QqRVlLhRQlp36jHYbw1zT4d86vwEmhZy5 DarnSdc35UhQyE63ALR0m7b7llXEouWZFsngZxZQk1Ob0Ltfni4JB6t7AKsOLhC7Dc0n4c dxj/ygg6RlkYEkfpmw2Qz/JXyB13ubDVF7bqcT1k8T3/V0BJ5cJgilKtQGmBux5+B4b7Qu AL1NJuZonxf2SMJJv/RLj5d974TmIIX7++/LagAVLBpvBGJjnX94ezaLxH7SMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780776449; a=rsa-sha256; cv=none; b=Ch04Kmk48EZaFdxfrYRgFmrbp81PVAZ109nGp9pRxAWe9u2hokxhxdOyHqSnkTuiWjZDKq MLhvFklqLWDT31hhYT3h41FrroDLvk0iNNjVZD2EpVuCOBzGrZsZhMy7QiQBtVO3RLqVrA 7FZibXqBuLbLlHqrTTdXbMQECRat+IT+o62eWhEUZ+pVr7lGGpxEptHTxZM9lCHvj7ObJ8 oKLPBcoYKbUBthhVRhSlsAVBxZZQf7wnluWsqTYtURM/9bEYIp/qDq1Qc0yknIhmvxoxJY ujzhNeKlYsiS4sj1e1UM9t7ms0MjqFqlk6Jh5qOXWHywsiiIUNWQoQEK7Nk4iA== 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=1780776449; 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=KiFYTC5EXP3E4ItXOaa8tNPe0kHNkOwD4JNZNb+vaQE=; b=gpAhucS8i6gxJOH/zuIabjzd5mUV3Mx4XHW3qeOdDmGd6DRzTQKowYWvTtVsMfHRGHqLjW 9PZUbAr6j/Ju93Q1w/8wsBhnFC9rC3OdVWJUakHdYhjuWkBvzg4nWvTqCJHD14mYTdlf0p e5/HRi/ICMT0nvWKl8DgEtIt7tlTYM5cTxbk98ugVwIF1hiSjbfS7KGo20vfCm03yCe+Yi 4CI85epPtIhA3xw6v3k28HnkiCFGh4bqMTpReCdfp0UH0vt6AaFtUL23AlaYhsGs/+o/l+ Q3Dk6G6QmrZORT2TGE23pNEKMO2G/hGqbDMI4fVRaGCM/Du85kkDSV7me3WRkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gXq8x24g7zTwt for ; Sat, 06 Jun 2026 20:07:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f7d3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Jun 2026 20:07:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 390ae06d4f52 - main - procctl(PROC_REAP_GETPIDS): re-validate reaper after relock of proctree_lock 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: 390ae06d4f524a6f32383cbc1bcbdecdb3738bc3 Auto-Submitted: auto-generated Date: Sat, 06 Jun 2026 20:07:29 +0000 Message-Id: <6a247e01.3f7d3.cfc2e0a@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=390ae06d4f524a6f32383cbc1bcbdecdb3738bc3 commit 390ae06d4f524a6f32383cbc1bcbdecdb3738bc3 Author: Konstantin Belousov AuthorDate: 2026-06-05 23:29:23 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-06 20:00:30 +0000 procctl(PROC_REAP_GETPIDS): re-validate reaper after relock of proctree_lock Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57487 --- sys/kern/kern_procctl.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index db9de394c101..1ff1b15767b5 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -203,28 +203,49 @@ reap_status(struct thread *td, struct proc *p, void *data) return (0); } +static int +reap_getpids_count(struct proc **reapp, struct proc *p, + const struct procctl_reaper_pids *rp) +{ + struct proc *reap, *p2; + int n; + + sx_assert(&proctree_lock, SX_LOCKED); + + reap = get_reaper_or_p(p); + n = 0; + LIST_FOREACH(p2, &reap->p_reaplist, p_reapsibling) + n++; + if (rp->rp_count < n) + n = rp->rp_count; + *reapp = reap; + return (n); +} + static int reap_getpids(struct thread *td, struct proc *p, void *data) { struct proc *reap, *p2; struct procctl_reaper_pidinfo *pi, *pip; struct procctl_reaper_pids *rp; - u_int i, n; + u_int i, n, n1; int error; rp = data; sx_assert(&proctree_lock, SX_LOCKED); PROC_UNLOCK(p); - reap = (p->p_treeflag & P_TREE_REAPER) == 0 ? p->p_reaper : p; - n = i = 0; - error = 0; - LIST_FOREACH(p2, &reap->p_reaplist, p_reapsibling) - n++; - sx_unlock(&proctree_lock); - if (rp->rp_count < n) - n = rp->rp_count; - pi = malloc(n * sizeof(*pi), M_TEMP, M_WAITOK); - sx_slock(&proctree_lock); + i = 0; + for (;;) { + n1 = reap_getpids_count(&reap, p, rp); + sx_unlock(&proctree_lock); + pi = mallocarray(n1, sizeof(*pi), M_TEMP, M_WAITOK); + sx_slock(&proctree_lock); + n = reap_getpids_count(&reap, p, rp); + if (n <= n1) + break; + free(pi, M_TEMP); + } + LIST_FOREACH(p2, &reap->p_reaplist, p_reapsibling) { if (i == n) break;