This is a note to let you know that I've just added the patch titled
random: remove unnecessary unlikely()
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:
random-remove-unnecessary-unlikely.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: Yangtao Li <tiny.windzz@xxxxxxxxx>
Date: Tue, 7 Jan 2020 16:10:28 -0500
Subject: random: remove unnecessary unlikely()
From: Yangtao Li <tiny.windzz@xxxxxxxxx>
commit 870e05b1b18814911cb2703a977f447cb974f0f9 upstream.
WARN_ON() already contains an unlikely(), so it's not necessary to use
unlikely.
Signed-off-by: Yangtao Li <tiny.windzz@xxxxxxxxx>
Link: https://lore.kernel.org/r/20190607182517.28266-1-tiny.windzz@xxxxxxxxx
Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
Signed-off-by: Jason A. Donenfeld <Jason@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/char/random.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -738,10 +738,9 @@ retry:
} while (unlikely(entropy_count < pool_size-2 && pnfrac));
}
- if (unlikely(entropy_count < 0)) {
+ if (WARN_ON(entropy_count < 0)) {
pr_warn("random: negative entropy/overflow: pool %s count %d\n",
r->name, entropy_count);
- WARN_ON(1);
entropy_count = 0;
} else if (entropy_count > pool_size)
entropy_count = pool_size;
@@ -1380,10 +1379,9 @@ retry:
if (ibytes < min)
ibytes = 0;
- if (unlikely(entropy_count < 0)) {
+ if (WARN_ON(entropy_count < 0)) {
pr_warn("random: negative entropy count: pool %s count %d\n",
r->name, entropy_count);
- WARN_ON(1);
entropy_count = 0;
}
nfrac = ibytes << (ENTROPY_SHIFT + 3);
Patches currently in stable-queue which might be from tiny.windzz@xxxxxxxxx are
queue-4.14/random-fix-typo-in-add_timer_randomness.patch
queue-4.14/random-add-and-use-pr_fmt.patch
queue-4.14/random-convert-to-entropy_bits-for-better-code-readability.patch
queue-4.14/random-remove-unnecessary-unlikely.patch
queue-4.14/random-remove-some-dead-code-of-poolinfo.patch
