From patchwork Mon Jan 16 09:17:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 44036 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1098285wrn; Mon, 16 Jan 2023 01:30:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXtQ/ac9FOSYm2lv52ijRoIvPZMNeTSopbW/TniaJSnJNuONmy0FiRmUb0j5r7csQQeyu0O+ X-Received: by 2002:a17:90a:ac12:b0:226:ca91:3979 with SMTP id o18-20020a17090aac1200b00226ca913979mr20444061pjq.26.1673861409056; Mon, 16 Jan 2023 01:30:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673861409; cv=none; d=google.com; s=arc-20160816; b=PU9QSg6XAHFtY2e482/bO8EM6UbJfXon70LRqS2CPDvdFLjaHWFzthQ4mNLd6JEZ03 lI8Gf2WeNpcdL4jS3A9gLKDUOKikpKR1A63NpQrs8c5DtSCwS507Uvu8VMd8LIX6SdF/ cGRnnXBFuDGqtpecvLNNPKx8girSl4zOM3cHX8JndyeqBr+yqRuwgZRtP6arDSGC20ij nXkwqbflk/nL7wb5Nry3QPQ7t9qX6vP3z0jX6Ig2dCnWwy/5oAg+NUpS3xouZtIqbexI fItrM32BY5mIgXxiwfVki7i60O9H7FL9G0o1d4mBcC0CZUC250I/7bvA7FZbyLr/fO6E vvhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date; bh=zhLk7w1uLiSbiIqihfLxUhOVPTmV5zSaMZvUKWj+KUc=; b=KA50DFnHZ7b/cuJUIIz7Y7coykvgUAen6IQkdJ0e8i9VB7xJ5WZnb7RyhBmAUHtOFR Igzx1GBX1rSIWBTe3t8ZUw4jOhAjUIErS3br18QW/eyuHde5DEdKRYNKEdswJtYoSGfO eMkVpEubK6X/awAabLG5+MUc+4FolShsD6WlkD+9CN7yHdHuqfqdKKHRK0QyqCkAtSiZ aaaZ9fedt7imPVEEOYvjJuF6nOk9QhZilRBsZa6OX7h7s6gVD+ilUEEXpGI1trft1LEc 8vjnxufmr5nFvASUKP59E23aJk1V8RE1gZ6ZiAyQI2cnlpqoi97ni8sFJ+X6B9UwnvcM mpUg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id rm12-20020a17090b3ecc00b00219044e1bbdsi295679pjb.25.2023.01.16.01.29.57; Mon, 16 Jan 2023 01:30:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232260AbjAPJTD (ORCPT + 99 others); Mon, 16 Jan 2023 04:19:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232156AbjAPJRy (ORCPT ); Mon, 16 Jan 2023 04:17:54 -0500 Received: from formenos.hmeau.com (helcar.hmeau.com [216.24.177.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 136DDF76B; Mon, 16 Jan 2023 01:17:25 -0800 (PST) Received: from loth.rohan.me.apana.org.au ([192.168.167.2]) by formenos.hmeau.com with smtp (Exim 4.94.2 #2 (Debian)) id 1pHLcF-000RAu-NC; Mon, 16 Jan 2023 17:17:20 +0800 Received: by loth.rohan.me.apana.org.au (sSMTP sendmail emulation); Mon, 16 Jan 2023 17:17:19 +0800 Date: Mon, 16 Jan 2023 17:17:19 +0800 From: Herbert Xu To: Stephen Rothwell Cc: Linux Crypto List , Danny Tsen , Linux Kernel Mailing List , Linux Next Mailing List Subject: [PATCH] crypto: p10-aes-gcm - Use _GLOBAL instead of .global Message-ID: References: <20230116112939.0820ff24@canb.auug.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230116112939.0820ff24@canb.auug.org.au> X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755170900967147347?= X-GMAIL-MSGID: =?utf-8?q?1755170900967147347?= 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 Thanks, Tested-by: Stephen Rothwell # build test only 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 + .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