From patchwork Mon May 29 08:22:52 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: 100632 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp230803qge; Mon, 29 May 2017 01:24:39 -0700 (PDT) X-Received: by 10.99.157.196 with SMTP id i187mr17911548pgd.132.1496046279688; Mon, 29 May 2017 01:24:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496046279; cv=none; d=google.com; s=arc-20160816; b=ysDWXjH/VI49InUOaTnLh/CSWLuhiQl5rYGk11v4vhA6BMomSd41a89GcJHv55M8Jh QUKMQ6Onw6bq3AXd7E+GmO/QKy8fBdNu4FgW8StJ6VFlEFWDaSwG5S04iCTjnOLSA7Dd SohfTEDxwog3N8ZPS8F0rY6AuIctoHN9BeKiP+LelWBoGlf5G+DhHlz3r5B8dVs7u8sn 6lpyGF+ux7f2tClkKF1btGdMmYZPVicIVXypxOPaNGYdNUbvLbvokxrwUJhXiUhpEVTh 9DhuFTX9l7PlzIa9FSFouUhix+bW4sm6nN7X/WQWTFBv5tBRzWBYdgnzZpnopGQjMvyE 1MjA== 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=fqCQ0Z5SPyIROH8V6JRPqGWg89YCQUYzTzL0/nc/wYV9zzSVKj7QWNgWdO83Y0c1gE doc3boRo7D/61FXSM8d1xWVIfoivyO/xlXn8FVIUuFKCMXyac2Hbz0OpOy6AtJFsAP/b m3xcirme4nCPZ2Jstcw7uo92JXdzutAdwJftW0+fZ5Oc+UnORZXGXNKFUxYg+0WhWpAf agNchVZ7mIvUHSI0kCijx1dwh2XfSJciADWnpOO0i8CsBStOQsNQzJYVTTQO0CnDVN7T yadq59wKJd6rn7FWzBLl0yr84fN5KUrEFlQ7UaZdhtWlguRKAMc2nPIv71U4k0+mWm9d vmJg== 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 h18si9457709pfd.167.2017.05.29.01.24.39; Mon, 29 May 2017 01:24:39 -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 S1751219AbdE2IYT (ORCPT + 25 others); Mon, 29 May 2017 04:24:19 -0400 Received: from foss.arm.com ([217.140.101.70]:45944 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750909AbdE2IYO (ORCPT ); Mon, 29 May 2017 04:24:14 -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 ADB9680D; Mon, 29 May 2017 01:24:03 -0700 (PDT) Received: from gby.kfn.arm.com (unknown [10.45.48.155]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D43C13F52A; Mon, 29 May 2017 01:23:56 -0700 (PDT) From: Gilad Ben-Yossef To: Herbert Xu , "David S. Miller" , Jonathan Corbet , David Howells , 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" Cc: Eric Biggers , Ofir Drang , Pavel Shilovsky , linux-crypto@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, keyrings@vger.kernel.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 Subject: [PATCH v2 05/11] crypto: move gcm to generic async completion Date: Mon, 29 May 2017 11:22:52 +0300 Message-Id: <1496046180-21962-6-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1496046180-21962-1-git-send-email-gilad@benyossef.com> References: <1496046180-21962-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;