This is a note to let you know that I've just added the patch titled
Revert "hwrng: core - Freeze khwrng thread during suspend"
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-hwrng-core-freeze-khwrng-thread-during-suspend.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Thu Jun 16 07:08:33 PM CEST 2022
From: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sun, 17 Nov 2019 08:48:17 +0800
Subject: Revert "hwrng: core - Freeze khwrng thread during suspend"
From: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Jason A. Donenfeld <Jason@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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>
@@ -2431,8 +2430,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);
Patches currently in stable-queue which might be from herbert@xxxxxxxxxxxxxxxxxxx are
queue-4.14/revert-hwrng-core-freeze-khwrng-thread-during-suspend.patch
queue-4.14/crypto-chacha20-fix-chacha20_block-keystream-alignment-again.patch
queue-4.14/random-pull-add_hwgenerator_randomness-declaration-into-random.h.patch
queue-4.14/random-initialize-chacha20-constants-with-correct-endianness.patch
queue-4.14/lib-crypto-sha1-re-roll-loops-to-reduce-code-size.patch
queue-4.14/random-continually-use-hwgenerator-randomness.patch
queue-4.14/random-support-freezable-kthreads-in-add_hwgenerator_randomness.patch
queue-4.14/crypto-drbg-add-fips-140-2-ctrng-for-noise-source.patch
queue-4.14/random-early-initialization-of-chacha-constants.patch
queue-4.14/crypto-drbg-prepare-for-more-fine-grained-tracking-of-seeding-state.patch
queue-4.14/crypto-drbg-always-try-to-free-jitter-rng-instance.patch
queue-4.14/random-use-wait_event_freezable-in-add_hwgenerator_randomness.patch
queue-4.14/crypto-blake2s-generic-c-library-implementation-and-selftest.patch
queue-4.14/random-remove-dead-code-left-over-from-blocking-pool.patch
queue-4.14/crypto-drbg-track-whether-drbg-was-seeded-with-rng_is_initialized.patch
queue-4.14/crypto-drbg-make-reseeding-from-get_random_bytes-synchronous.patch
queue-4.14/lib-crypto-blake2s-move-hmac-construction-into-wireguard.patch
queue-4.14/crypto-chacha20-fix-keystream-alignment-for-chacha20_block.patch
queue-4.14/crypto-drbg-move-dynamic-reseed_threshold-adjustments-to-__drbg_seed.patch
queue-4.14/crypto-blake2s-include-linux-bug.h-instead-of-asm-bug.h.patch
queue-4.14/crypto-drbg-always-seeded-with-sp800-90b-compliant-noise-source.patch
queue-4.14/crypto-blake2s-adjust-include-guard-naming.patch
queue-4.14/crypto-deduplicate-le32_to_cpu_array-and-cpu_to_le32_array.patch
