From: "Theodore Ts'o" <tytso@mit.edu>
This adds a pool name to the entropy_store data structure, which simplifies
the debugging code, and makes the code more generic for adding additional
entropy pools.
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/char/random.c | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 deletions(-)
diff -puN drivers/char/random.c~dev-random-add-pool-name-to-entropy-store drivers/char/random.c
--- 25/drivers/char/random.c~dev-random-add-pool-name-to-entropy-store 2004-08-19 23:36:16.288235704 -0700
+++ 25-akpm/drivers/char/random.c 2004-08-19 23:36:16.293234944 -0700
@@ -493,6 +493,7 @@ struct entropy_store {
/* mostly-read data: */
struct poolinfo poolinfo;
__u32 *pool;
+ const char *name;
/* read-write data: */
spinlock_t lock ____cacheline_aligned_in_smp;
@@ -507,7 +508,8 @@ struct entropy_store {
*
* Returns an negative error if there is a problem.
*/
-static int create_entropy_store(int size, struct entropy_store **ret_bucket)
+static int create_entropy_store(int size, const char *name,
+ struct entropy_store **ret_bucket)
{
struct entropy_store *r;
struct poolinfo *p;
@@ -538,6 +540,7 @@ static int create_entropy_store(int size
}
memset(r->pool, 0, POOLBYTES);
r->lock = SPIN_LOCK_UNLOCKED;
+ r->name = name;
*ret_bucket = r;
return 0;
}
@@ -643,12 +646,8 @@ static void credit_entropy_store(struct
} else {
r->entropy_count += nbits;
if (nbits)
- DEBUG_ENT("%04d %04d : added %d bits to %s\n",
- random_state->entropy_count,
- sec_random_state->entropy_count,
- nbits,
- r == sec_random_state ? "secondary" :
- r == random_state ? "primary" : "unknown");
+ DEBUG_ENT("Added %d entropy credits to %s, now %d\n",
+ nbits, r->name, r->entropy_count);
}
spin_unlock_irqrestore(&r->lock, flags);
@@ -1321,8 +1320,7 @@ static inline void xfer_secondary_pool(s
"(%d of %d requested)\n",
random_state->entropy_count,
sec_random_state->entropy_count,
- r == sec_random_state ? "secondary" : "unknown",
- bytes * 8, nbytes * 8, r->entropy_count);
+ r->name, bytes * 8, nbytes * 8, r->entropy_count);
bytes=extract_entropy(random_state, tmp, bytes,
EXTRACT_ENTROPY_LIMIT);
@@ -1366,9 +1364,7 @@ static ssize_t extract_entropy(struct en
DEBUG_ENT("%04d %04d : trying to extract %d bits from %s\n",
random_state->entropy_count,
sec_random_state->entropy_count,
- nbytes * 8,
- r == sec_random_state ? "secondary" :
- r == random_state ? "primary" : "unknown");
+ nbytes * 8, r->name);
if (flags & EXTRACT_ENTROPY_LIMIT && nbytes >= r->entropy_count / 8)
nbytes = r->entropy_count / 8;
@@ -1381,12 +1377,8 @@ static ssize_t extract_entropy(struct en
if (r->entropy_count < random_write_wakeup_thresh)
wake_up_interruptible(&random_write_wait);
- DEBUG_ENT("%04d %04d : debiting %d bits from %s%s\n",
- random_state->entropy_count,
- sec_random_state->entropy_count,
- nbytes * 8,
- r == sec_random_state ? "secondary" :
- r == random_state ? "primary" : "unknown",
+ DEBUG_ENT("Debiting %d entropy credits from %s%s\n",
+ nbytes * 8, r->name,
flags & EXTRACT_ENTROPY_LIMIT ? "" : " (unlimited)");
spin_unlock_irqrestore(&r->lock, cpuflags);
@@ -1526,11 +1518,12 @@ static int __init rand_initialize(void)
{
int i;
- if (create_entropy_store(DEFAULT_POOL_SIZE, &random_state))
+ if (create_entropy_store(DEFAULT_POOL_SIZE, "primary", &random_state))
goto err;
if (batch_entropy_init(BATCH_ENTROPY_SIZE, random_state))
goto err;
- if (create_entropy_store(SECONDARY_POOL_SIZE, &sec_random_state))
+ if (create_entropy_store(SECONDARY_POOL_SIZE, "secondary",
+ &sec_random_state))
goto err;
clear_entropy_store(random_state);
clear_entropy_store(sec_random_state);
@@ -1878,7 +1871,8 @@ static int change_poolsize(int poolsize)
struct entropy_store *new_store, *old_store;
int ret;
- if ((ret = create_entropy_store(poolsize, &new_store)))
+ if ((ret = create_entropy_store(poolsize, random_state->name,
+ &new_store)))
return ret;
add_entropy_words(new_store, random_state->pool,
_