From patchwork Tue Aug 8 12:03:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilad Ben-Yossef X-Patchwork-Id: 109622 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp3984260obb; Tue, 8 Aug 2017 05:06:16 -0700 (PDT) X-Received: by 10.84.218.65 with SMTP id f1mr4507991plm.295.1502193976750; Tue, 08 Aug 2017 05:06:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502193976; cv=none; d=google.com; s=arc-20160816; b=QP8Y8wg/6Rm0QtkuHunKTDGEdelOyAZ0Y9GqtZyI8pUSNUXChD7MCmd5jBDrou14+T i/JxwL9gDOguY6pyqmcA3VWvYmzG8HCWaGAThqeou0DY9cnog0jMvY/yRYyfNSuFBNZ7 NrUno4aiX3KhxGLvWc9tGM61CN36oCrmN4uuYcPBC55UeA6fPhl/0L27XY1f5mK1+Olx T4cQxzyV/GOf5p3a/ER2S76i9i4mO1ZiBX124RXROBMVyUEMb800mhIE7wtV79SGXeBs nKzdVgENk8dH6DfwNkbWueirBEkjw95w7V5PXDTrTQ5dU0j4H6Hp3nxNESvvfsaeI85B Lx5g== 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:arc-authentication-results; bh=yGaAHjHUMBmQzH3ic2oX8wNfseqXS3eodE5CNvqrLCs=; b=ScqHv0qn3xrj1TNLlIRBDaZSy79uGWz1nEWoz9HVsk234VXyF5ZIixjYawuP0ydi+C ux189aAo/xq7MvzPos1cI3INqMw0JK/x1xRenrRhiQ7OHDqXM3Nfi6gjCeC5kxDoDlRk noacm0o5cZqixsx/XKluWhCU1xfwWxGI60DfJBSVnWLVgr1Lw+Q54w6EK0uDvy9Gs/8h 8rXBOGwmO4l/WoxJojP/5NYMf1SxnMrnmKva6lzDLqKenExlwJaKYQ11al828h7g3D9a 2lJoKHT9JrCGhghYQnafg9RSuea5tBUi5nqwxXU2cMoBu1rJYqKVhAQRXTeHT8i3hoCT 42wA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i5si824919plk.404.2017.08.08.05.06.16; Tue, 08 Aug 2017 05:06:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752673AbdHHMGO (ORCPT + 25 others); Tue, 8 Aug 2017 08:06:14 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:33650 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752049AbdHHMGJ (ORCPT ); Tue, 8 Aug 2017 08:06:09 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1CE58165C; Tue, 8 Aug 2017 05:06:09 -0700 (PDT) Received: from gby.kfn.arm.com (unknown [10.45.48.154]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 783693F577; Tue, 8 Aug 2017 05:05:59 -0700 (PDT) From: Gilad Ben-Yossef To: Herbert Xu , "David S. Miller" , Jonathan Corbet , David Howells , Tom Lendacky , Gary Hook , Boris Brezillon , Arnaud Ebalard , Matthias Brugger , Alasdair Kergon , Mike Snitzer , dm-devel@redhat.com, Shaohua Li , Steve French , "Theodore Y. Ts'o" , Jaegeuk Kim , Mimi Zohar , Dmitry Kasatkin , James Morris , "Serge E. Hallyn" , linux-crypto@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, keyrings@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-raid@vger.kernel.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-fscrypt@vger.kernel.org, linux-ima-devel@lists.sourceforge.net, linux-ima-user@lists.sourceforge.net, linux-security-module@vger.kernel.org Cc: Ofir Drang Subject: [PATCH v4 09/19] crypto: move gcm to generic async completion Date: Tue, 8 Aug 2017 15:03:40 +0300 Message-Id: <1502193834-11289-10-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1502193834-11289-1-git-send-email-gilad@benyossef.com> References: <1502193834-11289-1-git-send-email-gilad@benyossef.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcm is starting an async. crypto op and waiting for it complete. Move it over to generic code doing the same. Signed-off-by: Gilad Ben-Yossef --- crypto/gcm.c | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) -- 2.1.4 diff --git a/crypto/gcm.c b/crypto/gcm.c index 3841b5e..fb923a5 100644 --- a/crypto/gcm.c +++ b/crypto/gcm.c @@ -16,7 +16,6 @@ #include #include #include "internal.h" -#include #include #include #include @@ -78,11 +77,6 @@ struct crypto_gcm_req_priv_ctx { } u; }; -struct crypto_gcm_setkey_result { - int err; - struct completion completion; -}; - static struct { u8 buf[16]; struct scatterlist sg; @@ -98,17 +92,6 @@ static inline struct crypto_gcm_req_priv_ctx *crypto_gcm_reqctx( return (void *)PTR_ALIGN((u8 *)aead_request_ctx(req), align + 1); } -static void crypto_gcm_setkey_done(struct crypto_async_request *req, int err) -{ - struct crypto_gcm_setkey_result *result = req->data; - - if (err == -EINPROGRESS) - return; - - result->err = err; - complete(&result->completion); -} - static int crypto_gcm_setkey(struct crypto_aead *aead, const u8 *key, unsigned int keylen) { @@ -119,7 +102,7 @@ static int crypto_gcm_setkey(struct crypto_aead *aead, const u8 *key, be128 hash; u8 iv[16]; - struct crypto_gcm_setkey_result result; + struct crypto_wait wait; struct scatterlist sg[1]; struct skcipher_request req; @@ -140,21 +123,18 @@ static int crypto_gcm_setkey(struct crypto_aead *aead, const u8 *key, if (!data) return -ENOMEM; - init_completion(&data->result.completion); + crypto_init_wait(&data->wait); sg_init_one(data->sg, &data->hash, sizeof(data->hash)); skcipher_request_set_tfm(&data->req, ctr); skcipher_request_set_callback(&data->req, CRYPTO_TFM_REQ_MAY_SLEEP | CRYPTO_TFM_REQ_MAY_BACKLOG, - crypto_gcm_setkey_done, - &data->result); + crypto_req_done, + &data->wait); skcipher_request_set_crypt(&data->req, data->sg, data->sg, sizeof(data->hash), data->iv); - err = crypto_skcipher_encrypt(&data->req); - if (err == -EINPROGRESS || err == -EBUSY) { - wait_for_completion(&data->result.completion); - err = data->result.err; - } + err = crypto_wait_req(crypto_skcipher_encrypt(&data->req), + &data->wait); if (err) goto out;