From: Laurent Vivier <lvivier@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
linux-crypto@vger.kernel.org, Matt Mackall <mpm@selenic.com>
Subject: [PATCH] hwrng: core - don't block in add_early_randomness()
Date: Fri, 29 Mar 2019 17:30:11 +0100 [thread overview]
Message-ID: <20190329163011.7370-1-lvivier@redhat.com> (raw)
If the device is not ready to provide data the kernel will
be stuck indefinitely in the init function.
This is not a problem if the device is driven using a module,
but if the driver is linked directly into the kernel then the
kernel boot sequence hangs.
This can happen with virtio-rng device with rng-egd backend
with no data provider, for instance with QEMU command line parameters:
...
-chardev socket,id=charrng0,host=localhost,port=2345,server,nowait \
-object rng-egd,id=objrng0,chardev=charrng0 \
-device virtio-rng-pci,rng=objrng0,id=rng0
To avoid that, we can call rng_get_data() in non blocking mode because
the function already manages the case where byte_read is
0 (if the device is not already initialized).
See also commit d3cc7996473a
("hwrng: fetch randomness only after device init")
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
drivers/char/hw_random/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index 95be7228f327..3866d6b8017c 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -67,7 +67,7 @@ static void add_early_randomness(struct hwrng *rng)
size_t size = min_t(size_t, 16, rng_buffer_size());
mutex_lock(&reading_mutex);
- bytes_read = rng_get_data(rng, rng_buffer, size, 1);
+ bytes_read = rng_get_data(rng, rng_buffer, size, 0);
mutex_unlock(&reading_mutex);
if (bytes_read > 0)
add_device_randomness(rng_buffer, bytes_read);
--
2.20.1
next reply other threads:[~2019-03-29 16:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-29 16:30 Laurent Vivier [this message]
2019-04-08 6:31 ` [PATCH] hwrng: core - don't block in add_early_randomness() Herbert Xu
2019-04-08 6:55 ` Laurent Vivier
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=20190329163011.7370-1-lvivier@redhat.com \
--to=lvivier@redhat.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mpm@selenic.com \
/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;
as well as URLs for NNTP newsgroup(s).