2021-10-15 08:18:44

by Tianjia Zhang

Subject: [PATCH] crypto: x86/sm4 - Fix invalid section entry size

This fixes the following warning:

vmlinux.o: warning: objtool: elf_update: invalid section entry size

The size of the rodata section is 164 bytes, directly using the
entry_size of 164 bytes will cause errors in some versions of the
gcc compiler, while using 16 bytes directly will cause errors in
the clang compiler. This patch correct it by filling the size of
rodata to a 16-byte boundary.

Fixes: a7ee22ee1445 ("crypto: x86/sm4 - add AES-NI/AVX/x86_64 implementation")
Fixes: 5b2efa2bb865 ("crypto: x86/sm4 - add AES-NI/AVX2/x86_64 implementation")
Reported-by: Peter Zijlstra <[email protected]>
Reported-by: Abaci Robot <[email protected]>
Signed-off-by: Tianjia Zhang <[email protected]>
Tested-by: Heyuan Shi <[email protected]>
---
arch/x86/crypto/sm4-aesni-avx-asm_64.S | 6 +++++-
arch/x86/crypto/sm4-aesni-avx2-asm_64.S | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/arch/x86/crypto/sm4-aesni-avx-asm_64.S b/arch/x86/crypto/sm4-aesni-avx-asm_64.S
index 18d2f5199194..1cc72b4804fa 100644
--- a/arch/x86/crypto/sm4-aesni-avx-asm_64.S
+++ b/arch/x86/crypto/sm4-aesni-avx-asm_64.S
@@ -78,7 +78,7 @@
vpxor tmp0, x, x;


-.section .rodata.cst164, "aM", @progbits, 164
+.section .rodata.cst16, "aM", @progbits, 16
.align 16

/*
@@ -133,6 +133,10 @@
.L0f0f0f0f:
.long 0x0f0f0f0f

+/* 12 bytes, only for padding */
+.Lpadding_deadbeef:
+ .long 0xdeadbeef, 0xdeadbeef, 0xdeadbeef
+

.text
.align 16
diff --git a/arch/x86/crypto/sm4-aesni-avx2-asm_64.S b/arch/x86/crypto/sm4-aesni-avx2-asm_64.S
index d2ffd7f76ee2..9c5d3f3ad45a 100644
--- a/arch/x86/crypto/sm4-aesni-avx2-asm_64.S
+++ b/arch/x86/crypto/sm4-aesni-avx2-asm_64.S
@@ -93,7 +93,7 @@
vpxor tmp0, x, x;


-.section .rodata.cst164, "aM", @progbits, 164
+.section .rodata.cst16, "aM", @progbits, 16
.align 16

/*
@@ -148,6 +148,10 @@
.L0f0f0f0f:
.long 0x0f0f0f0f

+/* 12 bytes, only for padding */
+.Lpadding_deadbeef:
+ .long 0xdeadbeef, 0xdeadbeef, 0xdeadbeef
+
.text
.align 16

--
2.24.3 (Apple Git-128)

2021-10-22 12:37:31

by Herbert Xu

Subject: Re: [PATCH] crypto: x86/sm4 - Fix invalid section entry size

On Fri, Oct 15, 2021 at 11:47:33AM +0800, Tianjia Zhang wrote:
> This fixes the following warning:
>
> vmlinux.o: warning: objtool: elf_update: invalid section entry size
>
> The size of the rodata section is 164 bytes, directly using the
> entry_size of 164 bytes will cause errors in some versions of the
> gcc compiler, while using 16 bytes directly will cause errors in
> the clang compiler. This patch correct it by filling the size of
> rodata to a 16-byte boundary.
>
> Fixes: a7ee22ee1445 ("crypto: x86/sm4 - add AES-NI/AVX/x86_64 implementation")
> Fixes: 5b2efa2bb865 ("crypto: x86/sm4 - add AES-NI/AVX2/x86_64 implementation")
> Reported-by: Peter Zijlstra <[email protected]>
> Reported-by: Abaci Robot <[email protected]>
> Signed-off-by: Tianjia Zhang <[email protected]>
> Tested-by: Heyuan Shi <[email protected]>
> ---
> arch/x86/crypto/sm4-aesni-avx-asm_64.S | 6 +++++-
> arch/x86/crypto/sm4-aesni-avx2-asm_64.S | 6 +++++-
> 2 files changed, 10 insertions(+), 2 deletions(-)

Patch applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt