Skip to contentSkip to conversation

ARM: signal: fix armv7-m build issue in sigreturn_codes.S

PATCH New Victor Kamensky 4 participants 8 messages Nov 11, 2013 – Nov 19, 2013 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: signal: fix armv7-m build issue in sigreturn_codes.S

Hi,

Here is proposal for armv7-m build failure in sigreturn_codes.S. The armv7-m build issue was discussed in [1].

Proposed solution is based on conditional compilation. If CONFIG_CPU_THUMBONLY is set instead of arm opcodes nops in thumb mode are used. I've tried to wrap conditional compilation as nice as I found possible. Other suggestions/approaches are welcome.

Fix was tested:
linux-next with efm32_defconfig build (along with few other fixes) rmk-next BE/LE arndale build/boot and LTP rt_sigaction0? tests run

Uwe, is it possible for you to test that the fix runs on efm32. Also if the platform can run LTP, you give a spin to LTP rt_sigaction0? tests that would be great. It is known that this tests covers code under change.

If folks don't like this fix, I have another variant as I mention in [1] that backs out 574e2b5111e13827da501771b27d92e6e3f2e3d7 (ARM: signal: sigreturn_codes should be endian neutral to work in BE8) and use asm/opcodes to byteswap manually crafted instructions.

Thanks,
Victor

[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-November/209334.html

Victor Kamensky (1):
ARM: signal: fix armv7-m build issue in sigreturn_codes.S

 arch/arm/kernel/sigreturn_codes.S | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)
Signature · 1 line
1.8.1.4
#1 lore raw

PATCH 1/1 ARM: signal: fix armv7-m build issue in sigreturn_codes.S

In case of armv7-m architecture arm instructions are not allowed. For this architecture CONFIG_CPU_THUMBONLY is set. Use this macro to emit conditionally arm instructions or nops in thumb mode.

---
 arch/arm/kernel/sigreturn_codes.S | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)
arch/arm/kernel/sigreturn_codes.S +18 -7
index 3c5d0f2..899fb86 100644
@@ -41,17 +41,29 @@
 	.arch armv4t
 #endif
 
+/*
+ * In CPU_THUMBONLY kernel case arm opcodes are not allowed
+ */
+#ifndef CONFIG_CPU_THUMBONLY
+#define ARM_INSTR(code...) .arm ; \
+			   code
+#else
+#define ARM_INSTR(code...) .thumb ; \
+			   nop ;    \
+			   nop ;
+#endif
+
 	.section .rodata
 	.global sigreturn_codes
 	.type	sigreturn_codes, #object
 
-	.arm
+	.align
 
 sigreturn_codes:
 
 	/* ARM sigreturn syscall code snippet */
-	mov	r7, #(__NR_sigreturn - __NR_SYSCALL_BASE)
-	swi	#(__NR_sigreturn)|(__NR_OABI_SYSCALL_BASE)
+ARM_INSTR(mov	r7, #(__NR_sigreturn - __NR_SYSCALL_BASE))
+ARM_INSTR(swi	#(__NR_sigreturn)|(__NR_OABI_SYSCALL_BASE))
 
 	/* Thumb sigreturn syscall code snippet */
 	.thumb
@@ -59,9 +71,8 @@ sigreturn_codes:
 	swi	#0
 
 	/* ARM sigreturn_rt syscall code snippet */
-	.arm
-	mov	r7, #(__NR_rt_sigreturn - __NR_SYSCALL_BASE)
-	swi	#(__NR_rt_sigreturn)|(__NR_OABI_SYSCALL_BASE)
+ARM_INSTR(mov	r7, #(__NR_rt_sigreturn - __NR_SYSCALL_BASE))
+ARM_INSTR(swi	#(__NR_rt_sigreturn)|(__NR_OABI_SYSCALL_BASE))
 
 	/* Thumb sigreturn_rt syscall code snippet */
 	.thumb
@@ -74,7 +85,7 @@ sigreturn_codes:
 	 * it is thumb case or not, so we need additional
 	 * word after real last entry.
 	 */
-	.arm
+	.align
 	.space	4
 
 	.size	sigreturn_codes, . - sigreturn_codes
Signature · 1 line
1.8.1.4
#2 lore raw

PATCH 1/1 ARM: signal: fix armv7-m build issue in sigreturn_codes.S

Quoted 14 lines · Victor Kamensky

In case of armv7-m architecture arm instructions are not allowed. For this architecture CONFIG_CPU_THUMBONLY is set. Use this macro to emit conditionally arm instructions or nops in thumb mode.

---
 arch/arm/kernel/sigreturn_codes.S | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)
arch/arm/kernel/sigreturn_codes.S +0 -0
index 3c5d0f2..899fb86 100644

arch/arm/kernel/sigreturn_codes.S line 47

Quoted 7 lines
arch/arm/kernel/sigreturn_codes.S +4 -0
@@ -41,17 +41,29 @@
 	.arch armv4t
 #endif
 
+/*
+ * In CPU_THUMBONLY kernel case arm opcodes are not allowed
+ */
+#ifndef CONFIG_CPU_THUMBONLY

Is this THUMBONLY stuff actually destined for mainline?

arch/arm/kernel/sigreturn_codes.S line 54

Quoted 7 lines
arch/arm/kernel/sigreturn_codes.S +7 -0
+#define ARM_INSTR(code...) .arm ; \
+			   code
+#else
+#define ARM_INSTR(code...) .thumb ; \
+			   nop ;    \
+			   nop ;
+#endif

Why can't you solve this with the ARM(...) and THUMB(...) macros, like we do in places like head.S?

Will

#3 lore raw

PATCH 1/1 ARM: signal: fix armv7-m build issue in sigreturn_codes.S

Quoted 25 lines · Will Deacon
Quoted 14 lines · Victor Kamensky

In case of armv7-m architecture arm instructions are not allowed. For this architecture CONFIG_CPU_THUMBONLY is set. Use this macro to emit conditionally arm instructions or nops in thumb mode.

---
 arch/arm/kernel/sigreturn_codes.S | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)
arch/arm/kernel/sigreturn_codes.S +0 -0
index 3c5d0f2..899fb86 100644

arch/arm/kernel/sigreturn_codes.S line 47

Quoted 7 lines
arch/arm/kernel/sigreturn_codes.S +4 -0
@@ -41,17 +41,29 @@
      .arch armv4t
 #endif
 
+/*
+ * In CPU_THUMBONLY kernel case arm opcodes are not allowed
+ */
+#ifndef CONFIG_CPU_THUMBONLY

Is this THUMBONLY stuff actually destined for mainline?

Quoted 10 lines

arch/arm/kernel/sigreturn_codes.S line 54

Quoted 7 lines
arch/arm/kernel/sigreturn_codes.S +7 -0
+#define ARM_INSTR(code...) .arm ; \
+                        code
+#else
+#define ARM_INSTR(code...) .thumb ; \
+                        nop ;    \
+                        nop ;
+#endif

Why can't you solve this with the ARM(...) and THUMB(...) macros, like we do in places like head.S?

If we pursue this route (otherwise see Dave's suggestion on [1]), sigreturn_codes is array of instructions snipets. It
is indexed by signal.c. Layout is very important here. I don't see how ARM and THUMB can help us to achieve this. The conditionally include instruction or empty. If I use them, it will not help because it will change layout of sigreturn_codes. Local macro I introduced uses .arm instruction
if not THUMBONLY and put two thumb instructions
to fill the space so sigreturn_codes keeps the same layout.

Thanks,
Victor

[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-November/210631.html

Quoted 1 line

Will

#4 lore raw

PATCH 1/1 ARM: signal: fix armv7-m build issue in sigreturn_codes.S

In reply to Victor Kamensky
Quoted 19 lines · Victor Kamensky

In case of armv7-m architecture arm instructions are not allowed. For this architecture CONFIG_CPU_THUMBONLY is set. Use this macro to emit conditionally arm instructions or nops in thumb mode.

---
 arch/arm/kernel/sigreturn_codes.S | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)
arch/arm/kernel/sigreturn_codes.S +2 -0
index 3c5d0f2..899fb86 100644
@@ -41,17 +41,29 @@
 	.arch armv4t
 #endif
 
+/*
+ * In CPU_THUMBONLY kernel case arm opcodes are not allowed

arch/arm/kernel/sigreturn_codes.S line 55

Quoted 10 lines
arch/arm/kernel/sigreturn_codes.S +10 -0
+ */
+#ifndef CONFIG_CPU_THUMBONLY
+#define ARM_INSTR(code...) .arm ; \
+			   code
+#else
+#define ARM_INSTR(code...) .thumb ; \
+			   nop ;    \
+			   nop ;
+#endif
+

Maybe use .org to force the layout, instead of nop-padding, and don't emit the ARM instructions at all in the THUMBONLY case.

So, this becomes something like:

sigreturn_codes:

#ifndef CONFIG_CPU_THUMBONLY
	.arm
	mov	r7, #(__NR_sigreturn - __NR_SYSCALL_BASE)
	swi	#(__NR_sigreturn)|(__NR_OABI_SYSCALL_BASE)
#endif
	.org	sigreturn_codes + 8 + 12 * 0
	.thumb
        movs	r7, #(__NR_sigreturn - __NR_SYSCALL_BASE)
        swi	#0
#ifndef CONFIG_CPU_THUMBONLY
	.arm
	mov	r7, #(__NR_rt_sigreturn - __NR_SYSCALL_BASE)
	swi	#(__NR_rt_sigreturn)|(__NR_OABI_SYSCALL_BASE)
#endif
	.org	sigreturn_codes + 8 + 12 * 1
	.thumb
	movs	r7, #(__NR_rt_sigreturn - __NR_SYSCALL_BASE)
	swi	#0

...etc.

This will just leave gaps in the right places without needing to worry about what to fill them with (which shouldn't matter).

Ideally the ifdefs can be hidden with macros to make things look a bit less ugly. You could keep ARM_INSTR() unmodified, and define separate macros that spit out the .org and related stuff, like:

.macro arm_slot n

		.org	sigreturn_codes + 12 * (\n)

ARM_INSTR( .arm )
.endm

.macro thumb_slot n

		.org	sigreturn_codes + 12 * (\n) + 8
		.thumb

.endm

Then you get

sigreturn_codes:

arm_slot 0
ARM_INSTR( mov r7, #(__NR_sigreturn - __NR_SYSCALL_BASE) )
ARM_INSTR( mov r7, #(__NR_sigreturn - __NR_SYSCALL_BASE) )
thumb_slot 0

	        movs	r7, #(__NR_sigreturn - __NR_SYSCALL_BASE)
	        swi	#0

arm_slot 1
ARM_INSTR( mov r7, #(__NR_rt_sigreturn - __NR_SYSCALL_BASE) )
ARM_INSTR( swi #(__NR_rt_sigreturn)|(__NR_OABI_SYSCALL_BASE) )
thumb_slot 1

		movs	r7, #(__NR_rt_sigreturn - __NR_SYSCALL_BASE)
		swi	#0

Still not ideal, but it might work.

Cheers
---Dave

Quoted 46 lines
arch/arm/kernel/sigreturn_codes.S +6 -7
 	.section .rodata
 	.global sigreturn_codes
 	.type	sigreturn_codes, #object
 
-	.arm
+	.align
 
 sigreturn_codes:
 
 	/* ARM sigreturn syscall code snippet */
-	mov	r7, #(__NR_sigreturn - __NR_SYSCALL_BASE)
-	swi	#(__NR_sigreturn)|(__NR_OABI_SYSCALL_BASE)
+ARM_INSTR(mov	r7, #(__NR_sigreturn - __NR_SYSCALL_BASE))
+ARM_INSTR(swi	#(__NR_sigreturn)|(__NR_OABI_SYSCALL_BASE))
 
 	/* Thumb sigreturn syscall code snippet */
 	.thumb
@@ -59,9 +71,8 @@ sigreturn_codes:
 	swi	#0
 
 	/* ARM sigreturn_rt syscall code snippet */
-	.arm
-	mov	r7, #(__NR_rt_sigreturn - __NR_SYSCALL_BASE)
-	swi	#(__NR_rt_sigreturn)|(__NR_OABI_SYSCALL_BASE)
+ARM_INSTR(mov	r7, #(__NR_rt_sigreturn - __NR_SYSCALL_BASE))
+ARM_INSTR(swi	#(__NR_rt_sigreturn)|(__NR_OABI_SYSCALL_BASE))
 
 	/* Thumb sigreturn_rt syscall code snippet */
 	.thumb
@@ -74,7 +85,7 @@ sigreturn_codes:
 	 * it is thumb case or not, so we need additional
 	 * word after real last entry.
 	 */
-	.arm
+	.align
 	.space	4
 
 	.size	sigreturn_codes, . - sigreturn_codes
Signature · 7 lines
1.8.1.4


_______________________________________________
linaro-kernel mailing list
linaro-kernel at lists.linaro.org
http://lists.linaro.org/mailman/listinfo/linaro-kernel
#5 lore raw

PATCH 1/1 ARM: signal: fix armv7-m build issue in sigreturn_codes.S

Quoted 91 lines · Dave Martin
Quoted 19 lines · Victor Kamensky

In case of armv7-m architecture arm instructions are not allowed. For this architecture CONFIG_CPU_THUMBONLY is set. Use this macro to emit conditionally arm instructions or nops in thumb mode.

---
 arch/arm/kernel/sigreturn_codes.S | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)
arch/arm/kernel/sigreturn_codes.S +2 -0
index 3c5d0f2..899fb86 100644
@@ -41,17 +41,29 @@
      .arch armv4t
 #endif
 
+/*
+ * In CPU_THUMBONLY kernel case arm opcodes are not allowed

arch/arm/kernel/sigreturn_codes.S line 55

Quoted 10 lines
arch/arm/kernel/sigreturn_codes.S +10 -0
+ */
+#ifndef CONFIG_CPU_THUMBONLY
+#define ARM_INSTR(code...) .arm ; \
+                        code
+#else
+#define ARM_INSTR(code...) .thumb ; \
+                        nop ;    \
+                        nop ;
+#endif
+

Maybe use .org to force the layout, instead of nop-padding, and don't emit the ARM instructions at all in the THUMBONLY case.

So, this becomes something like:

sigreturn_codes:

#ifndef CONFIG_CPU_THUMBONLY
        .arm
        mov     r7, #(__NR_sigreturn - __NR_SYSCALL_BASE)
        swi     #(__NR_sigreturn)|(__NR_OABI_SYSCALL_BASE)

#endif
.org sigreturn_codes + 8 + 12 * 0
.thumb
movs r7, #(__NR_sigreturn - __NR_SYSCALL_BASE)
swi #0

#ifndef CONFIG_CPU_THUMBONLY
        .arm
        mov     r7, #(__NR_rt_sigreturn - __NR_SYSCALL_BASE)
        swi     #(__NR_rt_sigreturn)|(__NR_OABI_SYSCALL_BASE)

#endif
.org sigreturn_codes + 8 + 12 * 1
.thumb
movs r7, #(__NR_rt_sigreturn - __NR_SYSCALL_BASE)
swi #0

...etc.

This will just leave gaps in the right places without needing to worry about what to fill them with (which shouldn't matter).

Ideally the ifdefs can be hidden with macros to make things look a bit less ugly. You could keep ARM_INSTR() unmodified, and define separate macros that spit out the .org and related stuff, like:

.macro arm_slot n

                .org    sigreturn_codes + 12 * (\n)

ARM_INSTR( .arm )
.endm

.macro thumb_slot n

                .org    sigreturn_codes + 12 * (\n) + 8
                .thumb

.endm

Then you get

sigreturn_codes:

arm_slot 0

 ARM_INSTR(     mov     r7, #(__NR_sigreturn - __NR_SYSCALL_BASE)       )
 ARM_INSTR(     mov     r7, #(__NR_sigreturn - __NR_SYSCALL_BASE)       )
thumb_slot 0
                movs    r7, #(__NR_sigreturn - __NR_SYSCALL_BASE)
                swi     #0
Quoted 8 lines

arm_slot 1

 ARM_INSTR(     mov     r7, #(__NR_rt_sigreturn - __NR_SYSCALL_BASE)    )
 ARM_INSTR(     swi     #(__NR_rt_sigreturn)|(__NR_OABI_SYSCALL_BASE)   )
thumb_slot 1
                movs    r7, #(__NR_rt_sigreturn - __NR_SYSCALL_BASE)
                swi     #0

Still not ideal, but it might work.

Thanks, Dave! I've tried above and it works. I've sent version 3 of patch as [1]. Please take a look at it.

Thanks,
Victor

[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-November/212307.html

Quoted 50 lines

Cheers
---Dave

Quoted 46 lines
arch/arm/kernel/sigreturn_codes.S +6 -8
      .section .rodata
      .global sigreturn_codes
      .type   sigreturn_codes, #object
 
-     .arm
+     .align
 
 sigreturn_codes:
 
      /* ARM sigreturn syscall code snippet */
-     mov     r7, #(__NR_sigreturn - __NR_SYSCALL_BASE)
-     swi     #(__NR_sigreturn)|(__NR_OABI_SYSCALL_BASE)
+ARM_INSTR(mov        r7, #(__NR_sigreturn - __NR_SYSCALL_BASE))
+ARM_INSTR(swi        #(__NR_sigreturn)|(__NR_OABI_SYSCALL_BASE))
 
      /* Thumb sigreturn syscall code snippet */
      .thumb
@@ -59,9 +71,8 @@ sigreturn_codes:
      swi     #0
 
      /* ARM sigreturn_rt syscall code snippet */
-     .arm
-     mov     r7, #(__NR_rt_sigreturn - __NR_SYSCALL_BASE)
-     swi     #(__NR_rt_sigreturn)|(__NR_OABI_SYSCALL_BASE)
+ARM_INSTR(mov        r7, #(__NR_rt_sigreturn - __NR_SYSCALL_BASE))
+ARM_INSTR(swi        #(__NR_rt_sigreturn)|(__NR_OABI_SYSCALL_BASE))
 
      /* Thumb sigreturn_rt syscall code snippet */
      .thumb
@@ -74,7 +85,7 @@ sigreturn_codes:
       * it is thumb case or not, so we need additional
       * word after real last entry.
       */
-     .arm
+     .align
      .space  4
 
      .size   sigreturn_codes, . - sigreturn_codes
--

1.8.1.4

_______________________________________________
linaro-kernel mailing list
linaro-kernel at lists.linaro.org
http://lists.linaro.org/mailman/listinfo/linaro-kernel

#6 lore raw

PATCH 1/1 ARM: signal: fix armv7-m build issue in sigreturn_codes.S

In reply to Victor Kamensky

Hi Victor,

Quoted 11 lines · Victor Kamensky

Here is proposal for armv7-m build failure in sigreturn_codes.S. The armv7-m build issue was discussed in [1].

Proposed solution is based on conditional compilation. If CONFIG_CPU_THUMBONLY is set instead of arm opcodes nops in thumb mode are used. I've tried to wrap conditional compilation as nice as I found possible. Other suggestions/approaches are welcome.

Fix was tested:
linux-next with efm32_defconfig build (along with few other fixes) rmk-next BE/LE arndale build/boot and LTP rt_sigaction0? tests run

Next currently fails for other reasons, too and I'm out of time. I'd say if it compiles for you it's fine and I will handle eventual fall-outs later.

Quoted 4 lines

Uwe, is it possible for you to test that the fix runs on efm32. Also if the platform can run LTP, you give a spin to LTP rt_sigaction0? tests that would be great. It is known that this tests covers code under change.

No, at least not as easily as enable/install LTP and run it. ptxdist doesn't offer a working LTP integration unfortunately.

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#7 lore raw

PATCH 1/1 ARM: signal: fix armv7-m build issue in sigreturn_codes.S

Hello Victor,

Quoted 9 lines · Uwe Kleine-K?nig
Quoted 8 lines · Victor Kamensky

Here is proposal for armv7-m build failure in sigreturn_codes.S. The armv7-m build issue was discussed in [1].

Proposed solution is based on conditional compilation. If CONFIG_CPU_THUMBONLY is set instead of arm opcodes nops in thumb mode are used. I've tried to wrap conditional compilation as nice as I found possible. Other suggestions/approaches are welcome.

Quoted 6 lines
Quoted 3 lines

Fix was tested:
linux-next with efm32_defconfig build (along with few other fixes) rmk-next BE/LE arndale build/boot and LTP rt_sigaction0? tests run

Next currently fails for other reasons, too and I'm out of time. I'd say if it compiles for you it's fine and I will handle eventual fall-outs later.

next-20131111 + your patch + reverts of d779c07dd7209 and 50e05119f9800 compiles and boots fine.

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |