x86: convert arch_futex_atomic_op_inuser() to user_access_begin/user_access_end()
Subsystems (19)
A message that is not in the archive (sent off-list or not yet received): x86: unsafe_put-style macro for sigmask
RFC PATCH v2 1/8 futex: arch_futex_atomic_op_inuser() calling conventions change
From: Al Viro <[email protected]>
Move access_ok() in and pagefault_enable()/pagefault_disable() out. Mechanical conversion only - some instances don't really need a separate access_ok() at all (e.g. the ones only using get_user()/put_user(), or architectures where access_ok() is always true); we'll deal with that in followups.
--- arch/alpha/include/asm/futex.h | 5 ++--- arch/arc/include/asm/futex.h | 5 +++-- arch/arm/include/asm/futex.h | 5 +++-- arch/arm64/include/asm/futex.h | 5 ++--- arch/hexagon/include/asm/futex.h | 5 ++--- arch/ia64/include/asm/futex.h | 5 ++--- arch/microblaze/include/asm/futex.h | 5 ++--- arch/mips/include/asm/futex.h | 5 ++--- arch/nds32/include/asm/futex.h | 6 ++---- arch/openrisc/include/asm/futex.h | 5 ++--- arch/parisc/include/asm/futex.h | 5 +++-- arch/powerpc/include/asm/futex.h | 5 ++--- arch/riscv/include/asm/futex.h | 5 ++--- arch/s390/include/asm/futex.h | 4 ++-- arch/sh/include/asm/futex.h | 5 ++--- arch/sparc/include/asm/futex_64.h | 6 ++---- arch/x86/include/asm/futex.h | 5 ++--- arch/xtensa/include/asm/futex.h | 5 ++--- include/asm-generic/futex.h | 4 ++-- kernel/futex.c | 5 ++--- 20 files changed, 43 insertions(+), 57 deletions(-)
arch/alpha/include/asm/futex.h +2 -3
@@ -31,7 +31,8 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, {int oldval =0 , ret; -pagefault_disable (); +if (!access_ok (uaddr,sizeof (u32))) +return -EFAULT ;switch (op) {case FUTEX_OP_SET :
@@ -53,8 +54,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, ret = -ENOSYS ; } -pagefault_enable (); -if (!ret) *oval = oldval;
arch/arc/include/asm/futex.h +3 -2
@@ -75,10 +75,12 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, {int oldval =0 , ret; +if (!access_ok (uaddr,sizeof (u32))) +return -EFAULT ; +#ifndef CONFIG_ARC_HAS_LLSC preempt_disable ();/* to guarantee atomic r-m-w of futex op */ #endif -pagefault_disable ();switch (op) {case FUTEX_OP_SET :
@@ -101,7 +103,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, ret = -ENOSYS ; } -pagefault_enable ();#ifndef CONFIG_ARC_HAS_LLSC preempt_enable ();#endif
arch/arm/include/asm/futex.h +3 -2
@@ -134,10 +134,12 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) {int oldval =0 , ret, tmp; +if (!access_ok (uaddr,sizeof (u32))) +return -EFAULT ; +#ifndef CONFIG_SMP preempt_disable ();#endif -pagefault_disable ();switch (op) {case FUTEX_OP_SET :
@@ -159,7 +161,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) ret = -ENOSYS ; } -pagefault_enable ();#ifndef CONFIG_SMP preempt_enable ();#endif
arch/arm64/include/asm/futex.h +2 -3
@@ -48,7 +48,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *_uaddr)int oldval =0 , ret, tmp;u32 __user *uaddr =__uaccess_mask_ptr (_uaddr); -pagefault_disable (); +if (!access_ok (_uaddr,sizeof (u32))) +return -EFAULT ;switch (op) {case FUTEX_OP_SET :
@@ -75,8 +76,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *_uaddr) ret = -ENOSYS ; } -pagefault_enable (); -if (!ret) *oval = oldval;
arch/hexagon/include/asm/futex.h +2 -3
@@ -36,7 +36,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) {int oldval =0 , ret; -pagefault_disable (); +if (!access_ok (uaddr,sizeof (u32))) +return -EFAULT ;switch (op) {case FUTEX_OP_SET :
@@ -62,8 +63,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) ret = -ENOSYS ; } -pagefault_enable (); -if (!ret) *oval = oldval;
arch/ia64/include/asm/futex.h +2 -3
@@ -50,7 +50,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) {int oldval =0 , ret; -pagefault_disable (); +if (!access_ok (uaddr,sizeof (u32))) +return -EFAULT ;switch (op) {case FUTEX_OP_SET :
@@ -74,8 +75,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) ret = -ENOSYS ; } -pagefault_enable (); -if (!ret) *oval = oldval;
arch/microblaze/include/asm/futex.h +2 -3
@@ -34,7 +34,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) {int oldval =0 , ret; -pagefault_disable (); +if (!access_ok (uaddr,sizeof (u32))) +return -EFAULT ;switch (op) {case FUTEX_OP_SET :
@@ -56,8 +57,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) ret = -ENOSYS ; } -pagefault_enable (); -if (!ret) *oval = oldval;
arch/mips/include/asm/futex.h +2 -3
@@ -89,7 +89,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) {int oldval =0 , ret; -pagefault_disable (); +if (!access_ok (uaddr,sizeof (u32))) +return -EFAULT ;switch (op) {case FUTEX_OP_SET :
@@ -116,8 +117,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) ret = -ENOSYS ; } -pagefault_enable (); -if (!ret) *oval = oldval;
arch/nds32/include/asm/futex.h +2 -4
@@ -66,8 +66,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) {int oldval =0 , ret; - -pagefault_disable (); +if (!access_ok (uaddr,sizeof (u32))) +return -EFAULT ;switch (op) {case FUTEX_OP_SET : __futex_atomic_op("move %0, %3", ret, oldval, tmp, uaddr,
@@ -93,8 +93,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) ret = -ENOSYS ; } -pagefault_enable (); -if (!ret) *oval = oldval;
arch/openrisc/include/asm/futex.h +2 -3
@@ -35,7 +35,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) {int oldval =0 , ret; -pagefault_disable (); +if (!access_ok (uaddr,sizeof (u32))) +return -EFAULT ;switch (op) {case FUTEX_OP_SET :
@@ -57,8 +58,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) ret = -ENOSYS ; } -pagefault_enable (); -if (!ret) *oval = oldval;
arch/parisc/include/asm/futex.h +3 -2
@@ -39,8 +39,10 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)int oldval, ret;u32 tmp; +if (!access_ok (uaddr,sizeof (u32))) +return -EFAULT ; +_futex_spin_lock_irqsave (uaddr, &flags); -pagefault_disable (); ret = -EFAULT ;if (unlikely (get_user (oldval, uaddr) !=0 ))
@@ -73,7 +75,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) ret = -EFAULT ; out_pagefault_enable: -pagefault_enable ();_futex_spin_unlock_irqrestore (uaddr, &flags);if (!ret)
arch/powerpc/include/asm/futex.h +2 -3
@@ -35,8 +35,9 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, {int oldval =0 , ret; +if (!access_ok (uaddr,sizeof (u32))) +return -EFAULT ;allow_read_write_user (uaddr, uaddr,sizeof (*uaddr)); -pagefault_disable ();switch (op) {case FUTEX_OP_SET :
@@ -58,8 +59,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, ret = -ENOSYS ; } -pagefault_enable (); - *oval = oldval;prevent_read_write_user (uaddr, uaddr,sizeof (*uaddr));
arch/riscv/include/asm/futex.h +2 -3
@@ -46,7 +46,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) {int oldval =0 , ret =0 ; -pagefault_disable (); +if (!access_ok (uaddr,sizeof (u32))) +return -EFAULT ;switch (op) {case FUTEX_OP_SET :
@@ -73,8 +74,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) ret = -ENOSYS ; } -pagefault_enable (); -if (!ret) *oval = oldval;
arch/s390/include/asm/futex.h +2 -2
@@ -28,8 +28,9 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,int oldval =0 , newval, ret;mm_segment_t old_fs; +if (!access_ok (uaddr,sizeof (u32))) +return -EFAULT ; old_fs =enable_sacf_uaccess (); -pagefault_disable ();switch (op) {case FUTEX_OP_SET : __futex_atomic_op("lr %2,%5\n",
@@ -54,7 +55,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,default : ret = -ENOSYS ; } -pagefault_enable ();disable_sacf_uaccess (old_fs);if (!ret)
arch/sh/include/asm/futex.h +2 -3
@@ -34,7 +34,8 @@ static inline int arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval,u32 oldval, newval, prev;int ret; -pagefault_disable (); +if (!access_ok (uaddr,sizeof (u32))) +return -EFAULT ; do { ret = get_user(oldval, uaddr);
@@ -67,8 +68,6 @@ static inline int arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval, ret =futex_atomic_cmpxchg_inatomic (&prev, uaddr, oldval, newval); }while (!ret && prev != oldval); -pagefault_enable (); -if (!ret) *oval = oldval;
arch/sparc/include/asm/futex_64.h +2 -4
@@ -35,11 +35,11 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, {int oldval =0 , ret, tem; +if (!access_ok (uaddr,sizeof (u32))) +return -EFAULT ;if (unlikely ((((unsigned long ) uaddr) &0x3UL )))return -EINVAL ; -pagefault_disable (); -switch (op) {case FUTEX_OP_SET :__futex_cas_op ("mov\t%4, %1" , ret, oldval, uaddr, oparg);
@@ -60,8 +60,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, ret = -ENOSYS ; } -pagefault_enable (); -if (!ret) *oval = oldval;
arch/x86/include/asm/futex.h +2 -3
@@ -47,7 +47,8 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, {int oldval =0 , ret, tem; -pagefault_disable (); +if (!access_ok (uaddr,sizeof (u32))) +return -EFAULT ;switch (op) {case FUTEX_OP_SET :
@@ -70,8 +71,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, ret = -ENOSYS ; } -pagefault_enable (); -if (!ret) *oval = oldval;
arch/xtensa/include/asm/futex.h +2 -3
@@ -72,7 +72,8 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,#if XCHAL_HAVE_S32C1I ||XCHAL_HAVE_EXCLUSIVE int oldval =0 , ret; -pagefault_disable (); +if (!access_ok (uaddr,sizeof (u32))) +return -EFAULT ;switch (op) {case FUTEX_OP_SET :
@@ -99,8 +100,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, ret = -ENOSYS ; } -pagefault_enable (); -if (!ret) *oval = oldval;
include/asm-generic/futex.h +2 -2
@@ -33,8 +33,9 @@ arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval, u32 __user *uaddr)int oldval, ret;u32 tmp; +if (!access_ok (uaddr,sizeof (u32))) +return -EFAULT ;preempt_disable (); -pagefault_disable (); ret = -EFAULT ;if (unlikely (get_user (oldval, uaddr) !=0 ))
@@ -67,7 +68,6 @@ arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval, u32 __user *uaddr) ret = -EFAULT ; out_pagefault_enable: -pagefault_enable ();preempt_enable ();if (ret ==0 )
kernel/futex.c +2 -3
@@ -1723,10 +1723,9 @@ static int futex_atomic_op_inuser(unsigned int encoded_op, u32 __user *uaddr) oparg =1 << oparg; } -if (!access_ok (uaddr,sizeof (u32))) -return -EFAULT ; - +pagefault_disable (); ret =arch_futex_atomic_op_inuser (op, oparg, &oldval, uaddr); +pagefault_enable ();if (ret)return ret;
Signature · 1 line
2.11.0
RFC PATCH v2 2/8 sh: no need of access_ok() in arch_futex_atomic_op_inuser()
From: Al Viro <[email protected]>
everything it uses is doing access_ok() already
--- arch/sh/include/asm/futex.h | 3 --- 1 file changed, 3 deletions(-)
arch/sh/include/asm/futex.h +0 -3
@@ -34,9 +34,6 @@ static inline int arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval,u32 oldval, newval, prev;int ret; -if (!access_ok (uaddr,sizeof (u32))) -return -EFAULT ; - do { ret = get_user(oldval, uaddr);
Signature · 1 line
2.11.0
RFC PATCH v2 3/8 no need for access_ok() in futex handling
In reply to Al ViroFrom: Al Viro <[email protected]>
access_ok() is always true on those
--- arch/parisc/include/asm/futex.h | 3 --- arch/s390/include/asm/futex.h | 2 -- arch/sparc/include/asm/futex_64.h | 2 -- 3 files changed, 7 deletions(-)
arch/parisc/include/asm/futex.h +0 -3
@@ -39,9 +39,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)int oldval, ret;u32 tmp; -if (!access_ok (uaddr,sizeof (u32))) -return -EFAULT ; -_futex_spin_lock_irqsave (uaddr, &flags); ret = -EFAULT ;
arch/s390/include/asm/futex.h +0 -2
@@ -28,8 +28,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,int oldval =0 , newval, ret;mm_segment_t old_fs; -if (!access_ok (uaddr,sizeof (u32))) -return -EFAULT ; old_fs =enable_sacf_uaccess ();switch (op) {case FUTEX_OP_SET :
arch/sparc/include/asm/futex_64.h +0 -2
@@ -35,8 +35,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, {int oldval =0 , ret, tem; -if (!access_ok (uaddr,sizeof (u32))) -return -EFAULT ;if (unlikely ((((unsigned long ) uaddr) &0x3UL )))return -EINVAL ;
Signature · 1 line
2.11.0
RFC PATCH v2 4/8 objtool: whitelist __sanitizer_cov_trace_switch()
In reply to Al ViroFrom: Al Viro <[email protected]>
it's not really different from e.g. __sanitizer_cov_trace_cmp4(); as it is, the switches that generate an array of labels get rejected by objtool, while slightly different set of cases that gets compiled into a series of comparisons is accepted.
--- tools/objtool/check.c | 1 + 1 file changed, 1 insertion(+)
tools/objtool/check.c +1 -0
@@ -478,6 +478,7 @@ static const char *uaccess_safe_builtin[] = {"__sanitizer_cov_trace_cmp2" ,"__sanitizer_cov_trace_cmp4" ,"__sanitizer_cov_trace_cmp8" , +"__sanitizer_cov_trace_switch" ,/* UBSAN */ "ubsan_type_mismatch_common" , "__ubsan_handle_type_mismatch",
Signature · 1 line
2.11.0
RFC PATCH v2 5/8 x86: convert arch_futex_atomic_op_inuser() to user_access_begin/user_access_end()
In reply to Al ViroFrom: Al Viro <[email protected]>
Lift stac/clac pairs from __futex_atomic_op{1,2} into arch_futex_atomic_op_inuser(), fold them with access_ok() in there. The switch in arch_futex_atomic_op_inuser() is what has required the previous (objtool) commit...
--- arch/x86/include/asm/futex.h | 62 +++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 26 deletions(-)
arch/x86/include/asm/futex.h +36 -26
@@ -12,26 +12,33 @@#include <asm/processor.h> #include <asm/smap.h> -#define __futex_atomic_op1 (insn, ret, oldval, uaddr, oparg) \ - asm volatile("\t" ASM_STAC "\n" \ - "1:\t" insn "\n" \ - "2:\t" ASM_CLAC "\n" \ +#define unsafe_atomic_op1 (insn, oval, uaddr, oparg, label) \ +do { \ + int oldval = 0, ret; \ + asm volatile("1:\t" insn "\n" \ + "2:\n" \ "\t.section .fixup,\"ax\"\n" \ "3:\tmov\t%3, %1\n" \ "\tjmp\t2b\n" \ "\t.previous\n" \ _ASM_EXTABLE_UA(1b, 3b) \ : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \ - : "i" (-EFAULT), "0" (oparg), "1" (0)) + : "i" (-EFAULT), "0" (oparg), "1" (0)); \ + if (ret) \ + goto label; \ + *oval = oldval; \ +} while(0) -#define __futex_atomic_op2 (insn, ret, oldval, uaddr, oparg) \ - asm volatile("\t" ASM_STAC "\n" \ - "1:\tmovl %2, %0\n" \ + +#define unsafe_atomic_op2 (insn, oval, uaddr, oparg, label) \ +do { \ + int oldval = 0, ret, tem; \ + asm volatile("1:\tmovl %2, %0\n" \ "\tmovl\t%0, %3\n" \ "\t" insn "\n" \ "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \ "\tjnz\t1b\n" \ - "3:\t" ASM_CLAC "\n" \ + "3:\n" \ "\t.section .fixup,\"ax\"\n" \ "4:\tmov\t%5, %1\n" \ "\tjmp\t3b\n" \
@@ -40,41 +47,44 @@ _ASM_EXTABLE_UA(2b, 4b) \ : "=&a" (oldval), "=&r" (ret), \ "+m" (*uaddr), "=&r" (tem) \ - : "r" (oparg), "i" (-EFAULT), "1" (0)) + : "r" (oparg), "i" (-EFAULT), "1" (0)); \ +if (ret) \ + goto label; \ + *oval = oldval; \ +}while (0 ) -static inline int arch_futex_atomic_op_inuser (int op,int oparg,int *oval, +static __always_inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,u32 __user *uaddr) { -int oldval =0 , ret, tem; - -if (!access_ok (uaddr,sizeof (u32))) +if (!user_access_begin (uaddr,sizeof (u32)))return -EFAULT ;switch (op) {case FUTEX_OP_SET : -__futex_atomic_op1 ("xchgl %0, %2" , ret, oldval, uaddr, oparg); +unsafe_atomic_op1 ("xchgl %0, %2" , oval, uaddr, oparg, Efault);break ;case FUTEX_OP_ADD : -__futex_atomic_op1 (LOCK_PREFIX "xaddl %0, %2" , ret, oldval, - uaddr, oparg); +unsafe_atomic_op1 (LOCK_PREFIX "xaddl %0, %2" , oval, + uaddr, oparg, Efault);break ;case FUTEX_OP_OR : -__futex_atomic_op2 ("orl %4, %3" , ret, oldval, uaddr, oparg); +unsafe_atomic_op2 ("orl %4, %3" , oval, uaddr, oparg, Efault);break ;case FUTEX_OP_ANDN : -__futex_atomic_op2 ("andl %4, %3" , ret, oldval, uaddr, ~oparg); +unsafe_atomic_op2 ("andl %4, %3" , oval, uaddr, ~oparg, Efault);break ;case FUTEX_OP_XOR : -__futex_atomic_op2 ("xorl %4, %3" , ret, oldval, uaddr, oparg); +unsafe_atomic_op2 ("xorl %4, %3" , oval, uaddr, oparg, Efault);break ;default : - ret = -ENOSYS ; +user_access_end (); +return -ENOSYS ; } - -if (!ret) - *oval = oldval; - -return ret; +user_access_end (); +return 0 ; +Efault: +user_access_end (); +return -EFAULT ; } static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
Signature · 1 line
2.11.0
RFC PATCH v2 6/8 x86: don't reload after cmpxchg in unsafe_atomic_op2() loop
In reply to Al ViroFrom: Al Viro <[email protected]>
lock cmpxchg leaves the current value in eax; no need to reload it.
--- arch/x86/include/asm/futex.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
arch/x86/include/asm/futex.h +7 -7
@@ -34,17 +34,17 @@ do { \ do { \ int oldval = 0, ret, tem; \ asm volatile("1:\tmovl %2, %0\n" \ - "\tmovl\t%0, %3\n" \ + "2:\tmovl\t%0, %3\n" \ "\t" insn "\n" \ - "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \ - "\tjnz\t1b\n" \ - "3:\n" \ + "3:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \ + "\tjnz\t2b\n" \ + "4:\n" \ "\t.section .fixup,\"ax\"\n" \ - "4:\tmov\t%5, %1\n" \ + "5:\tmov\t%5, %1\n" \ "\tjmp\t3b\n" \ "\t.previous\n" \ - _ASM_EXTABLE_UA(1b, 4b) \ - _ASM_EXTABLE_UA(2b, 4b) \ + _ASM_EXTABLE_UA(1b, 5b) \ + _ASM_EXTABLE_UA(3b, 5b) \ : "=&a" (oldval), "=&r" (ret), \ "+m" (*uaddr), "=&r" (tem) \ : "r" (oparg), "i" (-EFAULT), "1" (0)); \
Signature · 1 line
2.11.0
Re: [RFC][PATCH v2 6/8] x86: don't reload after cmpxchg in unsafe_atomic_op2() loop
Quoted 4 lines · Al Viro
From: Al Viro <[email protected]>
lock cmpxchg leaves the current value in eax; no need to reload it.
I think this one is buggy.
Patch edited to remove the "-" lines, so that you see the end result:
Quoted 6 lines
int oldval = 0, ret, tem; \ asm volatile("1:\tmovl %2, %0\n" \arch/x86/include/asm/futex.h +3
-0+"2:\tmovl\t%0, %3\n" \"\t" insn"\n" \ +"3:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \ +"\tjnz\t2b\n" \
arch/x86/include/asm/futex.h do { \ · line 50
Quoted 10 lines
arch/x86/include/asm/futex.h +4
-0+"4:\n" \"\t.section .fixup,\"ax\"\n" \ +"5:\tmov\t%5, %1\n" \"\tjmp\t3b\n" \"\t.previous\n" \ + _ASM_EXTABLE_UA(1b, 5b) \ +_ASM_EXTABLE_UA (3b ,5b ) \ : "=&a" (oldval), "=&r" (ret), \ "+m" (*uaddr), "=&r" (tem) \ : "r" (oparg), "i" (-EFAULT), "1" (0)); \
I think that
"\tjmp\t3b\n"
line in the fixup section should be
"\tjmp\t4b\n"
because you don't want to jump to the cmpxchg instruction.
Maybe I'm misreading it.
Linus
Re: [RFC][PATCH v2 6/8] x86: don't reload after cmpxchg in unsafe_atomic_op2() loop
Quoted 31 lines · Linus Torvalds
Quoted 4 lines · Al Viro
From: Al Viro <[email protected]>
lock cmpxchg leaves the current value in eax; no need to reload it.
I think this one is buggy.
Patch edited to remove the "-" lines, so that you see the end result:
Quoted 6 lines
int oldval = 0, ret, tem; \ asm volatile("1:\tmovl %2, %0\n" \arch/x86/include/asm/futex.h +3
-0+"2:\tmovl\t%0, %3\n" \"\t" insn"\n" \ +"3:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \ +"\tjnz\t2b\n" \arch/x86/include/asm/futex.h do { \ · line 50
Quoted 10 lines
arch/x86/include/asm/futex.h +4
-0+"4:\n" \"\t.section .fixup,\"ax\"\n" \ +"5:\tmov\t%5, %1\n" \"\tjmp\t3b\n" \"\t.previous\n" \ + _ASM_EXTABLE_UA(1b, 5b) \ +_ASM_EXTABLE_UA (3b ,5b ) \ : "=&a" (oldval), "=&r" (ret), \ "+m" (*uaddr), "=&r" (tem) \ : "r" (oparg), "i" (-EFAULT), "1" (0)); \I think that
"\tjmp\t3b\n"
Quoted 7 lines
line in the fixup section should be
"\tjmp\t4b\n"because you don't want to jump to the cmpxchg instruction.
Maybe I'm misreading it.
You are not - I'd missed that one while renumbering the labels. Fixed and pushed.
RFC PATCH v2 7/8 generic arch_futex_atomic_op_inuser() doesn't need access_ok()
In reply to Al ViroFrom: Al Viro <[email protected]>
uses get_user() and put_user() for memory accesses
--- include/asm-generic/futex.h | 2 -- 1 file changed, 2 deletions(-)
include/asm-generic/futex.h +0 -2
@@ -33,8 +33,6 @@ arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval, u32 __user *uaddr)int oldval, ret;u32 tmp; -if (!access_ok (uaddr,sizeof (u32))) -return -EFAULT ;preempt_disable (); ret = -EFAULT ;
Signature · 1 line
2.11.0
RFC PATCH v2 8/8 x86: get rid of user_atomic_cmpxchg_inatomic()
In reply to Al ViroFrom: Al Viro <[email protected]>
Only one user left; the thing had been made polymorphic back in 2013 for the sake of MPX. No point keeping it now that MPX is gone. Convert futex_atomic_cmpxchg_inatomic() to user_access_{begin,end}() while we are at it.
--- arch/x86/include/asm/futex.h | 20 ++++++++- arch/x86/include/asm/uaccess.h | 93 ------------------------------------------ 2 files changed, 19 insertions(+), 94 deletions(-)
arch/x86/include/asm/futex.h +19 -1
@@ -90,7 +90,25 @@ static __always_inline int arch_futex_atomic_op_inuser(int op, int oparg, int *ostatic inline int futex_atomic_cmpxchg_inatomic (u32 *uval,u32 __user *uaddr,u32 oldval,u32 newval) { -return user_atomic_cmpxchg_inatomic (uval, uaddr, oldval, newval); +int ret =0 ; + +if (!user_access_begin (uaddr,sizeof (u32))) +return -EFAULT ; + asmvolatile ("\n" +"1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" +"2:\n" +"\t.section .fixup, \"ax\"\n" +"3:\tmov %3, %0\n" +"\tjmp 2b\n" +"\t.previous\n" + _ASM_EXTABLE_UA(1b, 3b) + : "+r" (ret), "=a" (oldval), "+m" (*uaddr) + : "i" (-EFAULT), "r" (newval), "1" (oldval) + : "memory" + ); +user_access_end (); + *uval = oldval; +return ret; }#endif
arch/x86/include/asm/uaccess.h +0 -93
99 lines not on this page · raw message
Signature · 1 line
2.11.0