2023-01-16 00:52:57

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the crypto tree

Hi all,

After merging the crypto tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

ERROR: modpost: ".aes_p10_gcm_decrypt" [arch/powerpc/crypto/p10-aes-gcm-crypto.ko] undefined!
ERROR: modpost: ".aes_p10_gcm_encrypt" [arch/powerpc/crypto/p10-aes-gcm-crypto.ko] undefined!

Caused by commits

cc40379b6e19 ("crypto: p10-aes-gcm - Glue code for AES/GCM stitched implementation")
ca68a96c37eb ("crypto: p10-aes-gcm - An accelerated AES/GCM stitched implementation")

I have used the crypto tree from next-20230113 for today.

BTW, that series seems to have been committed in the wrong order -
there are refrerences to files/functions before they are created.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2023-01-16 09:30:35

by Herbert Xu

[permalink] [raw]
Subject: [PATCH] crypto: p10-aes-gcm - Use _GLOBAL instead of .global

On Mon, Jan 16, 2023 at 11:29:39AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the crypto tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> ERROR: modpost: ".aes_p10_gcm_decrypt" [arch/powerpc/crypto/p10-aes-gcm-crypto.ko] undefined!
> ERROR: modpost: ".aes_p10_gcm_encrypt" [arch/powerpc/crypto/p10-aes-gcm-crypto.ko] undefined!
>
> Caused by commits
>
> cc40379b6e19 ("crypto: p10-aes-gcm - Glue code for AES/GCM stitched implementation")
> ca68a96c37eb ("crypto: p10-aes-gcm - An accelerated AES/GCM stitched implementation")

Does this patch help?

> I have used the crypto tree from next-20230113 for today.
>
> BTW, that series seems to have been committed in the wrong order -
> there are refrerences to files/functions before they are created.

Sorry, this patch series was submitted in this order and I
didn't pick it up when applying it.

---8<---
_GLOBAL is needed instead of .global on Linux in assembly code.

Fixes: cc40379b6e19 ("crypto: p10-aes-gcm - Glue code for AES/GCM stitched implementation")
Signed-off-by: Herbert Xu <[email protected]>

diff --git a/arch/powerpc/crypto/p10_aes_gcm.S b/arch/powerpc/crypto/p10_aes_gcm.S
index 2306ad7c5e36..c25a1837efca 100644
--- a/arch/powerpc/crypto/p10_aes_gcm.S
+++ b/arch/powerpc/crypto/p10_aes_gcm.S
@@ -38,6 +38,8 @@
# ===================================================================================
#

+#include <asm/ppc_asm.h>
+
.machine "any"
.abiversion 1
.text
@@ -569,9 +571,8 @@ ppc_aes_gcm_ghash:
# rounds is at offset 240 in rk
# Xi is at 0 in gcm_table (Xip).
#
-.global aes_p10_gcm_encrypt
.align 5
-aes_p10_gcm_encrypt:
+_GLOBAL(aes_p10_gcm_encrypt)

SAVE_REGS

@@ -1109,9 +1110,8 @@ aes_gcm_out:
#
# 8x Decrypt
#
-.global aes_p10_gcm_decrypt
.align 5
-aes_p10_gcm_decrypt:
+_GLOBAL(aes_p10_gcm_decrypt)

SAVE_REGS

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