From nobody Tue Sep 5 08:53:55 2023 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 4Rfznb5gClz4sJGQ; Tue, 5 Sep 2023 08:53:55 +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 4Rfznb5BGQz3LPM; Tue, 5 Sep 2023 08:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693904035; 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=ZHeqT0vCf9Zqr6m6btufzlcA6D1DA2yJOVU012o9q0c=; b=YZ3FZFQY6XzHzlnIfrhlQN3NRqHbdu2+g7gwxbUO0lKrI/mtN9GtMZzL7h/08SnrQxNQJ1 8rd/vBlCJoIEWLV0HGmmnKg3UgfVpm2GRarz/kS49tDQmdgyhTZazLUnCDRQH4QFJsi9TO HJ8n2QQXUdIW1JMhr61MSBP9nvPgN8kwXyMemHUTaJ7tendYk3qkYiyk+4htaKIyLsXxLx f+SspnzRK+nUzzzhZhYD1Xzo9lcPemTuPRUoCCBIm34lxu2d+qbJyVIu7gsOwRBiZYkLQ0 JWsZ3/0EKX1nI9TTH9jyMIzmoy29SjMGz2NnF+3FTWUXpNaWF+/+7gvNB7Z/PQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693904035; a=rsa-sha256; cv=none; b=Zypn05QyhV7MgJO5Ak/uMws54s69dJN5JA7SCV2r1cUjPs1S1fWraVlmRs2PqlpbIbR6FX X6lDAuMrnOvj5ayTq3ByMKySaKkyUfDseRFVJ3OeELtAx32KmIQPrfcstkvaDk6ELHuTie uA9KvuOtL7RVF4zYPhvmjTv0lntQJb25bDvv03xCYspMC7kqnyLDoGcQsevVavsEhRrH3f aWWZbaCMY0ICi3Udf/kz+h27Bi/F3j0vuCsu98rFWIHfl8kpFLYrlTUYKHWe9Ip+Yv7tEg hHAqF/ivFaPnD/VTTrx58/4ALQhfLf8byzs4aP6qLOzUFUGqSHBSJ7d5FvURGQ== 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=1693904035; 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=ZHeqT0vCf9Zqr6m6btufzlcA6D1DA2yJOVU012o9q0c=; b=dbROlGMC45tzHPFSLwKD6rGrNagT8c5wCExFleGHP+qmKFMLjDMZJIlRYG1HLWD8I8x/KD q5qIN1dNpeHm0iWQdm4yXof3/lO9YAjULDciWzwHbqCr48/2eVchUw5VMf/sAhPJY9Xequ 42KUraVUptTNkrDau6c1X7uZxLYQofsrXJ1KGQ+JrHFnRHBF1DwKkpLJ8nGmnESXNWsYdX dm/XFU9XHP/z3a+eNn9eblBZQEFYE9Pe+rjzikjuKhmk3EVjsiEaP8ljHEGTUoYlzorRKh BjOi4W08iY01+HtIYBAsKPkEppkiKLJKmIQxnTXBsrtpAMWq/nOkjI3hhJlgAA== 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 4Rfznb3nY1zC0Q; Tue, 5 Sep 2023 08:53:55 +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 3858rtoO030706; Tue, 5 Sep 2023 08:53:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3858rtbE030703; Tue, 5 Sep 2023 08:53:55 GMT (envelope-from git) Date: Tue, 5 Sep 2023 08:53:55 GMT Message-Id: <202309050853.3858rtbE030703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: aadc14bceb4e - main - linux(4): Convert flags in timerfd_create 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: aadc14bceb4e94f5b75a05de96cd9619b877b030 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=aadc14bceb4e94f5b75a05de96cd9619b877b030 commit aadc14bceb4e94f5b75a05de96cd9619b877b030 Author: Vico Chen AuthorDate: 2023-09-05 08:53:02 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-05 08:53:02 +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 Differential revision: https://reviews.freebsd.org/D41708 MFC after: 1 week --- 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_ */