Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 830a4f07 authored by Gonglei (Arei)'s avatar Gonglei (Arei) Committed by Greg Kroah-Hartman
Browse files

crypto: virtio - Handle dataq logic with tasklet 



[ Upstream commit fed93fb62e05c38152b0fc1dc9609639e63eed76 ]

Doing ipsec produces a spinlock recursion warning.
This is due to crypto_finalize_request() being called in the upper half.
Move virtual data queue processing of virtio-crypto driver to tasklet.

Fixes: dbaf0624 ("crypto: add virtio-crypto driver")
Reported-by: default avatarHalil Pasic <pasic@linux.ibm.com>
Signed-off-by: default avatarwangyangxin <wangyangxin1@huawei.com>
Signed-off-by: default avatarGonglei <arei.gonglei@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 86a7c9ba

drivers/crypto/virtio/virtio_crypto_common.h

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/virtio.h>

#include <linux/crypto.h>

#include <linux/spinlock.h>

#include <linux/interrupt.h>

#include <crypto/aead.h>

#include <crypto/aes.h>

#include <crypto/engine.h>
@@ -27,6 +28,7 @@ struct data_queue { 
	char name[32];



	struct crypto_engine *engine;

	struct tasklet_struct done_task;

};



struct virtio_crypto {

drivers/crypto/virtio/virtio_crypto_core.c

+13 −10
Original line number Diff line number Diff line
@@ -22,27 +22,28 @@ virtcrypto_clear_request(struct virtio_crypto_request *vc_req) 
	}

}



static void virtcrypto_dataq_callback(struct virtqueue *vq)

static void virtcrypto_done_task(unsigned long data)

{

	struct virtio_crypto *vcrypto = vq->vdev->priv;

	struct data_queue *data_vq = (struct data_queue *)data;

	struct virtqueue *vq = data_vq->vq;

	struct virtio_crypto_request *vc_req;

	unsigned long flags;

	unsigned int len;

	unsigned int qid = vq->index;



	spin_lock_irqsave(&vcrypto->data_vq[qid].lock, flags);

	do {

		virtqueue_disable_cb(vq);

		while ((vc_req = virtqueue_get_buf(vq, &len)) != NULL) {

			spin_unlock_irqrestore(

				&vcrypto->data_vq[qid].lock, flags);

			if (vc_req->alg_cb)

				vc_req->alg_cb(vc_req, len);

			spin_lock_irqsave(

				&vcrypto->data_vq[qid].lock, flags);

		}

	} while (!virtqueue_enable_cb(vq));

	spin_unlock_irqrestore(&vcrypto->data_vq[qid].lock, flags);

}



static void virtcrypto_dataq_callback(struct virtqueue *vq)

{

	struct virtio_crypto *vcrypto = vq->vdev->priv;

	struct data_queue *dq = &vcrypto->data_vq[vq->index];



	tasklet_schedule(&dq->done_task);

}



static int virtcrypto_find_vqs(struct virtio_crypto *vi)
@@ -99,6 +100,8 @@ static int virtcrypto_find_vqs(struct virtio_crypto *vi) 
			ret = -ENOMEM;

			goto err_engine;

		}

		tasklet_init(&vi->data_vq[i].done_task, virtcrypto_done_task,

				(unsigned long)&vi->data_vq[i]);

	}



	kfree(names);