lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 498/917] crypto: tcrypt - fix skcipher multi-buffer tests for 1420B blocks
    Date
    From: Horia Geantă <horia.geanta@nxp.com>

    [ Upstream commit 3ae88f676aa63366ffa9eebb8ae787c7e19f0c57 ]

    Commit ad6d66bcac77e ("crypto: tcrypt - include 1420 byte blocks in aead and skcipher benchmarks")
    mentions:
    > power-of-2 block size. So let's add 1420 bytes explicitly, and round
    > it up to the next blocksize multiple of the algo in question if it
    > does not support 1420 byte blocks.
    but misses updating skcipher multi-buffer tests.

    Fix this by using the proper (rounded) input size.

    Fixes: ad6d66bcac77e ("crypto: tcrypt - include 1420 byte blocks in aead and skcipher benchmarks")
    Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    crypto/tcrypt.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
    index 82b0400985a51..00149657a4bc1 100644
    --- a/crypto/tcrypt.c
    +++ b/crypto/tcrypt.c
    @@ -1333,7 +1333,7 @@ static void test_mb_skcipher_speed(const char *algo, int enc, int secs,

    if (bs > XBUFSIZE * PAGE_SIZE) {
    pr_err("template (%u) too big for buffer (%lu)\n",
    - *b_size, XBUFSIZE * PAGE_SIZE);
    + bs, XBUFSIZE * PAGE_SIZE);
    goto out;
    }

    @@ -1386,8 +1386,7 @@ static void test_mb_skcipher_speed(const char *algo, int enc, int secs,
    memset(cur->xbuf[p], 0xff, k);

    skcipher_request_set_crypt(cur->req, cur->sg,
    - cur->sg, *b_size,
    - iv);
    + cur->sg, bs, iv);
    }

    if (secs) {
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 01:10    [W:2.184 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site