From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pegase2.c-s.fr (pegase2.c-s.fr [93.17.235.10]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 79699354AC2; Sat, 18 Oct 2025 09:20:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=93.17.235.10 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760779207; cv=none; b=OtQXUNukYE2qW5x2gEJhgNtd/T7K2ge+hY8WgAc3VIAnGZkp9tq2pq73Xhy4lipqccjA/1a/5gsy6ghQo4KomEu9fWii5ux8darHWWXJoaR4/uPgYuf/85aqBJxIaqSVEXSnjKauoUKpu71G8DKLTImYbYaRJG2RrLmMbw3YG9A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760779207; c=relaxed/simple; bh=Js3Sv/xG8mYjoHec+OB1wgclcQpEP3pJbcpRQXSFxB4=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=pm2lnFn5lUtn1vUnscaSHxD62/OM9PxQrKBkjxfP6vIaUyOOrkfQaol0y8cDxS5L0d8lPjbxI1LTZqLRkpX2GriGy6Yc30G/SRZmeFNpmvrZOG3I4m2dOQ0x+SPE3LY7f26209fbtP3uWeEvJRJC+Qi1sso4tdEgoe0WUQrw2iY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=csgroup.eu; spf=pass smtp.mailfrom=csgroup.eu; arc=none smtp.client-ip=93.17.235.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=csgroup.eu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=csgroup.eu Received: from localhost (mailhub4.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4cpbJ13kd9z9sSC; Sat, 18 Oct 2025 11:00:33 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase2.c-s.fr ([172.26.127.65]) by localhost (pegase2.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HJxa1yDcQJwG; Sat, 18 Oct 2025 11:00:33 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase2.c-s.fr (Postfix) with ESMTP id 4cpbJ12blgz9sS8; Sat, 18 Oct 2025 11:00:33 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 468C38B765; Sat, 18 Oct 2025 11:00:33 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id 0rhQCqUhMXYB; Sat, 18 Oct 2025 11:00:33 +0200 (CEST) Received: from [192.168.235.99] (unknown [192.168.235.99]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 4BD6D8B764; Sat, 18 Oct 2025 11:00:32 +0200 (CEST) Message-ID: Date: Sat, 18 Oct 2025 11:00:32 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v6 02/17] arm64/sha3: Rename conflicting functions To: David Howells , Eric Biggers Cc: "Jason A . Donenfeld" , Ard Biesheuvel , Herbert Xu , Stephan Mueller , Lukas Wunner , Ignat Korchagin , Luis Chamberlain , Petr Pavlu , Daniel Gomez , Sami Tolvanen , linux-crypto@vger.kernel.org, keyrings@vger.kernel.org, linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org, Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org References: <20251017144311.817771-1-dhowells@redhat.com> <20251017144311.817771-3-dhowells@redhat.com> From: Christophe Leroy Content-Language: fr-FR In-Reply-To: <20251017144311.817771-3-dhowells@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Le 17/10/2025 à 16:42, David Howells a écrit : > Rename the arm64 sha3_* functions to have an "arm64_" prefix to avoid > conflict with generic code. Same comment as previous patch, the functions are static, why would they conflict with generic code ? Also generic code doesn't have such functions at the moment, are they added by a follow patch ? Christophe > > Signed-off-by: David Howells > cc: Eric Biggers > cc: Jason A. Donenfeld > cc: Ard Biesheuvel > cc: Catalin Marinas > cc: Will Deacon > cc: Herbert Xu > cc: Stephan Mueller > cc: linux-crypto@vger.kernel.org > cc: linux-arm-kernel@lists.infradead.org > --- > arch/arm64/crypto/sha3-ce-glue.c | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/arch/arm64/crypto/sha3-ce-glue.c b/arch/arm64/crypto/sha3-ce-glue.c > index b4f1001046c9..426d8044535a 100644 > --- a/arch/arm64/crypto/sha3-ce-glue.c > +++ b/arch/arm64/crypto/sha3-ce-glue.c > @@ -31,7 +31,7 @@ MODULE_ALIAS_CRYPTO("sha3-512"); > asmlinkage int sha3_ce_transform(u64 *st, const u8 *data, int blocks, > int md_len); > > -static int sha3_update(struct shash_desc *desc, const u8 *data, > +static int arm64_sha3_update(struct shash_desc *desc, const u8 *data, > unsigned int len) > { > struct sha3_state *sctx = shash_desc_ctx(desc); > @@ -55,8 +55,8 @@ static int sha3_update(struct shash_desc *desc, const u8 *data, > return len; > } > > -static int sha3_finup(struct shash_desc *desc, const u8 *src, unsigned int len, > - u8 *out) > +static int arm64_sha3_finup(struct shash_desc *desc, const u8 *src, unsigned int len, > + u8 *out) > { > struct sha3_state *sctx = shash_desc_ctx(desc); > struct crypto_shash *tfm = desc->tfm; > @@ -90,8 +90,8 @@ static int sha3_finup(struct shash_desc *desc, const u8 *src, unsigned int len, > static struct shash_alg algs[] = { { > .digestsize = SHA3_224_DIGEST_SIZE, > .init = crypto_sha3_init, > - .update = sha3_update, > - .finup = sha3_finup, > + .update = arm64_sha3_update, > + .finup = arm64_sha3_finup, > .descsize = SHA3_STATE_SIZE, > .base.cra_name = "sha3-224", > .base.cra_driver_name = "sha3-224-ce", > @@ -102,8 +102,8 @@ static struct shash_alg algs[] = { { > }, { > .digestsize = SHA3_256_DIGEST_SIZE, > .init = crypto_sha3_init, > - .update = sha3_update, > - .finup = sha3_finup, > + .update = arm64_sha3_update, > + .finup = arm64_sha3_finup, > .descsize = SHA3_STATE_SIZE, > .base.cra_name = "sha3-256", > .base.cra_driver_name = "sha3-256-ce", > @@ -114,8 +114,8 @@ static struct shash_alg algs[] = { { > }, { > .digestsize = SHA3_384_DIGEST_SIZE, > .init = crypto_sha3_init, > - .update = sha3_update, > - .finup = sha3_finup, > + .update = arm64_sha3_update, > + .finup = arm64_sha3_finup, > .descsize = SHA3_STATE_SIZE, > .base.cra_name = "sha3-384", > .base.cra_driver_name = "sha3-384-ce", > @@ -126,8 +126,8 @@ static struct shash_alg algs[] = { { > }, { > .digestsize = SHA3_512_DIGEST_SIZE, > .init = crypto_sha3_init, > - .update = sha3_update, > - .finup = sha3_finup, > + .update = arm64_sha3_update, > + .finup = arm64_sha3_finup, > .descsize = SHA3_STATE_SIZE, > .base.cra_name = "sha3-512", > .base.cra_driver_name = "sha3-512-ce", > >