crypto: virtio - Wait for tasklet to complete on device remove

[ Upstream commit 67cc511e8d436456cc98033e6d4ba83ebfc8e672 ]

The scheduled tasklet needs to be executed on device remove.

Fixes: fed93fb62e05 ("crypto: virtio - Handle dataq logic with tasklet")
Signed-off-by: wangyangxin <wangyangxin1@huawei.com>
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/crypto/virtio/virtio_crypto_core.c b/drivers/crypto/virtio/virtio_crypto_core.c
index 428d76562447f3fc609e18c28f37608609902264..b909c6a2bf1c348a653a093335f1df4d2f6dc4ab 100644 (file)
--- a/drivers/crypto/virtio/virtio_crypto_core.c
+++ b/drivers/crypto/virtio/virtio_crypto_core.c
@@ -500,12 +500,15 @@ static void virtcrypto_free_unused_reqs(struct virtio_crypto *vcrypto)
 static void virtcrypto_remove(struct virtio_device *vdev)
 {
        struct virtio_crypto *vcrypto = vdev->priv;
+       int i;
 
        dev_info(&vdev->dev, "Start virtcrypto_remove.\n");
 
        flush_work(&vcrypto->config_work);
        if (virtcrypto_dev_started(vcrypto))
                virtcrypto_dev_stop(vcrypto);
+       for (i = 0; i < vcrypto->max_data_queues; i++)
+               tasklet_kill(&vcrypto->data_vq[i].done_task);
        virtio_reset_device(vdev);
        virtcrypto_free_unused_reqs(vcrypto);
        virtcrypto_clear_crypto_engines(vcrypto);