Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1726688
| From | Gilad Ben-Yossef <gilad@benyossef.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v8 18/20] crypto: qce: move to generic async completion |
| Date | 2017-09-05 14:50 +0200 |
| Message-ID | <umlsL-2FV-41@gated-at.bofh.it> (permalink) |
| References | <umlj3-2Cy-9@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
The qce 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 <gilad@benyossef.com>
---
drivers/crypto/qce/sha.c | 30 ++++--------------------------
1 file changed, 4 insertions(+), 26 deletions(-)
diff --git a/drivers/crypto/qce/sha.c b/drivers/crypto/qce/sha.c
index 47e114a..53227d7 100644
--- a/drivers/crypto/qce/sha.c
+++ b/drivers/crypto/qce/sha.c
@@ -349,28 +349,12 @@ static int qce_ahash_digest(struct ahash_request *req)
return qce->async_req_enqueue(tmpl->qce, &req->base);
}
-struct qce_ahash_result {
- struct completion completion;
- int error;
-};
-
-static void qce_digest_complete(struct crypto_async_request *req, int error)
-{
- struct qce_ahash_result *result = req->data;
-
- if (error == -EINPROGRESS)
- return;
-
- result->error = error;
- complete(&result->completion);
-}
-
static int qce_ahash_hmac_setkey(struct crypto_ahash *tfm, const u8 *key,
unsigned int keylen)
{
unsigned int digestsize = crypto_ahash_digestsize(tfm);
struct qce_sha_ctx *ctx = crypto_tfm_ctx(&tfm->base);
- struct qce_ahash_result result;
+ struct crypto_wait wait;
struct ahash_request *req;
struct scatterlist sg;
unsigned int blocksize;
@@ -405,9 +389,9 @@ static int qce_ahash_hmac_setkey(struct crypto_ahash *tfm, const u8 *key,
goto err_free_ahash;
}
- init_completion(&result.completion);
+ crypto_init_wait(&wait);
ahash_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
- qce_digest_complete, &result);
+ crypto_req_done, &wait);
crypto_ahash_clear_flags(ahash_tfm, ~0);
buf = kzalloc(keylen + QCE_MAX_ALIGN_SIZE, GFP_KERNEL);
@@ -420,13 +404,7 @@ static int qce_ahash_hmac_setkey(struct crypto_ahash *tfm, const u8 *key,
sg_init_one(&sg, buf, keylen);
ahash_request_set_crypt(req, &sg, ctx->authkey, keylen);
- ret = crypto_ahash_digest(req);
- if (ret == -EINPROGRESS || ret == -EBUSY) {
- ret = wait_for_completion_interruptible(&result.completion);
- if (!ret)
- ret = result.error;
- }
-
+ ret = crypto_wait_req(crypto_ahash_digest(req), &wait);
if (ret)
crypto_ahash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
--
2.1.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v8 00/20] simplify crypto wait for async op Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:40 +0200 [PATCH v8 09/20] crypto: move drbg to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200 [PATCH v8 03/20] net: use -EAGAIN for transient busy indication Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200 [PATCH v8 04/20] crypto: remove redundant backlog checks on EBUSY Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200 [PATCH v8 14/20] cifs: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200 [PATCH v8 12/20] fscrypt: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200 [PATCH v8 20/20] crypto: adapt api sample to use async. op wait Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200 [PATCH v8 02/20] crypto: ccp: use -EAGAIN for transient busy indication Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200 [PATCH v8 05/20] crypto: marvell/cesa: remove redundant backlog checks on EBUSY Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200 [PATCH v8 08/20] crypto: move pub key to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200 [PATCH v8 10/20] crypto: move gcm to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200 [PATCH v8 07/20] crypto: move algif to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200 [PATCH v8 19/20] crypto: mediatek: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200 [PATCH v8 17/20] crypto: talitos: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200 [PATCH v8 06/20] crypto: introduce crypto wait for async op Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200 [PATCH v8 13/20] dm: move dm-verity to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200 [PATCH v8 18/20] crypto: qce: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200 [PATCH v8 16/20] crypto: tcrypt: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200 [PATCH v8 15/20] ima: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200 [PATCH v8 11/20] crypto: move testmgr to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200
csiph-web