From nobody Tue Apr 26 16:37:16 2022 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 5F643199B1F1; Tue, 26 Apr 2022 16:37: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 4Knnbc65BSz4hqq; Tue, 26 Apr 2022 16:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650991037; 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=klhA0OGYzMUglc56+Ge4e492gaqUsTN19NP7JG8ceVI=; b=Ru83K4V1xruMU5l9s6CngBsnD9tbchxZwEyt02qZF/KRfynYwnpcpR3gjRUcp4vtm1Behf TvjJMSM+X/z3/IGIZ1IdvaNQAdD8ZKZL1np4SpBvBBj8Sk81Tv+GY4zNSpiZn49speMz3t WcSYb2IHQXqADmCaZP/lcD3TLfSSPcMReEBRRte2/RuTrM9FbHsekpxq8y8ZVu8D/3erzQ yytu2IAJFhGn0q7R12RP7FW06V/vkAkk2S38ubOab8RnySHPwAgubfdpdKNNIYQ8MiwC17 2O5DAoUfyZ7j+GqqQ0g4AjNXHBjDf/acJISpmACbW3k49hq7qUjJ5gxNzFbxNg== 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 913BD12B47; Tue, 26 Apr 2022 16:37:16 +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 23QGbGlW065459; Tue, 26 Apr 2022 16:37:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QGbG8B065458; Tue, 26 Apr 2022 16:37:16 GMT (envelope-from git) Date: Tue, 26 Apr 2022 16:37:16 GMT Message-Id: <202204261637.23QGbG8B065458@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: 27a25179c835 - main - linux(4): Add linux_epoll_pwait_ts() helper for future use. 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/main X-Git-Reftype: branch X-Git-Commit: 27a25179c8356d58b5df6303d850050122f020c6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650991037; 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=klhA0OGYzMUglc56+Ge4e492gaqUsTN19NP7JG8ceVI=; b=njQrPSelirP0wShjpoEfDixayPexJrYY60laJ1SjTIzAkLkJhlBJBnpD5rYv/kjyExtOVE lxjeBSwn7mArJnfPiajJfEqvIQIxcZ59ItdjgCERdoRLjBHPe/Si/bwXDgyLDxV1jlFCY7 ge25v4hNOw3MckQCw+348PqMHFsQnkNMvxXs3CfM3V+p4A5PhHOqVFHS8b6lTYQBoFE/ZL q3PiMJluf+GVyjV2kPt12doiZ6VxvaL9lj+mxRu9t40q+cIaNGe8VyBjrVNuP6fM+27YY+ pP/qR/0DrM1PkxDyBFXCjJM65h+xX/u5qlZieQPg/jN/P2hbdi4TI/i4XENwbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650991037; a=rsa-sha256; cv=none; b=rZKGXq9cXf1SQYQVQuIVu3MY38taNin5Xlc55TIcPa6HJKOizrdwItdNy6oKVEcwjkFEdC wThVFdIAFr1LoabWXYEAPsDf+uej+sYEISuwRozBXKawqMaJgsXdGAixEfHpo74iEKF6bV swL67+TzQNb+nV2buYrM7WEWw5tkvh/x0TNDRM3MPcEnc3iT/Tfguuds6orN5MHCNXp9L3 zf500CZAfopYRQeI+tNTNLhRLQcGJpxenglATcSar+a8Rw12kQuzYSRy6sGnRnOw1dXl20 nDoVlhizh3wYFsUHRkj2xfrUq9W5wE9jHR5j87AU+0+bXLJIQcTGn4vtSmzLRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=27a25179c8356d58b5df6303d850050122f020c6 commit 27a25179c8356d58b5df6303d850050122f020c6 Author: Dmitry Chagin AuthorDate: 2022-04-26 16:35:56 +0000 Commit: Dmitry Chagin CommitDate: 2022-04-26 16:35:56 +0000 linux(4): Add linux_epoll_pwait_ts() helper for future use. MFC after: 2 weeks --- sys/compat/linux/linux_event.c | 43 +++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c index fa6ebc366ae9..4389e8daa0dd 100644 --- a/sys/compat/linux/linux_event.c +++ b/sys/compat/linux/linux_event.c @@ -421,15 +421,15 @@ leave1: /* * Wait for a filter to be triggered on the epoll file descriptor. */ + static int -linux_epoll_wait_common(struct thread *td, int epfd, struct epoll_event *events, - int maxevents, int timeout, sigset_t *uset) +linux_epoll_wait_ts(struct thread *td, int epfd, struct epoll_event *events, + int maxevents, struct timespec *tsp, sigset_t *uset) { struct epoll_copyout_args coargs; struct kevent_copyops k_ops = { &coargs, epoll_kev_copyout, NULL}; - struct timespec ts, *tsp; cap_rights_t rights; struct file *epfp; sigset_t omask; @@ -467,20 +467,6 @@ linux_epoll_wait_common(struct thread *td, int epfd, struct epoll_event *events, coargs.count = 0; coargs.error = 0; - /* - * Linux epoll_wait(2) man page states that timeout of -1 causes caller - * to block indefinitely. Real implementation does it if any negative - * timeout value is passed. - */ - if (timeout >= 0) { - /* Convert from milliseconds to timespec. */ - ts.tv_sec = timeout / 1000; - ts.tv_nsec = (timeout % 1000) * 1000000; - tsp = &ts; - } else { - tsp = NULL; - } - error = kern_kevent_fp(td, epfp, 0, maxevents, &k_ops, tsp); if (error == 0 && coargs.error != 0) error = coargs.error; @@ -500,6 +486,29 @@ leave: return (error); } +static int +linux_epoll_wait_common(struct thread *td, int epfd, struct epoll_event *events, + int maxevents, int timeout, sigset_t *uset) +{ + struct timespec ts, *tsp; + + /* + * Linux epoll_wait(2) man page states that timeout of -1 causes caller + * to block indefinitely. Real implementation does it if any negative + * timeout value is passed. + */ + if (timeout >= 0) { + /* Convert from milliseconds to timespec. */ + ts.tv_sec = timeout / 1000; + ts.tv_nsec = (timeout % 1000) * 1000000; + tsp = &ts; + } else { + tsp = NULL; + } + return (linux_epoll_wait_ts(td, epfd, events, maxevents, tsp, uset)); + +} + #ifdef LINUX_LEGACY_SYSCALLS int linux_epoll_wait(struct thread *td, struct linux_epoll_wait_args *args)