Skip to content

Commit 04a4616

Browse files
Tero Kristoherbertx
Tero Kristo
authored and
herbertx
committed
crypto: omap-aes-gcm - convert to use crypto engine
Currently omap-aes-gcm algorithms are using local implementation for crypto request queuing logic. Instead, implement this via usage of crypto engine which is used already for rest of the omap aes algorithms. This avoids some random conflicts / crashes also which can happen if both aes and aes-gcm are attempted to be used simultaneously. Signed-off-by: Tero Kristo <t-kristo@ti.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
1 parent 1cfd9f3 commit 04a4616

File tree

3 files changed

+55
-68
lines changed

3 files changed

+55
-68
lines changed

‎drivers/crypto/omap-aes-gcm.c

Lines changed: 54 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <linux/dmaengine.h>
1414
#include <linux/omap-dma.h>
1515
#include <linux/interrupt.h>
16+
#include <linux/pm_runtime.h>
1617
#include <crypto/aes.h>
1718
#include <crypto/gcm.h>
1819
#include <crypto/scatterwalk.h>
@@ -29,11 +30,13 @@ static void omap_aes_gcm_finish_req(struct omap_aes_dev *dd, int ret)
2930
{
3031
struct aead_request *req = dd->aead_req;
3132

32-
dd->flags &= ~FLAGS_BUSY;
3333
dd->in_sg = NULL;
3434
dd->out_sg = NULL;
3535

36-
req->base.complete(&req->base, ret);
36+
crypto_finalize_aead_request(dd->engine, req, ret);
37+
38+
pm_runtime_mark_last_busy(dd->dev);
39+
pm_runtime_put_autosuspend(dd->dev);
3740
}
3841

3942
static void omap_aes_gcm_done_task(struct omap_aes_dev *dd)
@@ -81,7 +84,6 @@ static void omap_aes_gcm_done_task(struct omap_aes_dev *dd)
8184
}
8285

8386
omap_aes_gcm_finish_req(dd, ret);
84-
omap_aes_gcm_handle_queue(dd, NULL);
8587
}
8688

8789
static int omap_aes_gcm_copy_buffers(struct omap_aes_dev *dd,
@@ -127,6 +129,9 @@ static int omap_aes_gcm_copy_buffers(struct omap_aes_dev *dd,
127129
if (cryptlen) {
128130
tmp = scatterwalk_ffwd(sg_arr, req->src, req->assoclen);
129131

132+
if (nsg)
133+
sg_unmark_end(dd->in_sgl);
134+
130135
ret = omap_crypto_align_sg(&tmp, cryptlen,
131136
AES_BLOCK_SIZE, &dd->in_sgl[nsg],
132137
OMAP_CRYPTO_COPY_DATA |
@@ -146,7 +151,7 @@ static int omap_aes_gcm_copy_buffers(struct omap_aes_dev *dd,
146151
dd->out_sg = req->dst;
147152
dd->orig_out = req->dst;
148153

149-
dd->out_sg = scatterwalk_ffwd(sg_arr, req->dst, assoclen);
154+
dd->out_sg = scatterwalk_ffwd(sg_arr, req->dst, req->assoclen);
150155

151156
flags = 0;
152157
if (req->src == req->dst || dd->out_sg == sg_arr)
@@ -202,37 +207,21 @@ void omap_aes_gcm_dma_out_callback(void *data)
202207
static int omap_aes_gcm_handle_queue(struct omap_aes_dev *dd,
203208
struct aead_request *req)
204209
{
205-
struct omap_aes_gcm_ctx *ctx;
206-
struct aead_request *backlog;
207-
struct omap_aes_reqctx *rctx;
208-
unsigned long flags;
209-
int err, ret = 0;
210-
211-
spin_lock_irqsave(&dd->lock, flags);
212-
if (req)
213-
ret = aead_enqueue_request(&dd->aead_queue, req);
214-
if (dd->flags & FLAGS_BUSY) {
215-
spin_unlock_irqrestore(&dd->lock, flags);
216-
return ret;
217-
}
218-
219-
backlog = aead_get_backlog(&dd->aead_queue);
220-
req = aead_dequeue_request(&dd->aead_queue);
221210
if (req)
222-
dd->flags |= FLAGS_BUSY;
223-
spin_unlock_irqrestore(&dd->lock, flags);
224-
225-
if (!req)
226-
return ret;
211+
return crypto_transfer_aead_request_to_engine(dd->engine, req);
227212

228-
if (backlog)
229-
backlog->base.complete(&backlog->base, -EINPROGRESS);
213+
return 0;
214+
}
230215

231-
ctx = crypto_aead_ctx(crypto_aead_reqtfm(req));
232-
rctx = aead_request_ctx(req);
216+
static int omap_aes_gcm_prepare_req(struct crypto_engine *engine, void *areq)
217+
{
218+
struct aead_request *req = container_of(areq, struct aead_request,
219+
base);
220+
struct omap_aes_reqctx *rctx = aead_request_ctx(req);
221+
struct omap_aes_dev *dd = rctx->dd;
222+
struct omap_aes_gcm_ctx *ctx = crypto_aead_ctx(crypto_aead_reqtfm(req));
223+
int err;
233224

234-
dd->ctx = &ctx->octx;
235-
rctx->dd = dd;
236225
dd->aead_req = req;
237226

238227
rctx->mode &= FLAGS_MODE_MASK;
@@ -242,20 +231,9 @@ static int omap_aes_gcm_handle_queue(struct omap_aes_dev *dd,
242231
if (err)
243232
return err;
244233

245-
err = omap_aes_write_ctrl(dd);
246-
if (!err) {
247-
if (dd->in_sg_len)
248-
err = omap_aes_crypt_dma_start(dd);
249-
else
250-
omap_aes_gcm_dma_out_callback(dd);
251-
}
252-
253-
if (err) {
254-
omap_aes_gcm_finish_req(dd, err);
255-
omap_aes_gcm_handle_queue(dd, NULL);
256-
}
234+
dd->ctx = &ctx->octx;
257235

258-
return ret;
236+
return omap_aes_write_ctrl(dd);
259237
}
260238

261239
static int omap_aes_gcm_crypt(struct aead_request *req, unsigned long mode)
@@ -378,3 +356,35 @@ int omap_aes_4106gcm_setauthsize(struct crypto_aead *parent,
378356
{
379357
return crypto_rfc4106_check_authsize(authsize);
380358
}
359+
360+
static int omap_aes_gcm_crypt_req(struct crypto_engine *engine, void *areq)
361+
{
362+
struct aead_request *req = container_of(areq, struct aead_request,
363+
base);
364+
struct omap_aes_reqctx *rctx = aead_request_ctx(req);
365+
struct omap_aes_dev *dd = rctx->dd;
366+
int ret = 0;
367+
368+
if (!dd)
369+
return -ENODEV;
370+
371+
if (dd->in_sg_len)
372+
ret = omap_aes_crypt_dma_start(dd);
373+
else
374+
omap_aes_gcm_dma_out_callback(dd);
375+
376+
return ret;
377+
}
378+
379+
int omap_aes_gcm_cra_init(struct crypto_aead *tfm)
380+
{
381+
struct omap_aes_ctx *ctx = crypto_aead_ctx(tfm);
382+
383+
ctx->enginectx.op.prepare_request = omap_aes_gcm_prepare_req;
384+
ctx->enginectx.op.unprepare_request = NULL;
385+
ctx->enginectx.op.do_one_request = omap_aes_gcm_crypt_req;
386+
387+
crypto_aead_set_reqsize(tfm, sizeof(struct omap_aes_reqctx));
388+
389+
return 0;
390+
}

‎drivers/crypto/omap-aes.c

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -657,29 +657,6 @@ static int omap_aes_init_tfm(struct crypto_skcipher *tfm)
657657
return 0;
658658
}
659659

660-
static int omap_aes_gcm_cra_init(struct crypto_aead *tfm)
661-
{
662-
struct omap_aes_dev *dd = NULL;
663-
int err;
664-
665-
/* Find AES device, currently picks the first device */
666-
spin_lock_bh(&list_lock);
667-
list_for_each_entry(dd, &dev_list, list) {
668-
break;
669-
}
670-
spin_unlock_bh(&list_lock);
671-
672-
err = pm_runtime_get_sync(dd->dev);
673-
if (err < 0) {
674-
dev_err(dd->dev, "%s: failed to get_sync(%d)\n",
675-
__func__, err);
676-
return err;
677-
}
678-
679-
tfm->reqsize = sizeof(struct omap_aes_reqctx);
680-
return 0;
681-
}
682-
683660
static void omap_aes_exit_tfm(struct crypto_skcipher *tfm)
684661
{
685662
struct omap_aes_ctx *ctx = crypto_skcipher_ctx(tfm);

‎drivers/crypto/omap-aes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080

8181
#define FLAGS_INIT BIT(5)
8282
#define FLAGS_FAST BIT(6)
83-
#define FLAGS_BUSY BIT(7)
8483

8584
#define FLAGS_IN_DATA_ST_SHIFT 8
8685
#define FLAGS_OUT_DATA_ST_SHIFT 10
@@ -212,6 +211,7 @@ int omap_aes_4106gcm_encrypt(struct aead_request *req);
212211
int omap_aes_4106gcm_decrypt(struct aead_request *req);
213212
int omap_aes_4106gcm_setauthsize(struct crypto_aead *parent,
214213
unsigned int authsize);
214+
int omap_aes_gcm_cra_init(struct crypto_aead *tfm);
215215
int omap_aes_write_ctrl(struct omap_aes_dev *dd);
216216
int omap_aes_crypt_dma_start(struct omap_aes_dev *dd);
217217
int omap_aes_crypt_dma_stop(struct omap_aes_dev *dd);

0 commit comments

Comments
 (0)