From patchwork Mon Aug 19 14:17:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 171633 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp3046499ily; Mon, 19 Aug 2019 07:18:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqym4ntX52XYmNwi/GWRW6Uwr6USkrQzBm78cOCeLKL3s4fJaEco3dv5lzEZDq3JRcd6HZeb X-Received: by 2002:aa7:8a97:: with SMTP id a23mr23810903pfc.117.1566224283658; Mon, 19 Aug 2019 07:18:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566224283; cv=none; d=google.com; s=arc-20160816; b=EEprvRdSgCnePcSCLjBFGG4OpDjpC/7AJpGZ8We3QXPI8Id4M948jCYheAbV55Zk+F D9Hce2hqFp/LRt8uP27piN5VtI2kOLA1elfLVfwdwD7N+SdrarfITvAjCw9GQ5uE+zuN uCy54vxQqk81cOjqX+naviAkR2aNl7WBTfwY5b4lam7xYX8EN0obiX+DRvACH4Bmo+vl LLFQlycCR7U/B+eJqfG2dSqEChNaePBPj1zYH517mgH9l56VbGND25rw9SLQk/eIx+73 UV9rYoxJrVX+glDJdVwVCot/9nKO/kcyTbBkMrESLxShrHbs8qZWpipVEK2QLBoEYkt9 20Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=huVoFUpMc5dzWwrmJm9Qwvn6MCUViGlDp2QJ3557fZk=; b=wcdYXMkM6DY1iMMEYDy3o6eG92y6GCBEfQqZYULfD1bvrdHVaZfsVfA3arGK+flgby 1dh0YXjfVo5OkaeyMAoMrUiDZavNMShywU2vY7voJmVtPJ9aQGB0OPTBgUWwnv7+hnxI Sb7H39t+cj2RCwMxR/h3yVMzeK6gEgCz1SR1jlDtwRyPRgY1zLdzoI+YTL5T7WwrwYEo CPBp7LptiVTC8ecqABc/Ks8CQJOSVRYt+cDER/4Nk3yM76Fqh7rU9d7XxCBzU+FypETN oaUoJy1QB9CdxjnA2PerTsNg565a2cngibmudxi8R4wIcTfNxov1RCflX1do/EafqwV/ 9gQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XoPoxuLn; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l13si9983973pgp.133.2019.08.19.07.18.03; Mon, 19 Aug 2019 07:18:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XoPoxuLn; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726553AbfHSOSD (ORCPT + 3 others); Mon, 19 Aug 2019 10:18:03 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:43057 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727009AbfHSOSC (ORCPT ); Mon, 19 Aug 2019 10:18:02 -0400 Received: by mail-wr1-f68.google.com with SMTP id y8so8897466wrn.10 for ; Mon, 19 Aug 2019 07:18:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=huVoFUpMc5dzWwrmJm9Qwvn6MCUViGlDp2QJ3557fZk=; b=XoPoxuLnvrBI/Ivdo2XSK+uutZ1pxAL4/4OQ3gzXFZ/obaBw9VfP+9dthB6bv5qhZU jE+qt+sjLEimU7FZNovUfLqkHxpXjNZyUuUqbk5blXZehYBjr97LP3YK9fbKaDIk3Uco Zf66hCcJimDVFZSMGb5TvJneGo7Bp6ASW5RhidPZNOCfa6xAUCGOHtKJjG2a3+1PQGQu 6qKH4rgy5KFUqX6eqf/GXL+YExIr2MXYrpOn3XpgYbT7UFEsAF9a3DAln76jd6ukZl8c 8ygIHDI5HavLluSl6zlaPTs7lJtX/0iavwy2JkMPSLLTVG0X1HtLNkgylHeQxAErD1eU KWwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=huVoFUpMc5dzWwrmJm9Qwvn6MCUViGlDp2QJ3557fZk=; b=iINZmLVEancBE8mT59Elf+kGQMyh0hjxV14JG4zVd4H00MWj/DEPBrSGBIAok8oHwV OM+7vjPI78CTkaw/VvQooNEicqYqJH1ol0RsHuM29qHvyy5ptG6IUp7Hu3C9K87NCStC b/eeDPjN/TMR5lJUGNqZYg6/MXXL/BSjXjvfDqsmbEbme9jHtgL3SKK0TnZM6Bf7++1H 1vTk3GZNjp8/VMdRAR80oxqDpJi9+9JShXDb1sRLc92iWTkr821a/lbGxkR2gKbCJ+w5 hyjQx7maWoDEXZUSGfDKTo2YVfSn06LIDhHfeTNrcBaPLjiPnGkiz5NuZ4luy3KC57mS NXLg== X-Gm-Message-State: APjAAAUtcoz1GgLOJ2SNWZpgeiP5ELAp8B8iU0KjXwsWzlcfLT7v1cgK +uF/gRHXNUMNBo8WA+EnLj0OXJXNS49sCw== X-Received: by 2002:adf:f646:: with SMTP id x6mr29595194wrp.18.1566224279255; Mon, 19 Aug 2019 07:17:59 -0700 (PDT) Received: from localhost.localdomain (11.172.185.81.rev.sfr.net. [81.185.172.11]) by smtp.gmail.com with ESMTPSA id b26sm12693352wmj.14.2019.08.19.07.17.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Aug 2019 07:17:58 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: Ard Biesheuvel , Herbert Xu , Eric Biggers , dm-devel@redhat.com, linux-fscrypt@vger.kernel.org, Gilad Ben-Yossef , Milan Broz Subject: [PATCH v13 3/6] crypto: arm64/aes-cts-cbc - factor out CBC en/decryption of a walk Date: Mon, 19 Aug 2019 17:17:35 +0300 Message-Id: <20190819141738.1231-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190819141738.1231-1-ard.biesheuvel@linaro.org> References: <20190819141738.1231-1-ard.biesheuvel@linaro.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org The plain CBC driver and the CTS one share some code that iterates over a scatterwalk and invokes the CBC asm code to do the processing. The upcoming ESSIV/CBC mode will clone that pattern for the third time, so let's factor it out first. Signed-off-by: Ard Biesheuvel --- arch/arm64/crypto/aes-glue.c | 82 ++++++++++---------- 1 file changed, 40 insertions(+), 42 deletions(-) -- 2.17.1 diff --git a/arch/arm64/crypto/aes-glue.c b/arch/arm64/crypto/aes-glue.c index 55d6d4838708..23abf335f1ee 100644 --- a/arch/arm64/crypto/aes-glue.c +++ b/arch/arm64/crypto/aes-glue.c @@ -186,46 +186,64 @@ static int ecb_decrypt(struct skcipher_request *req) return err; } -static int cbc_encrypt(struct skcipher_request *req) +static int cbc_encrypt_walk(struct skcipher_request *req, + struct skcipher_walk *walk) { struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req); struct crypto_aes_ctx *ctx = crypto_skcipher_ctx(tfm); - int err, rounds = 6 + ctx->key_length / 4; - struct skcipher_walk walk; + int err = 0, rounds = 6 + ctx->key_length / 4; unsigned int blocks; - err = skcipher_walk_virt(&walk, req, false); - - while ((blocks = (walk.nbytes / AES_BLOCK_SIZE))) { + while ((blocks = (walk->nbytes / AES_BLOCK_SIZE))) { kernel_neon_begin(); - aes_cbc_encrypt(walk.dst.virt.addr, walk.src.virt.addr, - ctx->key_enc, rounds, blocks, walk.iv); + aes_cbc_encrypt(walk->dst.virt.addr, walk->src.virt.addr, + ctx->key_enc, rounds, blocks, walk->iv); kernel_neon_end(); - err = skcipher_walk_done(&walk, walk.nbytes % AES_BLOCK_SIZE); + err = skcipher_walk_done(walk, walk->nbytes % AES_BLOCK_SIZE); } return err; } -static int cbc_decrypt(struct skcipher_request *req) +static int cbc_encrypt(struct skcipher_request *req) { - struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req); - struct crypto_aes_ctx *ctx = crypto_skcipher_ctx(tfm); - int err, rounds = 6 + ctx->key_length / 4; struct skcipher_walk walk; - unsigned int blocks; + int err; err = skcipher_walk_virt(&walk, req, false); + if (err) + return err; + return cbc_encrypt_walk(req, &walk); +} - while ((blocks = (walk.nbytes / AES_BLOCK_SIZE))) { +static int cbc_decrypt_walk(struct skcipher_request *req, + struct skcipher_walk *walk) +{ + struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req); + struct crypto_aes_ctx *ctx = crypto_skcipher_ctx(tfm); + int err = 0, rounds = 6 + ctx->key_length / 4; + unsigned int blocks; + + while ((blocks = (walk->nbytes / AES_BLOCK_SIZE))) { kernel_neon_begin(); - aes_cbc_decrypt(walk.dst.virt.addr, walk.src.virt.addr, - ctx->key_dec, rounds, blocks, walk.iv); + aes_cbc_decrypt(walk->dst.virt.addr, walk->src.virt.addr, + ctx->key_dec, rounds, blocks, walk->iv); kernel_neon_end(); - err = skcipher_walk_done(&walk, walk.nbytes % AES_BLOCK_SIZE); + err = skcipher_walk_done(walk, walk->nbytes % AES_BLOCK_SIZE); } return err; } +static int cbc_decrypt(struct skcipher_request *req) +{ + struct skcipher_walk walk; + int err; + + err = skcipher_walk_virt(&walk, req, false); + if (err) + return err; + return cbc_decrypt_walk(req, &walk); +} + static int cts_cbc_init_tfm(struct crypto_skcipher *tfm) { crypto_skcipher_set_reqsize(tfm, sizeof(struct cts_cbc_req_ctx)); @@ -251,22 +269,12 @@ static int cts_cbc_encrypt(struct skcipher_request *req) } if (cbc_blocks > 0) { - unsigned int blocks; - skcipher_request_set_crypt(&rctx->subreq, req->src, req->dst, cbc_blocks * AES_BLOCK_SIZE, req->iv); - err = skcipher_walk_virt(&walk, &rctx->subreq, false); - - while ((blocks = (walk.nbytes / AES_BLOCK_SIZE))) { - kernel_neon_begin(); - aes_cbc_encrypt(walk.dst.virt.addr, walk.src.virt.addr, - ctx->key_enc, rounds, blocks, walk.iv); - kernel_neon_end(); - err = skcipher_walk_done(&walk, - walk.nbytes % AES_BLOCK_SIZE); - } + err = skcipher_walk_virt(&walk, &rctx->subreq, false) ?: + cbc_encrypt_walk(&rctx->subreq, &walk); if (err) return err; @@ -316,22 +324,12 @@ static int cts_cbc_decrypt(struct skcipher_request *req) } if (cbc_blocks > 0) { - unsigned int blocks; - skcipher_request_set_crypt(&rctx->subreq, req->src, req->dst, cbc_blocks * AES_BLOCK_SIZE, req->iv); - err = skcipher_walk_virt(&walk, &rctx->subreq, false); - - while ((blocks = (walk.nbytes / AES_BLOCK_SIZE))) { - kernel_neon_begin(); - aes_cbc_decrypt(walk.dst.virt.addr, walk.src.virt.addr, - ctx->key_dec, rounds, blocks, walk.iv); - kernel_neon_end(); - err = skcipher_walk_done(&walk, - walk.nbytes % AES_BLOCK_SIZE); - } + err = skcipher_walk_virt(&walk, &rctx->subreq, false) ?: + cbc_decrypt_walk(&rctx->subreq, &walk); if (err) return err;