crypto: tcrypt - fix skcipher multi-buffer tests for 1420B blocks
authorHoria Geantă <horia.geanta@nxp.com>
Fri, 15 Oct 2021 07:39:18 +0000 (10:39 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Nov 2021 18:16:39 +0000 (19:16 +0100)
[ 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

index 82b0400..0014965 100644 (file)
@@ -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) {