Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1719312
| From | Gilad Ben-Yossef <gilad@benyossef.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v7 09/19] crypto: move gcm to generic async completion |
| Date | 2017-08-24 16:30 +0200 |
| Message-ID | <ui1iZ-7Ir-65@gated-at.bofh.it> (permalink) |
| References | <ui19g-7EU-7@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
gcm is starting an async. crypto op and waiting for it complete.
Move it over to generic code doing the same.
Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
---
crypto/gcm.c | 32 ++++++--------------------------
1 file changed, 6 insertions(+), 26 deletions(-)
diff --git a/crypto/gcm.c b/crypto/gcm.c
index 3841b5e..fb923a5 100644
--- a/crypto/gcm.c
+++ b/crypto/gcm.c
@@ -16,7 +16,6 @@
#include <crypto/scatterwalk.h>
#include <crypto/hash.h>
#include "internal.h"
-#include <linux/completion.h>
#include <linux/err.h>
#include <linux/init.h>
#include <linux/kernel.h>
@@ -78,11 +77,6 @@ struct crypto_gcm_req_priv_ctx {
} u;
};
-struct crypto_gcm_setkey_result {
- int err;
- struct completion completion;
-};
-
static struct {
u8 buf[16];
struct scatterlist sg;
@@ -98,17 +92,6 @@ static inline struct crypto_gcm_req_priv_ctx *crypto_gcm_reqctx(
return (void *)PTR_ALIGN((u8 *)aead_request_ctx(req), align + 1);
}
-static void crypto_gcm_setkey_done(struct crypto_async_request *req, int err)
-{
- struct crypto_gcm_setkey_result *result = req->data;
-
- if (err == -EINPROGRESS)
- return;
-
- result->err = err;
- complete(&result->completion);
-}
-
static int crypto_gcm_setkey(struct crypto_aead *aead, const u8 *key,
unsigned int keylen)
{
@@ -119,7 +102,7 @@ static int crypto_gcm_setkey(struct crypto_aead *aead, const u8 *key,
be128 hash;
u8 iv[16];
- struct crypto_gcm_setkey_result result;
+ struct crypto_wait wait;
struct scatterlist sg[1];
struct skcipher_request req;
@@ -140,21 +123,18 @@ static int crypto_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, sizeof(data->hash));
skcipher_request_set_tfm(&data->req, ctr);
skcipher_request_set_callback(&data->req, CRYPTO_TFM_REQ_MAY_SLEEP |
CRYPTO_TFM_REQ_MAY_BACKLOG,
- crypto_gcm_setkey_done,
- &data->result);
+ crypto_req_done,
+ &data->wait);
skcipher_request_set_crypt(&data->req, data->sg, data->sg,
sizeof(data->hash), data->iv);
- err = crypto_skcipher_encrypt(&data->req);
- if (err == -EINPROGRESS || err == -EBUSY) {
- wait_for_completion(&data->result.completion);
- err = data->result.err;
- }
+ err = crypto_wait_req(crypto_skcipher_encrypt(&data->req),
+ &data->wait);
if (err)
goto out;
--
2.1.4
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
[PATCH v7 00/19] simplify crypto wait for async op Gilad Ben-Yossef <gilad@benyossef.com> - 2017-08-24 16:20 +0200 [PATCH v7 02/19] crypto: ccp: use -EAGAIN for transient busy indication Gilad Ben-Yossef <gilad@benyossef.com> - 2017-08-24 16:20 +0200 [PATCH v7 17/19] crypto: qce: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-08-24 16:30 +0200 [PATCH v7 16/19] crypto: talitos: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-08-24 16:30 +0200 [PATCH v7 12/19] dm: move dm-verity to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-08-24 16:30 +0200 [PATCH v7 18/19] crypto: mediatek: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-08-24 16:30 +0200 [PATCH v7 15/19] crypto: tcrypt: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-08-24 16:30 +0200 [PATCH v7 19/19] crypto: adapt api sample to use async. op wait Gilad Ben-Yossef <gilad@benyossef.com> - 2017-08-24 16:30 +0200 [PATCH v7 07/19] crypto: move pub key to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-08-24 16:30 +0200 [PATCH v7 11/19] fscrypt: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-08-24 16:30 +0200 [PATCH v7 04/19] crypto: marvell/cesa: remove redundant backlog checks on EBUSY Gilad Ben-Yossef <gilad@benyossef.com> - 2017-08-24 16:30 +0200 [PATCH v7 05/19] crypto: introduce crypto wait for async op Gilad Ben-Yossef <gilad@benyossef.com> - 2017-08-24 16:30 +0200 [PATCH v7 13/19] cifs: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-08-24 16:30 +0200 [PATCH v7 10/19] crypto: move testmgr to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-08-24 16:30 +0200 [PATCH v7 03/19] crypto: remove redundant backlog checks on EBUSY Gilad Ben-Yossef <gilad@benyossef.com> - 2017-08-24 16:30 +0200 [PATCH v7 14/19] ima: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-08-24 16:30 +0200 [PATCH v7 06/19] crypto: move algif to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-08-24 16:30 +0200 [PATCH v7 08/19] crypto: move drbg to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-08-24 16:30 +0200 [PATCH v7 09/19] crypto: move gcm to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-08-24 16:30 +0200
csiph-web