crypto: chelsio - Recalculate iv only if it is needed

Recalculate iv only if it is needed i.e. if the last req to hw
was partial for aes-xts.

Signed-off-by: Ayush Sawal <ayush.sawal@chelsio.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/chelsio/chcr_algo.c b/drivers/crypto/chelsio/chcr_algo.c
index 96c1b5fc9081dd5d425c2195845011576b46e848..17ce6970dab4339785c244a4edb1bad0baae8a2e 100644 (file)
--- a/drivers/crypto/chelsio/chcr_algo.c
+++ b/drivers/crypto/chelsio/chcr_algo.c
@@ -1086,8 +1086,12 @@ static int chcr_final_cipher_iv(struct skcipher_request *req,
        if (subtype == CRYPTO_ALG_SUB_TYPE_CTR)
                ctr_add_iv(iv, req->iv, DIV_ROUND_UP(reqctx->processed,
                                                       AES_BLOCK_SIZE));
-       else if (subtype == CRYPTO_ALG_SUB_TYPE_XTS)
-               ret = chcr_update_tweak(req, iv, 1);
+       else if (subtype == CRYPTO_ALG_SUB_TYPE_XTS) {
+               if (!reqctx->partial_req)
+                       memcpy(iv, reqctx->iv, AES_BLOCK_SIZE);
+               else
+                       ret = chcr_update_tweak(req, iv, 1);
+       }
        else if (subtype == CRYPTO_ALG_SUB_TYPE_CBC) {
                /*Already updated for Decrypt*/
                if (!reqctx->op)
@@ -1199,6 +1203,7 @@ static int process_cipher(struct skcipher_request *req,
        int bytes, err = -EINVAL;
 
        reqctx->processed = 0;
+       reqctx->partial_req = 0;
        if (!req->iv)
                goto error;
        if ((ablkctx->enckey_len == 0) || (ivsize > AES_BLOCK_SIZE) ||
@@ -1289,6 +1294,7 @@ static int process_cipher(struct skcipher_request *req,
        }
        reqctx->processed = bytes;
        reqctx->last_req_len = bytes;
+       reqctx->partial_req = !!(req->cryptlen - reqctx->processed);
 
        return 0;
 unmap:
@@ -1300,6 +1306,7 @@ error:
 static int chcr_aes_encrypt(struct skcipher_request *req)
 {
        struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
+       struct chcr_skcipher_req_ctx *reqctx = skcipher_request_ctx(req);
        struct chcr_context *ctx;
        struct chcr_dev *dev = c_ctx(tfm)->dev;
        struct sk_buff *skb = NULL;
@@ -1329,6 +1336,7 @@ static int chcr_aes_encrypt(struct skcipher_request *req)
                CRYPTO_ALG_SUB_TYPE_CBC && req->base.flags ==
                        CRYPTO_TFM_REQ_MAY_SLEEP ) {
                        ctx=c_ctx(tfm);
+                       reqctx->partial_req = 1;
                        wait_for_completion(&ctx->cbc_aes_aio_done);
         }
        return isfull ? -EBUSY : -EINPROGRESS;

diff --git a/drivers/crypto/chelsio/chcr_crypto.h b/drivers/crypto/chelsio/chcr_crypto.h
index 9207d88c55384401fd8a18e1a153802886c5110c..dbb7e13bb40928923ffebf87c784f633a251fd08 100644 (file)
--- a/drivers/crypto/chelsio/chcr_crypto.h
+++ b/drivers/crypto/chelsio/chcr_crypto.h
@@ -291,6 +291,7 @@ struct chcr_skcipher_req_ctx {
        struct scatterlist *dstsg;
        unsigned int processed;
        unsigned int last_req_len;
+       unsigned int partial_req;
        struct scatterlist *srcsg;
        unsigned int src_ofst;
        unsigned int dst_ofst;