Commit af9a17d2 authored by Bibo Mao's avatar Bibo Mao Committed by Michael S. Tsirkin
Browse files

crypto: virtio: Add spinlock protection with virtqueue notification 



When VM boots with one virtio-crypto PCI device and builtin backend,
run openssl benchmark command with multiple processes, such as
  openssl speed -evp aes-128-cbc -engine afalg  -seconds 10 -multi 32

openssl processes will hangup and there is error reported like this:
 virtio_crypto virtio0: dataq.0:id 3 is not a head!

It seems that the data virtqueue need protection when it is handled
for virtio done notification. If the spinlock protection is added
in virtcrypto_done_task(), openssl benchmark with multiple processes
works well.

Fixes: fed93fb6 ("crypto: virtio - Handle dataq logic with tasklet")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarBibo Mao <maobibo@loongson.cn>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Message-Id: <20260113030556.3522533-2-maobibo@loongson.cn>
parent 7a9dc249

drivers/crypto/virtio/virtio_crypto_core.c

+5 −0
Original line number Diff line number Diff line
@@ -75,15 +75,20 @@ static void virtcrypto_done_task(unsigned long data) 
	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;



	spin_lock_irqsave(&data_vq->lock, flags);

	do {

		virtqueue_disable_cb(vq);

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

			spin_unlock_irqrestore(&data_vq->lock, flags);

			if (vc_req->alg_cb)

				vc_req->alg_cb(vc_req, len);

			spin_lock_irqsave(&data_vq->lock, flags);

		}

	} while (!virtqueue_enable_cb(vq));

	spin_unlock_irqrestore(&data_vq->lock, flags);

}



static void virtcrypto_dataq_callback(struct virtqueue *vq)