Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f84af6ed authored by Yangtao Li's avatar Yangtao Li Committed by Mark Salyzyn
Browse files

UPSTREAM: random: Add and use pr_fmt() 



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: default avatarYangtao Li <tiny.windzz@gmail.com>
Link: https://lore.kernel.org/r/20190607182517.28266-3-tiny.windzz@gmail.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
(cherry picked from commit 12cd53aff5ea0359b1dac91fcd9ddc7b9e646588)
Signed-off-by: default avatarMark Salyzyn <salyzyn@google.com>
Bug: 148665638
Change-Id: I64f5cc7a59f746ff265d8af21744f49dc97ea128
parent d3df0392

drivers/char/random.c

+11 −12
Original line number Diff line number Diff line
@@ -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>
@@ -737,7 +739,7 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits) 
	}



	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)
@@ -833,7 +835,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;

}
@@ -895,7 +897,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;

}
@@ -981,16 +983,14 @@ static void crng_reseed(struct crng_state *crng, struct entropy_store *r) 
		process_random_ready_list();

		wake_up_interruptible(&crng_init_wait);

		kill_fasync(&fasync, SIGIO, POLL_IN);

		pr_notice("random: crng init done\n");

		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;

		}
@@ -1364,7 +1364,7 @@ static size_t account(struct entropy_store *r, size_t nbytes, int min, 
		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;

	}
@@ -1848,8 +1848,7 @@ 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",

			pr_notice("%s: uninitialized urandom read (%zd bytes read)\n",

				  current->comm, nbytes);

		spin_lock_irqsave(&primary_crng.lock, flags);

		crng_init_cnt = 0;