From: "André Almeida" <andrealmeid@collabora.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Darren Hart <dvhart@infradead.org>,
linux-kernel@vger.kernel.org,
Steven Rostedt <rostedt@goodmis.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: kernel@collabora.com, krisman@collabora.com,
pgriffais@valvesoftware.com, z.figura12@gmail.com,
joel@joelfernandes.org, malteskarupke@fastmail.fm,
linux-api@vger.kernel.org, fweimer@redhat.com,
libc-alpha@sourceware.org, linux-kselftest@vger.kernel.org,
shuah@kernel.org, acme@kernel.org, corbet@lwn.net,
"André Almeida" <andrealmeid@collabora.com>
Subject: [RFC PATCH v2 05/13] futex2: Add compatibility entry point for x86_x32 ABI
Date: Wed, 3 Mar 2021 21:42:11 -0300 [thread overview]
Message-ID: <20210304004219.134051-6-andrealmeid@collabora.com> (raw)
In-Reply-To: <20210304004219.134051-1-andrealmeid@collabora.com>
New syscalls should use the same entry point for x86_64 and x86_x32
paths. Add a wrapper for x32 calls to use parse functions that assumes
32bit pointers.
Signed-off-by: André Almeida <andrealmeid@collabora.com>
---
kernel/futex2.c | 42 +++++++++++++++++++++++++++++++++++-------
1 file changed, 35 insertions(+), 7 deletions(-)
diff --git a/kernel/futex2.c b/kernel/futex2.c
index b3277ab39b3c..92b560206666 100644
--- a/kernel/futex2.c
+++ b/kernel/futex2.c
@@ -23,6 +23,10 @@
#include <linux/syscalls.h>
#include <uapi/linux/futex.h>
+#ifdef CONFIG_X86_64
+#include <linux/compat.h>
+#endif
+
/**
* struct futex_key - Components to build unique key for a futex
* @pointer: Pointer to current->mm or inode's UUID for file backed futexes
@@ -856,7 +860,16 @@ SYSCALL_DEFINE4(futex_waitv, struct futex_waitv __user *, waiters,
futexv->hint = false;
futexv->task = current;
- ret = futex_parse_waitv(futexv, waiters, nr_futexes);
+#ifdef CONFIG_X86_X32_ABI
+ if (in_x32_syscall()) {
+ ret = compat_futex_parse_waitv(futexv, (struct compat_futex_waitv *)waiters,
+ nr_futexes);
+ } else
+#endif
+ {
+ ret = futex_parse_waitv(futexv, waiters, nr_futexes);
+ }
+
if (!ret)
ret = __futex_waitv(futexv, nr_futexes, timo, flags);
@@ -1163,13 +1176,28 @@ SYSCALL_DEFINE6(futex_requeue, struct futex_requeue __user *, uaddr1,
if (flags)
return -EINVAL;
- ret = futex_parse_requeue(&rq1, uaddr1, &shared1);
- if (ret)
- return ret;
+#ifdef CONFIG_X86_X32_ABI
+ if (in_x32_syscall()) {
+ ret = compat_futex_parse_requeue(&rq1, (struct compat_futex_requeue *)uaddr1,
+ &shared1);
+ if (ret)
+ return ret;
- ret = futex_parse_requeue(&rq2, uaddr2, &shared2);
- if (ret)
- return ret;
+ ret = compat_futex_parse_requeue(&rq2, (struct compat_futex_requeue *)uaddr2,
+ &shared2);
+ if (ret)
+ return ret;
+ } else
+#endif
+ {
+ ret = futex_parse_requeue(&rq1, uaddr1, &shared1);
+ if (ret)
+ return ret;
+
+ ret = futex_parse_requeue(&rq2, uaddr2, &shared2);
+ if (ret)
+ return ret;
+ }
return __futex_requeue(rq1, rq2, nr_wake, nr_requeue, cmpval, shared1, shared2);
}
--
2.30.1
next prev parent reply other threads:[~2021-03-04 1:09 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-04 0:42 [RFC PATCH v2 00/13] Add futex2 syscall André Almeida
2021-03-04 0:42 ` [RFC PATCH v2 01/13] futex2: Implement wait and wake functions André Almeida
2021-03-04 0:42 ` [RFC PATCH v2 02/13] futex2: Add support for shared futexes André Almeida
2021-03-04 0:42 ` [RFC PATCH v2 03/13] futex2: Implement vectorized wait André Almeida
2021-03-04 0:42 ` [RFC PATCH v2 04/13] futex2: Implement requeue operation André Almeida
2021-03-04 0:42 ` André Almeida [this message]
2021-03-04 0:42 ` [RFC PATCH v2 06/13] docs: locking: futex2: Add documentation André Almeida
2021-03-04 0:42 ` [RFC PATCH v2 07/13] selftests: futex2: Add wake/wait test André Almeida
2021-03-04 0:42 ` [RFC PATCH v2 08/13] selftests: futex2: Add timeout test André Almeida
2021-03-04 0:42 ` [RFC PATCH v2 09/13] selftests: futex2: Add wouldblock test André Almeida
2021-03-04 0:42 ` [RFC PATCH v2 10/13] selftests: futex2: Add waitv test André Almeida
2021-03-04 0:42 ` [RFC PATCH v2 11/13] selftests: futex2: Add requeue test André Almeida
2021-03-04 0:42 ` [RFC PATCH v2 12/13] perf bench: Add futex2 benchmark tests André Almeida
2021-03-04 0:42 ` [RFC PATCH v2 13/13] kernel: Enable waitpid() for futex2 André Almeida
2021-03-04 5:44 ` [RFC PATCH v2 00/13] Add futex2 syscall Peter Oskolkov
2021-03-04 18:58 ` André Almeida
2021-03-05 20:03 ` Peter Oskolkov
2021-03-05 20:08 ` Peter Oskolkov
2021-03-04 15:01 ` Theodore Ts'o
2021-03-04 19:15 ` André Almeida
2021-03-07 11:34 ` Stefan Metzmacher
2021-03-07 11:56 ` Daurnimator
2021-03-08 11:52 ` Stefan Metzmacher
2021-03-08 11:11 ` David Laight
2021-03-08 11:55 ` Stefan Metzmacher
2021-03-08 16:18 ` Zebediah Figura
2021-03-08 17:33 ` David Laight
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210304004219.134051-6-andrealmeid@collabora.com \
--to=andrealmeid@collabora.com \
--cc=acme@kernel.org \
--cc=bigeasy@linutronix.de \
--cc=corbet@lwn.net \
--cc=dvhart@infradead.org \
--cc=fweimer@redhat.com \
--cc=joel@joelfernandes.org \
--cc=kernel@collabora.com \
--cc=krisman@collabora.com \
--cc=libc-alpha@sourceware.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=malteskarupke@fastmail.fm \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=pgriffais@valvesoftware.com \
--cc=rostedt@goodmis.org \
--cc=shuah@kernel.org \
--cc=tglx@linutronix.de \
--cc=z.figura12@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).