From owner-dev-commits-src-branches@freebsd.org Sat Jan 30 23:41:03 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 925164FCCAD; Sat, 30 Jan 2021 23:41:03 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DSrLl3pfkz3htv; Sat, 30 Jan 2021 23:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 75AA41E4A0; Sat, 30 Jan 2021 23:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10UNf3Hr095726; Sat, 30 Jan 2021 23:41:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10UNf3ur095725; Sat, 30 Jan 2021 23:41:03 GMT (envelope-from git) Date: Sat, 30 Jan 2021 23:41:03 GMT Message-Id: <202101302341.10UNf3ur095725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 8ce9180c09d9 - stable/11 - kevent(2): Bugfix for wrong EVFILT_TIMER timeouts MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/11 X-Git-Reftype: branch X-Git-Commit: 8ce9180c09d93b4ef11859be604ef41173d6dbd1 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2021 23:41:03 -0000 The branch stable/11 has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=8ce9180c09d93b4ef11859be604ef41173d6dbd1 commit 8ce9180c09d93b4ef11859be604ef41173d6dbd1 Author: Jan Kokemüller AuthorDate: 2021-01-09 19:00:25 +0000 Commit: Gordon Bergling CommitDate: 2021-01-30 23:39:58 +0000 kevent(2): Bugfix for wrong EVFILT_TIMER timeouts When using NOTE_NSECONDS in the kevent(2) API, US_TO_SBT should be used instead of NS_TO_SBT, otherwise the timeout results are misleading. PR: 252539 Reviewed by: kevans, kib Approved by: kevans Differential Revision: https://reviews.freebsd.org/D28067 (cherry picked from commit 4d0c33be634a929f323117f04e6b1670776f9e37) (cherry picked from commit 6a3ad2d0a7b633bad2bb33f9c4c426dffcc91633) --- sys/kern/kern_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 16f24e59b73e..004e3e1e436e 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -629,7 +629,7 @@ timer2sbintime(intptr_t data, int flags) if (secs > (SBT_MAX / SBT_1S)) return (SBT_MAX); #endif - return (secs << 32 | US_TO_SBT(data % 1000000000)); + return (secs << 32 | NS_TO_SBT(data % 1000000000)); } return (NS_TO_SBT(data)); default: