From: Herbert Xu <herbert@gondor.apana.org.au>
To: Linux Crypto Mailing List <linux-crypto@vger.kernel.org>
Subject: [PATCH 20/30] crypto: omap - Stop using crypto scatterwalk_bytes_sglen
Date: Tue, 12 Jul 2016 13:17:52 +0800 [thread overview]
Message-ID: <E1bMq4u-0007TG-Rm@gondolin.me.apana.org.au> (raw)
In-Reply-To: 20160712051554.GA28324@gondor.apana.org.au
We already have a generic function sg_nents_for_len which does
the same thing. This patch switches omap over to it and also
adds error handling in case the SG list is short.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
drivers/crypto/omap-aes.c | 16 ++++++++++------
drivers/crypto/omap-des.c | 14 ++++++++++----
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
index 8178632..4ab53a6 100644
--- a/drivers/crypto/omap-aes.c
+++ b/drivers/crypto/omap-aes.c
@@ -578,10 +578,12 @@ static int omap_aes_copy_sgs(struct omap_aes_dev *dd)
sg_init_table(&dd->in_sgl, 1);
sg_set_buf(&dd->in_sgl, buf_in, total);
dd->in_sg = &dd->in_sgl;
+ dd->in_sg_len = 1;
sg_init_table(&dd->out_sgl, 1);
sg_set_buf(&dd->out_sgl, buf_out, total);
dd->out_sg = &dd->out_sgl;
+ dd->out_sg_len = 1;
return 0;
}
@@ -602,7 +604,6 @@ static int omap_aes_prepare_req(struct crypto_engine *engine,
crypto_ablkcipher_reqtfm(req));
struct omap_aes_dev *dd = omap_aes_find_dev(ctx);
struct omap_aes_reqctx *rctx;
- int len;
if (!dd)
return -ENODEV;
@@ -614,6 +615,14 @@ static int omap_aes_prepare_req(struct crypto_engine *engine,
dd->in_sg = req->src;
dd->out_sg = req->dst;
+ dd->in_sg_len = sg_nents_for_len(dd->in_sg, dd->total);
+ if (dd->in_sg_len < 0)
+ return dd->in_sg_len;
+
+ dd->out_sg_len = sg_nents_for_len(dd->out_sg, dd->total);
+ if (dd->out_sg_len < 0)
+ return dd->out_sg_len;
+
if (omap_aes_check_aligned(dd->in_sg, dd->total) ||
omap_aes_check_aligned(dd->out_sg, dd->total)) {
if (omap_aes_copy_sgs(dd))
@@ -623,11 +632,6 @@ static int omap_aes_prepare_req(struct crypto_engine *engine,
dd->sgs_copied = 0;
}
- len = ALIGN(dd->total, AES_BLOCK_SIZE);
- dd->in_sg_len = scatterwalk_bytes_sglen(dd->in_sg, len);
- dd->out_sg_len = scatterwalk_bytes_sglen(dd->out_sg, len);
- BUG_ON(dd->in_sg_len < 0 || dd->out_sg_len < 0);
-
rctx = ablkcipher_request_ctx(req);
ctx = crypto_ablkcipher_ctx(crypto_ablkcipher_reqtfm(req));
rctx->mode &= FLAGS_MODE_MASK;
diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
index 3eedb03..5691434 100644
--- a/drivers/crypto/omap-des.c
+++ b/drivers/crypto/omap-des.c
@@ -560,10 +560,12 @@ static int omap_des_copy_sgs(struct omap_des_dev *dd)
sg_init_table(&dd->in_sgl, 1);
sg_set_buf(&dd->in_sgl, buf_in, dd->total);
dd->in_sg = &dd->in_sgl;
+ dd->in_sg_len = 1;
sg_init_table(&dd->out_sgl, 1);
sg_set_buf(&dd->out_sgl, buf_out, dd->total);
dd->out_sg = &dd->out_sgl;
+ dd->out_sg_len = 1;
return 0;
}
@@ -595,6 +597,14 @@ static int omap_des_prepare_req(struct crypto_engine *engine,
dd->in_sg = req->src;
dd->out_sg = req->dst;
+ dd->in_sg_len = sg_nents_for_len(dd->in_sg, dd->total);
+ if (dd->in_sg_len < 0)
+ return dd->in_sg_len;
+
+ dd->out_sg_len = sg_nents_for_len(dd->out_sg, dd->total);
+ if (dd->out_sg_len < 0)
+ return dd->out_sg_len;
+
if (omap_des_copy_needed(dd->in_sg) ||
omap_des_copy_needed(dd->out_sg)) {
if (omap_des_copy_sgs(dd))
@@ -604,10 +614,6 @@ static int omap_des_prepare_req(struct crypto_engine *engine,
dd->sgs_copied = 0;
}
- dd->in_sg_len = scatterwalk_bytes_sglen(dd->in_sg, dd->total);
- dd->out_sg_len = scatterwalk_bytes_sglen(dd->out_sg, dd->total);
- BUG_ON(dd->in_sg_len < 0 || dd->out_sg_len < 0);
-
rctx = ablkcipher_request_ctx(req);
ctx = crypto_ablkcipher_ctx(crypto_ablkcipher_reqtfm(req));
rctx->mode &= FLAGS_MODE_MASK;
next prev parent reply other threads:[~2016-07-12 5:17 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-12 5:15 [PATCH 0/30] crypto: skcipher - skcipher algorithm conversion part 2 Herbert Xu
2016-07-12 5:17 ` [PATCH 1/30] crypto: skcipher - Add low-level skcipher interface Herbert Xu
2016-07-12 5:17 ` [PATCH 2/30] crypto: null - Add new default null skcipher Herbert Xu
2016-07-12 5:17 ` [PATCH 3/30] crypto: aead - Add chunk size Herbert Xu
2016-07-12 5:17 ` [PATCH 4/30] crypto: authenc - Use skcipher Herbert Xu
2016-07-12 5:17 ` [PATCH 5/30] crypto: authencesn " Herbert Xu
2016-07-12 5:17 ` [PATCH 6/30] crypto: ctr - Use skcipher in rfc3686 Herbert Xu
2016-07-12 5:17 ` [PATCH 7/30] crypto: ccm - Use skcipher Herbert Xu
2016-07-12 5:17 ` [PATCH 8/30] crypto: gcm " Herbert Xu
2016-07-12 5:17 ` [PATCH 9/30] crypto: chacha20poly1305 " Herbert Xu
2016-07-12 5:17 ` [PATCH 10/30] crypto: cryptd - Add support for skcipher Herbert Xu
2016-07-12 5:17 ` [PATCH 11/30] crypto: aead - Add skcipher null for IV generators Herbert Xu
2016-07-12 5:17 ` [PATCH 12/30] crypto: echainiv - Use skcipher Herbert Xu
2016-07-12 5:17 ` [PATCH 13/30] crypto: seqiv " Herbert Xu
2016-07-12 5:17 ` [PATCH 14/30] crypto: aead - Remove blkcipher null for IV generators Herbert Xu
2016-07-12 5:17 ` [PATCH 15/30] crypto: null - Remove default null blkcipher Herbert Xu
2016-07-12 5:17 ` [PATCH 16/30] crypto: cts - Convert to skcipher Herbert Xu
2016-07-12 5:17 ` [PATCH 17/30] crypto: user - Remove crypto_lookup_skcipher call Herbert Xu
2016-07-12 5:17 ` [PATCH 18/30] crypto: skcipher - Remove top-level givcipher interface Herbert Xu
2016-07-12 5:17 ` [PATCH 19/30] crypto: simd - Add simd skcipher helper Herbert Xu
2016-07-12 5:17 ` Herbert Xu [this message]
2016-07-12 5:17 ` [PATCH 21/30] crypto: scatterwalk - Remove scatterwalk_bytes_sglen Herbert Xu
2016-07-12 5:17 ` [PATCH 22/30] crypto: scatterwalk - Add no-copy support to copychunks Herbert Xu
2016-07-12 5:17 ` [PATCH 23/30] crypto: api - Optimise away crypto_yield when hard preemption is on Herbert Xu
2016-07-12 5:17 ` [PATCH 24/30] crypto: scatterwalk - Fix test in scatterwalk_done Herbert Xu
2016-07-12 5:17 ` [PATCH 25/30] crypto: scatterwalk - Remove unnecessary advance in scatterwalk_pagedone Herbert Xu
2016-07-12 5:17 ` [PATCH 26/30] crypto: scatterwalk - Remove unnecessary BUG in scatterwalk_start Herbert Xu
2016-07-12 5:18 ` [PATCH 27/30] crypto: scatterwalk - Inline start/map/done Herbert Xu
2016-07-12 5:18 ` [PATCH 28/30] crypto: skcipher - Add skcipher walk interface Herbert Xu
2016-07-12 5:18 ` [PATCH 29/30] crypto: aes-ce-ccm - Use " Herbert Xu
2016-07-12 5:18 ` [PATCH 30/30] crypto: lrw - Convert to skcipher Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1bMq4u-0007TG-Rm@gondolin.me.apana.org.au \
--to=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox