tile: use proper .align directives on __ex_table sections

This may fix a reported bug where an R_TILEGX_64 in a module was not
pointing to an aligned address.

Reported-by: Simon Marchi <simon.marchi@polymtl.ca>
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>

7 files changed, 24 insertions, 0 deletions

diff --git a/arch/tile/include/asm/futex.h b/arch/tile/include/asm/futex.h
index 5909ac3d7218..1a6ef1b69cb1 100644
--- a/arch/tile/include/asm/futex.h
+++ b/arch/tile/include/asm/futex.h
@@ -43,6 +43,7 @@
             ".pushsection .fixup,\"ax\"\n"                      \
             "0: { movei %0, %5; j 9f }\n"                       \
             ".section __ex_table,\"a\"\n"                       \
+            ".align 8\n"                                        \
             ".quad 1b, 0b\n"                                    \
             ".popsection\n"                                     \
             "9:"                                                \
diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
index f68503f8e0aa..b6cde3209b96 100644
--- a/arch/tile/include/asm/uaccess.h
+++ b/arch/tile/include/asm/uaccess.h
@@ -127,8 +127,10 @@ extern int fixup_exception(struct pt_regs *regs);
 
 #ifdef __LP64__
 #define _ASM_PTR        ".quad"
+#define _ASM_ALIGN      ".align 8"
 #else
 #define _ASM_PTR        ".long"
+#define _ASM_ALIGN      ".align 4"
 #endif
 
 #define __get_user_asm(OP, x, ptr, ret)                                 \
@@ -137,6 +139,7 @@ extern int fixup_exception(struct pt_regs *regs);
                      "0: { movei %1, 0; movei %0, %3 }\n"               \
                      "j 9f\n"                                           \
                      ".section __ex_table,\"a\"\n"                      \
+                     _ASM_ALIGN "\n"                                    \
                      _ASM_PTR " 1b, 0b\n"                               \
                      ".popsection\n"                                    \
                      "9:"                                               \
@@ -168,6 +171,7 @@ extern int fixup_exception(struct pt_regs *regs);
                              "0: { movei %1, 0; movei %2, 0 }\n"        \
                              "{ movei %0, %4; j 9f }\n"                 \
                              ".section __ex_table,\"a\"\n"              \
+                             ".align 4\n"                               \
                              ".word 1b, 0b\n"                           \
                              ".word 2b, 0b\n"                           \
                              ".popsection\n"                            \
@@ -224,6 +228,7 @@ extern int __get_user_bad(void)
                      ".pushsection .fixup,\"ax\"\n"                     \
                      "0: { movei %0, %3; j 9f }\n"                      \
                      ".section __ex_table,\"a\"\n"                      \
+                     _ASM_ALIGN "\n"                                    \
                      _ASM_PTR " 1b, 0b\n"                               \
                      ".popsection\n"                                    \
                      "9:"                                               \
@@ -248,6 +253,7 @@ extern int __get_user_bad(void)
                              ".pushsection .fixup,\"ax\"\n"             \
                              "0: { movei %0, %4; j 9f }\n"              \
                              ".section __ex_table,\"a\"\n"              \
+                             ".align 4\n"                               \
                              ".word 1b, 0b\n"                           \
                              ".word 2b, 0b\n"                           \
                              ".popsection\n"                            \
diff --git a/arch/tile/lib/atomic_asm_32.S b/arch/tile/lib/atomic_asm_32.S
index 30638042691d..6bda3132cd61 100644
--- a/arch/tile/lib/atomic_asm_32.S
+++ b/arch/tile/lib/atomic_asm_32.S
@@ -164,6 +164,7 @@ STD_ENTRY_SECTION(__atomic\name, .text.atomic)
         STD_ENDPROC(__atomic\name)
         .ifc \bitwidth,32
         .pushsection __ex_table,"a"
+        .align  4
         .word   1b, __atomic\name
         .word   2b, __atomic\name
         .word   __atomic\name, __atomic_bad_address
diff --git a/arch/tile/lib/memcpy_32.S b/arch/tile/lib/memcpy_32.S
index 2a419a6122db..8ba7626cfeb1 100644
--- a/arch/tile/lib/memcpy_32.S
+++ b/arch/tile/lib/memcpy_32.S
@@ -44,6 +44,7 @@
  */
 #define EX \
         .pushsection __ex_table, "a"; \
+        .align 4; \
         .word 9f, memcpy_common_fixup; \
         .popsection; \
         9
@@ -614,5 +615,6 @@ memcpy_fixup_loop:
         .size memcpy_common_fixup, . - memcpy_common_fixup
 
         .section __ex_table,"a"
+        .align 4
         .word .Lcfu, .Lcopy_from_user_fixup_zero_remainder
         .word .Lctu, .Lcopy_to_user_fixup_done
diff --git a/arch/tile/lib/memcpy_user_64.c b/arch/tile/lib/memcpy_user_64.c
index 37440caa7370..88c7016492c4 100644
--- a/arch/tile/lib/memcpy_user_64.c
+++ b/arch/tile/lib/memcpy_user_64.c
@@ -31,6 +31,7 @@
                     ".pushsection .coldtext.memcpy,\"ax\";"     \
                     "2: { move r0, %2; jrp lr };"               \
                     ".section __ex_table,\"a\";"                \
+                    ".align 8;"                                 \
                     ".quad 1b, 2b;"                             \
                     ".popsection"                               \
                     : "=m" (*(p)) : "r" (v), "r" (n));          \
@@ -43,6 +44,7 @@
                     ".pushsection .coldtext.memcpy,\"ax\";"     \
                     "2: { move r0, %2; jrp lr };"               \
                     ".section __ex_table,\"a\";"                \
+                    ".align 8;"                                 \
                     ".quad 1b, 2b;"                             \
                     ".popsection"                               \
                     : "=r" (__v) : "m" (*(p)), "r" (n));        \
diff --git a/arch/tile/lib/usercopy_32.S b/arch/tile/lib/usercopy_32.S
index 21ffa88ffe5f..bb4c127be6e9 100644
--- a/arch/tile/lib/usercopy_32.S
+++ b/arch/tile/lib/usercopy_32.S
@@ -36,6 +36,7 @@ strnlen_user_fault:
         { move r0, zero; jrp lr }
         ENDPROC(strnlen_user_fault)
         .section __ex_table,"a"
+        .align 4
         .word 1b, strnlen_user_fault
         .popsection
 
@@ -59,6 +60,7 @@ strncpy_from_user_fault:
         { movei r0, -EFAULT; jrp lr }
         ENDPROC(strncpy_from_user_fault)
         .section __ex_table,"a"
+        .align 4
         .word 1b, strncpy_from_user_fault
         .popsection
 
@@ -77,6 +79,7 @@ STD_ENTRY(clear_user_asm)
         bnzt r1, 1b
 2:      { move r0, r1; jrp lr }
         .pushsection __ex_table,"a"
+        .align 4
         .word 1b, 2b
         .popsection
 
@@ -86,6 +89,7 @@ STD_ENTRY(clear_user_asm)
 2:      { move r0, r1; jrp lr }
         STD_ENDPROC(clear_user_asm)
         .pushsection __ex_table,"a"
+        .align 4
         .word 1b, 2b
         .popsection
 
@@ -105,6 +109,7 @@ STD_ENTRY(flush_user_asm)
 2:      { move r0, r1; jrp lr }
         STD_ENDPROC(flush_user_asm)
         .pushsection __ex_table,"a"
+        .align 4
         .word 1b, 2b
         .popsection
 
@@ -124,5 +129,6 @@ STD_ENTRY(finv_user_asm)
 2:      { move r0, r1; jrp lr }
         STD_ENDPROC(finv_user_asm)
         .pushsection __ex_table,"a"
+        .align 4
         .word 1b, 2b
         .popsection
diff --git a/arch/tile/lib/usercopy_64.S b/arch/tile/lib/usercopy_64.S
index f248d3196e5c..0d94844eb218 100644
--- a/arch/tile/lib/usercopy_64.S
+++ b/arch/tile/lib/usercopy_64.S
@@ -36,6 +36,7 @@ strnlen_user_fault:
         { move r0, zero; jrp lr }
         ENDPROC(strnlen_user_fault)
         .section __ex_table,"a"
+        .align 8
         .quad 1b, strnlen_user_fault
         .popsection
 
@@ -59,6 +60,7 @@ strncpy_from_user_fault:
         { movei r0, -EFAULT; jrp lr }
         ENDPROC(strncpy_from_user_fault)
         .section __ex_table,"a"
+        .align 8
         .quad 1b, strncpy_from_user_fault
         .popsection
 
@@ -77,6 +79,7 @@ STD_ENTRY(clear_user_asm)
         bnezt r1, 1b
 2:      { move r0, r1; jrp lr }
         .pushsection __ex_table,"a"
+        .align 8
         .quad 1b, 2b
         .popsection
 
@@ -86,6 +89,7 @@ STD_ENTRY(clear_user_asm)
 2:      { move r0, r1; jrp lr }
         STD_ENDPROC(clear_user_asm)
         .pushsection __ex_table,"a"
+        .align 8
         .quad 1b, 2b
         .popsection
 
@@ -105,6 +109,7 @@ STD_ENTRY(flush_user_asm)
 2:      { move r0, r1; jrp lr }
         STD_ENDPROC(flush_user_asm)
         .pushsection __ex_table,"a"
+        .align 8
         .quad 1b, 2b
         .popsection
 
@@ -124,5 +129,6 @@ STD_ENTRY(finv_user_asm)
 2:      { move r0, r1; jrp lr }
         STD_ENDPROC(finv_user_asm)
         .pushsection __ex_table,"a"
+        .align 8
         .quad 1b, 2b
         .popsection