random: Add and use pr_fmt()

commit 12cd53aff5ea0359b1dac91fcd9ddc7b9e646588 upstream.

Prefix all printk/pr_<level> messages with "random: " to make the
logging a bit more consistent.

Miscellanea:

o Convert a printks to pr_notice
o Whitespace to align to open parentheses
o Remove embedded "random: " from pr_* as pr_fmt adds it

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Link: https://lore.kernel.org/r/20190607182517.28266-3-tiny.windzz@gmail.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/char/random.c b/drivers/char/random.c
index cee0fe3c3d980d5706403c4879d68a82cb33fce9..4271fc6382c202a85a054b3ce01eb29fe88b43c2 100644 (file)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -307,6 +307,8 @@
  * Eastlake, Steve Crocker, and Jeff Schiller.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/utsname.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -739,7 +741,7 @@ retry:
        }
 
        if (WARN_ON(entropy_count < 0)) {
-               pr_warn("random: negative entropy/overflow: pool %s count %d\n",
+               pr_warn("negative entropy/overflow: pool %s count %d\n",
                        r->name, entropy_count);
                entropy_count = 0;
        } else if (entropy_count > pool_size)
@@ -835,7 +837,7 @@ static void crng_initialize(struct crng_state *crng)
                invalidate_batched_entropy();
                numa_crng_init();
                crng_init = 2;
-               pr_notice("random: crng done (trusting CPU's manufacturer)\n");
+               pr_notice("crng done (trusting CPU's manufacturer)\n");
        }
        crng->init_time = jiffies - CRNG_RESEED_INTERVAL - 1;
 }
@@ -859,14 +861,12 @@ static void crng_finalize_init(struct crng_state *crng)
        kill_fasync(&fasync, SIGIO, POLL_IN);
        pr_notice("crng init done\n");
        if (unseeded_warning.missed) {
-               pr_notice("random: %d get_random_xx warning(s) missed "
-                         "due to ratelimiting\n",
+               pr_notice("%d get_random_xx warning(s) missed due to ratelimiting\n",
                          unseeded_warning.missed);
                unseeded_warning.missed = 0;
        }
        if (urandom_warning.missed) {
-               pr_notice("random: %d urandom warning(s) missed "
-                         "due to ratelimiting\n",
+               pr_notice("%d urandom warning(s) missed due to ratelimiting\n",
                          urandom_warning.missed);
                urandom_warning.missed = 0;
        }
@@ -947,7 +947,7 @@ static int crng_fast_load(const char *cp, size_t len)
        if (crng_init_cnt >= CRNG_INIT_CNT_THRESH) {
                invalidate_batched_entropy();
                crng_init = 1;
-               pr_notice("random: fast init done\n");
+               pr_notice("fast init done\n");
        }
        return 1;
 }
@@ -1383,7 +1383,7 @@ retry:
                ibytes = 0;
 
        if (WARN_ON(entropy_count < 0)) {
-               pr_warn("random: negative entropy count: pool %s count %d\n",
+               pr_warn("negative entropy count: pool %s count %d\n",
                        r->name, entropy_count);
                entropy_count = 0;
        }
@@ -1869,9 +1869,8 @@ urandom_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
        if (!crng_ready() && maxwarn > 0) {
                maxwarn--;
                if (__ratelimit(&urandom_warning))
-                       printk(KERN_NOTICE "random: %s: uninitialized "
-                              "urandom read (%zd bytes read)\n",
-                              current->comm, nbytes);
+                       pr_notice("%s: uninitialized urandom read (%zd bytes read)\n",
+                                 current->comm, nbytes);
                spin_lock_irqsave(&primary_crng.lock, flags);
                crng_init_cnt = 0;
                spin_unlock_irqrestore(&primary_crng.lock, flags);