From nobody Tue Sep 12 07:49:42 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 4RlG2G6Nmvz4tglv; Tue, 12 Sep 2023 07:49:42 +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 4RlG2G5xcjz3M3f; Tue, 12 Sep 2023 07:49:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694504982; 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=uLKjlLV/GEu/sxk4UdPDLrHC67vdt7Ar3Lwz7eZLcpE=; b=Kcb1+b+znq/MU6nTIvFt/M57eD9W+PnZSLSrLL6/cQ2cL3Bor1h8PafrLlLCUtRsTLiRFT 456sag7urnckOaQ0xxdjOhmdIm0UAMcuWgGKl8ayGeZT5C6xtMMp5aqKtWjKyAffGcDXWG rymTY9nFecWm88+AjwPkUVVZ6DeSOrfciBPIhi6/EdGl9UGLBJcrEn5B01tqLPD1OTPufU zbSFz4qOfsrmK9OdLfGzwA+MOG78yX1wcM6SHNIympwEOcdRMSgVeK7n8E+DJPy2yTzsUw 2LNllhhwpJvN3obe0qp0FPm4gK+LybzkPAsbdfdD6dZxq23CLNjtdfnHA73k4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694504982; a=rsa-sha256; cv=none; b=ynAfyFiDceyaTCZWr+hx9MLgkb0z0QYVAobgUfTflAtpkhhQWCkKceEcZhI2ESB59zJd5u oXpj+DS5xdX8w4jm5Ui2Kjg5vTtN3wu54s3qjN6AF0TuKbnQjDcg8df9ozmTrRwJNFzqy7 S3YBVLaLofb4ScA4Y36V7sPlajPbXc8AWLVAdDUpfLp5zYgE51iireEv7sdIQL7TeD/XMp y144X5jZICzKSyTFt8wR4SpbQ/Cp7IlD3GDSPwt/+7MPM3RPm7vjLhnVnssoXUr/mYgKYs 73/mI68tRRX8YtZ6OB2uIwugcOpx8K2z3wz8XKxUVMuV56ptUP4pqkVmlsdjKQ== 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=1694504982; 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=uLKjlLV/GEu/sxk4UdPDLrHC67vdt7Ar3Lwz7eZLcpE=; b=vwGO1C6eiejtaCfwp9DSbaHPVxaEoU6OvJGLn5fx5xh28KbNkKcKIU8MXL0XRdSVPUhgCv YMWa0bEfMeM+6uK4tXOXqPkkBT3Wrus8nwkBT9znFFQXgbGb7GIgnxRuKJHekADc0jMCHS W/4yokG5FuA8L0et0CVnU6TVCIY118hpnlld59oHHAkGnFFo4Xyytdsn5uvMWJUvoZtBHy e05eGos1lSa6BngCFnmdOVOlj80shvDJzojsFnj8pSV/Y7IAMiHLOHe5VDvNJydjFeS+hu GvFqzq6BkVax/IkxyfHyj6MoOBOx3+HXyIkoVad+teU/+k3CdA+Kl0DECdwYnQ== 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 4RlG2G50swz8ST; Tue, 12 Sep 2023 07:49:42 +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 38C7ngxd072203; Tue, 12 Sep 2023 07:49:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38C7ng0A072200; Tue, 12 Sep 2023 07:49:42 GMT (envelope-from git) Date: Tue, 12 Sep 2023 07:49:42 GMT Message-Id: <202309120749.38C7ng0A072200@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 3c93ba3d7f7c - stable/14 - linux(4): Convert flags in timerfd_create 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3c93ba3d7f7cf0d61f6b98c08319c729a6d31d71 Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=3c93ba3d7f7cf0d61f6b98c08319c729a6d31d71 commit 3c93ba3d7f7cf0d61f6b98c08319c729a6d31d71 Author: Vico Chen AuthorDate: 2023-09-05 08:53:02 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 07:47:54 +0000 linux(4): Convert flags in timerfd_create The timerfd is introduced in FreeBSD 14, and the Linux ABI timerfd is also moved to FreeBSD native timerfd, but it can't work well as Linux TFD_CLOEXEC and TFD_NONBLOCK haven't been converted to FreeBSD TFD_CLOEXEC and TFD_NONBLOCK. Reviewed by: dchagin, jfree PR: 273662 Differential revision: https://reviews.freebsd.org/D41708 MFC after: 1 week (cherry picked from commit aadc14bceb4e94f5b75a05de96cd9619b877b030) --- sys/compat/linux/linux_event.c | 9 +++++++-- sys/compat/linux/linux_event.h | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c index 816c68a90f1d..e88791659f1f 100644 --- a/sys/compat/linux/linux_event.c +++ b/sys/compat/linux/linux_event.c @@ -611,13 +611,18 @@ int linux_timerfd_create(struct thread *td, struct linux_timerfd_create_args *args) { clockid_t clockid; - int error; + int error, flags; error = linux_to_native_clockid(&clockid, args->clockid); if (error != 0) return (error); + flags = 0; + if ((args->flags & LINUX_TFD_CLOEXEC) != 0) + flags |= O_CLOEXEC; + if ((args->flags & LINUX_TFD_NONBLOCK) != 0) + flags |= TFD_NONBLOCK; - return (kern_timerfd_create(td, clockid, args->flags)); + return (kern_timerfd_create(td, clockid, flags)); } int diff --git a/sys/compat/linux/linux_event.h b/sys/compat/linux/linux_event.h index fa63371b5170..8c6758fefcc9 100644 --- a/sys/compat/linux/linux_event.h +++ b/sys/compat/linux/linux_event.h @@ -54,4 +54,7 @@ #define LINUX_EFD_SEMAPHORE (1 << 0) +#define LINUX_TFD_CLOEXEC LINUX_O_CLOEXEC +#define LINUX_TFD_NONBLOCK LINUX_O_NONBLOCK + #endif /* !_LINUX_EVENT_H_ */