Skip to content

Commit

Permalink
crypto: tcrypt - use multi buf for ahash mb test
Browse files Browse the repository at this point in the history
The multi buffer ahash speed test was allocating multiple
buffers for use with the multiple outstanding requests
it was starting but never actually using them (except
to free them), instead using a different single statically
allocated buffer for all requests.

Fix this by actually using the allocated buffers for the test.

It is noted that it may seem tempting to instead remove the
allocation and free of the multiple buffers and leave things as
they are since this is a hash test where the input is read
only. However, after consideration I believe that multiple
buffers better reflect real life scenario with regard
to data cache and TLB behaviours etc.

Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
Gilad Ben-Yossef authored and Herbert Xu committed Dec 28, 2017
1 parent 0e4b529 commit 7c3f132
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions crypto/tcrypt.c
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ static inline int do_one_ahash_op(struct ahash_request *req, int ret)
}

struct test_mb_ahash_data {
struct scatterlist sg[TVMEMSIZE];
struct scatterlist sg[XBUFSIZE];
char result[64];
struct ahash_request *req;
struct crypto_wait wait;
Expand Down Expand Up @@ -428,7 +428,12 @@ static void test_mb_ahash_speed(const char *algo, unsigned int sec,

ahash_request_set_callback(data[i].req, 0, crypto_req_done,
&data[i].wait);
test_hash_sg_init(data[i].sg);

sg_init_table(data[i].sg, XBUFSIZE);
for (j = 0; j < XBUFSIZE; j++) {
sg_set_buf(data[i].sg + j, data[i].xbuf[j], PAGE_SIZE);
memset(data[i].xbuf[j], 0xff, PAGE_SIZE);
}
}

pr_info("\ntesting speed of multibuffer %s (%s)\n", algo,
Expand All @@ -439,9 +444,9 @@ static void test_mb_ahash_speed(const char *algo, unsigned int sec,
if (speed[i].blen != speed[i].plen)
continue;

if (speed[i].blen > TVMEMSIZE * PAGE_SIZE) {
if (speed[i].blen > XBUFSIZE * PAGE_SIZE) {
pr_err("template (%u) too big for tvmem (%lu)\n",
speed[i].blen, TVMEMSIZE * PAGE_SIZE);
speed[i].blen, XBUFSIZE * PAGE_SIZE);
goto out;
}

Expand Down

0 comments on commit 7c3f132

Please sign in to comment.