Commit d024fb8a authored by Amos Kong's avatar Amos Kong Committed by Luis Henriques

virtio-rng: fix stuck of hot-unplugging busy device

commit 3856e548 upstream.

When we try to hot-remove a busy virtio-rng device from QEMU monitor,
the device can't be hot-removed. Because virtio-rng driver hangs at
wait_for_completion_killable().

This patch exits the waiting by completing have_data completion before
unregistering, resets data_avail to avoid the hwrng core use wrong
buffer bytes.
Signed-off-by: default avatarAmos Kong <akong@redhat.com>
Reviewed-by: default avatarAmit Shah <amit.shah@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent d5b57d65
...@@ -137,6 +137,8 @@ static void remove_common(struct virtio_device *vdev) ...@@ -137,6 +137,8 @@ static void remove_common(struct virtio_device *vdev)
{ {
struct virtrng_info *vi = vdev->priv; struct virtrng_info *vi = vdev->priv;
vi->data_avail = 0;
complete(&vi->have_data);
vdev->config->reset(vdev); vdev->config->reset(vdev);
vi->busy = false; vi->busy = false;
if (vi->hwrng_register_done) if (vi->hwrng_register_done)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment