From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ryder Lee Subject: Re: [PATCH v5 18/19] crypto: mediatek: move to generic async completion Date: Tue, 15 Aug 2017 13:13:58 +0800 Message-ID: <1502774038.962.2.camel@mtkswgap22> References: <1502724094-23305-1-git-send-email-gilad@benyossef.com> <1502724094-23305-19-git-send-email-gilad@benyossef.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1502724094-23305-19-git-send-email-gilad-6S/DczAoZh3WXxRugSxzZg@public.gmane.org> Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Gilad Ben-Yossef Cc: Herbert Xu , "David S. Miller" , Jonathan Corbet , David Howells , Tom Lendacky , Gary Hook , Boris Brezillon , Arnaud Ebalard , Matthias Brugger , Alasdair Kergon , Mike Snitzer , dm-devel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, Shaohua Li , Steve French , "Theodore Y. Ts'o" , Jaegeuk Kim , Mimi Zohar , Dmitry Kasatkin , James Morris , "Serge E. Hallyn" List-Id: dm-devel.ids On Mon, 2017-08-14 at 18:21 +0300, Gilad Ben-Yossef wrote: > The mediatek driver starts several async crypto ops and waits for their > completions. Move it over to generic code doing the same. > > Signed-off-by: Gilad Ben-Yossef > --- Acked-by: Ryder Lee > drivers/crypto/mediatek/mtk-aes.c | 31 +++++-------------------------- > 1 file changed, 5 insertions(+), 26 deletions(-) > > diff --git a/drivers/crypto/mediatek/mtk-aes.c b/drivers/crypto/mediatek/mtk-aes.c > index 9e845e8..e2c7c95 100644 > --- a/drivers/crypto/mediatek/mtk-aes.c > +++ b/drivers/crypto/mediatek/mtk-aes.c > @@ -137,11 +137,6 @@ struct mtk_aes_gcm_ctx { > struct crypto_skcipher *ctr; > }; > > -struct mtk_aes_gcm_setkey_result { > - int err; > - struct completion completion; > -}; > - > struct mtk_aes_drv { > struct list_head dev_list; > /* Device list lock */ > @@ -936,17 +931,6 @@ static int mtk_aes_gcm_crypt(struct aead_request *req, u64 mode) > &req->base); > } > > -static void mtk_gcm_setkey_done(struct crypto_async_request *req, int err) > -{ > - struct mtk_aes_gcm_setkey_result *result = req->data; > - > - if (err == -EINPROGRESS) > - return; > - > - result->err = err; > - complete(&result->completion); > -} > - > /* > * Because of the hardware limitation, we need to pre-calculate key(H) > * for the GHASH operation. The result of the encryption operation > @@ -962,7 +946,7 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key, > u32 hash[4]; > u8 iv[8]; > > - struct mtk_aes_gcm_setkey_result result; > + struct crypto_wait wait; > > struct scatterlist sg[1]; > struct skcipher_request req; > @@ -1002,22 +986,17 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key, > if (!data) > return -ENOMEM; > > - init_completion(&data->result.completion); > + crypto_init_wait(&data->wait); > sg_init_one(data->sg, &data->hash, AES_BLOCK_SIZE); > skcipher_request_set_tfm(&data->req, ctr); > skcipher_request_set_callback(&data->req, CRYPTO_TFM_REQ_MAY_SLEEP | > CRYPTO_TFM_REQ_MAY_BACKLOG, > - mtk_gcm_setkey_done, &data->result); > + crypto_req_done, &data->wait); > skcipher_request_set_crypt(&data->req, data->sg, data->sg, > AES_BLOCK_SIZE, data->iv); > > - err = crypto_skcipher_encrypt(&data->req); > - if (err == -EINPROGRESS || err == -EBUSY) { > - err = wait_for_completion_interruptible( > - &data->result.completion); > - if (!err) > - err = data->result.err; > - } > + err = crypto_wait_req(crypto_skcipher_encrypt(&data->req), > + &data->wait); > if (err) > goto out; > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ryder Lee Date: Tue, 15 Aug 2017 05:13:58 +0000 Subject: Re: [PATCH v5 18/19] crypto: mediatek: move to generic async completion Message-Id: <1502774038.962.2.camel@mtkswgap22> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit List-Id: References: <1502724094-23305-1-git-send-email-gilad@benyossef.com> <1502724094-23305-19-git-send-email-gilad@benyossef.com> In-Reply-To: <1502724094-23305-19-git-send-email-gilad-6S/DczAoZh3WXxRugSxzZg@public.gmane.org> To: Gilad Ben-Yossef Cc: Herbert Xu , "David S. Miller" , Jonathan Corbet , David Howells , Tom Lendacky , Gary Hook , Boris Brezillon , Arnaud Ebalard , Matthias Brugger , Alasdair Kergon , Mike Snitzer , dm-devel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, Shaohua Li , Steve French , "Theodore Y. Ts'o" , Jaegeuk Kim , Mimi Zohar , Dmitry Kasatkin , James Morris , "Serge E. Hallyn" On Mon, 2017-08-14 at 18:21 +0300, Gilad Ben-Yossef wrote: > The mediatek driver starts several async crypto ops and waits for their > completions. Move it over to generic code doing the same. > > Signed-off-by: Gilad Ben-Yossef > --- Acked-by: Ryder Lee > drivers/crypto/mediatek/mtk-aes.c | 31 +++++-------------------------- > 1 file changed, 5 insertions(+), 26 deletions(-) > > diff --git a/drivers/crypto/mediatek/mtk-aes.c b/drivers/crypto/mediatek/mtk-aes.c > index 9e845e8..e2c7c95 100644 > --- a/drivers/crypto/mediatek/mtk-aes.c > +++ b/drivers/crypto/mediatek/mtk-aes.c > @@ -137,11 +137,6 @@ struct mtk_aes_gcm_ctx { > struct crypto_skcipher *ctr; > }; > > -struct mtk_aes_gcm_setkey_result { > - int err; > - struct completion completion; > -}; > - > struct mtk_aes_drv { > struct list_head dev_list; > /* Device list lock */ > @@ -936,17 +931,6 @@ static int mtk_aes_gcm_crypt(struct aead_request *req, u64 mode) > &req->base); > } > > -static void mtk_gcm_setkey_done(struct crypto_async_request *req, int err) > -{ > - struct mtk_aes_gcm_setkey_result *result = req->data; > - > - if (err = -EINPROGRESS) > - return; > - > - result->err = err; > - complete(&result->completion); > -} > - > /* > * Because of the hardware limitation, we need to pre-calculate key(H) > * for the GHASH operation. The result of the encryption operation > @@ -962,7 +946,7 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key, > u32 hash[4]; > u8 iv[8]; > > - struct mtk_aes_gcm_setkey_result result; > + struct crypto_wait wait; > > struct scatterlist sg[1]; > struct skcipher_request req; > @@ -1002,22 +986,17 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key, > if (!data) > return -ENOMEM; > > - init_completion(&data->result.completion); > + crypto_init_wait(&data->wait); > sg_init_one(data->sg, &data->hash, AES_BLOCK_SIZE); > skcipher_request_set_tfm(&data->req, ctr); > skcipher_request_set_callback(&data->req, CRYPTO_TFM_REQ_MAY_SLEEP | > CRYPTO_TFM_REQ_MAY_BACKLOG, > - mtk_gcm_setkey_done, &data->result); > + crypto_req_done, &data->wait); > skcipher_request_set_crypt(&data->req, data->sg, data->sg, > AES_BLOCK_SIZE, data->iv); > > - err = crypto_skcipher_encrypt(&data->req); > - if (err = -EINPROGRESS || err = -EBUSY) { > - err = wait_for_completion_interruptible( > - &data->result.completion); > - if (!err) > - err = data->result.err; > - } > + err = crypto_wait_req(crypto_skcipher_encrypt(&data->req), > + &data->wait); > if (err) > goto out; > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ryder Lee Subject: Re: [PATCH v5 18/19] crypto: mediatek: move to generic async completion Date: Tue, 15 Aug 2017 13:13:58 +0800 Message-ID: <1502774038.962.2.camel@mtkswgap22> References: <1502724094-23305-1-git-send-email-gilad@benyossef.com> <1502724094-23305-19-git-send-email-gilad@benyossef.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: Herbert Xu , "David S. Miller" , Jonathan Corbet , David Howells , Tom Lendacky , Gary Hook , Boris Brezillon , Arnaud Ebalard , Matthias Brugger , Alasdair Kergon , Mike Snitzer , , Shaohua Li , Steve French , "Theodore Y. Ts'o" , "Jaegeuk Kim" , Mimi Zohar , "Dmitry Kasatkin" , James Morris , "Serge E. Hallyn" , To: Gilad Ben-Yossef Return-path: In-Reply-To: <1502724094-23305-19-git-send-email-gilad-6S/DczAoZh3WXxRugSxzZg@public.gmane.org> Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: On Mon, 2017-08-14 at 18:21 +0300, Gilad Ben-Yossef wrote: > The mediatek driver starts several async crypto ops and waits for their > completions. Move it over to generic code doing the same. > > Signed-off-by: Gilad Ben-Yossef > --- Acked-by: Ryder Lee > drivers/crypto/mediatek/mtk-aes.c | 31 +++++-------------------------- > 1 file changed, 5 insertions(+), 26 deletions(-) > > diff --git a/drivers/crypto/mediatek/mtk-aes.c b/drivers/crypto/mediatek/mtk-aes.c > index 9e845e8..e2c7c95 100644 > --- a/drivers/crypto/mediatek/mtk-aes.c > +++ b/drivers/crypto/mediatek/mtk-aes.c > @@ -137,11 +137,6 @@ struct mtk_aes_gcm_ctx { > struct crypto_skcipher *ctr; > }; > > -struct mtk_aes_gcm_setkey_result { > - int err; > - struct completion completion; > -}; > - > struct mtk_aes_drv { > struct list_head dev_list; > /* Device list lock */ > @@ -936,17 +931,6 @@ static int mtk_aes_gcm_crypt(struct aead_request *req, u64 mode) > &req->base); > } > > -static void mtk_gcm_setkey_done(struct crypto_async_request *req, int err) > -{ > - struct mtk_aes_gcm_setkey_result *result = req->data; > - > - if (err == -EINPROGRESS) > - return; > - > - result->err = err; > - complete(&result->completion); > -} > - > /* > * Because of the hardware limitation, we need to pre-calculate key(H) > * for the GHASH operation. The result of the encryption operation > @@ -962,7 +946,7 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key, > u32 hash[4]; > u8 iv[8]; > > - struct mtk_aes_gcm_setkey_result result; > + struct crypto_wait wait; > > struct scatterlist sg[1]; > struct skcipher_request req; > @@ -1002,22 +986,17 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key, > if (!data) > return -ENOMEM; > > - init_completion(&data->result.completion); > + crypto_init_wait(&data->wait); > sg_init_one(data->sg, &data->hash, AES_BLOCK_SIZE); > skcipher_request_set_tfm(&data->req, ctr); > skcipher_request_set_callback(&data->req, CRYPTO_TFM_REQ_MAY_SLEEP | > CRYPTO_TFM_REQ_MAY_BACKLOG, > - mtk_gcm_setkey_done, &data->result); > + crypto_req_done, &data->wait); > skcipher_request_set_crypt(&data->req, data->sg, data->sg, > AES_BLOCK_SIZE, data->iv); > > - err = crypto_skcipher_encrypt(&data->req); > - if (err == -EINPROGRESS || err == -EBUSY) { > - err = wait_for_completion_interruptible( > - &data->result.completion); > - if (!err) > - err = data->result.err; > - } > + err = crypto_wait_req(crypto_skcipher_encrypt(&data->req), > + &data->wait); > if (err) > goto out; > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mailgw02.mediatek.com ([210.61.82.184]:5867 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751509AbdHOFOJ (ORCPT ); Tue, 15 Aug 2017 01:14:09 -0400 Message-ID: <1502774038.962.2.camel@mtkswgap22> Subject: Re: [PATCH v5 18/19] crypto: mediatek: move to generic async completion From: Ryder Lee Date: Tue, 15 Aug 2017 13:13:58 +0800 In-Reply-To: <1502724094-23305-19-git-send-email-gilad@benyossef.com> References: <1502724094-23305-1-git-send-email-gilad@benyossef.com> <1502724094-23305-19-git-send-email-gilad@benyossef.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit MIME-Version: 1.0 Sender: linux-fscrypt-owner@vger.kernel.org To: Gilad Ben-Yossef Cc: Herbert Xu , "David S. Miller" , Jonathan Corbet , David Howells , Tom Lendacky , Gary Hook , Boris Brezillon , Arnaud Ebalard , Matthias Brugger , Alasdair Kergon , Mike Snitzer , dm-devel@redhat.com, Shaohua Li , Steve French , "Theodore Y. Ts'o" , Jaegeuk Kim , Mimi Zohar , Dmitry Kasatkin , James Morris , "Serge E. Hallyn" , linux-crypto@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, keyrings@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-raid@vger.kernel.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-fscrypt@vger.kernel.org, linux-ima-devel@lists.sourceforge.net, linux-ima-user@lists.sourceforge.net, linux-security-module@vger.kernel.org, Ofir Drang List-ID: On Mon, 2017-08-14 at 18:21 +0300, Gilad Ben-Yossef wrote: > The mediatek driver starts several async crypto ops and waits for their > completions. Move it over to generic code doing the same. > > Signed-off-by: Gilad Ben-Yossef > --- Acked-by: Ryder Lee > drivers/crypto/mediatek/mtk-aes.c | 31 +++++-------------------------- > 1 file changed, 5 insertions(+), 26 deletions(-) > > diff --git a/drivers/crypto/mediatek/mtk-aes.c b/drivers/crypto/mediatek/mtk-aes.c > index 9e845e8..e2c7c95 100644 > --- a/drivers/crypto/mediatek/mtk-aes.c > +++ b/drivers/crypto/mediatek/mtk-aes.c > @@ -137,11 +137,6 @@ struct mtk_aes_gcm_ctx { > struct crypto_skcipher *ctr; > }; > > -struct mtk_aes_gcm_setkey_result { > - int err; > - struct completion completion; > -}; > - > struct mtk_aes_drv { > struct list_head dev_list; > /* Device list lock */ > @@ -936,17 +931,6 @@ static int mtk_aes_gcm_crypt(struct aead_request *req, u64 mode) > &req->base); > } > > -static void mtk_gcm_setkey_done(struct crypto_async_request *req, int err) > -{ > - struct mtk_aes_gcm_setkey_result *result = req->data; > - > - if (err == -EINPROGRESS) > - return; > - > - result->err = err; > - complete(&result->completion); > -} > - > /* > * Because of the hardware limitation, we need to pre-calculate key(H) > * for the GHASH operation. The result of the encryption operation > @@ -962,7 +946,7 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key, > u32 hash[4]; > u8 iv[8]; > > - struct mtk_aes_gcm_setkey_result result; > + struct crypto_wait wait; > > struct scatterlist sg[1]; > struct skcipher_request req; > @@ -1002,22 +986,17 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key, > if (!data) > return -ENOMEM; > > - init_completion(&data->result.completion); > + crypto_init_wait(&data->wait); > sg_init_one(data->sg, &data->hash, AES_BLOCK_SIZE); > skcipher_request_set_tfm(&data->req, ctr); > skcipher_request_set_callback(&data->req, CRYPTO_TFM_REQ_MAY_SLEEP | > CRYPTO_TFM_REQ_MAY_BACKLOG, > - mtk_gcm_setkey_done, &data->result); > + crypto_req_done, &data->wait); > skcipher_request_set_crypt(&data->req, data->sg, data->sg, > AES_BLOCK_SIZE, data->iv); > > - err = crypto_skcipher_encrypt(&data->req); > - if (err == -EINPROGRESS || err == -EBUSY) { > - err = wait_for_completion_interruptible( > - &data->result.completion); > - if (!err) > - err = data->result.err; > - } > + err = crypto_wait_req(crypto_skcipher_encrypt(&data->req), > + &data->wait); > if (err) > goto out; > From mboxrd@z Thu Jan 1 00:00:00 1970 From: ryder.lee@mediatek.com (Ryder Lee) Date: Tue, 15 Aug 2017 13:13:58 +0800 Subject: [PATCH v5 18/19] crypto: mediatek: move to generic async completion In-Reply-To: <1502724094-23305-19-git-send-email-gilad@benyossef.com> References: <1502724094-23305-1-git-send-email-gilad@benyossef.com> <1502724094-23305-19-git-send-email-gilad@benyossef.com> Message-ID: <1502774038.962.2.camel@mtkswgap22> To: linux-security-module@vger.kernel.org List-Id: linux-security-module.vger.kernel.org On Mon, 2017-08-14 at 18:21 +0300, Gilad Ben-Yossef wrote: > The mediatek driver starts several async crypto ops and waits for their > completions. Move it over to generic code doing the same. > > Signed-off-by: Gilad Ben-Yossef > --- Acked-by: Ryder Lee > drivers/crypto/mediatek/mtk-aes.c | 31 +++++-------------------------- > 1 file changed, 5 insertions(+), 26 deletions(-) > > diff --git a/drivers/crypto/mediatek/mtk-aes.c b/drivers/crypto/mediatek/mtk-aes.c > index 9e845e8..e2c7c95 100644 > --- a/drivers/crypto/mediatek/mtk-aes.c > +++ b/drivers/crypto/mediatek/mtk-aes.c > @@ -137,11 +137,6 @@ struct mtk_aes_gcm_ctx { > struct crypto_skcipher *ctr; > }; > > -struct mtk_aes_gcm_setkey_result { > - int err; > - struct completion completion; > -}; > - > struct mtk_aes_drv { > struct list_head dev_list; > /* Device list lock */ > @@ -936,17 +931,6 @@ static int mtk_aes_gcm_crypt(struct aead_request *req, u64 mode) > &req->base); > } > > -static void mtk_gcm_setkey_done(struct crypto_async_request *req, int err) > -{ > - struct mtk_aes_gcm_setkey_result *result = req->data; > - > - if (err == -EINPROGRESS) > - return; > - > - result->err = err; > - complete(&result->completion); > -} > - > /* > * Because of the hardware limitation, we need to pre-calculate key(H) > * for the GHASH operation. The result of the encryption operation > @@ -962,7 +946,7 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key, > u32 hash[4]; > u8 iv[8]; > > - struct mtk_aes_gcm_setkey_result result; > + struct crypto_wait wait; > > struct scatterlist sg[1]; > struct skcipher_request req; > @@ -1002,22 +986,17 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key, > if (!data) > return -ENOMEM; > > - init_completion(&data->result.completion); > + crypto_init_wait(&data->wait); > sg_init_one(data->sg, &data->hash, AES_BLOCK_SIZE); > skcipher_request_set_tfm(&data->req, ctr); > skcipher_request_set_callback(&data->req, CRYPTO_TFM_REQ_MAY_SLEEP | > CRYPTO_TFM_REQ_MAY_BACKLOG, > - mtk_gcm_setkey_done, &data->result); > + crypto_req_done, &data->wait); > skcipher_request_set_crypt(&data->req, data->sg, data->sg, > AES_BLOCK_SIZE, data->iv); > > - err = crypto_skcipher_encrypt(&data->req); > - if (err == -EINPROGRESS || err == -EBUSY) { > - err = wait_for_completion_interruptible( > - &data->result.completion); > - if (!err) > - err = data->result.err; > - } > + err = crypto_wait_req(crypto_skcipher_encrypt(&data->req), > + &data->wait); > if (err) > goto out; > -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: ryder.lee@mediatek.com (Ryder Lee) Date: Tue, 15 Aug 2017 13:13:58 +0800 Subject: [PATCH v5 18/19] crypto: mediatek: move to generic async completion In-Reply-To: <1502724094-23305-19-git-send-email-gilad@benyossef.com> References: <1502724094-23305-1-git-send-email-gilad@benyossef.com> <1502724094-23305-19-git-send-email-gilad@benyossef.com> Message-ID: <1502774038.962.2.camel@mtkswgap22> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, 2017-08-14 at 18:21 +0300, Gilad Ben-Yossef wrote: > The mediatek driver starts several async crypto ops and waits for their > completions. Move it over to generic code doing the same. > > Signed-off-by: Gilad Ben-Yossef > --- Acked-by: Ryder Lee > drivers/crypto/mediatek/mtk-aes.c | 31 +++++-------------------------- > 1 file changed, 5 insertions(+), 26 deletions(-) > > diff --git a/drivers/crypto/mediatek/mtk-aes.c b/drivers/crypto/mediatek/mtk-aes.c > index 9e845e8..e2c7c95 100644 > --- a/drivers/crypto/mediatek/mtk-aes.c > +++ b/drivers/crypto/mediatek/mtk-aes.c > @@ -137,11 +137,6 @@ struct mtk_aes_gcm_ctx { > struct crypto_skcipher *ctr; > }; > > -struct mtk_aes_gcm_setkey_result { > - int err; > - struct completion completion; > -}; > - > struct mtk_aes_drv { > struct list_head dev_list; > /* Device list lock */ > @@ -936,17 +931,6 @@ static int mtk_aes_gcm_crypt(struct aead_request *req, u64 mode) > &req->base); > } > > -static void mtk_gcm_setkey_done(struct crypto_async_request *req, int err) > -{ > - struct mtk_aes_gcm_setkey_result *result = req->data; > - > - if (err == -EINPROGRESS) > - return; > - > - result->err = err; > - complete(&result->completion); > -} > - > /* > * Because of the hardware limitation, we need to pre-calculate key(H) > * for the GHASH operation. The result of the encryption operation > @@ -962,7 +946,7 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key, > u32 hash[4]; > u8 iv[8]; > > - struct mtk_aes_gcm_setkey_result result; > + struct crypto_wait wait; > > struct scatterlist sg[1]; > struct skcipher_request req; > @@ -1002,22 +986,17 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key, > if (!data) > return -ENOMEM; > > - init_completion(&data->result.completion); > + crypto_init_wait(&data->wait); > sg_init_one(data->sg, &data->hash, AES_BLOCK_SIZE); > skcipher_request_set_tfm(&data->req, ctr); > skcipher_request_set_callback(&data->req, CRYPTO_TFM_REQ_MAY_SLEEP | > CRYPTO_TFM_REQ_MAY_BACKLOG, > - mtk_gcm_setkey_done, &data->result); > + crypto_req_done, &data->wait); > skcipher_request_set_crypt(&data->req, data->sg, data->sg, > AES_BLOCK_SIZE, data->iv); > > - err = crypto_skcipher_encrypt(&data->req); > - if (err == -EINPROGRESS || err == -EBUSY) { > - err = wait_for_completion_interruptible( > - &data->result.completion); > - if (!err) > - err = data->result.err; > - } > + err = crypto_wait_req(crypto_skcipher_encrypt(&data->req), > + &data->wait); > if (err) > goto out; > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751856AbdHOFON (ORCPT ); Tue, 15 Aug 2017 01:14:13 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:5867 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751509AbdHOFOJ (ORCPT ); Tue, 15 Aug 2017 01:14:09 -0400 Message-ID: <1502774038.962.2.camel@mtkswgap22> Subject: Re: [PATCH v5 18/19] crypto: mediatek: move to generic async completion From: Ryder Lee To: Gilad Ben-Yossef CC: Herbert Xu , "David S. Miller" , Jonathan Corbet , David Howells , Tom Lendacky , Gary Hook , Boris Brezillon , Arnaud Ebalard , Matthias Brugger , Alasdair Kergon , Mike Snitzer , , Shaohua Li , Steve French , "Theodore Y. Ts'o" , "Jaegeuk Kim" , Mimi Zohar , "Dmitry Kasatkin" , James Morris , "Serge E. Hallyn" , , , , , , , , , , , , , , Ofir Drang Date: Tue, 15 Aug 2017 13:13:58 +0800 In-Reply-To: <1502724094-23305-19-git-send-email-gilad@benyossef.com> References: <1502724094-23305-1-git-send-email-gilad@benyossef.com> <1502724094-23305-19-git-send-email-gilad@benyossef.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3-0ubuntu6 Content-Transfer-Encoding: 7bit MIME-Version: 1.0 X-MTK: N Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2017-08-14 at 18:21 +0300, Gilad Ben-Yossef wrote: > The mediatek driver starts several async crypto ops and waits for their > completions. Move it over to generic code doing the same. > > Signed-off-by: Gilad Ben-Yossef > --- Acked-by: Ryder Lee > drivers/crypto/mediatek/mtk-aes.c | 31 +++++-------------------------- > 1 file changed, 5 insertions(+), 26 deletions(-) > > diff --git a/drivers/crypto/mediatek/mtk-aes.c b/drivers/crypto/mediatek/mtk-aes.c > index 9e845e8..e2c7c95 100644 > --- a/drivers/crypto/mediatek/mtk-aes.c > +++ b/drivers/crypto/mediatek/mtk-aes.c > @@ -137,11 +137,6 @@ struct mtk_aes_gcm_ctx { > struct crypto_skcipher *ctr; > }; > > -struct mtk_aes_gcm_setkey_result { > - int err; > - struct completion completion; > -}; > - > struct mtk_aes_drv { > struct list_head dev_list; > /* Device list lock */ > @@ -936,17 +931,6 @@ static int mtk_aes_gcm_crypt(struct aead_request *req, u64 mode) > &req->base); > } > > -static void mtk_gcm_setkey_done(struct crypto_async_request *req, int err) > -{ > - struct mtk_aes_gcm_setkey_result *result = req->data; > - > - if (err == -EINPROGRESS) > - return; > - > - result->err = err; > - complete(&result->completion); > -} > - > /* > * Because of the hardware limitation, we need to pre-calculate key(H) > * for the GHASH operation. The result of the encryption operation > @@ -962,7 +946,7 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key, > u32 hash[4]; > u8 iv[8]; > > - struct mtk_aes_gcm_setkey_result result; > + struct crypto_wait wait; > > struct scatterlist sg[1]; > struct skcipher_request req; > @@ -1002,22 +986,17 @@ static int mtk_aes_gcm_setkey(struct crypto_aead *aead, const u8 *key, > if (!data) > return -ENOMEM; > > - init_completion(&data->result.completion); > + crypto_init_wait(&data->wait); > sg_init_one(data->sg, &data->hash, AES_BLOCK_SIZE); > skcipher_request_set_tfm(&data->req, ctr); > skcipher_request_set_callback(&data->req, CRYPTO_TFM_REQ_MAY_SLEEP | > CRYPTO_TFM_REQ_MAY_BACKLOG, > - mtk_gcm_setkey_done, &data->result); > + crypto_req_done, &data->wait); > skcipher_request_set_crypt(&data->req, data->sg, data->sg, > AES_BLOCK_SIZE, data->iv); > > - err = crypto_skcipher_encrypt(&data->req); > - if (err == -EINPROGRESS || err == -EBUSY) { > - err = wait_for_completion_interruptible( > - &data->result.completion); > - if (!err) > - err = data->result.err; > - } > + err = crypto_wait_req(crypto_skcipher_encrypt(&data->req), > + &data->wait); > if (err) > goto out; >