Use definition for cmpxchg swi
PATCH 1/1 Use definition for cmpxchg swi
Use a definition for the cmpxchg SWI instead of hard-coding the number.
--- arch/arm/include/asm/unistd.h | 4 ++++ arch/arm/kernel/entry-armv.S | 7 ++++--- arch/arm/kernel/traps.c | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-)
arch/arm/include/asm/unistd.h +4 -0
@@ -402,6 +402,10 @@#define __ARM_NR_usr32 (__ARM_NR_BASE+4)#define __ARM_NR_set_tls (__ARM_NR_BASE+5) +#ifdef __KERNEL__ +#define __ARM_NR_cmpxchg (__ARM_NR_BASE+0x00fff0) +#endif +/* * The following syscalls are obsolete and no longer available for EABI. */
arch/arm/kernel/entry-armv.S +4 -3
@@ -21,6 +21,7 @@ #include <mach/entry-macro.S> #include <asm/thread_notify.h> #include <asm/unwind.h> +#include <asm/unistd.h> #include "entry-header.S"
@@ -908,10 +909,10 @@ __kuser_cmpxchg: @ 0xffff0fc0 * A special ghost syscall is used for that (see traps.c). */ stmfd sp!, {r7, lr} - mov r7, #0xff00 @ 0xfff0 into r7 for EABI - orr r7, r7, #0xf0 - swi #0x9ffff0 + ldr r7, =1f @ it's 20 bits + swi __ARM_NR_cmpxchg ldmfd sp!, {r7, pc} +1: .word __ARM_NR_cmpxchg #elif __LINUX_ARM_ARCH__ < 6
arch/arm/kernel/traps.c +1 -1
@@ -528,7 +528,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)* __kuser_cmpxchg code in entry-armv.S should be aware of its * existence. Don't ever use this from user code. */ -case 0xfff0 : +case NR (cmpxchg):for (;;) {extern void do_DataAbort (unsigned long addr,unsigned int fsr,struct pt_regs *regs);
PATCH 1/1 Use definition for cmpxchg swi
Quoted 1 line · Russell King - ARM Linux
Use a definition for the cmpxchg SWI instead of hard-coding the number.
Well... Initially I didn't use a definition in unistd.h because I didn't want user space to "see" it and assume this was part of the kernel ABI since this is actually just an implementation detail that depends on a particular kernel configuration. If you want to define it with this patch then I'd suggest copying the related comment from traps.c near the definition as well:
* *NOTE*: This is a ghost syscall private to the kernel. Only the
* __kuser_cmpxchg code in entry-armv.S should be aware of its
* existence. Don't ever use this from user code.
Nicolas
PATCH 1/1 Use definition for cmpxchg swi
Quoted 8 lines · Nicolas Pitre
Quoted 1 line · Russell King - ARM Linux
Use a definition for the cmpxchg SWI instead of hard-coding the number.
Well... Initially I didn't use a definition in
unistd.hbecause I didn't want user space to "see" it and assume this was part of the kernel ABI since this is actually just an implementation detail that depends on a particular kernel configuration.
The ifdef __KERNEL__ is sufficient for that - kernel headers are now stripped of code within these defines during 'make installheaders'.
PATCH 1/1 Use definition for cmpxchg swi
Quoted 5 lines · Russell King - ARM Linux
Quoted 4 lines · Nicolas Pitre
Quoted 1 line · Russell King - ARM Linux
Use a definition for the cmpxchg SWI instead of hard-coding the number.
Quoted 7 lines
Quoted 4 lines
Well... Initially I didn't use a definition in
unistd.hbecause I didn't want user space to "see" it and assume this was part of the kernel ABI since this is actually just an implementation detail that depends on a particular kernel configuration.The ifdef
__KERNEL__is sufficient for that - kernel headers are now stripped of code within these defines during 'make installheaders'.
Sure. But I wouldn't be surprised to see people redefining it manually just because they didn't understand why there was a #ifdef __KERNEL__ in the kernel file. Adding a comment makes the intent clearer.
Nicolas
PATCH 1/1 Use definition for cmpxchg swi
Quoted 12 lines · Nicolas Pitre
Quoted 10 lines · Russell King - ARM Linux
Quoted 8 lines · Nicolas Pitre
Quoted 1 line · Russell King - ARM Linux
Use a definition for the cmpxchg SWI instead of hard-coding the number.
Well... Initially I didn't use a definition in
unistd.hbecause I didn't want user space to "see" it and assume this was part of the kernel ABI since this is actually just an implementation detail that depends on a particular kernel configuration.
Quoted 6 lines
Quoted 2 lines
The ifdef
__KERNEL__is sufficient for that - kernel headers are now stripped of code within these defines during 'make installheaders'.Sure. But I wouldn't be surprised to see people redefining it manually just because they didn't understand why there was a #ifdef
__KERNEL__in the kernel file. Adding a comment makes the intent clearer.
One solution to that would be to make it a random number within a certain range picked at kernel boot time. ;)
I'll add a comment then.
Note, however, that the original code was buggy - it resulted in the '0xfff0' syscall being called instead of '0xffff0' - note the extra 4 bits there.
PATCH 1/1 Use definition for cmpxchg swi
Quoted 5 lines · Russell King - ARM Linux
I'll add a comment then.
Note, however, that the original code was buggy - it resulted in the '
0xfff0' syscall being called instead of '0xffff0' - note the extra 4 bits there.
Meaning that nobody has ever actually used the original code? :-)
I notice that it loads the syscall number register for EABI compatibility, but that instruction could be trivially omitted with OABI-compatible kernels, couldn't it?
By the way, did you change it to LDR to make it faster? (I.e. does that make it faster?)
-- Jamie
PATCH 1/1 Use definition for cmpxchg swi
Quoted 8 lines · Jamie Lokier
Quoted 5 lines · Russell King - ARM Linux
I'll add a comment then.
Note, however, that the original code was buggy - it resulted in the '
0xfff0' syscall being called instead of '0xffff0' - note the extra 4 bits there.Meaning that nobody has ever actually used the original code? :-)
Correct, because SMP on ARM architectures prior to V6 is rather rare. My only implementation of that is a pile of FPGAs implementing a 4-way ARM926 SMP system.
Quoted 3 lines
I notice that it loads the syscall number register for EABI compatibility, but that instruction could be trivially omitted with OABI-compatible kernels, couldn't it?
It could.
Quoted 2 lines
By the way, did you change it to LDR to make it faster? (I.e. does that make it faster?)
Well, we could use one mov and two orr instructions to load the minimum 20 bits of syscall number (which equates to a minimum of 3 cycles) or one ldr, which can be 1 cycle if the cache is warm. Since the result is not used in the following two instructions, there is no impact from result delays.
PATCH 1/1 Use definition for cmpxchg swi
In reply to Jamie LokierQuoted 8 lines · Jamie Lokier
Quoted 5 lines · Russell King - ARM Linux
I'll add a comment then.
Note, however, that the original code was buggy - it resulted in the '
0xfff0' syscall being called instead of '0xffff0' - note the extra 4 bits there.Meaning that nobody has ever actually used the original code? :-)
Hard to tell. This is certainly the last of the last resorts.
Quoted 3 lines
I notice that it loads the syscall number register for EABI compatibility, but that instruction could be trivially omitted with OABI-compatible kernels, couldn't it?
Maybe, but I don't think we should care that much. This is only to support maybe one or two dev boards in existence on the planet that might even not be used anymore, and being the solution of last resort means it is already much much slower than the alternatives. So this is not worth the bother.
Quoted 2 lines
By the way, did you change it to LDR to make it faster? (I.e. does that make it faster?)
It's most probably only a case of making the define usage simpler.
Nicolas
PATCH 1/1 Use definition for cmpxchg swi
So, can I have an ack for the patch with your suggested additional comment in?
PATCH 1/1 Use definition for cmpxchg swi
Quoted 2 lines · Russell King - ARM Linux
So, can I have an ack for the patch with your suggested additional comment in?
Sure.