This patch adds proper support for the new bulk requests to the SIMD helpers.

Signed-off-by: Ondrej Mosnacek <omosna...@gmail.com>
---
 crypto/simd.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/crypto/simd.c b/crypto/simd.c
index 8820337..2ae5930 100644
--- a/crypto/simd.c
+++ b/crypto/simd.c
@@ -100,6 +100,64 @@ static int simd_skcipher_decrypt(struct skcipher_request 
*req)
        return crypto_skcipher_decrypt(subreq);
 }
 
+static int simd_skcipher_encrypt_bulk(struct skcipher_bulk_request *req)
+{
+       struct crypto_skcipher *tfm = crypto_skcipher_bulk_reqtfm(req);
+       struct simd_skcipher_ctx *ctx = crypto_skcipher_ctx(tfm);
+       struct skcipher_bulk_request *subreq;
+       struct crypto_skcipher *child;
+
+       subreq = skcipher_bulk_request_ctx(req);
+       *subreq = *req;
+
+       if (!may_use_simd() ||
+           (in_atomic() && cryptd_skcipher_queued(ctx->cryptd_tfm)))
+               child = &ctx->cryptd_tfm->base;
+       else
+               child = cryptd_skcipher_child(ctx->cryptd_tfm);
+
+       skcipher_bulk_request_set_tfm(subreq, child);
+
+       return crypto_skcipher_encrypt_bulk(subreq);
+}
+
+static int simd_skcipher_decrypt_bulk(struct skcipher_bulk_request *req)
+{
+       struct crypto_skcipher *tfm = crypto_skcipher_bulk_reqtfm(req);
+       struct simd_skcipher_ctx *ctx = crypto_skcipher_ctx(tfm);
+       struct skcipher_bulk_request *subreq;
+       struct crypto_skcipher *child;
+
+       subreq = skcipher_bulk_request_ctx(req);
+       *subreq = *req;
+
+       if (!may_use_simd() ||
+           (in_atomic() && cryptd_skcipher_queued(ctx->cryptd_tfm)))
+               child = &ctx->cryptd_tfm->base;
+       else
+               child = cryptd_skcipher_child(ctx->cryptd_tfm);
+
+       skcipher_bulk_request_set_tfm(subreq, child);
+
+       return crypto_skcipher_decrypt_bulk(subreq);
+}
+
+static unsigned int simd_skcipher_reqsize_bulk(struct crypto_skcipher *tfm,
+                                              unsigned int maxmsgs)
+{
+       struct simd_skcipher_ctx *ctx = crypto_skcipher_ctx(tfm);
+       struct crypto_skcipher *tfm_cryptd, *tfm_child;
+       unsigned int reqsize_cryptd, reqsize_child;
+
+       tfm_cryptd = &ctx->cryptd_tfm->base;
+       tfm_child = cryptd_skcipher_child(ctx->cryptd_tfm);
+
+       reqsize_cryptd = crypto_skcipher_bulk_reqsize(tfm_cryptd, maxmsgs);
+       reqsize_child = crypto_skcipher_bulk_reqsize(tfm_child, maxmsgs);
+       return sizeof(struct skcipher_bulk_request) +
+                       max(reqsize_cryptd, reqsize_child);
+}
+
 static void simd_skcipher_exit(struct crypto_skcipher *tfm)
 {
        struct simd_skcipher_ctx *ctx = crypto_skcipher_ctx(tfm);
@@ -187,6 +245,9 @@ struct simd_skcipher_alg *simd_skcipher_create_compat(const 
char *algname,
        alg->setkey = simd_skcipher_setkey;
        alg->encrypt = simd_skcipher_encrypt;
        alg->decrypt = simd_skcipher_decrypt;
+       alg->encrypt_bulk = simd_skcipher_encrypt_bulk;
+       alg->decrypt_bulk = simd_skcipher_decrypt_bulk;
+       alg->reqsize_bulk = simd_skcipher_reqsize_bulk;
 
        err = crypto_register_skcipher(alg);
        if (err)
-- 
2.9.3

--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to