From: Amos Kong Date: Thu, 11 Sep 2014 12:50:39 +0000 (+0930) Subject: virtio-rng: fix stuck of hot-unplugging busy device X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3856e548372513665670ca5db60d9a74b970fe0d;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git virtio-rng: fix stuck of hot-unplugging busy device 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: Amos Kong Reviewed-by: Amit Shah Cc: stable@vger.kernel.org Signed-off-by: Rusty Russell --- diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c index 2e3139eda93b..849b22877196 100644 --- a/drivers/char/hw_random/virtio-rng.c +++ b/drivers/char/hw_random/virtio-rng.c @@ -137,6 +137,8 @@ static void remove_common(struct virtio_device *vdev) { struct virtrng_info *vi = vdev->priv; + vi->data_avail = 0; + complete(&vi->have_data); vdev->config->reset(vdev); vi->busy = false; if (vi->hwrng_register_done)