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 014/234] Revert "hwrng: core - Freeze khwrng thread during suspend"
    Date
    From: Herbert Xu <herbert@gondor.apana.org.au>

    commit 08e97aec700aeff54c4847f170e566cbd7e14e81 upstream.

    This reverts commit 03a3bb7ae631 ("hwrng: core - Freeze khwrng
    thread during suspend"), ff296293b353 ("random: Support freezable
    kthreads in add_hwgenerator_randomness()") and 59b569480dc8 ("random:
    Use wait_event_freezable() in add_hwgenerator_randomness()").

    These patches introduced regressions and we need more time to
    get them ready for mainline.

    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    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
    @@ -327,7 +327,6 @@
    #include <linux/percpu.h>
    #include <linux/cryptohash.h>
    #include <linux/fips.h>
    -#include <linux/freezer.h>
    #include <linux/ptrace.h>
    #include <linux/workqueue.h>
    #include <linux/irq.h>
    @@ -2494,8 +2493,7 @@ void add_hwgenerator_randomness(const ch
    * We'll be woken up again once below random_write_wakeup_thresh,
    * or when the calling thread is about to terminate.
    */
    - wait_event_freezable(random_write_wait,
    - kthread_should_stop() ||
    + wait_event_interruptible(random_write_wait, kthread_should_stop() ||
    ENTROPY_BITS(&input_pool) <= random_write_wakeup_bits);
    mix_pool_bytes(poolp, buffer, count);
    credit_entropy_bits(poolp, entropy);

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