On Fri, 09 Oct 2015 21:14:22 +0100
Russell King <rmk+kernel@xxxxxxxxxxxxxxxx> wrote:
> As all the import functions and export functions are virtually
> identical, factor out their common parts into a generic
> mv_cesa_ahash_import() and mv_cesa_ahash_export() respectively. This
> performs the actual import or export, and we pass the data pointers and
> length into these functions.
>
> We have to switch a % const operation to do_div() in the common import
> function to avoid provoking gcc to use the expensive 64-bit by 64-bit
> modulus operation.
>
> Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Looks good to me.
Acked-by: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxxxxxxx>
Thanks again for taking care of that.
Regards,
Boris
> ---
> Replacement to patch 5, going a little further, as requested by Boris.
>
> drivers/crypto/marvell/hash.c | 157 ++++++++++++++----------------------------
> 1 file changed, 53 insertions(+), 104 deletions(-)
>
> diff --git a/drivers/crypto/marvell/hash.c b/drivers/crypto/marvell/hash.c
> index b7c2c05f1a01..a24ceda7acfe 100644
> --- a/drivers/crypto/marvell/hash.c
> +++ b/drivers/crypto/marvell/hash.c
> @@ -795,39 +795,32 @@ static int mv_cesa_ahash_finup(struct ahash_request *req)
> return ret;
> }
>
> -static int mv_cesa_md5_init(struct ahash_request *req)
> +static int mv_cesa_ahash_export(struct ahash_request *req, void *hash,
> + u64 *len, void *cache)
> {
> - struct mv_cesa_op_ctx tmpl;
> -
> - mv_cesa_set_op_cfg(&tmpl, CESA_SA_DESC_CFG_MACM_MD5);
> -
> - mv_cesa_ahash_init(req, &tmpl);
> -
> - return 0;
> -}
> -
> -static int mv_cesa_md5_export(struct ahash_request *req, void *out)
> -{
> - struct md5_state *out_state = out;
> struct crypto_ahash *ahash = crypto_ahash_reqtfm(req);
> struct mv_cesa_ahash_req *creq = ahash_request_ctx(req);
> unsigned int digsize = crypto_ahash_digestsize(ahash);
> + unsigned int blocksize;
> +
> + blocksize = crypto_tfm_alg_blocksize(crypto_ahash_tfm(ahash));
>
> - out_state->byte_count = creq->len;
> - memcpy(out_state->hash, creq->state, digsize);
> - memset(out_state->block, 0, sizeof(out_state->block));
> + *len = creq->len;
> + memcpy(hash, creq->state, digsize);
> + memset(cache, 0, blocksize);
> if (creq->cache)
> - memcpy(out_state->block, creq->cache, creq->cache_ptr);
> + memcpy(cache, creq->cache, creq->cache_ptr);
>
> return 0;
> }
>
> -static int mv_cesa_md5_import(struct ahash_request *req, const void *in)
> +static int mv_cesa_ahash_import(struct ahash_request *req, const void *hash,
> + u64 len, const void *cache)
> {
> - const struct md5_state *in_state = in;
> struct crypto_ahash *ahash = crypto_ahash_reqtfm(req);
> struct mv_cesa_ahash_req *creq = ahash_request_ctx(req);
> unsigned int digsize = crypto_ahash_digestsize(ahash);
> + unsigned int blocksize;
> unsigned int cache_ptr;
> int ret;
>
> @@ -835,16 +828,17 @@ static int mv_cesa_md5_import(struct ahash_request *req, const void *in)
> if (ret)
> return ret;
>
> - if (in_state->byte_count >= sizeof(in_state->block))
> + blocksize = crypto_tfm_alg_blocksize(crypto_ahash_tfm(ahash));
> + if (len >= blocksize)
> mv_cesa_update_op_cfg(&creq->op_tmpl,
> CESA_SA_DESC_CFG_MID_FRAG,
> CESA_SA_DESC_CFG_FRAG_MSK);
>
> - creq->len = in_state->byte_count;
> - memcpy(creq->state, in_state->hash, digsize);
> + creq->len = len;
> + memcpy(creq->state, hash, digsize);
> creq->cache_ptr = 0;
>
> - cache_ptr = creq->len % sizeof(in_state->block);
> + cache_ptr = do_div(len, blocksize);
> if (!cache_ptr)
> return 0;
>
> @@ -852,12 +846,39 @@ static int mv_cesa_md5_import(struct ahash_request *req, const void *in)
> if (ret)
> return ret;
>
> - memcpy(creq->cache, in_state->block, cache_ptr);
> + memcpy(creq->cache, cache, cache_ptr);
> creq->cache_ptr = cache_ptr;
>
> return 0;
> }
>
> +static int mv_cesa_md5_init(struct ahash_request *req)
> +{
> + struct mv_cesa_op_ctx tmpl;
> +
> + mv_cesa_set_op_cfg(&tmpl, CESA_SA_DESC_CFG_MACM_MD5);
> +
> + mv_cesa_ahash_init(req, &tmpl);
> +
> + return 0;
> +}
> +
> +static int mv_cesa_md5_export(struct ahash_request *req, void *out)
> +{
> + struct md5_state *out_state = out;
> +
> + return mv_cesa_ahash_export(req, out_state->hash,
> + &out_state->byte_count, out_state->block);
> +}
> +
> +static int mv_cesa_md5_import(struct ahash_request *req, const void *in)
> +{
> + const struct md5_state *in_state = in;
> +
> + return mv_cesa_ahash_import(req, in_state->hash, in_state->byte_count,
> + in_state->block);
> +}
> +
> static int mv_cesa_md5_digest(struct ahash_request *req)
> {
> int ret;
> @@ -908,53 +929,17 @@ static int mv_cesa_sha1_init(struct ahash_request *req)
> static int mv_cesa_sha1_export(struct ahash_request *req, void *out)
> {
> struct sha1_state *out_state = out;
> - struct crypto_ahash *ahash = crypto_ahash_reqtfm(req);
> - struct mv_cesa_ahash_req *creq = ahash_request_ctx(req);
> - unsigned int digsize = crypto_ahash_digestsize(ahash);
> -
> - out_state->count = creq->len;
> - memcpy(out_state->state, creq->state, digsize);
> - memset(out_state->buffer, 0, sizeof(out_state->buffer));
> - if (creq->cache)
> - memcpy(out_state->buffer, creq->cache, creq->cache_ptr);
>
> - return 0;
> + return mv_cesa_ahash_export(req, out_state->state, &out_state->count,
> + out_state->buffer);
> }
>
> static int mv_cesa_sha1_import(struct ahash_request *req, const void *in)
> {
> const struct sha1_state *in_state = in;
> - struct crypto_ahash *ahash = crypto_ahash_reqtfm(req);
> - struct mv_cesa_ahash_req *creq = ahash_request_ctx(req);
> - unsigned int digsize = crypto_ahash_digestsize(ahash);
> - unsigned int cache_ptr;
> - int ret;
> -
> - ret = crypto_ahash_init(req);
> - if (ret)
> - return ret;
> -
> - if (in_state->count >= SHA1_BLOCK_SIZE)
> - mv_cesa_update_op_cfg(&creq->op_tmpl,
> - CESA_SA_DESC_CFG_MID_FRAG,
> - CESA_SA_DESC_CFG_FRAG_MSK);
> -
> - creq->len = in_state->count;
> - memcpy(creq->state, in_state->state, digsize);
> - creq->cache_ptr = 0;
> -
> - cache_ptr = creq->len % SHA1_BLOCK_SIZE;
> - if (!cache_ptr)
> - return 0;
> -
> - ret = mv_cesa_ahash_alloc_cache(req);
> - if (ret)
> - return ret;
> -
> - memcpy(creq->cache, in_state->buffer, cache_ptr);
> - creq->cache_ptr = cache_ptr;
>
> - return 0;
> + return mv_cesa_ahash_import(req, in_state->state, in_state->count,
> + in_state->buffer);
> }
>
> static int mv_cesa_sha1_digest(struct ahash_request *req)
> @@ -1018,53 +1003,17 @@ static int mv_cesa_sha256_digest(struct ahash_request *req)
> static int mv_cesa_sha256_export(struct ahash_request *req, void *out)
> {
> struct sha256_state *out_state = out;
> - struct crypto_ahash *ahash = crypto_ahash_reqtfm(req);
> - struct mv_cesa_ahash_req *creq = ahash_request_ctx(req);
> - unsigned int ds = crypto_ahash_digestsize(ahash);
>
> - out_state->count = creq->len;
> - memcpy(out_state->state, creq->state, ds);
> - memset(out_state->buf, 0, sizeof(out_state->buf));
> - if (creq->cache)
> - memcpy(out_state->buf, creq->cache, creq->cache_ptr);
> -
> - return 0;
> + return mv_cesa_ahash_export(req, out_state->state, &out_state->count,
> + out_state->buf);
> }
>
> static int mv_cesa_sha256_import(struct ahash_request *req, const void *in)
> {
> const struct sha256_state *in_state = in;
> - struct crypto_ahash *ahash = crypto_ahash_reqtfm(req);
> - struct mv_cesa_ahash_req *creq = ahash_request_ctx(req);
> - unsigned int digsize = crypto_ahash_digestsize(ahash);
> - unsigned int cache_ptr;
> - int ret;
> -
> - ret = crypto_ahash_init(req);
> - if (ret)
> - return ret;
> -
> - if (in_state->count >= SHA256_BLOCK_SIZE)
> - mv_cesa_update_op_cfg(&creq->op_tmpl,
> - CESA_SA_DESC_CFG_MID_FRAG,
> - CESA_SA_DESC_CFG_FRAG_MSK);
>
> - creq->len = in_state->count;
> - memcpy(creq->state, in_state->state, digsize);
> - creq->cache_ptr = 0;
> -
> - cache_ptr = creq->len % SHA256_BLOCK_SIZE;
> - if (!cache_ptr)
> - return 0;
> -
> - ret = mv_cesa_ahash_alloc_cache(req);
> - if (ret)
> - return ret;
> -
> - memcpy(creq->cache, in_state->buf, cache_ptr);
> - creq->cache_ptr = cache_ptr;
> -
> - return 0;
> + return mv_cesa_ahash_import(req, in_state->state, in_state->count,
> + in_state->buf);
> }
>
> struct ahash_alg mv_sha256_alg = {
--
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
