MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-07 09:55:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

BACKPORT: FROMLIST: dm-verity: move hash algorithm setup into its own function

Browse Source 
Move the code that sets up the hash transformation into its own
function.  No change in behavior.

Reviewed-by: Sami Tolvanen <samitolvanen@google.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Eric Biggers <ebiggers@google.com>

Bug: 330611177
Link: https://lore.kernel.org/r/20240621165922.77672-8-ebiggers@kernel.org
(resolved conflict due to missing the upstream commit
 "dm-verity: Convert from tasklet to BH workqueue", which is hard to
 cherry-pick because it depends on workqueue subsystem changes)
Change-Id: Ibe0a921f700bdb2de7922917e0d6cd879c042d81
Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
Eric Biggers 2024-06-21 10:37:52 -07:00 committed by William McVicker
parent abed1a5d36
commit 76fed9f013
1 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
drivers/md/dm-verity-target.c
View File

@ -1206,6 +1206,43 @@ static int verity_parse_opt_args(struct dm_arg_set *as, struct dm_verity *v,
return r; return r;
} }
static int verity_setup_hash_alg(struct dm_verity *v, const char *alg_name)
{
struct dm_target *ti = v->ti;
struct crypto_ahash *ahash;
v->alg_name = kstrdup(alg_name, GFP_KERNEL);
if (!v->alg_name) {
ti->error = "Cannot allocate algorithm name";
return -ENOMEM;
}
ahash = crypto_alloc_ahash(alg_name, 0,
v->use_tasklet ? CRYPTO_ALG_ASYNC : 0);
if (IS_ERR(ahash)) {
ti->error = "Cannot initialize hash function";
return PTR_ERR(ahash);
}
v->tfm = ahash;
/*
* dm-verity performance can vary greatly depending on which hash
* algorithm implementation is used. Help people debug performance
* problems by logging the ->cra_driver_name.
*/
DMINFO("%s using implementation \"%s\"", alg_name,
crypto_hash_alg_common(ahash)->base.cra_driver_name);
v->digest_size = crypto_ahash_digestsize(ahash);
if ((1 << v->hash_dev_block_bits) < v->digest_size * 2) {
ti->error = "Digest size too big";
return -EINVAL;
}
v->ahash_reqsize = sizeof(struct ahash_request) +
crypto_ahash_reqsize(ahash);
return 0;
}
/* /*
* Target parameters: * Target parameters:
* <version> The current format is version 1. * <version> The current format is version 1.
@ -1330,38 +1367,9 @@ static int verity_ctr(struct dm_target *ti, unsigned int argc, char **argv)
} }
v->hash_start = num_ll; v->hash_start = num_ll;
v->alg_name = kstrdup(argv[7], GFP_KERNEL); r = verity_setup_hash_alg(v, argv[7]);
if (!v->alg_name) { if (r)
ti->error = "Cannot allocate algorithm name";
r = -ENOMEM;
goto bad; goto bad;
}
v->tfm = crypto_alloc_ahash(v->alg_name, 0,
v->use_tasklet ? CRYPTO_ALG_ASYNC : 0);
if (IS_ERR(v->tfm)) {
ti->error = "Cannot initialize hash function";
r = PTR_ERR(v->tfm);
v->tfm = NULL;
goto bad;
}
/*
* dm-verity performance can vary greatly depending on which hash
* algorithm implementation is used. Help people debug performance
* problems by logging the ->cra_driver_name.
*/
DMINFO("%s using implementation \"%s\"", v->alg_name,
crypto_hash_alg_common(v->tfm)->base.cra_driver_name);
v->digest_size = crypto_ahash_digestsize(v->tfm);
if ((1 << v->hash_dev_block_bits) < v->digest_size * 2) {
ti->error = "Digest size too big";
r = -EINVAL;
goto bad;
}
v->ahash_reqsize = sizeof(struct ahash_request) +
crypto_ahash_reqsize(v->tfm);
v->root_digest = kmalloc(v->digest_size, GFP_KERNEL); v->root_digest = kmalloc(v->digest_size, GFP_KERNEL);
if (!v->root_digest) { if (!v->root_digest) {