* [PATCH] random: remove dead code left over from blocking pool
@ 2020-09-16 4:36 Eric Biggers
2020-09-16 13:53 ` Andy Lutomirski
2020-10-07 3:50 ` Eric Biggers
0 siblings, 2 replies; 6+ messages in thread
From: Eric Biggers @ 2020-09-16 4:36 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: linux-crypto, linux-kernel, Andy Lutomirski
From: Eric Biggers <ebiggers@google.com>
Remove some dead code that was left over following commit 90ea1c6436d2
("random: remove the blocking pool").
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
drivers/char/random.c | 17 ++-----
include/trace/events/random.h | 83 -----------------------------------
2 files changed, 3 insertions(+), 97 deletions(-)
diff --git a/drivers/char/random.c b/drivers/char/random.c
index a8b9e66f41435..26f0a23a6f021 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -500,7 +500,6 @@ struct entropy_store {
unsigned short add_ptr;
unsigned short input_rotate;
int entropy_count;
- unsigned int initialized:1;
unsigned int last_data_init:1;
__u8 last_data[EXTRACT_SIZE];
};
@@ -660,7 +659,7 @@ static void process_random_ready_list(void)
*/
static void credit_entropy_bits(struct entropy_store *r, int nbits)
{
- int entropy_count, orig, has_initialized = 0;
+ int entropy_count, orig;
const int pool_size = r->poolinfo->poolfracbits;
int nfrac = nbits << ENTROPY_SHIFT;
@@ -717,23 +716,14 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits)
if (cmpxchg(&r->entropy_count, orig, entropy_count) != orig)
goto retry;
- if (has_initialized) {
- r->initialized = 1;
- kill_fasync(&fasync, SIGIO, POLL_IN);
- }
-
trace_credit_entropy_bits(r->name, nbits,
entropy_count >> ENTROPY_SHIFT, _RET_IP_);
if (r == &input_pool) {
int entropy_bits = entropy_count >> ENTROPY_SHIFT;
- if (crng_init < 2) {
- if (entropy_bits < 128)
- return;
+ if (crng_init < 2 && entropy_bits >= 128)
crng_reseed(&primary_crng, r);
- entropy_bits = ENTROPY_BITS(r);
- }
}
}
@@ -1386,8 +1376,7 @@ static size_t account(struct entropy_store *r, size_t nbytes, int min,
}
/*
- * This function does the actual extraction for extract_entropy and
- * extract_entropy_user.
+ * This function does the actual extraction for extract_entropy.
*
* Note: we assume that .poolwords is a multiple of 16 words.
*/
diff --git a/include/trace/events/random.h b/include/trace/events/random.h
index 9570a10cb949b..3d7b432ca5f31 100644
--- a/include/trace/events/random.h
+++ b/include/trace/events/random.h
@@ -85,28 +85,6 @@ TRACE_EVENT(credit_entropy_bits,
__entry->entropy_count, (void *)__entry->IP)
);
-TRACE_EVENT(push_to_pool,
- TP_PROTO(const char *pool_name, int pool_bits, int input_bits),
-
- TP_ARGS(pool_name, pool_bits, input_bits),
-
- TP_STRUCT__entry(
- __field( const char *, pool_name )
- __field( int, pool_bits )
- __field( int, input_bits )
- ),
-
- TP_fast_assign(
- __entry->pool_name = pool_name;
- __entry->pool_bits = pool_bits;
- __entry->input_bits = input_bits;
- ),
-
- TP_printk("%s: pool_bits %d input_pool_bits %d",
- __entry->pool_name, __entry->pool_bits,
- __entry->input_bits)
-);
-
TRACE_EVENT(debit_entropy,
TP_PROTO(const char *pool_name, int debit_bits),
@@ -161,35 +139,6 @@ TRACE_EVENT(add_disk_randomness,
MINOR(__entry->dev), __entry->input_bits)
);
-TRACE_EVENT(xfer_secondary_pool,
- TP_PROTO(const char *pool_name, int xfer_bits, int request_bits,
- int pool_entropy, int input_entropy),
-
- TP_ARGS(pool_name, xfer_bits, request_bits, pool_entropy,
- input_entropy),
-
- TP_STRUCT__entry(
- __field( const char *, pool_name )
- __field( int, xfer_bits )
- __field( int, request_bits )
- __field( int, pool_entropy )
- __field( int, input_entropy )
- ),
-
- TP_fast_assign(
- __entry->pool_name = pool_name;
- __entry->xfer_bits = xfer_bits;
- __entry->request_bits = request_bits;
- __entry->pool_entropy = pool_entropy;
- __entry->input_entropy = input_entropy;
- ),
-
- TP_printk("pool %s xfer_bits %d request_bits %d pool_entropy %d "
- "input_entropy %d", __entry->pool_name, __entry->xfer_bits,
- __entry->request_bits, __entry->pool_entropy,
- __entry->input_entropy)
-);
-
DECLARE_EVENT_CLASS(random__get_random_bytes,
TP_PROTO(int nbytes, unsigned long IP),
@@ -253,38 +202,6 @@ DEFINE_EVENT(random__extract_entropy, extract_entropy,
TP_ARGS(pool_name, nbytes, entropy_count, IP)
);
-DEFINE_EVENT(random__extract_entropy, extract_entropy_user,
- TP_PROTO(const char *pool_name, int nbytes, int entropy_count,
- unsigned long IP),
-
- TP_ARGS(pool_name, nbytes, entropy_count, IP)
-);
-
-TRACE_EVENT(random_read,
- TP_PROTO(int got_bits, int need_bits, int pool_left, int input_left),
-
- TP_ARGS(got_bits, need_bits, pool_left, input_left),
-
- TP_STRUCT__entry(
- __field( int, got_bits )
- __field( int, need_bits )
- __field( int, pool_left )
- __field( int, input_left )
- ),
-
- TP_fast_assign(
- __entry->got_bits = got_bits;
- __entry->need_bits = need_bits;
- __entry->pool_left = pool_left;
- __entry->input_left = input_left;
- ),
-
- TP_printk("got_bits %d still_needed_bits %d "
- "blocking_pool_entropy_left %d input_entropy_left %d",
- __entry->got_bits, __entry->got_bits, __entry->pool_left,
- __entry->input_left)
-);
-
TRACE_EVENT(urandom_read,
TP_PROTO(int got_bits, int pool_left, int input_left),
--
2.28.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] random: remove dead code left over from blocking pool
2020-09-16 4:36 [PATCH] random: remove dead code left over from blocking pool Eric Biggers
@ 2020-09-16 13:53 ` Andy Lutomirski
2020-10-07 3:50 ` Eric Biggers
1 sibling, 0 replies; 6+ messages in thread
From: Andy Lutomirski @ 2020-09-16 13:53 UTC (permalink / raw)
To: Eric Biggers
Cc: Theodore Ts'o, Linux Crypto Mailing List, LKML, Andy Lutomirski
On Tue, Sep 15, 2020 at 9:38 PM Eric Biggers <ebiggers@kernel.org> wrote:>
> From: Eric Biggers <ebiggers@google.com>
>
> Remove some dead code that was left over following commit 90ea1c6436d2
> ("random: remove the blocking pool").
>
Looks good to me.
Reviewed-by: Andy Lutomirski <luto@kernel.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] random: remove dead code left over from blocking pool
2020-09-16 4:36 [PATCH] random: remove dead code left over from blocking pool Eric Biggers
2020-09-16 13:53 ` Andy Lutomirski
@ 2020-10-07 3:50 ` Eric Biggers
2020-10-26 16:34 ` Eric Biggers
1 sibling, 1 reply; 6+ messages in thread
From: Eric Biggers @ 2020-10-07 3:50 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: linux-crypto, linux-kernel, Andy Lutomirski
On Tue, Sep 15, 2020 at 09:36:52PM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> Remove some dead code that was left over following commit 90ea1c6436d2
> ("random: remove the blocking pool").
>
> Signed-off-by: Eric Biggers <ebiggers@google.com>
Ping?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] random: remove dead code left over from blocking pool
2020-10-07 3:50 ` Eric Biggers
@ 2020-10-26 16:34 ` Eric Biggers
2020-11-20 18:52 ` Eric Biggers
0 siblings, 1 reply; 6+ messages in thread
From: Eric Biggers @ 2020-10-26 16:34 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: linux-crypto, linux-kernel, Andy Lutomirski
On Tue, Oct 06, 2020 at 08:50:58PM -0700, Eric Biggers wrote:
> On Tue, Sep 15, 2020 at 09:36:52PM -0700, Eric Biggers wrote:
> > From: Eric Biggers <ebiggers@google.com>
> >
> > Remove some dead code that was left over following commit 90ea1c6436d2
> > ("random: remove the blocking pool").
> >
> > Signed-off-by: Eric Biggers <ebiggers@google.com>
>
> Ping?
Ping.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] random: remove dead code left over from blocking pool
2020-10-26 16:34 ` Eric Biggers
@ 2020-11-20 18:52 ` Eric Biggers
2021-01-04 18:55 ` Eric Biggers
0 siblings, 1 reply; 6+ messages in thread
From: Eric Biggers @ 2020-11-20 18:52 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: linux-crypto, linux-kernel, Andy Lutomirski
On Mon, Oct 26, 2020 at 09:34:03AM -0700, Eric Biggers wrote:
> On Tue, Oct 06, 2020 at 08:50:58PM -0700, Eric Biggers wrote:
> > On Tue, Sep 15, 2020 at 09:36:52PM -0700, Eric Biggers wrote:
> > > From: Eric Biggers <ebiggers@google.com>
> > >
> > > Remove some dead code that was left over following commit 90ea1c6436d2
> > > ("random: remove the blocking pool").
> > >
> > > Signed-off-by: Eric Biggers <ebiggers@google.com>
> >
> > Ping?
>
> Ping.
Ping.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] random: remove dead code left over from blocking pool
2020-11-20 18:52 ` Eric Biggers
@ 2021-01-04 18:55 ` Eric Biggers
0 siblings, 0 replies; 6+ messages in thread
From: Eric Biggers @ 2021-01-04 18:55 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: linux-crypto, linux-kernel, Andy Lutomirski
On Fri, Nov 20, 2020 at 10:52:35AM -0800, Eric Biggers wrote:
> On Mon, Oct 26, 2020 at 09:34:03AM -0700, Eric Biggers wrote:
> > On Tue, Oct 06, 2020 at 08:50:58PM -0700, Eric Biggers wrote:
> > > On Tue, Sep 15, 2020 at 09:36:52PM -0700, Eric Biggers wrote:
> > > > From: Eric Biggers <ebiggers@google.com>
> > > >
> > > > Remove some dead code that was left over following commit 90ea1c6436d2
> > > > ("random: remove the blocking pool").
> > > >
> > > > Signed-off-by: Eric Biggers <ebiggers@google.com>
> > >
> > > Ping?
> >
> > Ping.
>
> Ping.
Ping.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-01-04 18:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-16 4:36 [PATCH] random: remove dead code left over from blocking pool Eric Biggers
2020-09-16 13:53 ` Andy Lutomirski
2020-10-07 3:50 ` Eric Biggers
2020-10-26 16:34 ` Eric Biggers
2020-11-20 18:52 ` Eric Biggers
2021-01-04 18:55 ` Eric Biggers
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.