From: Russell Currey <ruscur@russell.cc>
To: linuxppc-dev@lists.ozlabs.org
Cc: mikey@neuling.org, Russell Currey <ruscur@russell.cc>
Subject: [PATCH 2/5] powerpc/futex: KHRAP support for futex ops
Date: Wed, 17 Oct 2018 17:44:20 +1100 [thread overview]
Message-ID: <20181017064422.26119-2-ruscur@russell.cc> (raw)
In-Reply-To: <20181017064422.26119-1-ruscur@russell.cc>
Wrap the futex operations in KHRAP locks and unlocks.
Signed-off-by: Russell Currey <ruscur@russell.cc>
---
arch/powerpc/include/asm/futex.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/powerpc/include/asm/futex.h b/arch/powerpc/include/asm/futex.h
index 94542776a62d..e0f4227cfd32 100644
--- a/arch/powerpc/include/asm/futex.h
+++ b/arch/powerpc/include/asm/futex.h
@@ -34,7 +34,9 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
u32 __user *uaddr)
{
int oldval = 0, ret;
+ unsigned long amr;
+ amr = unlock_user_access();
pagefault_disable();
switch (op) {
@@ -62,6 +64,7 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
if (!ret)
*oval = oldval;
+ lock_user_access(amr);
return ret;
}
@@ -71,10 +74,12 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
{
int ret = 0;
u32 prev;
+ unsigned long amr;
if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
return -EFAULT;
+ amr = unlock_user_access();
__asm__ __volatile__ (
PPC_ATOMIC_ENTRY_BARRIER
"1: lwarx %1,0,%3 # futex_atomic_cmpxchg_inatomic\n\
@@ -95,6 +100,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
: "cc", "memory");
*uval = prev;
+ lock_user_access(amr);
return ret;
}
--
2.19.1
next prev parent reply other threads:[~2018-10-17 6:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-17 6:44 [PATCH 1/5] powerpc/64s: Kernel Hypervisor Restricted Access Prevention Russell Currey
2018-10-17 6:44 ` Russell Currey [this message]
2018-10-17 6:44 ` [PATCH 3/5] powerpc/lib: checksum KHRAP support Russell Currey
2018-10-17 6:44 ` [PATCH 4/5] powerpc/64s: Disable KHRAP with nosmap option Russell Currey
2018-10-17 6:44 ` [PATCH 5/5] powerpc/64s: Document that PPC supports nosmap Russell Currey
2018-10-17 10:07 ` [PATCH 1/5] powerpc/64s: Kernel Hypervisor Restricted Access Prevention kbuild test robot
2018-10-17 11:30 ` Michael Ellerman
2018-10-18 2:03 ` Russell Currey
2018-10-17 12:59 ` Nicholas Piggin
2018-10-18 2:02 ` Russell Currey
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=20181017064422.26119-2-ruscur@russell.cc \
--to=ruscur@russell.cc \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mikey@neuling.org \
/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).