From: Dominik Brodowski <linux@dominikbrodowski.net>
To: "Jason A. Donenfeld" <Jason@zx2c4.com>
Cc: linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] random: move initialization out of reseeding hot path
Date: Fri, 13 May 2022 08:24:19 +0200 [thread overview]
Message-ID: <Yn35k+yyrvgAt3tb@owl.dominikbrodowski.net> (raw)
In-Reply-To: <20220509121409.529788-2-Jason@zx2c4.com>
Am Mon, May 09, 2022 at 02:14:09PM +0200 schrieb Jason A. Donenfeld:
> Initialization happens once -- by way of credit_init_bits() -- and then
> it never happens again. Therefore, it doesn't need to be in
> crng_reseed(), which is a hot path that is called multiple times. It
> also doesn't make sense to have there, as initialization activity is
> better associated with initialization routines.
>
> After the prior commit, crng_reseed() now won't be called by multiple
> concurrent callers, which means that we can safely move the
> "finialize_init" logic into crng_init_bits() unconditionally.
>
> Cc: Dominik Brodowski <linux@dominikbrodowski.net>
> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> ---
> drivers/char/random.c | 43 +++++++++++++++++++------------------------
> 1 file changed, 19 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/char/random.c b/drivers/char/random.c
> index 79409cf27a25..1598bb40376e 100644
> --- a/drivers/char/random.c
> +++ b/drivers/char/random.c
> @@ -266,7 +266,6 @@ static void crng_reseed(void)
> unsigned long flags;
> unsigned long next_gen;
> u8 key[CHACHA_KEY_SIZE];
> - bool finalize_init = false;
>
> extract_entropy(key, sizeof(key));
>
> @@ -283,28 +282,9 @@ static void crng_reseed(void)
> ++next_gen;
> WRITE_ONCE(base_crng.generation, next_gen);
> WRITE_ONCE(base_crng.birth, jiffies);
> - if (!crng_ready()) {
> - crng_init = CRNG_READY;
> - finalize_init = true;
> - }
> + crng_init = CRNG_READY;
Why unconditionally (you revert that bit in the static branch patch and make
it conditional again; so I see no reason for that here)?
Otherwise, looks good:
Reviewed-by: Dominik Brodowski <linux@dominikbrodowski.net>
Thanks,
Dominik
next prev parent reply other threads:[~2022-05-13 6:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-09 12:14 [PATCH 1/2] random: avoid init'ing twice in credit race Jason A. Donenfeld
2022-05-09 12:14 ` [PATCH 2/2] random: move initialization out of reseeding hot path Jason A. Donenfeld
2022-05-13 6:24 ` Dominik Brodowski [this message]
2022-05-13 10:21 ` Jason A. Donenfeld
2022-05-13 11:38 ` David Laight
2022-05-13 12:02 ` Jason A. Donenfeld
2022-05-13 12:05 ` [PATCH v2] " Jason A. Donenfeld
2022-05-13 6:23 ` [PATCH 1/2] random: avoid init'ing twice in credit race Dominik Brodowski
2022-05-13 10:23 ` Jason A. Donenfeld
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Yn35k+yyrvgAt3tb@owl.dominikbrodowski.net \
--to=linux@dominikbrodowski.net \
--cc=Jason@zx2c4.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®