The branch main has been updated by dchagin:
URL:
https://cgit.FreeBSD.org/src/commit/?id=4c361d7a5acc04f3da304a605855e23774449204
commit 4c361d7a5acc04f3da304a605855e23774449204
Author: Dmitry Chagin <dcha...@freebsd.org>
AuthorDate: 2021-07-20 11:38:44 +0000
Commit: Dmitry Chagin <dcha...@freebsd.org>
CommitDate: 2021-07-20 11:38:44 +0000
linux(4): Factor out the FUTEX_WAKE_OP op into linux_futex_wakeop().
MFC after: 2 weeks
---
sys/compat/linux/linux_futex.c | 130 +++++++++++++++++++++--------------------
1 file changed, 66 insertions(+), 64 deletions(-)
diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c
index 71ea8e320d73..1ba11ed3fc57 100644
--- a/sys/compat/linux/linux_futex.c
+++ b/sys/compat/linux/linux_futex.c
@@ -241,6 +241,7 @@ static int linux_futex(struct thread *, struct
linux_futex_args *);
static int linux_futex_wait(struct thread *, struct linux_futex_args *);
static int linux_futex_wake(struct thread *, struct linux_futex_args *);
static int linux_futex_requeue(struct thread *, struct linux_futex_args *);
+static int linux_futex_wakeop(struct thread *, struct linux_futex_args *);
static void
futex_put(struct futex *f, struct waiting_proc *wp)
@@ -646,11 +647,7 @@ 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 nrwake, op_ret, ret;
struct linux_pemuldata *pem;
- struct futex *f, *f2;
- int error, save;
- uint32_t val;
if (args->op & LINUX_FUTEX_PRIVATE_FLAG) {
args->flags = 0;
@@ -673,9 +670,6 @@ linux_futex(struct thread *td, struct linux_futex_args
*args)
return (ENOSYS);
}
- error = 0;
- f = f2 = NULL;
-
switch (args->op) {
case LINUX_FUTEX_WAIT:
args->val3 = FUTEX_BITSET_MATCH_ANY;
@@ -720,62 +714,7 @@ linux_futex(struct thread *td, struct linux_futex_args
*args)
args->uaddr, args->val, args->uaddr2, args->val3,
args->ts);
- if (args->uaddr == args->uaddr2)
- return (EINVAL);
-
-retry2:
- error = futex_get(args->uaddr, NULL, &f,
- args->flags | FUTEX_DONTLOCK);
- if (error)
- return (error);
-
- error = futex_get(args->uaddr2, NULL, &f2,
- args->flags | FUTEX_DONTLOCK);
- if (error) {
- futex_put(f, NULL);
- return (error);
- }
- futex_lock(f);
- futex_lock(f2);
-
- /*
- * This function returns positive number as results and
- * negative as errors
- */
- save = vm_fault_disable_pagefaults();
- op_ret = futex_atomic_op(td, args->val3, args->uaddr2);
- vm_fault_enable_pagefaults(save);
-
- LINUX_CTR2(sys_futex, "WAKE_OP atomic_op uaddr %p ret 0x%x",
- args->uaddr, op_ret);
-
- if (op_ret < 0) {
- if (f2 != NULL)
- futex_put(f2, NULL);
- futex_put(f, NULL);
- error = copyin(args->uaddr2, &val, sizeof(val));
- if (error == 0)
- goto retry2;
- return (error);
- }
-
- ret = futex_wake(f, args->val, args->val3);
-
- if (op_ret > 0) {
- op_ret = 0;
- nrwake = (int)(unsigned long)args->ts;
-
- if (f2 != NULL)
- op_ret += futex_wake(f2, nrwake, args->val3);
- else
- op_ret += futex_wake(f, nrwake, args->val3);
- ret += op_ret;
- }
- if (f2 != NULL)
- futex_put(f2, NULL);
- futex_put(f, NULL);
- td->td_retval[0] = ret;
- break;
+ return (linux_futex_wakeop(td, args));
case LINUX_FUTEX_LOCK_PI:
/* not yet implemented */
@@ -854,8 +793,71 @@ retry2:
args->op);
return (ENOSYS);
}
+}
- return (error);
+static int
+linux_futex_wakeop(struct thread *td, struct linux_futex_args *args)
+{
+ int nrwake, op_ret, ret;
+ struct futex *f, *f2;
+ int error, save;
+ uint32_t val;
+
+ if (args->uaddr == args->uaddr2)
+ return (EINVAL);
+
+retry:
+ f = f2 = NULL;
+ error = futex_get(args->uaddr, NULL, &f, args->flags | FUTEX_DONTLOCK);
+ if (error != 0)
+ return (error);
+
+ error = futex_get(args->uaddr2, NULL, &f2, args->flags |
FUTEX_DONTLOCK);
+ if (error != 0) {
+ futex_put(f, NULL);
+ return (error);
+ }
+ futex_lock(f);
+ futex_lock(f2);
+
+ /*
+ * This function returns positive number as results and
+ * negative as errors
+ */
+ save = vm_fault_disable_pagefaults();
+ op_ret = futex_atomic_op(td, args->val3, args->uaddr2);
+ vm_fault_enable_pagefaults(save);
+
+ LINUX_CTR2(sys_futex, "WAKE_OP atomic_op uaddr %p ret 0x%x",
+ args->uaddr, op_ret);
+
+ if (op_ret < 0) {
+ if (f2 != NULL)
+ futex_put(f2, NULL);
+ futex_put(f, NULL);
+ error = copyin(args->uaddr2, &val, sizeof(val));
+ if (error == 0)
+ goto retry;
+ return (error);
+ }
+
+ ret = futex_wake(f, args->val, args->val3);
+
+ if (op_ret > 0) {
+ op_ret = 0;
+ nrwake = (int)(unsigned long)args->ts;
+
+ if (f2 != NULL)
+ op_ret += futex_wake(f2, nrwake, args->val3);
+ else
+ op_ret += futex_wake(f, nrwake, args->val3);
+ ret += op_ret;
+ }
+ if (f2 != NULL)
+ futex_put(f2, NULL);
+ futex_put(f, NULL);
+ td->td_retval[0] = ret;
+ return (0);
}
static int
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
