Skip to content

Commit

Permalink
crypto: tcrypt - Reduce stack size
Browse files Browse the repository at this point in the history
Applying kernel janitors todos (printk calls need KERN_*
constants on linebeginnings, reduce stack footprint where
possible) to tcrypts test_hash_speed (where stacks
memory footprint was very high (on i386 1184 bytes to
160 now).

Signed-off-by: Frank Seidel <frank@f-seidel.de>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
Frank Seidel authored and Herbert Xu committed Jun 2, 2009
1 parent d315a0e commit 376bacb
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions crypto/tcrypt.c
Original file line number Diff line number Diff line change
Expand Up @@ -396,16 +396,16 @@ static void test_hash_speed(const char *algo, unsigned int sec,
struct scatterlist sg[TVMEMSIZE];
struct crypto_hash *tfm;
struct hash_desc desc;
char output[1024];
static char output[1024];
int i;
int ret;

printk("\ntesting speed of %s\n", algo);
printk(KERN_INFO "\ntesting speed of %s\n", algo);

tfm = crypto_alloc_hash(algo, 0, CRYPTO_ALG_ASYNC);

if (IS_ERR(tfm)) {
printk("failed to load transform for %s: %ld\n", algo,
printk(KERN_ERR "failed to load transform for %s: %ld\n", algo,
PTR_ERR(tfm));
return;
}
Expand All @@ -414,7 +414,7 @@ static void test_hash_speed(const char *algo, unsigned int sec,
desc.flags = 0;

if (crypto_hash_digestsize(tfm) > sizeof(output)) {
printk("digestsize(%u) > outputbuffer(%zu)\n",
printk(KERN_ERR "digestsize(%u) > outputbuffer(%zu)\n",
crypto_hash_digestsize(tfm), sizeof(output));
goto out;
}
Expand All @@ -427,12 +427,14 @@ static void test_hash_speed(const char *algo, unsigned int sec,

for (i = 0; speed[i].blen != 0; i++) {
if (speed[i].blen > TVMEMSIZE * PAGE_SIZE) {
printk("template (%u) too big for tvmem (%lu)\n",
printk(KERN_ERR
"template (%u) too big for tvmem (%lu)\n",
speed[i].blen, TVMEMSIZE * PAGE_SIZE);
goto out;
}

printk("test%3u (%5u byte blocks,%5u bytes per update,%4u updates): ",
printk(KERN_INFO "test%3u "
"(%5u byte blocks,%5u bytes per update,%4u updates): ",
i, speed[i].blen, speed[i].plen, speed[i].blen / speed[i].plen);

if (sec)
Expand All @@ -443,7 +445,7 @@ static void test_hash_speed(const char *algo, unsigned int sec,
speed[i].plen, output);

if (ret) {
printk("hashing failed ret=%d\n", ret);
printk(KERN_ERR "hashing failed ret=%d\n", ret);
break;
}
}
Expand Down

0 comments on commit 376bacb

Please sign in to comment.