Commit-ID:  f66f61919eb38c5f20e8a978cae7ecdede4c23b9
Gitweb:     http://git.kernel.org/tip/f66f61919eb38c5f20e8a978cae7ecdede4c23b9
Author:     Josh Poimboeuf <[email protected]>
AuthorDate: Thu, 21 Jan 2016 16:49:16 -0600
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 24 Feb 2016 08:35:42 +0100

x86/asm/crypto: Move jump_table to .rodata section

stacktool reports the following warning:

  stacktool: arch/x86/crypto/crc32c-pcl-intel-asm_64.o: crc_pcl()+0x11dd: can't 
decode instruction

It gets confused when trying to decode jump_table data.  Move jump_table
to the .rodata section which is a more appropriate home for read-only
data.

Signed-off-by: Josh Poimboeuf <[email protected]>
Reviewed-by: Borislav Petkov <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: Bernd Petrovitsch <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Brian Gerst <[email protected]>
Cc: Chris J Arges <[email protected]>
Cc: David S. Miller <[email protected]>
Cc: Denys Vlasenko <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Cc: Herbert Xu <[email protected]>
Cc: Jiri Slaby <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Michal Marek <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Pedro Alves <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Link: 
http://lkml.kernel.org/r/1dbf80c097bb9d89c0cbddc01a815ada690e3b32.1453405861.git.jpoim...@redhat.com
Signed-off-by: Ingo Molnar <[email protected]>
---
 arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S 
b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
index 4fe27e0..dc05f01 100644
--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
@@ -170,8 +170,8 @@ continue_block:
        ## branch into array
        lea     jump_table(%rip), bufp
        movzxw  (bufp, %rax, 2), len
-       offset=crc_array-jump_table
-       lea     offset(bufp, len, 1), bufp
+       lea     crc_array(%rip), bufp
+       lea     (bufp, len, 1), bufp
        jmp     *bufp
 
        ################################################################
@@ -310,7 +310,9 @@ do_return:
        popq    %rdi
        popq    %rbx
         ret
+ENDPROC(crc_pcl)
 
+.section       .rodata, "a", %progbits
         ################################################################
         ## jump table        Table is 129 entries x 2 bytes each
         ################################################################
@@ -324,13 +326,11 @@ JMPTBL_ENTRY %i
        i=i+1
 .endr
 
-ENDPROC(crc_pcl)
 
        ################################################################
        ## PCLMULQDQ tables
        ## Table is 128 entries x 2 words (8 bytes) each
        ################################################################
-.section       .rodata, "a", %progbits
 .align 8
 K_table:
        .long 0x493c7d27, 0x00000001

Reply via email to