* [PATCH v2] virtio-rng: Avoid repeated init of completion
@ 2019-01-18 19:01 David Tolnay
2019-01-25 10:48 ` Herbert Xu
0 siblings, 1 reply; 2+ messages in thread
From: David Tolnay @ 2019-01-18 19:01 UTC (permalink / raw)
To: Matt Mackall, Herbert Xu; +Cc: linux-crypto
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 7 Jan 2019 14:36:11 -0800
Subject: [PATCH v2] virtio-rng: Avoid repeated init of completion
The virtio-rng driver uses a completion called have_data to wait for a
virtio read to be fulfilled by the hypervisor. The completion is reset
before placing a buffer on the virtio queue and completed by the virtio
callback once data has been written into the buffer.
Prior to this commit, the driver called init_completion on this
completion both during probe as well as when registering virtio buffers
as part of a hwrng read operation. The second of these init_completion
calls should instead be reinit_completion because the have_data
completion has already been inited by probe. As described in
Documentation/scheduler/completion.txt, "Calling init_completion() twice
on the same completion object is most likely a bug".
This bug was present in the initial implementation of virtio-rng in
f7f510ec1957 ("virtio: An entropy device, as suggested by hpa"). Back
then the have_data completion was a single static completion rather than
a member of one of potentially multiple virtrng_info structs as
implemented later by 08e53fbdb85c ("virtio-rng: support multiple
virtio-rng devices"). The original driver incorrectly used
init_completion rather than INIT_COMPLETION to reset have_data during
read.
Tested by running `head -c48 /dev/random | hexdump` within crosvm, the
Chrome OS virtual machine monitor, and confirming that the virtio-rng
driver successfully produces random bytes from the host.
Signed-off-by: David Tolnay <dtolnay@gmail.com>
Tested-by: David Tolnay <dtolnay@gmail.com>
---
drivers/char/hw_random/virtio-rng.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c
index b89df66ea1ae..7abd604e938c 100644
--- a/drivers/char/hw_random/virtio-rng.c
+++ b/drivers/char/hw_random/virtio-rng.c
@@ -73,7 +73,7 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)
if (!vi->busy) {
vi->busy = true;
- init_completion(&vi->have_data);
+ reinit_completion(&vi->have_data);
register_buffer(vi, buf, size);
}
--
2.20.1.97.g81188d93c3-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] virtio-rng: Avoid repeated init of completion
2019-01-18 19:01 [PATCH v2] virtio-rng: Avoid repeated init of completion David Tolnay
@ 2019-01-25 10:48 ` Herbert Xu
0 siblings, 0 replies; 2+ messages in thread
From: Herbert Xu @ 2019-01-25 10:48 UTC (permalink / raw)
To: David Tolnay; +Cc: Matt Mackall, linux-crypto
On Fri, Jan 18, 2019 at 11:01:45AM -0800, David Tolnay wrote:
> From: David Tolnay <dtolnay@gmail.com>
> Date: Mon, 7 Jan 2019 14:36:11 -0800
> Subject: [PATCH v2] virtio-rng: Avoid repeated init of completion
>
> The virtio-rng driver uses a completion called have_data to wait for a
> virtio read to be fulfilled by the hypervisor. The completion is reset
> before placing a buffer on the virtio queue and completed by the virtio
> callback once data has been written into the buffer.
>
> Prior to this commit, the driver called init_completion on this
> completion both during probe as well as when registering virtio buffers
> as part of a hwrng read operation. The second of these init_completion
> calls should instead be reinit_completion because the have_data
> completion has already been inited by probe. As described in
> Documentation/scheduler/completion.txt, "Calling init_completion() twice
> on the same completion object is most likely a bug".
>
> This bug was present in the initial implementation of virtio-rng in
> f7f510ec1957 ("virtio: An entropy device, as suggested by hpa"). Back
> then the have_data completion was a single static completion rather than
> a member of one of potentially multiple virtrng_info structs as
> implemented later by 08e53fbdb85c ("virtio-rng: support multiple
> virtio-rng devices"). The original driver incorrectly used
> init_completion rather than INIT_COMPLETION to reset have_data during
> read.
>
> Tested by running `head -c48 /dev/random | hexdump` within crosvm, the
> Chrome OS virtual machine monitor, and confirming that the virtio-rng
> driver successfully produces random bytes from the host.
>
> Signed-off-by: David Tolnay <dtolnay@gmail.com>
> Tested-by: David Tolnay <dtolnay@gmail.com>
> ---
> drivers/char/hw_random/virtio-rng.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Patch applied. Thanks.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-25 10:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-18 19:01 [PATCH v2] virtio-rng: Avoid repeated init of completion David Tolnay
2019-01-25 10:48 ` Herbert Xu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.