From nobody Fri Jun 17 19:37:13 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 1913C85A62C; Fri, 17 Jun 2022 19:37:14 +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 4LPq7F3Zncz3PbD; Fri, 17 Jun 2022 19:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494633; 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=0vCVjdEbv0mmb5lc/qv24nF6Z6x0MH4AcfT6Xmq0CZU=; b=GrcuGkq5k7TehYVfsdawaTr/8LfUQIw5Hwo8oSObM4LSjtw28NNhIUQvknZp5tT9XVWMxf hf/SWFgnTPieepxQEOjFEAOv3kkXBQRzE3F+eQ7ARn3FyrtrfvSedm0qTqfDcsm5jRHJid A25B63IJsTFIlvvAcMGoQih9rh9KxXOOsaCgZbC6GDeynefuVFbExKRUIZPhNIVMKN0eJP 0Meh34F8vhrvpX5Yf98FhuwmOVze9AFqjVBtY1lh6ysTynp0aV8Gl3nA6dmI89PRyeJ2dB 5VRMfFxq18Cod4nLsC3w3Y/8kuOvDtHZ7fxxdxLBVpotQaMg1nAWcVsQulCEYQ== 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 269672557E; Fri, 17 Jun 2022 19:37:13 +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 25HJbD5s013058; Fri, 17 Jun 2022 19:37:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJbDWT013057; Fri, 17 Jun 2022 19:37:13 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:37:13 GMT Message-Id: <202206171937.25HJbDWT013057@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: e6a169af5c09 - stable/13 - linux(4): Factor out the futex_wait() op into linux_futex_wait(). 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/13 X-Git-Reftype: branch X-Git-Commit: e6a169af5c09ebb1671adc99017d5c0f8e3dbe43 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494633; 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=0vCVjdEbv0mmb5lc/qv24nF6Z6x0MH4AcfT6Xmq0CZU=; b=nH8+m2pa4oxRictU4n3dmJuANrkBzPezu+6NKPoBmRCDDKEKwRj1B0iq1FtCRFIe330Xsf Wd6uAA+EWclMm7ANwEJz34Mmr6bTkE4PN6adrcLHoBhrIVXQIb5hjO4Tpn2ETsNQ6gniXE nYLnsJt1Lc8i366k9hVqUMLfYBpqd+v0hjy6jykNmAH+DPmjyMVnlPrNyeGnPML7plyFIp IJEhdsqY9WyDiTxFvGJN8TucGX7selTIh4gUH9FqwVZ1QbUfNL+/0bMM/E7V5d4G7P0SWl RukUzlSSv+rYwk6uRPlgFsKF+/A5Dn7YBHNq8jmtWuLwLWejZDQikWwTcrwckQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494633; a=rsa-sha256; cv=none; b=VOH/YsEwVpP9tkqvkfB3eBhQxqW5cFdxQwxX4iFxWmNePyVnEl0hXm+0lynl0ucGxaojFo QiRxcdwZfFx0ndkNp1pCzyEdUXZmlR4gR8kPKIstcje7gP9AokK4iEY8bXBjIOVHOhfPHv KwpZyn0coqwUplzmJzpModjY1370VqXZUOkqoVKwe1Ipfpem/+l4x+i6uAkEZMQz3wEBok CRz7FVtzpNr7jE0RZ1YffAZCojs+RWj1ZE5yUXPlvUitZDxD8yKOTiFfpyk1WoGEOmPzn9 hAf9HSzJhW9xoZTP19+2HwiKum4uT61/X5ZoHnvTJVeQTj594Cx/VoUD+G1UGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=e6a169af5c09ebb1671adc99017d5c0f8e3dbe43 commit e6a169af5c09ebb1671adc99017d5c0f8e3dbe43 Author: Dmitry Chagin AuthorDate: 2021-07-20 11:40:24 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:13 +0000 linux(4): Factor out the futex_wait() op into linux_futex_wait(). MFC after: 2 weeks (cherry picked from commit 75cb2382b84d2a7c385e98a18da209236701494e) --- 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