From nobody Mon Jan 26 14:37:32 2026 X-Original-To: dev-commits-src-all@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 4f0B2j15ksz6QMDS for ; Mon, 26 Jan 2026 14:37:33 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0B2h4ZvNz3s2n for ; Mon, 26 Jan 2026 14:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769438252; 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=Cv82FwfLkcwR547RFGTlea//CfyTHvcPBuWSbtnd7NQ=; b=LZH/D1EDcyqosU8mY72HKgmlvFX29G8zrJbJNUZrTMg3rJQAjCf0zEGm9vyPbmhZsxHI2r xNYbUKNjIH+x1mq2S5vPCAkDUYgbhE9OgKIBtLEGS7afOEN8FWLC2fDS+h0n4EerkbgdvN rc96RG7N9qj2jgqGedVwEBCgwA94U49boVY2lfsqAwiznbHv3JQFgJgFaSW5aKcOGpHb2q v2/gwrC3UK3azTiCavs5m2DmaIjWPGYiYD98/lyi7f9OIE+kfK3XheIS5GTl6GKnl0xXyg hDzZLXmkjbUrgRRWMmTpCLXhZ3zLFuIQAJURn3WTX7AsuOjFgJ0RULJyaZ7WYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769438252; 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=Cv82FwfLkcwR547RFGTlea//CfyTHvcPBuWSbtnd7NQ=; b=cHaZinsgBdF2ttGRHBMU9biDcMKXS45/duZMkNJpZgM/XcJy29EIb7X2NV/xPdvik5u9Tm d7Qna1Ynj5jCtw1haLLdhiBnwk8QbdZV3cIIKvt29Ig/GUKslNrr/g4LmfY25dqO816+7D tKTSk9WkITPEfJgqjVtDNif6ZxyAKJqhiXt1tEZ8PAhfSoaIOgjQiE12tygC/5QW/L/st0 E9MrH3uqeBwbXGMorfBmbI3GtNXqnC0QTett9yUKGT/EXGIvMYOot+A2zIwwVhOrozZtCd z7zncMl//gjUZoIPhD16JlqNM7KkEPem3JB4M3oXF9vUGIxwdgf2cqLZgy+mqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769438252; a=rsa-sha256; cv=none; b=Tt5He5np5SNSDXL6l8mFuWEcnOHxhUySaaWz/YK1WA2LJCxkfn3brUlJIs7DcUGuTZypTF RmuXjOM/fKeuSGgRBZYWM+PlbAqZLCSO4mnidgAa0Hil+q3A/wQ14H9FYTec6Y9MD0WacC hiaczntTfRiDWk8F53W+CqUTx8gs/lSF5sGEUHCHRg20WjT3yX32BTpMau59yCIAirwetl IpcfRAIUyhencNjr20W8/bchL5E98633I8PnhAORfl9/gwd5EnnY+sNmIaNK5ZjnR9KN+O ncAdQ8H9JGg6VRbIwb8/y9ecUTF7XlKITyevzAMpaOIgFW4Ab0wm6mpym2PHRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f0B2h4B6mz8F3 for ; Mon, 26 Jan 2026 14:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 323d1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Jan 2026 14:37:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: e35df41f6891 - main - procdesc: Add a test for pid recycling behavior List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e35df41f68916cc23893a29e0284f386ec727462 Auto-Submitted: auto-generated Date: Mon, 26 Jan 2026 14:37:32 +0000 Message-Id: <69777c2c.323d1.e1f1bc2@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=e35df41f68916cc23893a29e0284f386ec727462 commit e35df41f68916cc23893a29e0284f386ec727462 Author: Alan Somers AuthorDate: 2026-01-13 00:45:23 +0000 Commit: Alan Somers CommitDate: 2026-01-26 14:36:57 +0000 procdesc: Add a test for pid recycling behavior MFC With: 09984871d8caff9263b955a94bb9fb5354af1b4c Sponsored by: ConnectWise --- tests/sys/kern/Makefile | 1 + tests/sys/kern/procdesc.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index e56dd560414a..b3611f34996d 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -30,6 +30,7 @@ ATF_TESTS_C+= ktrace_test ATF_TESTS_C+= listener_wakeup ATF_TESTS_C+= module_test ATF_TESTS_C+= prace +ATF_TESTS_C+= procdesc ATF_TESTS_C+= ptrace_test TEST_METADATA.ptrace_test+= timeout="15" ATF_TESTS_C+= reaper diff --git a/tests/sys/kern/procdesc.c b/tests/sys/kern/procdesc.c new file mode 100644 index 000000000000..3334ee404518 --- /dev/null +++ b/tests/sys/kern/procdesc.c @@ -0,0 +1,98 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 ConnectWise + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include + +#include +#include + +/* Tests for procdesc(4) that aren't specific to any one syscall */ + +/* + * Even after waiting on a process descriptor with waitpid(2), the kernel will + * not recycle the pid until after the process descriptor is closed. That is + * important to prevent users from trying to wait() twice, the second time + * using a dangling pid. + * + * Whether this same anti-recycling behavior is used with pdwait() is + * unimportant, because pdwait _always_ uses a process descriptor. + */ +ATF_TC_WITHOUT_HEAD(pid_recycle); +ATF_TC_BODY(pid_recycle, tc) +{ + size_t len; + int i, pd, pid_max; + pid_t dangle_pid; + + len = sizeof(pid_max); + ATF_REQUIRE_EQ_MSG(0, + sysctlbyname("kern.pid_max", &pid_max, &len, NULL, 0), + "sysctlbyname: %s", strerror(errno)); + + /* Create a process descriptor */ + dangle_pid = pdfork(&pd, PD_CLOEXEC | PD_DAEMON); + ATF_REQUIRE_MSG(dangle_pid >= 0, "pdfork: %s", strerror(errno)); + if (dangle_pid == 0) { + // In child + _exit(0); + } + /* + * Reap the child, but don't close the pd, creating a dangling pid. + * Notably, it isn't a Zombie, because the process is reaped. + */ + ATF_REQUIRE_EQ(dangle_pid, waitpid(dangle_pid, NULL, WEXITED)); + + /* + * Now create and kill pid_max additional children. Test to see if pid + * gets reused. If not, that means the kernel is correctly reserving + * the dangling pid from reuse. + */ + for (i = 0; i < pid_max; i++) { + pid_t pid; + + pid = vfork(); + ATF_REQUIRE_MSG(pid >= 0, "vfork: %s", strerror(errno)); + if (pid == 0) + _exit(0); + ATF_REQUIRE_MSG(pid != dangle_pid, + "pid got recycled after %d forks", i); + ATF_REQUIRE_EQ(pid, waitpid(pid, NULL, WEXITED)); + } + close(pd); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, pid_recycle); + + return (atf_no_error()); +}