From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8FA7CC4167B for ; Wed, 6 Dec 2023 11:45:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377856AbjLFLpW convert rfc822-to-8bit (ORCPT ); Wed, 6 Dec 2023 06:45:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377732AbjLFLpT (ORCPT ); Wed, 6 Dec 2023 06:45:19 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBD17137; Wed, 6 Dec 2023 03:45:24 -0800 (PST) Received: from kwepemi500024.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4SlbDB3WcwzvRfF; Wed, 6 Dec 2023 19:44:42 +0800 (CST) Received: from dggpemm500006.china.huawei.com (7.185.36.236) by kwepemi500024.china.huawei.com (7.221.188.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 6 Dec 2023 19:45:21 +0800 Received: from dggpemm500006.china.huawei.com ([7.185.36.236]) by dggpemm500006.china.huawei.com ([7.185.36.236]) with mapi id 15.01.2507.035; Wed, 6 Dec 2023 19:45:21 +0800 From: "Gonglei (Arei)" To: "Michael S. Tsirkin" CC: Herbert Xu , "linux-crypto@vger.kernel.org" , Halil Pasic , Jason Wang , "virtualization@lists.linux-foundation.org" , "linux-kernel@vger.kernel.org" , wangyangxin Subject: RE: [PATCH] crypto: virtio-crypto: Handle dataq logic with tasklet Thread-Topic: [PATCH] crypto: virtio-crypto: Handle dataq logic with tasklet Thread-Index: Adobp2Ma20NfNCVRS52WT53esc9NTAIe2VGAAQWnuTA= Date: Wed, 6 Dec 2023 11:45:21 +0000 Message-ID: <790734f7c6144b3aa1ee16ed1cc02b2c@huawei.com> References: <20231201095024-mutt-send-email-mst@kernel.org> In-Reply-To: <20231201095024-mutt-send-email-mst@kernel.org> Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.174.149.11] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > -----Original Message----- > From: Michael S. Tsirkin [mailto:mst@redhat.com] > Sent: Friday, December 1, 2023 10:51 PM > To: Gonglei (Arei) > Cc: Herbert Xu ; linux-crypto@vger.kernel.org; > Halil Pasic ; Jason Wang ; > virtualization@lists.linux-foundation.org; linux-kernel@vger.kernel.org; > wangyangxin > Subject: Re: [PATCH] crypto: virtio-crypto: Handle dataq logic with tasklet > > On Mon, Nov 20, 2023 at 11:49:45AM +0000, Gonglei (Arei) wrote: > > 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: dbaf0624ffa57 ("crypto: add virtio-crypto driver") > > Reported-by: Halil Pasic > > Signed-off-by: wangyangxin > > Signed-off-by: Gonglei > > --- > > drivers/crypto/virtio/virtio_crypto_common.h | 2 ++ > > drivers/crypto/virtio/virtio_crypto_core.c | 23 +++++++++++++---------- > > 2 files changed, 15 insertions(+), 10 deletions(-) > > > > diff --git a/drivers/crypto/virtio/virtio_crypto_common.h > > b/drivers/crypto/virtio/virtio_crypto_common.h > > index 59a4c02..5c17c6e 100644 > > --- a/drivers/crypto/virtio/virtio_crypto_common.h > > +++ b/drivers/crypto/virtio/virtio_crypto_common.h > > @@ -10,6 +10,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -28,6 +29,7 @@ struct data_queue { > > char name[32]; > > > > struct crypto_engine *engine; > > + struct tasklet_struct done_task; > > }; > > > > struct virtio_crypto { > > diff --git a/drivers/crypto/virtio/virtio_crypto_core.c > > b/drivers/crypto/virtio/virtio_crypto_core.c > > index 1198bd3..e747f4f 100644 > > --- a/drivers/crypto/virtio/virtio_crypto_core.c > > +++ b/drivers/crypto/virtio/virtio_crypto_core.c > > @@ -72,27 +72,28 @@ int virtio_crypto_ctrl_vq_request(struct virtio_crypto > *vcrypto, struct scatterl > > return 0; > > } > > > > -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); > > } > > > > Don't we then need to wait for tasklet to complete on device remove? > > Yes, we should do it. V2 will be sent soon. Regards, -Gonglei > > static int virtcrypto_find_vqs(struct virtio_crypto *vi) @@ -150,6 > > +151,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); > > -- > > 1.8.3.1 > > > > >