From nobody Fri Aug 25 15:10:35 2023 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 4RXNgH2twnz4rQ6B; Fri, 25 Aug 2023 15:10:35 +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 4RXNgH2Rprz4gqt; Fri, 25 Aug 2023 15:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692976235; 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=SHlocsy9Ai6Hh0UShAJjU7C7FKfzQ0sQO1TQPonHvHk=; b=Tvf3D/cmkIPd7IrTZdQLPeTNV3Yb13tqJgZClP6MY1/HEDCctYex8l6riBzg0sBbnqvw+2 N0C/73YcZAaytRhIG9gUtcylRaGXHSHTt5luKTfJ3Awynue/l61k3NWDF2wU9gOooHxHiQ s3wsNDw7ZORdO8ZNBbQi2VTHQORe+a7c5F4ppYTGTdMInEuOGeQocRZAsGIYN9GCeotX31 A1fpSEViBZgG96iXfbl3r/z/kckvP1f78w/OCv6y4daQjJ0j93FVw5y1Ew1jHSDcygZYYe NwO/1PpvUbzyRNq/mWEfrAKC9FEcQHDHjcn5IKJm6b6nNaCy7LPeIlbqpHtufg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692976235; 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=SHlocsy9Ai6Hh0UShAJjU7C7FKfzQ0sQO1TQPonHvHk=; b=DY2m7a7PsQPE/tWjnxrhGiRDLYHLnYMPumXf2xyWzBxCXeU0DuVznI0ALytVv8RxnhfXCV k9nZ5zdFwRGo8b0lNZ/ecASdF0t+LJN8CvnDj2QuclDskTH1YFQsnzdOcmhHQL3O/QG+ux ABVjxPqWgqiGiRw4w2i/EJ/mCKb02S587Yche4wC+73QjIqO0x/JqkSCLROaEypI4IWgyO LRtd1IfBp/WfsTAzHDL8m09a3ijZoeEe828nEHqT7qTO1w2Ntl9Aze2IHWMwQFSRR0JCfe JL1OafWTrK8OUmMEGcWt5+31IaiiesONfyj3kCvw5lMETGW74gP/EmkWtcf1bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692976235; a=rsa-sha256; cv=none; b=xfNfnkSbIeEfgajYghCADk5g8jIuz0rmHIJ6cD4IcA98oED0shvi2Mj7eRjE/4ttFlyUOS YBJW3w/aLw/DpxUxmsoTeSvqBLj93W4qhsXNGhIZDMnlaWB9YFZlO3+v2IlDhKARSjlwQm HrQW/eOxB9X5yIhSfwTWvENwJ5agU7REjfDQI22QgGcWFE0wUqENq4pvUL/mEp1yV8/Jcg SetttBLsBbj8whPl6NpZjlfDB2/E3GSsmHJXqeWMvpoDMPZvxQUB14WPR/jMGYyzbfUfFR urgtglZ1GFTssSUVph/bzG1d3Floc1ro7q76c33M+teIP00N8xVbsN/9CfU1ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RXNgH1VYVz1CJb; Fri, 25 Aug 2023 15:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37PFAZKX061474; Fri, 25 Aug 2023 15:10:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37PFAZCt061459; Fri, 25 Aug 2023 15:10:35 GMT (envelope-from git) Date: Fri, 25 Aug 2023 15:10:35 GMT Message-Id: <202308251510.37PFAZCt061459@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 5eab523053db - main - timerfd: compute fflags before calling falloc 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5eab523053db79b4bd4f926c7d7ac04444d9c1da Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=5eab523053db79b4bd4f926c7d7ac04444d9c1da commit 5eab523053db79b4bd4f926c7d7ac04444d9c1da Author: Mateusz Guzik AuthorDate: 2023-08-25 15:09:21 +0000 Commit: Mateusz Guzik CommitDate: 2023-08-25 15:09:21 +0000 timerfd: compute fflags before calling falloc While here dodge list locking in timerfd_adjust if empty. --- sys/kern/sys_timerfd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c index 2bf2a05c443c..c8b45a926b02 100644 --- a/sys/kern/sys_timerfd.c +++ b/sys/kern/sys_timerfd.c @@ -129,6 +129,9 @@ timerfd_jumped(void) struct timerfd *tfd; struct timespec boottime, diff; + if (LIST_EMPTY(&timerfd_list)) + return; + timerfd_getboottime(&boottime); sx_xlock(&timerfd_list_lock); LIST_FOREACH(tfd, &timerfd_list, entry) { @@ -418,7 +421,7 @@ kern_timerfd_create(struct thread *td, int clockid, int flags) { struct file *fp; struct timerfd *tfd; - int error, fd, fflags = 0; + int error, fd, fflags; AUDIT_ARG_VALUE(clockid); AUDIT_ARG_FFLAGS(flags); @@ -427,8 +430,12 @@ kern_timerfd_create(struct thread *td, int clockid, int flags) return (EINVAL); if ((flags & ~(TFD_CLOEXEC | TFD_NONBLOCK)) != 0) return (EINVAL); + + fflags = FREAD; if ((flags & TFD_CLOEXEC) != 0) fflags |= O_CLOEXEC; + if ((flags & TFD_NONBLOCK) != 0) + fflags |= FNONBLOCK; error = falloc(td, &fp, &fd, fflags); if (error != 0) @@ -447,9 +454,6 @@ kern_timerfd_create(struct thread *td, int clockid, int flags) LIST_INSERT_HEAD(&timerfd_list, tfd, entry); sx_xunlock(&timerfd_list_lock); - fflags = FREAD; - if ((flags & TFD_NONBLOCK) != 0) - fflags |= FNONBLOCK; finit(fp, fflags, DTYPE_TIMERFD, tfd, &timerfdops); fdrop(fp, td);