alignment handler instruction endian-ness
I ran in to an issue with the alignment handler when running BE8 where it loads instructions and fails to swap.
Is there a better way of swapping instructions for ARM when loading from arbitrary places? Have I missed any other places this could happen?
The following patch is my first attempt at solving the problem for the alignment handler:
Quoted 61 lines
Author: Ben Dooks <[email protected]> Date: Thu Jul 18 21:10:56 2013 +0100arm: alignment: deal with be8 mode when decoding instructions
If we are in BE8 mode, we must deal with the instruction stream being in LE order when data is being loaded in BE order. Ensure the data is swapped before processing to avoid thre following:
Alignment trap: not handling instruction
030091e8at [<80333e8c>] Unhandled fault: alignment exception (0x001) at0xbfa09567Signed-off-by Ben Dooks <[email protected]>arch/arm/mm/alignment.c +14
-1@@ -87,6 +87,12 @@ core_param(alignment, ai_usermode, int, 0600);#define UM_FIXUP (1 << 1)#define UM_SIGNAL (1 << 2) +#ifdef CONFIG_CPU_ENDIAN_BE8 +#define need_swap () true +#else +#define need_swap () false +#endif +/* Return true if and only if the ARMv6 unaligned access model is in use. */ static bool cpu_is_v6_unaligned (void ) {@@ -762,12 +768,16 @@ do_alignment(unsigned long addr, unsigned int fsr, structif (thumb_mode (regs)) {u16 *ptr = (u16 *)(instrptr & ~1 ); fault =probe_kernel_address (ptr, tinstr); +if (need_swap ()) + tinstr =cpu_to_le16 (tinstr);if (!fault) {if (cpu_architecture () >= CPU_ARCH_ARMv7 &&IS_T32 (tinstr)) {/* Thumb-2 32-bit */ u16 tinst2 =0 ; fault =probe_kernel_address (ptr +1 , tinst2); +if (need_swap ()) + tinst2 =cpu_to_le16 (tinst2); instr = (tinstr <<16 ) | tinst2; thumb2_32b =1 ; }else {@@ -775,8 +785,11 @@ do_alignment(unsigned long addr, unsigned int fsr, struct p instr =thumb2arm (tinstr); } } - }else + }else { fault =probe_kernel_address (instrptr, instr); +if (need_swap ()) + instr =cpu_to_le32 (instr); + }if (fault) { type =TYPE_FAULT ;
Signature · 2 lines
Ben Dooks http://www.codethink.co.uk/ Senior Engineer Codethink - Providing Genius
Quoted 5 lines · Ben Dooks
I ran in to an issue with the alignment handler when running BE8 where it loads instructions and fails to swap.
Is there a better way of swapping instructions for ARM when loading from arbitrary places? Have I missed any other places this could happen?
Maybe we need a macro which deals with this automatically?
arm_instr_to_cpu(x) thumb_instr_to_cpu(x)
These should probably make use of the swab*() macros when an endian swap is needed.
Quoted 2 lines
The following patch is my first attempt at solving the problem for the alignment handler:
I'd suggest checking this with sparse too - you have some type errors here.
Quoted 12 lines · Russell King - ARM Linux
Quoted 5 lines · Ben Dooks
I ran in to an issue with the alignment handler when running BE8 where it loads instructions and fails to swap.
Is there a better way of swapping instructions for ARM when loading from arbitrary places? Have I missed any other places this could happen?
Maybe we need a macro which deals with this automatically?
arm_instr_to_cpu(x) thumb_instr_to_cpu(x)
Quoted 7 lines
These should probably make use of the swab*() macros when an endian swap is needed.
Quoted 2 lines
The following patch is my first attempt at solving the problem for the alignment handler:
I'd suggest checking this with sparse too - you have some type errors here.
Very probably, I needed this in a hurry and was after some input on how it could be improved.
The only issue I was thinking of for having those functions would be if the userspace was running BE32 and the kernel was LE. I don't think this is very likely, so it can probably be discounted.
I could not find where the kernel's relocation code does this to see if it also needed changing.
Signature · 2 lines
Ben Dooks http://www.codethink.co.uk/ Senior Engineer Codethink - Providing Genius
Quoted 12 lines · Russell King - ARM Linux
Quoted 5 lines · Ben Dooks
I ran in to an issue with the alignment handler when running BE8 where it loads instructions and fails to swap.
Is there a better way of swapping instructions for ARM when loading from arbitrary places? Have I missed any other places this could happen?
Maybe we need a macro which deals with this automatically?
arm_instr_to_cpu(x) thumb_instr_to_cpu(x)
Quoted 7 lines
These should probably make use of the swab*() macros when an endian swap is needed.
Quoted 2 lines
The following patch is my first attempt at solving the problem for the alignment handler:
I'd suggest checking this with sparse too - you have some type errors here.
How about:
(quoted diff) +0 -0
b/arch/arm/include/uapi/asm/b
index 7737974..9e63a00 100644
arch/arm/include/uapi/asm/byteorder.h +7 -0
@@ -21,5 +21,13 @@#include <linux/byteorder/little_endian.h> #endif +#ifdef CONFIG_CPU_ENDIAN_BE8 +#define cpu_to_arm_instr (__instr) swab32(__instr) +#define cpu_to_thum_instr (__instr) swab16(__instr) +#else +#define cpu_to_arm_instr (__instr) (__instr) +#define cpu_to_thum_instr (__instr) (__instr) +#endif
Signature · 2 lines
Ben Dooks http://www.codethink.co.uk/ Senior Engineer Codethink - Providing Genius
Quoted 30 lines · Ben Dooks
Quoted 12 lines · Russell King - ARM Linux
Quoted 5 lines · Ben Dooks
I ran in to an issue with the alignment handler when running BE8 where it loads instructions and fails to swap.
Is there a better way of swapping instructions for ARM when loading from arbitrary places? Have I missed any other places this could happen?
Maybe we need a macro which deals with this automatically?
arm_instr_to_cpu(x) thumb_instr_to_cpu(x)Quoted 7 lines
These should probably make use of the swab*() macros when an endian swap is needed.
Quoted 2 lines
The following patch is my first attempt at solving the problem for the alignment handler:
I'd suggest checking this with sparse too - you have some type errors here.
How about:
arch/arm/include/uapi/asm/byteorder.h +0
-0@@ -21,5 +21,13 @@#include <linux/byteorder/little_endian.h>
arch/arm/include/uapi/asm/byteorder.h line 31
Quoted 10 lines
arch/arm/include/uapi/asm/byteorder.h +7
-0#endif +#ifdef CONFIG_CPU_ENDIAN_BE8 +#define cpu_to_arm_instr (__instr) swab32(__instr) +#define cpu_to_thum_instr (__instr) swab16(__instr) +#else +#define cpu_to_arm_instr (__instr) (__instr) +#define cpu_to_thum_instr (__instr) (__instr) +#endif
ARGH.
First point: does userspace have any knowledge how the kernel is configured? Do they include the kernel configuration header file? No. Therefore the use of CONFIG_* in UAPI header files is wrong.
Second point: does userspace need these macros and should the kernel provide them to userspace? No on both counts. Therefore, this must not be placed in UAPI.
UAPI was created explicitly to separate the kernel private definitions from the parts of the kernel interface which the user API depends on.
If you value your soul, NEVER EVER EVER place stuff which is not part of the user API in a header file in a UAPI subdirectory. And never modify a header file in a UAPI subdirectory without first having a good long think about how that modification may impact _userspace_.
Third point: the name is totally and utterly wrong. I think you've misunderstood the naming conventions of the cpu_to_xxx() and xxx_to_cpu() macros. "cpu" is the CPUs native data endianness - the endianness that you can do standard arithmetic on and you get the right answer. "xxx" is the "foreign" endianness. In this case, it's the instructions which are not the CPUs native data endianness, so they are the foreign state - they are the "xxx".
So, I've no idea why you decided to reverse the name of the macro I gave you... I am astounded at this.
Quoted 52 lines · Russell King - ARM Linux
Quoted 30 lines · Ben Dooks
Quoted 12 lines · Russell King - ARM Linux
Quoted 5 lines · Ben Dooks
I ran in to an issue with the alignment handler when running BE8 where it loads instructions and fails to swap.
Is there a better way of swapping instructions for ARM when loading from arbitrary places? Have I missed any other places this could happen?
Maybe we need a macro which deals with this automatically?
arm_instr_to_cpu(x) thumb_instr_to_cpu(x)Quoted 7 lines
These should probably make use of the swab*() macros when an endian swap is needed.
Quoted 2 lines
The following patch is my first attempt at solving the problem for the alignment handler:
I'd suggest checking this with sparse too - you have some type errors here.
How about:
arch/arm/include/uapi/asm/byteorder.h +0
-0@@ -21,5 +21,13 @@#include <linux/byteorder/little_endian.h> arch/arm/include/uapi/asm/byteorder.h line 31
Quoted 10 lines
arch/arm/include/uapi/asm/byteorder.h +7
-0#endif +#ifdef CONFIG_CPU_ENDIAN_BE8 +#define cpu_to_arm_instr (__instr) swab32(__instr) +#define cpu_to_thum_instr (__instr) swab16(__instr) +#else +#define cpu_to_arm_instr (__instr) (__instr) +#define cpu_to_thum_instr (__instr) (__instr) +#endif ARGH.
First point: does userspace have any knowledge how the kernel is configured? Do they include the kernel configuration header file? No. Therefore the use of CONFIG_* in UAPI header files is wrong.
Second point: does userspace need these macros and should the kernel provide them to userspace? No on both counts. Therefore, this must not be placed in UAPI.
Quoted 7 lines
UAPI was created explicitly to separate the kernel private definitions from the parts of the kernel interface which the user API depends on.
If you value your soul, NEVER EVER EVER place stuff which is not part of the user API in a header file in a UAPI subdirectory. And never modify a header file in a UAPI subdirectory without first having a good long think about how that modification may impact _userspace_.
Sorry, searched for byteorder.h and just did not notice.
Where is the best place for these to go?
Quoted 10 lines
Third point: the name is totally and utterly wrong. I think you've misunderstood the naming conventions of the
cpu_to_xxx()andxxx_to_cpu()macros. "cpu" is the CPUs native data endianness - the endianness that you can do standard arithmetic on and you get the right answer. "xxx" is the "foreign" endianness. In this case, it's the instructions which are not the CPUs native data endianness, so they are the foreign state - they are the "xxx".So, I've no idea why you decided to reverse the name of the macro I gave you... I am astounded at this.
I meant to put both versions in as I thought they'd be needed/.
Signature · 2 lines
Ben Dooks http://www.codethink.co.uk/ Senior Engineer Codethink - Providing Genius
Quoted 8 lines · Russell King - ARM Linux
Quoted 5 lines · Ben Dooks
I ran in to an issue with the alignment handler when running BE8 where it loads instructions and fails to swap.
Is there a better way of swapping instructions for ARM when loading from arbitrary places? Have I missed any other places this could happen?
Maybe we need a macro which deals with this automatically?
Like the stuff in arch/arm/include/asm/opcodes.h ?
Quoted 15 lines
arm_instr_to_cpu(x) thumb_instr_to_cpu(x)These should probably make use of the swab*() macros when an endian swap is needed.
Quoted 2 lines
The following patch is my first attempt at solving the problem for the alignment handler:
I'd suggest checking this with sparse too - you have some type errors here.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 11 lines · Jon Medhurst (Tixy)
Quoted 8 lines · Russell King - ARM Linux
Quoted 5 lines · Ben Dooks
I ran in to an issue with the alignment handler when running BE8 where it loads instructions and fails to swap.
Is there a better way of swapping instructions for ARM when loading from arbitrary places? Have I missed any other places this could happen?
Maybe we need a macro which deals with this automatically?
Like the stuff in
arch/arm/include/asm/opcodes.h?
Not like asm/opcodes.h does at the moment, because there's really no reason whatsoever that it isn't using the standard swab stuff, which will automatically use the rev/rev16 instructions where available.
There's really no reason to open code that stuff.
Quoted 11 lines · Russell King - ARM Linux
Quoted 10 lines · Jon Medhurst (Tixy)
Quoted 8 lines · Russell King - ARM Linux
Quoted 5 lines · Ben Dooks
I ran in to an issue with the alignment handler when running BE8 where it loads instructions and fails to swap.
Is there a better way of swapping instructions for ARM when loading from arbitrary places? Have I missed any other places this could happen?
Maybe we need a macro which deals with this automatically?
Quoted 7 lines
Quoted 1 line
Like the stuff in
arch/arm/include/asm/opcodes.h?Not like
asm/opcodes.hdoes at the moment, because there's really no reason whatsoever that it isn't using the standard swab stuff, which will automatically use the rev/rev16 instructions where available.There's really no reason to open code that stuff.
It seems it is only open coded for the __ASSEMBLY__ version, it does use swabXX() for the !__ASSEMBLY__ case.
Should we use __mem_to_opcode_arm() in the aligned and abort handlers?
Signature · 2 lines
Ben Dooks http://www.codethink.co.uk/ Senior Engineer Codethink - Providing Genius
Quoted 2 lines · Ben Dooks
Should we use
__mem_to_opcode_arm()in the aligned and abort handlers?
I think so.
Quoted 9 lines · Ben Dooks
Quoted 4 lines · Russell King - ARM Linux
If you value your soul, NEVER EVER EVER place stuff which is not part of the user API in a header file in a UAPI subdirectory. And never modify a header file in a UAPI subdirectory without first having a good long think about how that modification may impact _userspace_.
Sorry, searched for
byteorder.hand just did not notice.Where is the best place for these to go?
You should really have a look at arch/arm/include/asm/opcodes.h.
Nicolas
Quoted 7 lines · Nicolas Pitre
Quoted 6 lines · Ben Dooks
Quoted 4 lines · Russell King - ARM Linux
If you value your soul, NEVER EVER EVER place stuff which is not part of the user API in a header file in a UAPI subdirectory. And never modify a header file in a UAPI subdirectory without first having a good long think about how that modification may impact _userspace_.
Quoted 5 lines
Quoted 3 lines
Sorry, searched for
byteorder.hand just did not notice.Where is the best place for these to go?
You should really have a look at
arch/arm/include/asm/opcodes.h.
Yes, re-worked using <asm/opcodes.h> thanks.
Signature · 2 lines
Ben Dooks http://www.codethink.co.uk/ Senior Engineer Codethink - Providing Genius