From owner-dev-commits-src-main@freebsd.org Tue Jul 20 11:41:04 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3556466AC8F; Tue, 20 Jul 2021 11:41:04 +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 4GTcH34klWz3PbY; Tue, 20 Jul 2021 11:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6AD23186A; Tue, 20 Jul 2021 11:41:03 +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 16KBf3vw090039; Tue, 20 Jul 2021 11:41:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16KBf3gp090038; Tue, 20 Jul 2021 11:41:03 GMT (envelope-from git) Date: Tue, 20 Jul 2021 11:41:03 GMT Message-Id: <202107201141.16KBf3gp090038@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: 75cb2382b84d - main - linux(4): Factor out the futex_wait() op into linux_futex_wait(). 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: 75cb2382b84d2a7c385e98a18da209236701494e Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jul 2021 11:41:04 -0000 The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=75cb2382b84d2a7c385e98a18da209236701494e commit 75cb2382b84d2a7c385e98a18da209236701494e Author: Dmitry Chagin AuthorDate: 2021-07-20 11:40:24 +0000 Commit: Dmitry Chagin CommitDate: 2021-07-20 11:40:24 +0000 linux(4): Factor out the futex_wait() op into linux_futex_wait(). MFC after: 2 weeks --- sys/compat/linux/linux_futex.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c index a32542b16a8a..1858c573a576 100644 --- a/sys/compat/linux/linux_futex.c +++ b/sys/compat/linux/linux_futex.c @@ -215,8 +215,6 @@ static int futex_get(uint32_t *, struct waiting_proc **, struct futex **, static int futex_sleep(struct futex *, struct waiting_proc *, struct timespec *); static int futex_wake(struct futex *, int, uint32_t); static int futex_requeue(struct futex *, int, struct futex *, int); -static int futex_wait(struct futex *, struct waiting_proc *, struct timespec *, - uint32_t); static void futex_lock(struct futex *); static void futex_unlock(struct futex *); static int futex_atomic_op(struct thread *, int, uint32_t *); @@ -554,27 +552,6 @@ futex_requeue(struct futex *f, int nrwake, struct futex *f2, return (count); } -static int -futex_wait(struct futex *f, struct waiting_proc *wp, struct timespec *ts, - uint32_t bitset) -{ - int error; - - if (bitset == 0) { - futex_put(f, wp); - return (EINVAL); - } - - f->f_bitset = bitset; - error = futex_sleep(f, wp, ts); - if (error) - LIN_SDT_PROBE1(futex, futex_wait, sleep_error, error); - if (error == EWOULDBLOCK) - error = ETIMEDOUT; - - return (error); -} - static int futex_atomic_op(struct thread *td, int encoded_op, uint32_t *uaddr) { @@ -1015,7 +992,18 @@ retry: return (EWOULDBLOCK); } - return (futex_wait(f, wp, args->ts, args->val3)); + if (args->val3 == 0) { + futex_put(f, wp); + return (EINVAL); + } + + f->f_bitset = args->val3; + error = futex_sleep(f, wp, args->ts); + if (error != 0) + LIN_SDT_PROBE1(futex, futex_wait, sleep_error, error); + if (error == EWOULDBLOCK) + error = ETIMEDOUT; + return (error); } int