From patchwork Fri Mar 6 16:39:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 5956231 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 43ADDBF440 for ; Fri, 6 Mar 2015 16:39:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7F840202AE for ; Fri, 6 Mar 2015 16:39:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 554A520256 for ; Fri, 6 Mar 2015 16:39:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755045AbbCFQjI (ORCPT ); Fri, 6 Mar 2015 11:39:08 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:53996 "EHLO mailhub1.si.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755021AbbCFQjH (ORCPT ); Fri, 6 Mar 2015 11:39:07 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 27E651C8572; Fri, 6 Mar 2015 17:39:06 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from mailhub1.si.c-s.fr ([192.168.12.234]) by localhost (mailhub1.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OHYkxRWF51G8; Fri, 6 Mar 2015 17:39:06 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 1100D1C8570; Fri, 6 Mar 2015 17:39:06 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id F2739C73C5; Fri, 6 Mar 2015 17:39:05 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id cDl4QZ22OR-T; Fri, 6 Mar 2015 17:39:05 +0100 (CET) Received: from PO10863.localdomain (unknown [172.25.231.75]) by messagerie.si.c-s.fr (Postfix) with ESMTP id C4564C73C4; Fri, 6 Mar 2015 17:39:05 +0100 (CET) Received: by localhost.localdomain (Postfix, from userid 0) id AB8DE1A241C; Fri, 6 Mar 2015 17:39:05 +0100 (CET) From: Christophe Leroy To: Kim Phillips , Herbert Xu , "David S. Miller" CC: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-crypto@vger.kernel.org Subject: [PATCH v2 05/17] crypto: talitos - isolate scatter/gather handling for ahash Message-Id: <20150306163905.AB8DE1A241C@localhost.localdomain> Date: Fri, 6 Mar 2015 17:39:05 +0100 (CET) Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP SEC1 doesn't support scatter/gather, therefore this part of the code will have to be implemented differently for SEC1, so we isolate it in a small helper function Signed-off-by: Christophe Leroy --- drivers/crypto/talitos.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index 3165364..76e636b 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -1707,6 +1707,23 @@ static int ahash_init_sha224_swinit(struct ahash_request *areq) return 0; } +static void ahash_process_chain(struct scatterlist *src, int nbytes, + bool *chained, + struct talitos_ahash_req_ctx *req_ctx, + int nbytes_to_hash) +{ + if (req_ctx->nbuf) { + unsigned int nsg = (req_ctx->nbuf < nbytes_to_hash) ? 2 : 1; + + sg_init_table(req_ctx->bufsl, nsg); + sg_set_buf(req_ctx->bufsl, req_ctx->buf, req_ctx->nbuf); + if (nsg > 1) + scatterwalk_sg_chain(req_ctx->bufsl, 2, src); + req_ctx->psrc = req_ctx->bufsl; + } else + req_ctx->psrc = src; +} + static int ahash_process_req(struct ahash_request *areq, unsigned int nbytes) { struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq); @@ -1717,7 +1734,6 @@ static int ahash_process_req(struct ahash_request *areq, unsigned int nbytes) crypto_tfm_alg_blocksize(crypto_ahash_tfm(tfm)); unsigned int nbytes_to_hash; unsigned int to_hash_later; - unsigned int nsg; bool chained; if (!req_ctx->last && (nbytes + req_ctx->nbuf <= blocksize)) { @@ -1745,15 +1761,8 @@ static int ahash_process_req(struct ahash_request *areq, unsigned int nbytes) } /* Chain in any previously buffered data */ - if (req_ctx->nbuf) { - nsg = (req_ctx->nbuf < nbytes_to_hash) ? 2 : 1; - sg_init_table(req_ctx->bufsl, nsg); - sg_set_buf(req_ctx->bufsl, req_ctx->buf, req_ctx->nbuf); - if (nsg > 1) - scatterwalk_sg_chain(req_ctx->bufsl, 2, areq->src); - req_ctx->psrc = req_ctx->bufsl; - } else - req_ctx->psrc = areq->src; + ahash_process_chain(areq->src, nbytes, &chained, req_ctx, + nbytes_to_hash); if (to_hash_later) { int nents = sg_count(areq->src, nbytes, &chained);