From nobody Wed Oct 07 00:07:21 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 4hztjP6R05z6jwb4 for ; Wed, 07 Oct 2026 00:07:21 +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 4hztjP5zGWz3QD2 for ; Wed, 07 Oct 2026 00:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791331641; 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=dto1nEdjcyc6xIy64sAEgxrNo5ZmcYZJ72p0LBvrVig=; b=E/KgbVWZMHLqoz/QtBaJOqH+XLWCDsFBLrTa0FBImDQK4O7WrIS1TiMF2CAvpRT+jI2HFj Ki16Mwy3SUmKwncbaGYTK9AOpQvTtmEFeHG0lvbLaGrpMDcOn+qXPEIhEQcjtE9m93rI65 71oU+rF8iT4iJYs1eNm1zqm0XZYDu/4sTYZ6jh5rY0AR3HYBVh9s2d8oebEdfzx34+Ghjs pigUwBxZk95hN/Ge5/6Xwgnz/8m1QBD0NK/+/MhMrJRC6Sao5zMpvoqitAj80eA+YNgbR+ ibci2bzLXlR0LFtGIWhuES71iXufvwZuhOe29SqSUveINANw4WYvKIIV1cjfmw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791331641; b=fVcJCXJt2F9Hs4NE3kEvnjH4o5TcqvGjAmnIwDjvWOCQDFbbxFS+YH/xhbLMOl+0w/m8w0 M1RRj+t9zsFpQ/AhOXrKpVILTR9Xe9j4wI65e0FYHEyZPw2erNQZo4lhol7aUiST1Cg1VF jKQwYVz8kyMnT5zFwIV0q/AxFmAF8ihS5jjk/cqzjbV7tSr0h/7Lto4W54A/v9L4l4V/mc jFIWNCUItzLXZ4OBussccdfNZTPhwKPbTu85eTUuaA2sdC84lketOLVYzwZvhiEghpLArI hWz+dOXKc0M1loUfOvJGdBAn89sAzA/xc+z2S3bAHFTSDTmnY4k32lkZ6Gy8Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791331641; 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=dto1nEdjcyc6xIy64sAEgxrNo5ZmcYZJ72p0LBvrVig=; b=UCiqBrgSWKbCRUbu1lbG6vD0o+7CpccY6z8qLEIf0R2OJFpH61U0Fu67CnvEINKk5xcoBG Ixg+Lw3JMJQrjUfDE4Kj1e+Vp8+WDcU3Gf5vsChsAagTLxc8CMw/MaPV6OAJbegi8qntRz yHGkek690DosG3YckCTP4eiHNrK5iR6TUksk/tVM8ejaE0m9wZM6LwS6dwJ7Rz7+02xPkY PhKsVP0XYBXbOqLkZadVKQM6zu4Y68Iq0FUgA6cLrHgS5Cn738c4mHqqaOtXR4JKZfYp0s EyCUxeHrTQgGtt9Fd0KSyLRsPaJ6PYA52lSLEpkR5TL1V9oMKc2UjqjSx28MAw== 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 4hztjP533FzSWc for ; Wed, 07 Oct 2026 00:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38ab9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 07 Oct 2026 00:07:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: 9af3990ba794 - main - sem test: avoid ETIMEDOUT races in the EINTR test cases 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: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9af3990ba7940e85c31b5fc074e9510ee195465f Auto-Submitted: auto-generated Date: Wed, 07 Oct 2026 00:07:21 +0000 Message-Id: <6ac58d39.38ab9.6be1281e@gitrepo.freebsd.org> The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=9af3990ba7940e85c31b5fc074e9510ee195465f commit 9af3990ba7940e85c31b5fc074e9510ee195465f Author: Olivier Cochard AuthorDate: 2026-10-07 00:00:58 +0000 Commit: Olivier Cochard CommitDate: 2026-10-07 00:03:27 +0000 sem test: avoid ETIMEDOUT races in the EINTR test cases timedwait and clockwait_absolute_intr_remaining arm a 50ms SIGALRM and then wait until an absolute deadline only 100ms in the future. On a loaded VM the signal can be delivered more than 50ms late, so the wait times out first. Approved by: imp Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D60347 --- contrib/netbsd-tests/lib/librt/t_sem.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/contrib/netbsd-tests/lib/librt/t_sem.c b/contrib/netbsd-tests/lib/librt/t_sem.c index f542c6315528..d24ca81c86de 100644 --- a/contrib/netbsd-tests/lib/librt/t_sem.c +++ b/contrib/netbsd-tests/lib/librt/t_sem.c @@ -287,7 +287,11 @@ ATF_TC_BODY(timedwait, tc) "%s", strerror(errno)); ATF_REQUIRE_MSG(clock_gettime(CLOCK_REALTIME, &ts) == 0, "%s", strerror(errno)); - timespec_add_ms(&ts, 100); + /* + * Only EINTR matters here, not the deadline: keep it far enough + * from the 50ms timer that a loaded host cannot hit ETIMEDOUT. + */ + ts.tv_sec += 10; ATF_REQUIRE_ERRNO(EINTR, sem_timedwait(&sem, &ts)); ATF_REQUIRE_MSG(got_sigalrm, "did not get SIGALRM"); } @@ -365,7 +369,11 @@ ATF_TC_BODY(clockwait_absolute_intr_remaining, tc) "%s", strerror(errno)); ATF_REQUIRE_MSG(clock_gettime(CLOCK_MONOTONIC, &ts) == 0, "%s", strerror(errno)); - timespec_add_ms(&ts, 100); + /* + * Only EINTR matters here, not the deadline: keep it far enough + * from the 50ms timer that a loaded host cannot hit ETIMEDOUT. + */ + ts.tv_sec += 10; ATF_REQUIRE_EQ(-1, sem_clockwait_np(&sem, CLOCK_MONOTONIC, TIMER_ABSTIME, &ts, &remain)); ATF_REQUIRE_ERRNO(EINTR, 1);