From nobody Tue Nov 10 00:22:04 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 4jNnQj1wylz70kxR for ; Tue, 10 Nov 2026 00:22:05 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jNnQj00y3z3Qhl for ; Tue, 10 Nov 2026 00:22:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794270125; 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=fKn0c+R64aUDl2IvdgtuzDFVzsh1EGodEqx2JQkW0SI=; b=Cw59BSb7W44NtvXr5aASAUf8GyOLLZPgcb0x5lt/B9L4RLXtrTqvAMGUX7Dl1a2yAxPm0m /DZwWp9hApw4JfGmxSTDGTrxXMt8SaA92G8WxFBaTWbdu+7hVyvc6yBm6ul89pyTDqrfjD 3JrcqIKZ5TrV+D2sirM/HVySjVt/51lekp5EVt4h//tABxVLDFN8Z20lVndWqYRhfon98c 2MJKmPwCbtzLIwaz41xOeXYOMUwq2hcXgBcrH38EUYgPw74vqB5A5lfx/YibjvJOw5kopt y+gDEn/5Hd/cTWlxCy7hxhrvN2tit2Kb1MofCdRcmhSoHjY/8K1V4jRjBSp1zw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794270125; b=VH2GGGLE4MLJ1mlnB2ysige36y5ZCS+5cLxPZA4qarRicQCVDuvgex3agghVQhx3oMJj31 k/TUq68dFIT3X0Knqf/4VWJKg7zaFVZLHOZPEI6+3HhhQoaiWz7OatnQUvEGxthXURxrSx tymE04ol+cYmULpu8NbLrN0nbuTFWl6I+5cc2Avtio3RmBl5z4E816ApP745D4XuyU6StU FVgIHbGIKPDIvgAeNhCAuLWE5dHc+S/DIlI34LUfXyxRY9oW/E4qxqOPoHiwDL/n5n6pQe TJ+NeqVCC/3KkYUGlARHrSII639+VroKUYiyeHI4ptvzrOEU4adIhx8uDIbHEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794270125; 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=fKn0c+R64aUDl2IvdgtuzDFVzsh1EGodEqx2JQkW0SI=; b=bsAVxQIgAzkMd63dNtNGzDkUUChu408CnqIi/L/aT5OSAs8ty740V0rKMHPnV5YGUBKpT9 YbkUgpFsbCYTnlLPf5SaYia3t1R3Ya0Qhv1MXO0VSUBQ0w4wtuVhV8iGS5y2lmxvu53qQB VEvqgbVcHALG4X/mmFqEo1GPikfUJYD1BhHa6AFaJNZLbumZLUFA85F8W5r6GF7O6IXE8U nN4RmpANp1+5SSfx/gRhbjYEyrNNVS+GbzbbSlXu+1he9yjfbj5O6olhGHOyI6PW3/Mu/G xawDfEvyuBtvtiLLleSXOuQk0zan+W49F2idPc2EZ6K6l7a0sC1yJZhRNSiSZQ== 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 4jNnQh6Tbwz13sq for ; Tue, 10 Nov 2026 00:22:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f1f2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Nov 2026 00:22:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8c13acc68517 - main - umtxq_sleep(): do not wait forever for zero absolute timeouts List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: 8c13acc68517f785df4b6c4b016dfd1c6f38c8cf Auto-Submitted: auto-generated Date: Tue, 10 Nov 2026 00:22:04 +0000 Message-Id: <6af263ac.f1f2.2b88aab3@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8c13acc68517f785df4b6c4b016dfd1c6f38c8cf commit 8c13acc68517f785df4b6c4b016dfd1c6f38c8cf Author: Konstantin Belousov AuthorDate: 2026-11-06 00:09:12 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-10 00:21:18 +0000 umtxq_sleep(): do not wait forever for zero absolute timeouts For msleep(), zero sbt means no timeout. If the timeout was specified as absolute {0, 0} on MONOTONIC/UPTIME clocks, consider the call timed out immediately, instead of sleeping until a signal is delivered. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D61253 --- sys/kern/kern_umtx.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index 9182b13cba5a..fb8fba030b23 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -888,6 +888,15 @@ umtxq_sleep(struct umtx_q *uq, const char *wmesg, error = umtx_abs_timeout_getsbt(timo, &sbt, &flags); if (error != 0) break; + + /* + * msleep() treats zero timeout as no timeout, + * return ETIMEDOUT right away. + */ + if ((flags & C_ABSOLUTE) != 0 && sbt == 0) { + error = ETIMEDOUT; + break; + } } error = msleep_sbt(uq, &uc->uc_lock, PCATCH | PDROP, wmesg, sbt, 0, flags);