From nobody Mon Jun 15 12:58:43 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 4gf9D4055Mz6hJk9 for ; Mon, 15 Jun 2026 12:58:44 +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 4gf9D34ryJz3WVn for ; Mon, 15 Jun 2026 12:58:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781528323; 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=b3OrtNM+N8MX+qQtt9QVrhjvulT1tj5l+GA7hcRdwJU=; b=kWD+9F4aV3Fmn3rmZGv3jVFx/GW7N3gVi7JXVGt422H2x6vEBq6NDUxckAAPzK9jPaSDZD b6wm+JCuyUZPEqvG3QjhO8JlPddYXHrdCEGw8icx7/iIgRc+zqFD+lsYYT1kaSzqurhZZ9 KXlbdZIxBq0cNdCzoRn0DDCVp5mbKd/sRJna8NhF6XGiQWJLlpa+szl+eYA9PQoLhsZgaJ Euac0ZBxz14Td/P4F3C03nkk9qQdLFV0WVnwapVqumfo5RgFf3V2P+sa5HjJtzqy89zwOC AaWDfX8ydw6/TKDi28xklgAlrIaGWA3yCKW+eTFhumu/KIxr5349YpYCM3xNPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781528323; a=rsa-sha256; cv=none; b=yb7HdVsmPMl4vEbAJJ405vCx4FG1uRHjR5NxR31zqRk3oAQHvzuSUajAAkppAaqf3URba8 s8XaBPegAt+k95hdvVHJ8DYU4yZlgGsXEm+4DjkEC6lE8fMRyy1rCBLmh+MMADycn99fIc JyuNthL5wO9KDZXOYFi48micHjidwPJom2QHe9AqgOjBAczZmteK+T3Z2VHre+Wxqn+jao 2EHZQ8aJoEkWRFHv1ECPK3DYSmjErDJxFz1HJFtOrDBGc6MRvbS/tyyM0I5w0A67nubKpY wUzPk/5B4otI7XhNAUOtOGqHtltcDIjoqB1ZIaqDQa7/9pn8q5ds1dRBpZgRiQ== 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=1781528323; 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=b3OrtNM+N8MX+qQtt9QVrhjvulT1tj5l+GA7hcRdwJU=; b=i4ev+Zm1ggkGerfc8er46ckom9SjrKDv1dYZWMKdGfJXBDJsLXHluSclKF5KD7Yy4mS7h7 hH//SzBg4DYEXt4h7Q+kFNuGHo0wz9HwbXgcCplfzb0HCzEp59Sj6TXbru3h5ocZjEjVdS o2e1HG9L70BQ3u3oegPDDh7BCR27UEAPaxqCm5aC1+3lMetjl95/zkzsoZozxrarN1nbxO Y0UKk8yOujBw1xH80M07oSHdo/cnxNkQbil4+OD6hBLZQF16zwkjUwSXbpnODLZC+SaFj+ 3BtneJhynM4foO2FLQHRE4gyJZ2PVwyVvtivR483+xCnUT+wvBZuByLeaayivQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gf9D34GtVzw3C for ; Mon, 15 Jun 2026 12:58:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25bd5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Jun 2026 12:58:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 96759ab67a42 - main - ntsync(9): properly handle timeouts 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: 96759ab67a42226679675e24e35549aea2aa49e0 Auto-Submitted: auto-generated Date: Mon, 15 Jun 2026 12:58:43 +0000 Message-Id: <6a2ff703.25bd5.10fe416f@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=96759ab67a42226679675e24e35549aea2aa49e0 commit 96759ab67a42226679675e24e35549aea2aa49e0 Author: Konstantin Belousov AuthorDate: 2026-06-15 00:59:46 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-15 12:56:40 +0000 ntsync(9): properly handle timeouts Reported by: Alex S Sponsored by: The FreeBSD Foundation MFC after: 3 days --- 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;