From nobody Tue Sep 12 16:44:16 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 4RlTv50hjXz4stxb; Tue, 12 Sep 2023 16:44:17 +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 4RlTv44LzWz3dsP; Tue, 12 Sep 2023 16:44:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694537056; 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=7jtbtOe6OmEsPKGB2JV1ut177Itj2LSB31NPZ0A2/7M=; b=qSSM5OMqJfOutgHOUFh9f7yqZBRck42OBhtDaNwcif8sYEzrkIZEiivfUDt/lPPNotbeSJ sF/BcQzlqUpdVBqNOP3SY5MR131q3QflMXBgTcXHGCpQpnGFpST6T10BAnLJXiqv4SZfE1 Mgu3X0eHV6a+z6RPLqehcdIFKh3SrrQ90npG/cR2eMRyOH3qGNeNQBlwlvd6ZW17MyZxmZ XhWPaUis5ZgX3yOzmzFqRidrwvi7y+fz+XqhuiWYVmYNRl1/h8zbgZ1KcpoN9/NwmFlp1D 2UvIoVcEZnO9wj0S1G8c7W0TzcHVL4vSaJ4cz+QOib6H44MN4OLzY87CICfAig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694537056; a=rsa-sha256; cv=none; b=yycRbYdEvSLQJpyy3CJdyTwqdZcNXPcgID7Q+iIUwkXgQfkZb/ChFRvNF92l7mYPb8ftv8 VXYkR9pY0I4zGNPCjC1y2LmY/NCNazKHJE06IReA8Dd8cXzc6oZ+ei8yn74NZ8vIz4Ls15 ztAH+/OQpWsrQz/+IeKKuuvag3VGJCUw+xMwp5RGXpKVPs0MDtm0kT1R9Jxe5kBjf8euNJ C9Ee0GukXUoZxIQP5nvJg53wMuhnjZp7PKP2S1/yd60wKxIhlax7S+M1/e8BnX+0XRO29/ 71Mj6iwgnwrIe4kPvbZb9XMXrV6Syl9YmJXZNwoKL50HmX5neGVpznPOoglYZQ== 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=1694537056; 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=7jtbtOe6OmEsPKGB2JV1ut177Itj2LSB31NPZ0A2/7M=; b=yArc/x0Ro9Bq0O7r/8++eKwP4VtrieZJUU1n5hfuVgWISs3b36ln9vLgtUhu/hQT4Pk+Rp aVeRK2xsP+gi2hEWOAEMCAV4D/7GLsrrJbUnPpBM/ZQhnJHf655FeSMZzE6Vl+5CmMmVU0 Xp7UkWmc5kQXCgFJLUhAKLMovUB4r0eTt6GQoLaD5gvPaA/MJccls7EOcWWhTAZS+yYTRV Xfmnw3zUaDtBC+S+qBLuE53xtR1xP78cVEe1Ckdy7spGtMrhfmMGlNHGAPrQLWT7bxDGJ/ C1btk7R+mkDyESUqYGufHjYMRa2WsO9kdEBPpvam2kfpDlqPL+73vDDNRKlW3g== 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 4RlTv43R0lzfvY; Tue, 12 Sep 2023 16:44:16 +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 38CGiGrn071251; Tue, 12 Sep 2023 16:44:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGiGUd071248; Tue, 12 Sep 2023 16:44:16 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:44:16 GMT Message-Id: <202309121644.38CGiGUd071248@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: 80b763d4a539 - releng/14.0 - 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 80b763d4a539854d43535b2f9dcd0b2f739a6502 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=80b763d4a539854d43535b2f9dcd0b2f739a6502 commit 80b763d4a539854d43535b2f9dcd0b2f739a6502 Author: Vico Chen AuthorDate: 2023-09-05 08:53:02 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-12 16:43:20 +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. Approved by: re (gjb) Reviewed by: dchagin, jfree PR: 273662 Differential revision: https://reviews.freebsd.org/D41708 MFC after: 1 week (cherry picked from commit aadc14bceb4e94f5b75a05de96cd9619b877b030) (cherry picked from commit 3c93ba3d7f7cf0d61f6b98c08319c729a6d31d71) --- 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_ */