From owner-dev-commits-src-all@freebsd.org Tue Jul 20 11:40:54 2021 Return-Path: Delivered-To: dev-commits-src-all@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 8F07366AA53; Tue, 20 Jul 2021 11:40:54 +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 4GTcGt38Glz3PHS; Tue, 20 Jul 2021 11:40:54 +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 49EA81E7B; Tue, 20 Jul 2021 11:40:54 +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 16KBesxk089830; Tue, 20 Jul 2021 11:40:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16KBesDk089829; Tue, 20 Jul 2021 11:40:54 GMT (envelope-from git) Date: Tue, 20 Jul 2021 11:40:54 GMT Message-Id: <202107201140.16KBesDk089829@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: 1866eef48435 - main - linux(4): Refactor the struct linux_futex_args. 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: 1866eef48435eda506db32c88ed52605a4cb941a Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jul 2021 11:40:54 -0000 The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=1866eef48435eda506db32c88ed52605a4cb941a commit 1866eef48435eda506db32c88ed52605a4cb941a Author: Dmitry Chagin AuthorDate: 2021-07-20 11:37:37 +0000 Commit: Dmitry Chagin CommitDate: 2021-07-20 11:37:37 +0000 linux(4): Refactor the struct linux_futex_args. Move flags and rtclock to the struct linux_futex_args. This will be used when I split linux_futex() into separate futex op functions. MFC after: 2 weeks --- sys/compat/linux/linux_futex.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c index d1fd7725650d..d89b9fd89f3b 100644 --- a/sys/compat/linux/linux_futex.c +++ b/sys/compat/linux/linux_futex.c @@ -228,6 +228,8 @@ static int fetch_robust_entry(struct linux_robust_list **, struct linux_futex_args { uint32_t *uaddr; int32_t op; + uint32_t flags; + bool clockrt; uint32_t val; struct timespec *ts; uint32_t *uaddr2; @@ -641,19 +643,19 @@ futex_atomic_op(struct thread *td, int encoded_op, uint32_t *uaddr) static int linux_futex(struct thread *td, struct linux_futex_args *args) { - int clockrt, nrwake, nrrequeue, op_ret, ret; + int nrwake, nrrequeue, op_ret, ret; struct linux_pemuldata *pem; struct waiting_proc *wp; struct futex *f, *f2; struct timespec kts; int error, save; - uint32_t flags, val; + uint32_t val; if (args->op & LINUX_FUTEX_PRIVATE_FLAG) { - flags = 0; + args->flags = 0; args->op &= ~LINUX_FUTEX_PRIVATE_FLAG; } else - flags = FUTEX_SHARED; + args->flags = FUTEX_SHARED; /* * Currently support for switching between CLOCK_MONOTONIC and @@ -661,9 +663,9 @@ linux_futex(struct thread *td, struct linux_futex_args *args) * FUTEX_CLOCK_REALTIME with any op except FUTEX_WAIT_BITSET and * FUTEX_WAIT_REQUEUE_PI. */ - clockrt = args->op & LINUX_FUTEX_CLOCK_REALTIME; + args->clockrt = args->op & LINUX_FUTEX_CLOCK_REALTIME; args->op = args->op & ~LINUX_FUTEX_CLOCK_REALTIME; - if (clockrt && args->op != LINUX_FUTEX_WAIT_BITSET && + if (args->clockrt && args->op != LINUX_FUTEX_WAIT_BITSET && args->op != LINUX_FUTEX_WAIT_REQUEUE_PI) { LIN_SDT_PROBE0(futex, linux_futex, unimplemented_clockswitch); @@ -685,7 +687,7 @@ linux_futex(struct thread *td, struct linux_futex_args *args) args->uaddr, args->val, args->val3); if (args->ts != NULL) { - if (clockrt) { + if (args->clockrt) { nanotime(&kts); timespecsub(args->ts, &kts, args->ts); } else if (args->op == LINUX_FUTEX_WAIT_BITSET) { @@ -696,7 +698,7 @@ linux_futex(struct thread *td, struct linux_futex_args *args) retry0: error = futex_get(args->uaddr, &wp, &f, - flags | FUTEX_CREATE_WP); + args->flags | FUTEX_CREATE_WP); if (error) return (error); @@ -737,7 +739,7 @@ retry0: args->uaddr, args->val, args->val3); error = futex_get(args->uaddr, NULL, &f, - flags | FUTEX_DONTCREATE); + args->flags | FUTEX_DONTCREATE); if (error) return (error); @@ -778,7 +780,8 @@ retry0: return (EINVAL); retry1: - error = futex_get(args->uaddr, NULL, &f, flags | FUTEX_DONTLOCK); + error = futex_get(args->uaddr, NULL, &f, + args->flags | FUTEX_DONTLOCK); if (error) return (error); @@ -790,7 +793,7 @@ retry1: * returned by FUTEX_CMP_REQUEUE. */ error = futex_get(args->uaddr2, NULL, &f2, - flags | FUTEX_DONTEXISTS | FUTEX_DONTLOCK); + args->flags | FUTEX_DONTEXISTS | FUTEX_DONTLOCK); if (error) { futex_put(f, NULL); return (error); @@ -837,11 +840,13 @@ retry1: return (EINVAL); retry2: - error = futex_get(args->uaddr, NULL, &f, flags | FUTEX_DONTLOCK); + error = futex_get(args->uaddr, NULL, &f, + args->flags | FUTEX_DONTLOCK); if (error) return (error); - error = futex_get(args->uaddr2, NULL, &f2, flags | FUTEX_DONTLOCK); + error = futex_get(args->uaddr2, NULL, &f2, + args->flags | FUTEX_DONTLOCK); if (error) { futex_put(f, NULL); return (error);