From nobody Thu Jun 18 04:40:00 2026 X-Original-To: dev-commits-src-branches@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 4ggp1D6T0hz6jPjK for ; Thu, 18 Jun 2026 04:40:00 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ggp1D45cSz3nkx for ; Thu, 18 Jun 2026 04:40:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781757600; 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=xGcgHwHp8fXckGSLylK11qNoBfId1ypXVxRwSjlvsWQ=; b=EgQdLyAVfmD1ArvDMf1XS7WdhjdUPHf98oCGCA07zB/4E3OB4ZaaitpKo6d7KNYcfsxVeF QopaAjuyTnBi99aSlFLhJ1ttR3zNrQAIx8Osy8JpCXl9yO+0bAmIlsn25zafh9AK5BIAtG 36G+MT1BRtdHLWPn13Z63TXAy2f9I68/7KqFEitUmcd/22nSHGnJlLRUv1sDuQ2DWdsYj5 IHC3JhUKyfo/9aCq6m5f0IRhevO4JfsIU9jwkPXEzoCRuF4SBtghqOrVHCJ7W+3W09musn aAkgjPj6KZtlDMy0/4YNHFuyJSsS4eq3LxaUaYsTceKyF7vgBdHLN+1iABXihQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781757600; a=rsa-sha256; cv=none; b=I1sKZMWN7z0d2sQDCz80Ept5RNvTjP/JeV3MOG9i8QXKIbuFvtLfHp/rnwz6yfozWS6Qwu 7SFGKrYKq53Dywb2qLv0VxGR2A9Jq2ROCtymQGUE8G9iyw8s5VDY22r9hBwFIS8TXHGeAS v3b9qLxpvnZ5w8nMyFKNBFPSVxGE+e0ApGI2Wd9JcMdVU5QCpWnC4P/u3mWN64rbq2foFk HB5AyNcdkzCNx1flkmAFJ3oB6eERvgZNjGEBOyXUGx+R0VV8cjqdzVmpA3ZJFn6codHZBP H6b9cZ++r7PmnmPKjKP07YH1RzKqvuivjihtB5D9JMNXMpZPdCBVt2n7+wF/TA== 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=1781757600; 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=xGcgHwHp8fXckGSLylK11qNoBfId1ypXVxRwSjlvsWQ=; b=AMGoqFi1yTxUs2XdTCcEzqAuYU/dVygswbgwWIUVf8+iM5q8C6vQg5PYTXQod13ZmKO5RE txwtWfqf3UGP3Yo+DEnK9Dq90/dFc46Op3hu5FEKg/I/hQozEOwAgiqFDmG9UkwzvTimVH VuARi0ADLDp1ZwXhw9q17rWVgG7eFD1ncq4jxOBqJ0iJ9nyvh3ObS6f8pZkbr7lcFQMG7B baWl8OUP79N2TjLmA6XAxwGkZIwGAImfX7sB4EuPRUIKf/yE0FOXpbXoBjc2C0MmlP3FTg 58UuH1YbJCB02wda2smGOsV6I0l3h7wbrZr+h9VYSJNpMprYxJmy4Tn7oVPoSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ggp1D2Wzszkg3 for ; Thu, 18 Jun 2026 04:40:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d8c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Jun 2026 04:40:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7d69db2f49d9 - stable/15 - ntsync(9): properly handle timeouts List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 7d69db2f49d924342cf0ba2eda0af16592db3811 Auto-Submitted: auto-generated Date: Thu, 18 Jun 2026 04:40:00 +0000 Message-Id: <6a3376a0.1d8c0.29f17a9a@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7d69db2f49d924342cf0ba2eda0af16592db3811 commit 7d69db2f49d924342cf0ba2eda0af16592db3811 Author: Konstantin Belousov AuthorDate: 2026-06-15 00:59:46 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-17 18:24:57 +0000 ntsync(9): properly handle timeouts (cherry picked from commit 96759ab67a42226679675e24e35549aea2aa49e0) --- sys/dev/ntsync/ntsync.c | 16 ++++++++++++---- sys/dev/ntsync/ntsyncvar.h | 1 + 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sys/dev/ntsync/ntsync.c b/sys/dev/ntsync/ntsync.c index a7b002de7cb6..2d3054e0a4ee 100644 --- a/sys/dev/ntsync/ntsync.c +++ b/sys/dev/ntsync/ntsync.c @@ -215,7 +215,7 @@ ntsync_wait_locked(struct ntsync_wait_state *state, struct thread *td) if (state->ready) break; error = msleep_sbt(state, &state->owner->lock, - PCATCH, "ntsync", state->sb, 0, + PCATCH, "ntsync", state->sb, state->prec, C_ABSOLUTE /* | C_HARDCLOCK XXXKIB */); /* @@ -1195,7 +1195,6 @@ ntsync_wait_state_get(struct ntsync_wait_args *nwa, u_long cmd, { struct ntsync_wait_state *state; struct ntsync_obj *obj; - struct bintime btb; int error, i, j; if (nwa->count > NTSYNC_MAX_WAIT_COUNT) @@ -1270,14 +1269,23 @@ ntsync_wait_state_get(struct ntsync_wait_args *nwa, u_long cmd, } } + state->prec = 0; if (nwa->timeout == UINT64_MAX) { state->sb = 0; } else { state->sb = nstosbt(nwa->timeout); if ((nwa->flags & NTSYNC_WAIT_REALTIME) != 0) { - getboottimebin(&btb); - state->sb += bttosbt(btb); + struct bintime btb; + + bintime(&btb); + state->sb -= bttosbt(btb); + } else { + struct timespec ts; + + nanouptime(&ts); + state->sb -= tstosbt(ts); } + state->sb += sbinuptime(); } *statep = state; diff --git a/sys/dev/ntsync/ntsyncvar.h b/sys/dev/ntsync/ntsyncvar.h index fd875588e889..97828c99bb7d 100644 --- a/sys/dev/ntsync/ntsyncvar.h +++ b/sys/dev/ntsync/ntsyncvar.h @@ -81,6 +81,7 @@ struct ntsync_wait_state { struct ntsync_obj *objs[NTSYNC_MAX_WAIT_COUNT + 1]; struct ntsync_obj_event *alert_event; sbintime_t sb; + sbintime_t prec; int error; int index; bool any;