[PATCH 4.19 31/52] crypto: tcrypt - avoid signed overflow in byte count

[Greg Kroah-Hartman]

From: Ard Biesheuvel <a...@kernel.org>

[ Upstream commit 303fd3e1c771077e32e96e5788817f025f0067e2 ]

The signed long type used for printing the number of bytes processed in
tcrypt benchmarks limits the range to -/+ 2 GiB, which is not sufficient
to cover the performance of common accelerated ciphers such as AES-NI
when benchmarked with sec=1. So switch to u64 instead.

While at it, fix up a missing printk->pr_cont conversion in the AEAD
benchmark.

Signed-off-by: Ard Biesheuvel <a...@kernel.org>
Signed-off-by: Herbert Xu <herb...@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 crypto/tcrypt.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index d332988eb8de..bf797c613ba2 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -202,8 +202,8 @@ static int test_mb_aead_jiffies(struct test_mb_aead_data 
*data, int enc,
                        goto out;
        }
 
-       pr_cont("%d operations in %d seconds (%ld bytes)\n",
-               bcount * num_mb, secs, (long)bcount * blen * num_mb);
+       pr_cont("%d operations in %d seconds (%llu bytes)\n",
+               bcount * num_mb, secs, (u64)bcount * blen * num_mb);
 
 out:
        kfree(rc);
@@ -472,8 +472,8 @@ static int test_aead_jiffies(struct aead_request *req, int 
enc,
                        return ret;
        }
 
-       printk("%d operations in %d seconds (%ld bytes)\n",
-              bcount, secs, (long)bcount * blen);
+       pr_cont("%d operations in %d seconds (%llu bytes)\n",
+               bcount, secs, (u64)bcount * blen);
        return 0;
 }
 
@@ -763,8 +763,8 @@ static int test_mb_ahash_jiffies(struct test_mb_ahash_data 
*data, int blen,
                        goto out;
        }
 
-       pr_cont("%d operations in %d seconds (%ld bytes)\n",
-               bcount * num_mb, secs, (long)bcount * blen * num_mb);
+       pr_cont("%d operations in %d seconds (%llu bytes)\n",
+               bcount * num_mb, secs, (u64)bcount * blen * num_mb);
 
 out:
        kfree(rc);
@@ -1200,8 +1200,8 @@ static int test_mb_acipher_jiffies(struct 
test_mb_skcipher_data *data, int enc,
                        goto out;
        }
 
-       pr_cont("%d operations in %d seconds (%ld bytes)\n",
-               bcount * num_mb, secs, (long)bcount * blen * num_mb);
+       pr_cont("%d operations in %d seconds (%llu bytes)\n",
+               bcount * num_mb, secs, (u64)bcount * blen * num_mb);
 
 out:
        kfree(rc);
@@ -1438,8 +1438,8 @@ static int test_acipher_jiffies(struct skcipher_request 
*req, int enc,
                        return ret;
        }
 
-       pr_cont("%d operations in %d seconds (%ld bytes)\n",
-               bcount, secs, (long)bcount * blen);
+       pr_cont("%d operations in %d seconds (%llu bytes)\n",
+               bcount, secs, (u64)bcount * blen);
        return 0;
 }
 
-- 
2.30.1