From: Thara Gopinath <thara.gopinath@linaro.org>
To: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: herbert@gondor.apana.org.au, davem@davemloft.net,
ebiggers@google.com, ardb@kernel.org, sivaprak@codeaurora.org,
linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 6/7] crypto: qce: common: Add support for AEAD algorithms
Date: Tue, 13 Apr 2021 18:46:28 -0400 [thread overview]
Message-ID: <784e0379-ee24-51ea-68c5-de7adf907dfb@linaro.org> (raw)
In-Reply-To: <20210413223316.GT1538589@yoga>
On 4/13/21 6:33 PM, Bjorn Andersson wrote:
> On Tue 13 Apr 17:27 CDT 2021, Thara Gopinath wrote:
>
>>
>>
>> On 4/5/21 6:18 PM, Bjorn Andersson wrote:
>>> On Thu 25 Feb 12:27 CST 2021, Thara Gopinath wrote:
>>>
>>>> Add register programming sequence for enabling AEAD
>>>> algorithms on the Qualcomm crypto engine.
>>>>
>>>> Signed-off-by: Thara Gopinath <thara.gopinath@linaro.org>
>>>> ---
>>>> drivers/crypto/qce/common.c | 155 +++++++++++++++++++++++++++++++++++-
>>>> 1 file changed, 153 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/drivers/crypto/qce/common.c b/drivers/crypto/qce/common.c
>>>> index 05a71c5ecf61..54d209cb0525 100644
>>>> --- a/drivers/crypto/qce/common.c
>>>> +++ b/drivers/crypto/qce/common.c
>>>> @@ -15,6 +15,16 @@
>>>> #include "core.h"
>>>> #include "regs-v5.h"
>>>> #include "sha.h"
>>>> +#include "aead.h"
>>>> +
>>>> +static const u32 std_iv_sha1[SHA256_DIGEST_SIZE / sizeof(u32)] = {
>>>> + SHA1_H0, SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4, 0, 0, 0
>>>> +};
>>>> +
>>>> +static const u32 std_iv_sha256[SHA256_DIGEST_SIZE / sizeof(u32)] = {
>>>> + SHA256_H0, SHA256_H1, SHA256_H2, SHA256_H3,
>>>> + SHA256_H4, SHA256_H5, SHA256_H6, SHA256_H7
>>>> +};
>>>> static inline u32 qce_read(struct qce_device *qce, u32 offset)
>>>> {
>>>> @@ -96,7 +106,7 @@ static inline void qce_crypto_go(struct qce_device *qce, bool result_dump)
>>>> qce_write(qce, REG_GOPROC, BIT(GO_SHIFT));
>>>> }
>>>> -#ifdef CONFIG_CRYPTO_DEV_QCE_SHA
>>>> +#if defined(CONFIG_CRYPTO_DEV_QCE_SHA) || defined(CONFIG_CRYPTO_DEV_QCE_AEAD)
>>>> static u32 qce_auth_cfg(unsigned long flags, u32 key_size, u32 auth_size)
>>>> {
>>>> u32 cfg = 0;
>>>> @@ -139,7 +149,9 @@ static u32 qce_auth_cfg(unsigned long flags, u32 key_size, u32 auth_size)
>>>> return cfg;
>>>> }
>>>> +#endif
>>>> +#ifdef CONFIG_CRYPTO_DEV_QCE_SHA
>>>> static int qce_setup_regs_ahash(struct crypto_async_request *async_req)
>>>> {
>>>> struct ahash_request *req = ahash_request_cast(async_req);
>>>> @@ -225,7 +237,7 @@ static int qce_setup_regs_ahash(struct crypto_async_request *async_req)
>>>> }
>>>> #endif
>>>> -#ifdef CONFIG_CRYPTO_DEV_QCE_SKCIPHER
>>>> +#if defined(CONFIG_CRYPTO_DEV_QCE_SKCIPHER) || defined(CONFIG_CRYPTO_DEV_QCE_AEAD)
>>>> static u32 qce_encr_cfg(unsigned long flags, u32 aes_key_size)
>>>> {
>>>> u32 cfg = 0;
>>>> @@ -271,7 +283,9 @@ static u32 qce_encr_cfg(unsigned long flags, u32 aes_key_size)
>>>> return cfg;
>>>> }
>>>> +#endif
>>>> +#ifdef CONFIG_CRYPTO_DEV_QCE_SKCIPHER
>>>> static void qce_xts_swapiv(__be32 *dst, const u8 *src, unsigned int ivsize)
>>>> {
>>>> u8 swap[QCE_AES_IV_LENGTH];
>>>> @@ -386,6 +400,139 @@ static int qce_setup_regs_skcipher(struct crypto_async_request *async_req)
>>>> }
>>>> #endif
>>>> +#ifdef CONFIG_CRYPTO_DEV_QCE_AEAD
>>>> +static int qce_setup_regs_aead(struct crypto_async_request *async_req)
>>>> +{
>>>> + struct aead_request *req = aead_request_cast(async_req);
>>>> + struct qce_aead_reqctx *rctx = aead_request_ctx(req);
>>>> + struct qce_aead_ctx *ctx = crypto_tfm_ctx(async_req->tfm);
>>>> + struct qce_alg_template *tmpl = to_aead_tmpl(crypto_aead_reqtfm(req));
>>>> + struct qce_device *qce = tmpl->qce;
>>>> + __be32 enckey[QCE_MAX_CIPHER_KEY_SIZE / sizeof(__be32)] = {0};
>>>> + __be32 enciv[QCE_MAX_IV_SIZE / sizeof(__be32)] = {0};
>>>> + __be32 authkey[QCE_SHA_HMAC_KEY_SIZE / sizeof(__be32)] = {0};
>>>> + __be32 authiv[SHA256_DIGEST_SIZE / sizeof(__be32)] = {0};
>>>> + __be32 authnonce[QCE_MAX_NONCE / sizeof(__be32)] = {0};
>>>> + unsigned int enc_keylen = ctx->enc_keylen;
>>>> + unsigned int auth_keylen = ctx->auth_keylen;
>>>> + unsigned int enc_ivsize = rctx->ivsize;
>>>> + unsigned int auth_ivsize;
>>>> + unsigned int enckey_words, enciv_words;
>>>> + unsigned int authkey_words, authiv_words, authnonce_words;
>>>> + unsigned long flags = rctx->flags;
>>>> + u32 encr_cfg = 0, auth_cfg = 0, config, totallen;
>>>
>>> I don't see any reason to initialize encr_cfg or auth_cfg.
>>>
>>>> + u32 *iv_last_word;
>>>> +
>>>> + qce_setup_config(qce);
>>>> +
>>>> + /* Write encryption key */
>>>> + qce_cpu_to_be32p_array(enckey, ctx->enc_key, enc_keylen);
>>>> + enckey_words = enc_keylen / sizeof(u32);
>>>> + qce_write_array(qce, REG_ENCR_KEY0, (u32 *)enckey, enckey_words);
>>>
>>> Afaict all "array registers" in this function are affected by the
>>> CRYPTO_SETUP little endian bit, but you set this bit before launching
>>> the operation dependent on IS_CCM(). So is this really working for the
>>> !IS_CCM() case?
>>>
>>>> +
>>>> + /* Write encryption iv */
>>>> + qce_cpu_to_be32p_array(enciv, rctx->iv, enc_ivsize);
>>>> + enciv_words = enc_ivsize / sizeof(u32);
>>>> + qce_write_array(qce, REG_CNTR0_IV0, (u32 *)enciv, enciv_words);
>>>
>>> It would be nice if this snippet was extracted to a helper function.
>>
>> I kind of forgot to type this earlier. So yes I agree in principle.
>> It is more elegant to have something like qce_convert_be32_and_write
>> and in the function do the above three steps. This snippet is prevalent in
>> this driver code across other alogs as well (skcipher and hash).
>
> Perhaps make qce_cpu_to_be32p_array() (or qce_be32_to_cpu() per the
> other reply), could return the number of words written - that way you
> remove the ugly middle line at least - and can still poke at the data
> when needed.
Right. I will note this down for clean up as it touches other stuff as
well.
>
>> Take it up as a separate clean up activity ?
>>
>
> Yes, that seems like a good idea.
>
> Regards,
> Bjorn
>
--
Warm Regards
Thara
next prev parent reply other threads:[~2021-04-13 22:46 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-25 18:27 [PATCH 0/7] Add support for AEAD algorithms in Qualcomm Crypto Engine driver Thara Gopinath
2021-02-25 18:27 ` [PATCH 1/7] crypto: qce: common: Add MAC failed error checking Thara Gopinath
2021-04-05 17:36 ` Bjorn Andersson
2021-04-13 19:28 ` Thara Gopinath
2021-02-25 18:27 ` [PATCH 2/7] crypto: qce: common: Make result dump optional Thara Gopinath
2021-04-05 22:23 ` Bjorn Andersson
2021-02-25 18:27 ` [PATCH 3/7] crypto: qce: Add mode for rfc4309 Thara Gopinath
2021-04-05 22:32 ` Bjorn Andersson
2021-04-13 19:30 ` Thara Gopinath
2021-04-13 20:38 ` Bjorn Andersson
2021-02-25 18:27 ` [PATCH 4/7] crypto: qce: Add support for AEAD algorithms Thara Gopinath
2021-03-12 13:01 ` Herbert Xu
2021-03-17 2:09 ` Thara Gopinath
2021-02-25 18:27 ` [PATCH 5/7] crypto: qce: common: Clean up qce_auth_cfg Thara Gopinath
2021-02-25 18:27 ` [PATCH 6/7] crypto: qce: common: Add support for AEAD algorithms Thara Gopinath
2021-04-05 22:18 ` Bjorn Andersson
2021-04-13 21:31 ` Thara Gopinath
2021-04-13 22:20 ` Bjorn Andersson
2021-04-13 22:44 ` Thara Gopinath
2021-04-13 23:09 ` Bjorn Andersson
2021-04-17 13:31 ` Thara Gopinath
2021-04-13 22:27 ` Thara Gopinath
2021-04-13 22:33 ` Bjorn Andersson
2021-04-13 22:46 ` Thara Gopinath [this message]
2021-02-25 18:27 ` [PATCH 7/7] crypto: qce: aead: Schedule fallback algorithm Thara Gopinath
2021-03-04 5:30 ` [PATCH 0/7] Add support for AEAD algorithms in Qualcomm Crypto Engine driver Herbert Xu
2021-03-04 18:41 ` Thara Gopinath
2021-03-12 13:02 ` Herbert Xu
2021-03-17 2:08 ` Thara Gopinath
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=784e0379-ee24-51ea-68c5-de7adf907dfb@linaro.org \
--to=thara.gopinath@linaro.org \
--cc=ardb@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=davem@davemloft.net \
--cc=ebiggers@google.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sivaprak@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).