Commit 08e97aec authored by Herbert Xu's avatar Herbert Xu
Browse files

Revert "hwrng: core - Freeze khwrng thread during suspend" 



This reverts commit 03a3bb7a ("hwrng: core - Freeze khwrng
thread during suspend"), ff296293 ("random: Support freezable
kthreads in add_hwgenerator_randomness()") and 59b56948 ("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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent f703964f

drivers/char/hw_random/core.c

+1 −4
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/delay.h>

#include <linux/device.h>

#include <linux/err.h>

#include <linux/freezer.h>

#include <linux/fs.h>

#include <linux/hw_random.h>

#include <linux/kernel.h>
@@ -422,9 +421,7 @@ static int hwrng_fillfn(void *unused) 
{

	long rc;



	set_freezable();



	while (!kthread_freezable_should_stop(NULL)) {

	while (!kthread_should_stop()) {

		struct hwrng *rng;



		rng = get_current_rng();

drivers/char/random.c

+1 −3
Original line number Diff line number Diff line
@@ -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>
@@ -2440,8 +2439,7 @@ void add_hwgenerator_randomness(const char *buffer, size_t count, 
	 * 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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE