From nobody Fri Mar 20 07:16:17 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 4fcYl56pJRz6VVW9 for ; Fri, 20 Mar 2026 07:16:17 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fcYl55csrz4LKN for ; Fri, 20 Mar 2026 07:16:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773990977; 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=AAnBHWIUQcBCp5dLGNTaTR48oRKqOZ35BQeM95wUrW8=; b=BwYYs8fQqx+z0jDioub2YBTGA8V4zBsE7WNIqYGZbEZrn+S9rBm/24Dlbgih59fvMToeN8 /CjK6zhOWxxS1rsQ7BgQF1cEhjAziMHIyO6/cIw/jXHZnm4w4fSoCav3Po+eUonO93/bTP ifMPDIAwiBedKYKusnpBcUZK4nlhLk1m2YFMQ869jpZxVIFcUwWiAM9O7rhpxvEpuCUeuy mLmnszPPnEdIcMWSOJ8zyj1MdPWqcO0wsZaHHSCGJGrWSvHrwpNgQ0cg/CDO/CrtYqohTE Kdhm0N1Zjlm9E9L0iqrDR8rSm5dbDQNEN5pyeNjf9g0pz7f5XaDciyrTxSU4gA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773990977; a=rsa-sha256; cv=none; b=gW2ssz01F0IA6Lm7gcsFvDTahPPpHgm6Nk8Xp4IYXfEtFYLnJUQV4MNBAe7XfI7RNqPQ7l PLytx8Zr8Ll1sNJyNnwdavYJDDcXtfUVZ/g7DLRj6dgxdEzr9t1ri2pV0o6bfAjHTyfH6v nu+4S7dwvIpujy8W4TwegeP2tvGn8+M2HrrKk0CCXBvgmauZzdxtJatKS1/ljygznvT+rn CXCA9fw5LQJBpLJdDh+L9zHa8R14vG5q6Nj691PCgsNIsudXcRF53ax9dXWC7swdewxbke FkVQXgi8Nt7gYbSLssNJusmQSIPiRYAN1gT5ZbWV24KuAb4IxzrXTL6lfccwAQ== 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=1773990977; 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=AAnBHWIUQcBCp5dLGNTaTR48oRKqOZ35BQeM95wUrW8=; b=OhO1Qd0wGya67VDcA+vumaKOu19hbz11QTtbLsAZ4X+aYB4MC8/WGlGgu3Mthl+ruuMAh+ o5z86gf92LIRazjaHbzbv2AS83sIrTJGZXlQMZ1RoJwNFm4SXGiKgzbzO7/BTHyWPwPyb7 64fKXti5gNayBiEbHy1q2HVTLPKvyCUe/sbK7fW/ZcswZ7ewYqV/sgzw2cC3aYNKmTaOx1 DsEnhcrs3ekTxAPNjO2QmTCUC6/Hn0yFGAxgNjiHuK7UtpPDt9MoBPmD73ciPEiwnt17Nq +aOkH3RwabH0YH7r/VUyXbxfo4ai0IHa6q+8msZM4T9EdLlo2OozQh9ILJcz/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fcYl55DDjz1QL for ; Fri, 20 Mar 2026 07:16:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b1f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Mar 2026 07:16:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jake Freeland Subject: git: b11fba41265a - main - timerfd: Wake up on discontinuous jump 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jfree X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b11fba41265ae132acfb05587a6dbf60334d3279 Auto-Submitted: auto-generated Date: Fri, 20 Mar 2026 07:16:17 +0000 Message-Id: <69bcf441.3b1f8.7006a046@gitrepo.freebsd.org> The branch main has been updated by jfree: URL: https://cgit.FreeBSD.org/src/commit/?id=b11fba41265ae132acfb05587a6dbf60334d3279 commit b11fba41265ae132acfb05587a6dbf60334d3279 Author: Jake Freeland AuthorDate: 2026-03-20 06:33:54 +0000 Commit: Jake Freeland CommitDate: 2026-03-20 07:15:08 +0000 timerfd: Wake up on discontinuous jump If a discontinous realtime clock change occurs and sets any TFD_JUMPED bits on the timerfd, then wake up waiting readers. This fixes failures from the timerfd_root__clock_change_notification test case. MFC after: 2 weeks --- sys/kern/sys_timerfd.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c index f2a66e21cd63..e4d00f224505 100644 --- a/sys/kern/sys_timerfd.c +++ b/sys/kern/sys_timerfd.c @@ -118,6 +118,14 @@ timerfd_getboottime(struct timespec *ts) TIMEVAL_TO_TIMESPEC(&tv, ts); } +static void +timerfd_wakeup(struct timerfd *tfd) +{ + wakeup(&tfd->tfd_count); + selwakeup(&tfd->tfd_sel); + KNOTE_LOCKED(&tfd->tfd_sel.si_note, 0); +} + /* * Call when a discontinuous jump has occured in CLOCK_REALTIME and * update timerfd's cached boottime. A jump can be triggered using @@ -172,6 +180,8 @@ timerfd_jumped(void) } tfd->tfd_boottim = boottime; + if ((tfd->tfd_jumped & TFD_JUMPED) != 0) + timerfd_wakeup(tfd); mtx_unlock(&tfd->tfd_lock); } mtx_unlock(&timerfd_list_lock); @@ -418,9 +428,7 @@ timerfd_expire(void *arg) timespecclear(&tfd->tfd_time.it_value); } - wakeup(&tfd->tfd_count); - selwakeup(&tfd->tfd_sel); - KNOTE_LOCKED(&tfd->tfd_sel.si_note, 0); + timerfd_wakeup(tfd); } int