lkml.org 
[lkml]   [2022]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 066/234] random: remove unused OUTPUT_POOL constants
    Date
    From: "Jason A. Donenfeld" <Jason@zx2c4.com>

    commit 0f63702718c91d89c922081ac1e6baeddc2d8b1a upstream.

    We no longer have an output pool. Rather, we have just a wakeup bits
    threshold for /dev/random reads, presumably so that processes don't
    hang. This value, random_write_wakeup_bits, is configurable anyway. So
    all the no longer usefully named OUTPUT_POOL constants were doing was
    setting a reasonable default for random_write_wakeup_bits. This commit
    gets rid of the constants and just puts it all in the default value of
    random_write_wakeup_bits.

    Reviewed-by: Dominik Brodowski <linux@dominikbrodowski.net>
    Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/char/random.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    --- a/drivers/char/random.c
    +++ b/drivers/char/random.c
    @@ -363,8 +363,6 @@
    */
    #define INPUT_POOL_SHIFT 12
    #define INPUT_POOL_WORDS (1 << (INPUT_POOL_SHIFT-5))
    -#define OUTPUT_POOL_SHIFT 10
    -#define OUTPUT_POOL_WORDS (1 << (OUTPUT_POOL_SHIFT-5))
    #define EXTRACT_SIZE (BLAKE2S_HASH_SIZE / 2)

    /*
    @@ -382,7 +380,7 @@
    * should wake up processes which are selecting or polling on write
    * access to /dev/random.
    */
    -static int random_write_wakeup_bits = 28 * OUTPUT_POOL_WORDS;
    +static int random_write_wakeup_bits = 28 * (1 << 5);

    /*
    * Originally, we used a primitive polynomial of degree .poolwords

    \
     
     \ /
      Last update: 2022-06-23 20:02    [W:5.073 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site