Re: [PATCH] crypto: testmgr - delete some redundant code

From: Eric Biggers
Date: Wed Feb 24 2021 - 01:56:36 EST


On Tue, Feb 23, 2021 at 11:42:04AM +0800, Kai Ye wrote:
> Delete sg_data function, because sg_data function definition same as
> sg_virt(), so need to delete it and use sg_virt() replace to sg_data().
>
> Signed-off-by: Kai Ye <yekai13@xxxxxxxxxx>
> ---
> crypto/testmgr.c | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/crypto/testmgr.c b/crypto/testmgr.c
> index 9335999..e13e73c 100644
> --- a/crypto/testmgr.c
> +++ b/crypto/testmgr.c
> @@ -1168,11 +1168,6 @@ static inline int check_shash_op(const char *op, int err,
> return err;
> }
>
> -static inline const void *sg_data(struct scatterlist *sg)
> -{
> - return page_address(sg_page(sg)) + sg->offset;
> -}
> -
> /* Test one hash test vector in one configuration, using the shash API */
> static int test_shash_vec_cfg(const struct hash_testvec *vec,
> const char *vec_name,
> @@ -1230,7 +1225,7 @@ static int test_shash_vec_cfg(const struct hash_testvec *vec,
> return 0;
> if (cfg->nosimd)
> crypto_disable_simd_for_test();
> - err = crypto_shash_digest(desc, sg_data(&tsgl->sgl[0]),
> + err = crypto_shash_digest(desc, sg_virt(&tsgl->sgl[0]),
> tsgl->sgl[0].length, result);
> if (cfg->nosimd)
> crypto_reenable_simd_for_test();
> @@ -1266,7 +1261,7 @@ static int test_shash_vec_cfg(const struct hash_testvec *vec,
> cfg->finalization_type == FINALIZATION_TYPE_FINUP) {
> if (divs[i]->nosimd)
> crypto_disable_simd_for_test();
> - err = crypto_shash_finup(desc, sg_data(&tsgl->sgl[i]),
> + err = crypto_shash_finup(desc, sg_virt(&tsgl->sgl[i]),
> tsgl->sgl[i].length, result);
> if (divs[i]->nosimd)
> crypto_reenable_simd_for_test();
> @@ -1278,7 +1273,7 @@ static int test_shash_vec_cfg(const struct hash_testvec *vec,
> }
> if (divs[i]->nosimd)
> crypto_disable_simd_for_test();
> - err = crypto_shash_update(desc, sg_data(&tsgl->sgl[i]),
> + err = crypto_shash_update(desc, sg_virt(&tsgl->sgl[i]),
> tsgl->sgl[i].length);
> if (divs[i]->nosimd)
> crypto_reenable_simd_for_test();
> --

Looks good,

Reviewed-by: Eric Biggers <ebiggers@xxxxxxxxxx>

- Eric