crypto: tcrypt - avoid signed overflow in byte count

[ 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 <ardb@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index eea0f453cfb6e3275f3b1c813f592245e3c5752e..8609174e036e844ff0137d2e2b0eebb151226ec1 100644 (file)
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -199,8 +199,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);
@@ -469,8 +469,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;
 }
 
@@ -760,8 +760,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);
@@ -1197,8 +1197,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);
@@ -1435,8 +1435,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;
 }