From nobody Fri Mar 20 07:16:16 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 4fcYl46bKNz6VVbQ for ; Fri, 20 Mar 2026 07:16:16 +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 4fcYl44r18z4LCN for ; Fri, 20 Mar 2026 07:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773990976; 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=CyNKAevzVdDSXVR1G/pCgJppjXHb3AJZghs/NFhbw3U=; b=g1EaBjsijnG+X7cOCMJyqvVWBdnHemjCcSgQAqwXec1kUJzU44gWcopiTJPX4l+rq2aMkz 8IdYFSNec1xvRmhuMCY4Sk5m/dMeVoy8mzB7KvSqqSrGRBzzoW5LMH/TQ4wCEpDwgAX5LF L12NAxXH963/WJLhCADdkTPGA8c9YYbZaCXmIpxBjcChkVnhguX+hUXzNPG4Cm3HjW1IWP shqhGFMOF6gY5LExIJZqWdIOQEsd/p/0KIfc/8CCGpai3A9WxXruBC1hCPDjO/pyO8evm1 NEh/fxfcbldXCQ0lQiYPdxXsL9l4sBqbSF6NTMepq8c7Fuex1Re+N3TRS0PHNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773990976; a=rsa-sha256; cv=none; b=gKawOc5g+z2cZamtUGXQoHtKxeyA8djQukG7a3ySxjrTypYxwX0ip9E9P3TSSqX6BzcWeB qclcb+Eci6rFLP/oabipBcFrOBvuK8MibVZwZGbgMn4FIuqgFnzNAgonLqodKSj5wKMTdv xuYTCvA7Y1943WznxkqGg5L4mwWXn6NOHZdeKjaFMNZ4SeMj/B1E0ExWc35dq/PbS0jsR4 3Zls4eLX8VSDuNqmJHZwW2uo8Bkm3XQVWtNq5WZlNG5yuvpHxQAs+DJCYUR9cv6NvYJlSY iNboKCOl99V5AcHpb8qKrW6g35ONlrni1xohDLnAtzh4G53Y46WEy6upQTle8Q== 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=1773990976; 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=CyNKAevzVdDSXVR1G/pCgJppjXHb3AJZghs/NFhbw3U=; b=f+++4IliF31jtbYe+jeaNp30ti/+pnTPetrl9ZEx/3iExrEa0JzplqpeaP2YNciqDIxUY+ F8m/92jGcmX3nN0vjB+s8+jzjVEZxmq6U58orejnhoJuhW5pIt3BNWQ5nwQVV+Cl+L5T0d ZBtGnimf1nqrOgIK1BcDD+p8hPMXhAnVAhf/+nIbBoxpz+zdHpZ+eFmyDUIDBlHeJr/wM4 LoiuGMCSBZneIZcnc5c3yVsxNcuSP9iVnbHZay2O6qb+3pmf9X7nqCNlgewRuXjf19JO1Q TpJPZb3haM/r3xu/J3Ujttf1skfhrDQDW9UvCGzC5StXogHCeNGh/C03Yv0c7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fcYl44Kcgz1QK for ; Fri, 20 Mar 2026 07:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c897 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Mar 2026 07:16:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jake Freeland Subject: git: 0e8f351be793 - main - timerfd: Use saturating sbintime conversions 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: 0e8f351be7935729bf67dc1b7aa4d178cf154931 Auto-Submitted: auto-generated Date: Fri, 20 Mar 2026 07:16:16 +0000 Message-Id: <69bcf440.3c897.7b15e50a@gitrepo.freebsd.org> The branch main has been updated by jfree: URL: https://cgit.FreeBSD.org/src/commit/?id=0e8f351be7935729bf67dc1b7aa4d178cf154931 commit 0e8f351be7935729bf67dc1b7aa4d178cf154931 Author: Jake Freeland AuthorDate: 2026-03-20 06:33:38 +0000 Commit: Jake Freeland CommitDate: 2026-03-20 07:15:08 +0000 timerfd: Use saturating sbintime conversions Some timerfd consumers set expirations with timespec tv_sec components larger than 2^31 - 1. In such cases, converting that timespec to sbintime results in data loss or sign flip, yielding a shorter expiration than desired. To avoid this problem, use saturating timespec-to-sbintime conversion functions. These will clamp the converted sbintime to SBT_MAX under circumstances where the normal conversion functions would overflow. Saturating conversions still result in data loss, but the consequences are less severe, causing problems only after SBT_MAX (~68 years) of system uptime elapses. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55792 MFC after: 2 weeks --- sys/kern/sys_timerfd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c index 236dfe8bb96a..f2a66e21cd63 100644 --- a/sys/kern/sys_timerfd.c +++ b/sys/kern/sys_timerfd.c @@ -165,7 +165,7 @@ timerfd_jumped(void) &diff, &tfd->tfd_time.it_value); if (callout_stop(&tfd->tfd_callout) == 1) { callout_schedule_sbt(&tfd->tfd_callout, - tstosbt(tfd->tfd_time.it_value), + tstosbt_sat(tfd->tfd_time.it_value), 0, C_ABSOLUTE); } } @@ -398,10 +398,10 @@ timerfd_expire(void *arg) ++tfd->tfd_count; tfd->tfd_expired = true; if (timespecisset(&tfd->tfd_time.it_interval)) { - exp = tstosbt(tfd->tfd_time.it_value); - interval = tstosbt(tfd->tfd_time.it_interval); + exp = tstosbt_sat(tfd->tfd_time.it_value); + interval = tstosbt_sat(tfd->tfd_time.it_interval); now = sbinuptime(); - next = now + interval; + next = now > SBT_MAX - interval ? SBT_MAX : now + interval; /* Count missed events. */ if (now > exp) { @@ -553,7 +553,7 @@ kern_timerfd_settime(struct thread *td, int fd, int flags, &tfd->tfd_time.it_value); } callout_reset_sbt(&tfd->tfd_callout, - tstosbt(tfd->tfd_time.it_value), + tstosbt_sat(tfd->tfd_time.it_value), 0, timerfd_expire, tfd, C_ABSOLUTE); } else { callout_stop(&tfd->tfd_callout);