linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] crypto: add missing KERN_* constants to printks
@ 2009-02-06 14:19 Frank Seidel
  2009-02-06 14:58 ` Alexey Dobriyan
  2009-02-07 15:19 ` [PATCHv2] " Frank Seidel
  0 siblings, 2 replies; 9+ messages in thread
From: Frank Seidel @ 2009-02-06 14:19 UTC (permalink / raw)
  To: linux kernel
  Cc: akpm, David S. Miller, linux-crypto, Frank Seidel, frank, herbert, jarod

From: Frank Seidel <frank@f-seidel.de>

According to kerneljanitors todo list all printk calls (beginning
a new line) should have an according KERN_* constant.
Those are the missing pieces here for the crypto subsystem.

Signed-off-by: Frank Seidel <frank@f-seidel.de>
---
 crypto/ansi_cprng.c |    2 +-
 crypto/tcrypt.c     |   48 +++++++++++++++++++++++++++---------------------
 2 files changed, 28 insertions(+), 22 deletions(-)

--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -74,7 +74,7 @@ static int test_cipher_jiffies(struct bl
 			return ret;
 	}
 
-	printk("%d operations in %d seconds (%ld bytes)\n",
+	printk(KERN_WARNING "%d operations in %d seconds (%ld bytes)\n",
 	       bcount, sec, (long)bcount * blen);
 	return 0;
 }
@@ -122,7 +122,7 @@ out:
 	local_bh_enable();
 
 	if (ret == 0)
-		printk("1 operation in %lu cycles (%d bytes)\n",
+		printk(KERN_WARNING "1 operation in %lu cycles (%d bytes)\n",
 		       (cycles + 4) / 8, blen);
 
 	return ret;
@@ -146,13 +146,13 @@ static void test_cipher_speed(const char
 	else
 		e = "decryption";
 
-	printk("\ntesting speed of %s %s\n", algo, e);
+	printk(KERN_WARNING "\ntesting speed of %s %s\n", algo, e);
 
 	tfm = crypto_alloc_blkcipher(algo, 0, CRYPTO_ALG_ASYNC);
 
 	if (IS_ERR(tfm)) {
-		printk("failed to load transform for %s: %ld\n", algo,
-		       PTR_ERR(tfm));
+		printk(KERN_WARNING "failed to load transform for %s: %ld\n",
+		       algo, PTR_ERR(tfm));
 		return;
 	}
 	desc.tfm = tfm;
@@ -166,14 +166,16 @@ static void test_cipher_speed(const char
 			struct scatterlist sg[TVMEMSIZE];
 
 			if ((*keysize + *b_size) > TVMEMSIZE * PAGE_SIZE) {
-				printk("template (%u) too big for "
+				printk(KERN_WARNING
+				       "template (%u) too big for "
 				       "tvmem (%lu)\n", *keysize + *b_size,
 				       TVMEMSIZE * PAGE_SIZE);
 				goto out;
 			}
 
-			printk("test %u (%d bit key, %d byte blocks): ", i,
-					*keysize * 8, *b_size);
+			printk(KERN_WARNING
+					"test %u (%d bit key, %d byte blocks): ",
+					i, *keysize * 8, *b_size);
 
 			memset(tvmem[0], 0xff, PAGE_SIZE);
 
@@ -188,7 +190,8 @@ static void test_cipher_speed(const char
 
 			ret = crypto_blkcipher_setkey(tfm, key, *keysize);
 			if (ret) {
-				printk("setkey() failed flags=%x\n",
+				printk(KERN_WARNING
+						"setkey() failed flags=%x\n",
 						crypto_blkcipher_get_flags(tfm));
 				goto out;
 			}
@@ -215,7 +218,8 @@ static void test_cipher_speed(const char
 							 *b_size);
 
 			if (ret) {
-				printk("%s() failed flags=%x\n", e, desc.flags);
+				printk(KERN_WARNING "%s() failed flags=%x\n",
+				       e, desc.flags);
 				break;
 			}
 			b_size++;
@@ -243,7 +247,7 @@ static int test_hash_jiffies_digest(stru
 			return ret;
 	}
 
-	printk("%6u opers/sec, %9lu bytes/sec\n",
+	printk(KERN_WARNING "%6u opers/sec, %9lu bytes/sec\n",
 	       bcount / sec, ((long)bcount * blen) / sec);
 
 	return 0;
@@ -275,7 +279,7 @@ static int test_hash_jiffies(struct hash
 			return ret;
 	}
 
-	printk("%6u opers/sec, %9lu bytes/sec\n",
+	printk(KERN_WARNING "%6u opers/sec, %9lu bytes/sec\n",
 	       bcount / sec, ((long)bcount * blen) / sec);
 
 	return 0;
@@ -320,7 +324,7 @@ out:
 	if (ret)
 		return ret;
 
-	printk("%6lu cycles/operation, %4lu cycles/byte\n",
+	printk(KERN_WARNING "%6lu cycles/operation, %4lu cycles/byte\n",
 	       cycles / 8, cycles / (8 * blen));
 
 	return 0;
@@ -384,7 +388,7 @@ out:
 	if (ret)
 		return ret;
 
-	printk("%6lu cycles/operation, %4lu cycles/byte\n",
+	printk(KERN_WARNING "%6lu cycles/operation, %4lu cycles/byte\n",
 	       cycles / 8, cycles / (8 * blen));
 
 	return 0;
@@ -400,13 +404,13 @@ static void test_hash_speed(const char *
 	int i;
 	int ret;
 
-	printk("\ntesting speed of %s\n", algo);
+	printk(KERN_WARNING "\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,
-		       PTR_ERR(tfm));
+		printk(KERN_WARNING "failed to load transform for %s: %ld\n",
+		       algo, PTR_ERR(tfm));
 		return;
 	}
 
@@ -414,7 +418,7 @@ static void test_hash_speed(const char *
 	desc.flags = 0;
 
 	if (crypto_hash_digestsize(tfm) > sizeof(output)) {
-		printk("digestsize(%u) > outputbuffer(%zu)\n",
+		printk(KERN_WARNING "digestsize(%u) > outputbuffer(%zu)\n",
 		       crypto_hash_digestsize(tfm), sizeof(output));
 		goto out;
 	}
@@ -427,12 +431,14 @@ static void test_hash_speed(const char *
 
 	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_WARNING
+			       "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_WARNING
+		       "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)
@@ -443,7 +449,7 @@ static void test_hash_speed(const char *
 					       speed[i].plen, output);
 
 		if (ret) {
-			printk("hashing failed ret=%d\n", ret);
+			printk(KERN_WARNING "hashing failed ret=%d\n", ret);
 			break;
 		}
 	}
--- a/crypto/ansi_cprng.c
+++ b/crypto/ansi_cprng.c
@@ -167,7 +167,7 @@ static int _get_more_prng_bytes(struct p
 			break;
 	}
 
-	dbgprint("Returning new block for context %p\n", ctx);
+	dbgprint(KERN_WARNING "Returning new block for context %p\n", ctx);
 	ctx->rand_data_valid = 0;
 
 	hexdump("Output DT: ", ctx->DT, DEFAULT_BLK_SZ);

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] crypto: add missing KERN_* constants to printks
  2009-02-06 14:58 ` Alexey Dobriyan
@ 2009-02-06 14:54   ` Frank Seidel
  2009-02-06 15:03     ` Alexey Dobriyan
  0 siblings, 1 reply; 9+ messages in thread
From: Frank Seidel @ 2009-02-06 14:54 UTC (permalink / raw)
  To: Alexey Dobriyan
  Cc: Frank Seidel, linux kernel, akpm, David S. Miller, linux-crypto,
	herbert, jarod

Alexey Dobriyan schrieb:
> On Fri, Feb 06, 2009 at 03:19:10PM +0100, Frank Seidel wrote:
>> According to kerneljanitors todo list all printk calls (beginning
>> a new line) should have an according KERN_* constant.
> 
> Forget about kernel janitors todo list, fix a bug instead.

Sure, i am eager to get my hands dirty in the kernel ;-),
but i needed to start somewhere and everybody told me
that the janitors todo list would be good place to start.

>> Those are the missing pieces here for the crypto subsystem.
> 
> You're inserting KERN_WARNING everywhere, what for?

Because every new line should have KERN_* constant and
KERN_WARNING is default/doesn't change current printout
behaviour.

Thanks,
Frank

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] crypto: add missing KERN_* constants to printks
  2009-02-06 14:19 [PATCH] crypto: add missing KERN_* constants to printks Frank Seidel
@ 2009-02-06 14:58 ` Alexey Dobriyan
  2009-02-06 14:54   ` Frank Seidel
  2009-02-07 15:19 ` [PATCHv2] " Frank Seidel
  1 sibling, 1 reply; 9+ messages in thread
From: Alexey Dobriyan @ 2009-02-06 14:58 UTC (permalink / raw)
  To: Frank Seidel
  Cc: linux kernel, akpm, David S. Miller, linux-crypto, frank, herbert, jarod

On Fri, Feb 06, 2009 at 03:19:10PM +0100, Frank Seidel wrote:
> According to kerneljanitors todo list all printk calls (beginning
> a new line) should have an according KERN_* constant.

Forget about kernel janitors todo list, fix a bug instead.

> Those are the missing pieces here for the crypto subsystem.

You're inserting KERN_WARNING everywhere, what for?

> --- a/crypto/tcrypt.c
> +++ b/crypto/tcrypt.c
> @@ -74,7 +74,7 @@ static int test_cipher_jiffies(struct bl
>  			return ret;
>  	}
>  
> -	printk("%d operations in %d seconds (%ld bytes)\n",
> +	printk(KERN_WARNING "%d operations in %d seconds (%ld bytes)\n",
>  	       bcount, sec, (long)bcount * blen);
>  	return 0;
>  }
> @@ -122,7 +122,7 @@ out:
>  	local_bh_enable();
>  
>  	if (ret == 0)
> -		printk("1 operation in %lu cycles (%d bytes)\n",
> +		printk(KERN_WARNING "1 operation in %lu cycles (%d bytes)\n",
>  		       (cycles + 4) / 8, blen);
>  
>  	return ret;
> @@ -146,13 +146,13 @@ static void test_cipher_speed(const char
>  	else
>  		e = "decryption";
>  
> -	printk("\ntesting speed of %s %s\n", algo, e);
> +	printk(KERN_WARNING "\ntesting speed of %s %s\n", algo, e);
>  
>  	tfm = crypto_alloc_blkcipher(algo, 0, CRYPTO_ALG_ASYNC);
>  
>  	if (IS_ERR(tfm)) {
> -		printk("failed to load transform for %s: %ld\n", algo,
> -		       PTR_ERR(tfm));
> +		printk(KERN_WARNING "failed to load transform for %s: %ld\n",
> +		       algo, PTR_ERR(tfm));
>  		return;
>  	}
>  	desc.tfm = tfm;
> @@ -166,14 +166,16 @@ static void test_cipher_speed(const char
>  			struct scatterlist sg[TVMEMSIZE];
>  
>  			if ((*keysize + *b_size) > TVMEMSIZE * PAGE_SIZE) {
> -				printk("template (%u) too big for "
> +				printk(KERN_WARNING
> +				       "template (%u) too big for "
>  				       "tvmem (%lu)\n", *keysize + *b_size,
>  				       TVMEMSIZE * PAGE_SIZE);
>  				goto out;
>  			}
>  
> -			printk("test %u (%d bit key, %d byte blocks): ", i,
> -					*keysize * 8, *b_size);
> +			printk(KERN_WARNING
> +					"test %u (%d bit key, %d byte blocks): ",
> +					i, *keysize * 8, *b_size);
>  
>  			memset(tvmem[0], 0xff, PAGE_SIZE);
>  
> @@ -188,7 +190,8 @@ static void test_cipher_speed(const char
>  
>  			ret = crypto_blkcipher_setkey(tfm, key, *keysize);
>  			if (ret) {
> -				printk("setkey() failed flags=%x\n",
> +				printk(KERN_WARNING
> +						"setkey() failed flags=%x\n",
>  						crypto_blkcipher_get_flags(tfm));
>  				goto out;
>  			}
> @@ -215,7 +218,8 @@ static void test_cipher_speed(const char
>  							 *b_size);
>  
>  			if (ret) {
> -				printk("%s() failed flags=%x\n", e, desc.flags);
> +				printk(KERN_WARNING "%s() failed flags=%x\n",
> +				       e, desc.flags);
>  				break;
>  			}
>  			b_size++;
> @@ -243,7 +247,7 @@ static int test_hash_jiffies_digest(stru
>  			return ret;
>  	}
>  
> -	printk("%6u opers/sec, %9lu bytes/sec\n",
> +	printk(KERN_WARNING "%6u opers/sec, %9lu bytes/sec\n",
>  	       bcount / sec, ((long)bcount * blen) / sec);
>  
>  	return 0;
> @@ -275,7 +279,7 @@ static int test_hash_jiffies(struct hash
>  			return ret;
>  	}
>  
> -	printk("%6u opers/sec, %9lu bytes/sec\n",
> +	printk(KERN_WARNING "%6u opers/sec, %9lu bytes/sec\n",
>  	       bcount / sec, ((long)bcount * blen) / sec);
>  
>  	return 0;
> @@ -320,7 +324,7 @@ out:
>  	if (ret)
>  		return ret;
>  
> -	printk("%6lu cycles/operation, %4lu cycles/byte\n",
> +	printk(KERN_WARNING "%6lu cycles/operation, %4lu cycles/byte\n",
>  	       cycles / 8, cycles / (8 * blen));
>  
>  	return 0;
> @@ -384,7 +388,7 @@ out:
>  	if (ret)
>  		return ret;
>  
> -	printk("%6lu cycles/operation, %4lu cycles/byte\n",
> +	printk(KERN_WARNING "%6lu cycles/operation, %4lu cycles/byte\n",
>  	       cycles / 8, cycles / (8 * blen));
>  
>  	return 0;
> @@ -400,13 +404,13 @@ static void test_hash_speed(const char *
>  	int i;
>  	int ret;
>  
> -	printk("\ntesting speed of %s\n", algo);
> +	printk(KERN_WARNING "\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,
> -		       PTR_ERR(tfm));
> +		printk(KERN_WARNING "failed to load transform for %s: %ld\n",
> +		       algo, PTR_ERR(tfm));
>  		return;
>  	}
>  
> @@ -414,7 +418,7 @@ static void test_hash_speed(const char *
>  	desc.flags = 0;
>  
>  	if (crypto_hash_digestsize(tfm) > sizeof(output)) {
> -		printk("digestsize(%u) > outputbuffer(%zu)\n",
> +		printk(KERN_WARNING "digestsize(%u) > outputbuffer(%zu)\n",
>  		       crypto_hash_digestsize(tfm), sizeof(output));
>  		goto out;
>  	}
> @@ -427,12 +431,14 @@ static void test_hash_speed(const char *
>  
>  	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_WARNING
> +			       "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_WARNING
> +		       "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)
> @@ -443,7 +449,7 @@ static void test_hash_speed(const char *
>  					       speed[i].plen, output);
>  
>  		if (ret) {
> -			printk("hashing failed ret=%d\n", ret);
> +			printk(KERN_WARNING "hashing failed ret=%d\n", ret);
>  			break;
>  		}
>  	}
> --- a/crypto/ansi_cprng.c
> +++ b/crypto/ansi_cprng.c
> @@ -167,7 +167,7 @@ static int _get_more_prng_bytes(struct p
>  			break;
>  	}
>  
> -	dbgprint("Returning new block for context %p\n", ctx);
> +	dbgprint(KERN_WARNING "Returning new block for context %p\n", ctx);

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] crypto: add missing KERN_* constants to printks
  2009-02-06 15:03     ` Alexey Dobriyan
@ 2009-02-06 14:59       ` Frank Seidel
  2009-02-07 12:52         ` Herbert Xu
  0 siblings, 1 reply; 9+ messages in thread
From: Frank Seidel @ 2009-02-06 14:59 UTC (permalink / raw)
  To: Alexey Dobriyan
  Cc: Frank Seidel, linux kernel, akpm, David S. Miller, linux-crypto,
	herbert, jarod

Alexey Dobriyan schrieb:
> Some messages there were truly debugging and some clearly weren't
> WARNING, but INFO.

Yes, i also thought so, but i didn't venture to change it
to i think it looks like. And as bevor they also were all at
the same (unspecified/default) level...
Do you think its worth/i should redo it and adapt the loglevel
more appropriate?

Thanks,
Frank


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] crypto: add missing KERN_* constants to printks
  2009-02-06 14:54   ` Frank Seidel
@ 2009-02-06 15:03     ` Alexey Dobriyan
  2009-02-06 14:59       ` Frank Seidel
  0 siblings, 1 reply; 9+ messages in thread
From: Alexey Dobriyan @ 2009-02-06 15:03 UTC (permalink / raw)
  To: Frank Seidel
  Cc: Frank Seidel, linux kernel, akpm, David S. Miller, linux-crypto,
	herbert, jarod

On Fri, Feb 06, 2009 at 03:54:38PM +0100, Frank Seidel wrote:
> Alexey Dobriyan schrieb:
> > On Fri, Feb 06, 2009 at 03:19:10PM +0100, Frank Seidel wrote:
> >> According to kerneljanitors todo list all printk calls (beginning
> >> a new line) should have an according KERN_* constant.
> > 
> > Forget about kernel janitors todo list, fix a bug instead.
> 
> Sure, i am eager to get my hands dirty in the kernel ;-),
> but i needed to start somewhere and everybody told me
> that the janitors todo list would be good place to start.
> 
> >> Those are the missing pieces here for the crypto subsystem.
> > 
> > You're inserting KERN_WARNING everywhere, what for?
> 
> Because every new line should have KERN_* constant and
> KERN_WARNING is default/doesn't change current printout
> behaviour.

Some messages there were truly debugging and some clearly weren't
WARNING, but INFO.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] crypto: add missing KERN_* constants to printks
  2009-02-06 14:59       ` Frank Seidel
@ 2009-02-07 12:52         ` Herbert Xu
  2009-02-07 14:13           ` Frank Seidel
  0 siblings, 1 reply; 9+ messages in thread
From: Herbert Xu @ 2009-02-07 12:52 UTC (permalink / raw)
  To: Frank Seidel
  Cc: Alexey Dobriyan, Frank Seidel, linux kernel, akpm,
	David S. Miller, linux-crypto, jarod

On Fri, Feb 06, 2009 at 03:59:31PM +0100, Frank Seidel wrote:
> 
> Yes, i also thought so, but i didn't venture to change it
> to i think it looks like. And as bevor they also were all at
> the same (unspecified/default) level...
> Do you think its worth/i should redo it and adapt the loglevel
> more appropriate?

Please do.  If it doesn't have any markings at least we know that
it needs fixing.  If you just add WARNINGs then we lose that
information.

Thanks,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] crypto: add missing KERN_* constants to printks
  2009-02-07 12:52         ` Herbert Xu
@ 2009-02-07 14:13           ` Frank Seidel
  0 siblings, 0 replies; 9+ messages in thread
From: Frank Seidel @ 2009-02-07 14:13 UTC (permalink / raw)
  To: Herbert Xu
  Cc: Alexey Dobriyan, Frank Seidel, linux kernel, akpm,
	David S. Miller, linux-crypto, jarod

Herbert Xu wrote:
> Please do.  If it doesn't have any markings at least we know that
> it needs fixing.  If you just add WARNINGs then we lose that
> information.

Thats right, i fully agree. So i'll redo it asap.

Thanks,
Frank

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCHv2] crypto: add missing KERN_* constants to printks
  2009-02-06 14:19 [PATCH] crypto: add missing KERN_* constants to printks Frank Seidel
  2009-02-06 14:58 ` Alexey Dobriyan
@ 2009-02-07 15:19 ` Frank Seidel
  2009-02-10  6:23   ` Herbert Xu
  1 sibling, 1 reply; 9+ messages in thread
From: Frank Seidel @ 2009-02-07 15:19 UTC (permalink / raw)
  To: linux kernel
  Cc: akpm, David S. Miller, linux-crypto, frank, herbert, jarod,
	Alexey Dobriyan, Frank Seidel

From: Frank Seidel <frank@f-seidel.de>

According to kerneljanitors todo list all printk calls (beginning
a new line) should have an according KERN_* constant.
Those are the missing pieces here for the crypto subsystem.

Signed-off-by: Frank Seidel <frank@f-seidel.de>
---
 crypto/ansi_cprng.c |    2 +-
 crypto/tcrypt.c     |   51 +++++++++++++++++++++++++++++----------------------
 2 files changed, 30 insertions(+), 23 deletions(-)

--- a/crypto/ansi_cprng.c
+++ b/crypto/ansi_cprng.c
@@ -167,7 +167,7 @@ static int _get_more_prng_bytes(struct p
 			break;
 	}
 
-	dbgprint("Returning new block for context %p\n", ctx);
+	dbgprint(KERN_DEBUG "Returning new block for context %p\n", ctx);
 	ctx->rand_data_valid = 0;
 
 	hexdump("Output DT: ", ctx->DT, DEFAULT_BLK_SZ);
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -74,7 +74,7 @@ static int test_cipher_jiffies(struct bl
 			return ret;
 	}
 
-	printk("%d operations in %d seconds (%ld bytes)\n",
+	printk(KERN_INFO "%d operations in %d seconds (%ld bytes)\n",
 	       bcount, sec, (long)bcount * blen);
 	return 0;
 }
@@ -122,7 +122,7 @@ out:
 	local_bh_enable();
 
 	if (ret == 0)
-		printk("1 operation in %lu cycles (%d bytes)\n",
+		printk(KERN_INFO "1 operation in %lu cycles (%d bytes)\n",
 		       (cycles + 4) / 8, blen);
 
 	return ret;
@@ -146,13 +146,13 @@ static void test_cipher_speed(const char
 	else
 		e = "decryption";
 
-	printk("\ntesting speed of %s %s\n", algo, e);
+	printk(KERN_INFO "\ntesting speed of %s %s\n", algo, e);
 
 	tfm = crypto_alloc_blkcipher(algo, 0, CRYPTO_ALG_ASYNC);
 
 	if (IS_ERR(tfm)) {
-		printk("failed to load transform for %s: %ld\n", algo,
-		       PTR_ERR(tfm));
+		printk(KERN_WARNING "failed to load transform for %s: %ld\n",
+		       algo, PTR_ERR(tfm));
 		return;
 	}
 	desc.tfm = tfm;
@@ -166,14 +166,16 @@ static void test_cipher_speed(const char
 			struct scatterlist sg[TVMEMSIZE];
 
 			if ((*keysize + *b_size) > TVMEMSIZE * PAGE_SIZE) {
-				printk("template (%u) too big for "
+				printk(KERN_WARNING
+				       "template (%u) too big for "
 				       "tvmem (%lu)\n", *keysize + *b_size,
 				       TVMEMSIZE * PAGE_SIZE);
 				goto out;
 			}
 
-			printk("test %u (%d bit key, %d byte blocks): ", i,
-					*keysize * 8, *b_size);
+			printk(KERN_INFO "test %u "
+					"(%d bit key, %d byte blocks): ",
+					i, *keysize * 8, *b_size);
 
 			memset(tvmem[0], 0xff, PAGE_SIZE);
 
@@ -188,7 +190,8 @@ static void test_cipher_speed(const char
 
 			ret = crypto_blkcipher_setkey(tfm, key, *keysize);
 			if (ret) {
-				printk("setkey() failed flags=%x\n",
+				printk(KERN_WARNING
+						"setkey() failed flags=%x\n",
 						crypto_blkcipher_get_flags(tfm));
 				goto out;
 			}
@@ -215,7 +218,8 @@ static void test_cipher_speed(const char
 							 *b_size);
 
 			if (ret) {
-				printk("%s() failed flags=%x\n", e, desc.flags);
+				printk(KERN_WARNING "%s() failed flags=%x\n",
+				       e, desc.flags);
 				break;
 			}
 			b_size++;
@@ -243,7 +247,7 @@ static int test_hash_jiffies_digest(stru
 			return ret;
 	}
 
-	printk("%6u opers/sec, %9lu bytes/sec\n",
+	printk(KERN_INFO "%6u opers/sec, %9lu bytes/sec\n",
 	       bcount / sec, ((long)bcount * blen) / sec);
 
 	return 0;
@@ -275,7 +279,7 @@ static int test_hash_jiffies(struct hash
 			return ret;
 	}
 
-	printk("%6u opers/sec, %9lu bytes/sec\n",
+	printk(KERN_INFO "%6u opers/sec, %9lu bytes/sec\n",
 	       bcount / sec, ((long)bcount * blen) / sec);
 
 	return 0;
@@ -320,7 +324,7 @@ out:
 	if (ret)
 		return ret;
 
-	printk("%6lu cycles/operation, %4lu cycles/byte\n",
+	printk(KERN_INFO "%6lu cycles/operation, %4lu cycles/byte\n",
 	       cycles / 8, cycles / (8 * blen));
 
 	return 0;
@@ -384,7 +388,7 @@ out:
 	if (ret)
 		return ret;
 
-	printk("%6lu cycles/operation, %4lu cycles/byte\n",
+	printk(KERN_INFO "%6lu cycles/operation, %4lu cycles/byte\n",
 	       cycles / 8, cycles / (8 * blen));
 
 	return 0;
@@ -400,13 +404,13 @@ static void test_hash_speed(const char *
 	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,
-		       PTR_ERR(tfm));
+		printk(KERN_WARNING "failed to load transform for %s: %ld\n",
+		       algo, PTR_ERR(tfm));
 		return;
 	}
 
@@ -414,7 +418,7 @@ static void test_hash_speed(const char *
 	desc.flags = 0;
 
 	if (crypto_hash_digestsize(tfm) > sizeof(output)) {
-		printk("digestsize(%u) > outputbuffer(%zu)\n",
+		printk(KERN_WARNING "digestsize(%u) > outputbuffer(%zu)\n",
 		       crypto_hash_digestsize(tfm), sizeof(output));
 		goto out;
 	}
@@ -427,13 +431,16 @@ static void test_hash_speed(const char *
 
 	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_WARNING
+			       "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): ",
-		       i, speed[i].blen, speed[i].plen, speed[i].blen / speed[i].plen);
+		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)
 			ret = test_hash_jiffies(&desc, sg, speed[i].blen,
@@ -443,7 +450,7 @@ static void test_hash_speed(const char *
 					       speed[i].plen, output);
 
 		if (ret) {
-			printk("hashing failed ret=%d\n", ret);
+			printk(KERN_WARNING "hashing failed ret=%d\n", ret);
 			break;
 		}
 	}

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCHv2] crypto: add missing KERN_* constants to printks
  2009-02-07 15:19 ` [PATCHv2] " Frank Seidel
@ 2009-02-10  6:23   ` Herbert Xu
  0 siblings, 0 replies; 9+ messages in thread
From: Herbert Xu @ 2009-02-10  6:23 UTC (permalink / raw)
  To: Frank Seidel
  Cc: linux kernel, akpm, David S. Miller, linux-crypto, frank, jarod,
	Alexey Dobriyan

On Sat, Feb 07, 2009 at 04:19:12PM +0100, Frank Seidel wrote:
> From: Frank Seidel <frank@f-seidel.de>
> 
> According to kerneljanitors todo list all printk calls (beginning
> a new line) should have an according KERN_* constant.
> Those are the missing pieces here for the crypto subsystem.
> 
> Signed-off-by: Frank Seidel <frank@f-seidel.de>

Patch applied.  Thanks a lot!
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2009-02-10  6:23 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-02-06 14:19 [PATCH] crypto: add missing KERN_* constants to printks Frank Seidel
2009-02-06 14:58 ` Alexey Dobriyan
2009-02-06 14:54   ` Frank Seidel
2009-02-06 15:03     ` Alexey Dobriyan
2009-02-06 14:59       ` Frank Seidel
2009-02-07 12:52         ` Herbert Xu
2009-02-07 14:13           ` Frank Seidel
2009-02-07 15:19 ` [PATCHv2] " Frank Seidel
2009-02-10  6:23   ` Herbert Xu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).