From nobody Fri Apr 3 15:26:17 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 4fnMy24Hq8z6YgNX for ; Fri, 03 Apr 2026 15:26:18 +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 4fnMy20Rsnz3fDf for ; Fri, 03 Apr 2026 15:26:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775229978; 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=jAKUiWnEzgQtmc0o0Or2qZ4cQgtAAaACKDS8gQF5lzc=; b=cklQMLlJBk5pxc7R8c6Wc5THptLm6nBjlx8nXQlxm7TYktxWVK3+Hx3xLdIqqW0h7qze+j tFiVVYoTvqQRe2jEmvL41Fwv99Ti4WbIHM0UrPngYPHL5Q0+525JkfsmmDJDXgw0P5DLm2 gBCxqfC4rnadMZeg88SZl0xTgvXuVNRasp5s18v2ohZgytjAYZ+eaY4+K4giOKSK31Ilcg jO4ZjelCAdEWtT8xwaXWQCFN4D9vrxmF8uud/8xT/nD+yXIl5Fe1DggSqQ1eIBlGakjzLi zUD3rsKJC4rp1ZJHIT1sQWFi/qozFrcyn5XgMimfErsu7zSHIBS4x/pWQTk2iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775229978; a=rsa-sha256; cv=none; b=OjNy01vrvB9xszgi3qooeeV7AmpmsTOgbTQQ87qoeMzB0U0e4kCVL+tsyNt/TzhddBBFtS 2hZV9fxW1RrKZ0F6NW08mW/cJ+DTc0mm3Es7hOOwqQ6Yu87kP3ptwnFs3QHgO3ni1PTe1I 4iXQiV710b0yT2Svo+ekFK/BnCgq7CF1KiHZIqHFviYY2P9LG2uS5AqV29pEGZSQfk4u+U 8xG/Dk3VcaNhN9E2FSYcWml8PlfwpTk9o9NPDeV4ScuOxPgyyA8u18hBcptupgf4HaXueR 4PvJ1cjsSiz2MBMK9FuwkE/BwvekJlxwMHPtIPyz/iEsFTyofRI5Vc9UhTXT3A== 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=1775229978; 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=jAKUiWnEzgQtmc0o0Or2qZ4cQgtAAaACKDS8gQF5lzc=; b=Pk9xCz0Z6LUII0V5oU9IHqSfhqMNNCqjAnOOgwWp5r3jB4oYCiFkXjzIh9NaO1QgLQONQQ yiqKXiDR+nKNDT/ZdA0OcReEom90qp6uwzaBhZP+SzMC8jgzium50JoFE8AQo89VI7f3kW xXOeIw4Yo+TWgtaY8KWONiZNb+yE9ygsiUrjf0dJeu9qKreh+LS06yWGwl46/bhP4Lb3gL +xDsQ218o5T1QVxqW9n1vjH5FxU2lwZTgLUCn7Usewqe9PJ5IZvme8HhugdhP7axop5D64 tuX9jsd0OUPCOCiRyAGWCYf0s/rzJqjrHPrZptbuMVYaUkhrc6rnIrWwLkqSjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fnMy1736Hztrg for ; Fri, 03 Apr 2026 15:26:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e66c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 03 Apr 2026 15:26:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jake Freeland Subject: git: 6a5176a100fb - stable/15 - timerfd: Wake up on discontinuous jump 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 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/15 X-Git-Reftype: branch X-Git-Commit: 6a5176a100fbb19c48eabfc48ab626320606fcfb Auto-Submitted: auto-generated Date: Fri, 03 Apr 2026 15:26:17 +0000 Message-Id: <69cfdc19.3e66c.c4b1abe@gitrepo.freebsd.org> The branch stable/15 has been updated by jfree: URL: https://cgit.FreeBSD.org/src/commit/?id=6a5176a100fbb19c48eabfc48ab626320606fcfb commit 6a5176a100fbb19c48eabfc48ab626320606fcfb Author: Jake Freeland AuthorDate: 2026-03-20 06:33:54 +0000 Commit: Jake Freeland CommitDate: 2026-04-03 15:25:36 +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