From nobody Fri Apr 3 15:27:29 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 4fnMzQ4bfqz6Ygh2 for ; Fri, 03 Apr 2026 15:27:30 +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 4fnMzP4qzRz3hWm for ; Fri, 03 Apr 2026 15:27:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775230049; 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=xlLg5E4tK8qmAUY0lWrB5g4Ze2ejlUG7FyxmzR0or7I=; b=FXTDGrQT/nK3FT1+nTqtz53RTKZ9o+FPuZrc/VeVSEUqqCnF2tVROcxKBuDxnzumAwoxYk 8BPxKale0es8YbG4tB/3XsfNl+F3407lVO0hdPNCd+2aUycZBMYRJ7RB7i+AeIW0k6bnXZ LZFfduYF2llB3AI2PcKDMvV8Vii5OVJbje3iPIbGAD0PHbnMRLqRb/JpE/zZ74uPsD0RDb HZrXpZDq63DVz4TosdC/jadgWE1JmJYzv54pfS9/dcVEHE1agDr6UC+kEe3mWJkkuI0glG fneZfLpLF4iXhFeoiYGhSGVU2CEYKV7V6v/Kip8FwCivcMi1B7a9nHxUN883SQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775230049; a=rsa-sha256; cv=none; b=O8zLCVNW+bbkPtm4cGeDoxTweFWAN5qOPEhkIHacIV4lRraGE6QcjPGzc5wUt9YPqoW9YT 7NeAUq2+gherT7SkXnCTGRZ219thpkugdJZCQpi/MmH8la3MkYJ3Jxm6KO/20pUgg3Cfjb C0YwrGaIpWh9AasROtMUuPCpB7faz3ChHRj3k1WjQ7vi0Bz5WMTzXDc3dVFoM6z6/upCpK ief5KgW/CPpSboSs4ft1gFqgm+ddvSF3EUBnRBNbCThgJKtKddIF5Kp7FyKFGKhEWDlfIR zabC1dDWo4CnRI10RqCp4ezPuN2tJVvPdasHkFDmbpVeloAMFpmJI+K1zQBkkw== 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=1775230049; 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=xlLg5E4tK8qmAUY0lWrB5g4Ze2ejlUG7FyxmzR0or7I=; b=YGhftPY4ussxNHvXNXhQkiYP6UfwIZVQmw/rIgaS4zNDVX3Fb24Yy/BnXUk1ue7FouneVD Kr8qHZW0N4oKojgrOyqQox3JtTqj6oc6vwC1efHgVtTdB8+ldtPFc4wOBYpJGCw/X/vAdy CUOYvhwml2l8I/W/2T7Ts8P8C9vlTinUxDRCQM4HNDQ4kSGFwSRO8kUup5MywuaBVHBSZe Tf0S2vfNQ7wlizT1/vRx1O7+PB/orLhnFmy1RHPL8AltA5qc+iDSC/7H56VRXhpl+GCwNh AxQ23Gtbe2u9njaTaEKhyPglQoxHzKAwPNvqv5K+38OaACqrpbVeVpsSbbsHcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fnMzP2pd4zv6G for ; Fri, 03 Apr 2026 15:27:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fe6e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 03 Apr 2026 15:27:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jake Freeland Subject: git: f05e8fc76e66 - stable/14 - timerfd: Wake up on discontinuous jump List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: f05e8fc76e66f654f9b842dbe83cecb5d41b8c94 Auto-Submitted: auto-generated Date: Fri, 03 Apr 2026 15:27:29 +0000 Message-Id: <69cfdc61.3fe6e.4c0df8b@gitrepo.freebsd.org> The branch stable/14 has been updated by jfree: URL: https://cgit.FreeBSD.org/src/commit/?id=f05e8fc76e66f654f9b842dbe83cecb5d41b8c94 commit f05e8fc76e66f654f9b842dbe83cecb5d41b8c94 Author: Jake Freeland AuthorDate: 2026-03-20 06:33:54 +0000 Commit: Jake Freeland CommitDate: 2026-04-03 15:26:56 +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 (cherry picked from commit b11fba41265ae132acfb05587a6dbf60334d3279) --- 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