From patchwork Tue Aug 8 12:03:48 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: 109630 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp3986833obb; Tue, 8 Aug 2017 05:08:10 -0700 (PDT) X-Received: by 10.98.16.194 with SMTP id 63mr1311982pfq.172.1502194090224; Tue, 08 Aug 2017 05:08:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502194090; cv=none; d=google.com; s=arc-20160816; b=r/870TAXR0Jr6sgoCZOX4r7zynUhXHZelmz1Cs1XC1fVJro5DlgRaKRZ19Fzqh0MQi AXA0+ZASgIFcNsofkUviivB3CB9epUllmIsTviUKYB2shBAKpVnf0cZRkPWMINmGjNFi 27ZWijPGHq6N8aFpKzZrkjg4lGir9rWk6No+KPGEgskoklcF03AQHR3NI1mGxiB3piTg Qx1tQcT56ZT76I6bYbub0jhdrMfQcqQYLfcxLWy7u2/GaKPi/nkLnlXcu6FzAkWhLkCk 3uzcVOHAv5tCecTiyBFLN6lrfnxSe29bOoAempk+inUchnnI+IGYes7xTRWI0elSaARS D43g== 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=ZEEwY7S0lvfkzX5eSnqpbx2gek6uifwcDnkIXVl4mV0=; b=Oq/SF8UWZiULqo6jXllbpf19gKT1oIVsAFo/TxlOpvMU6a56NBTGSGUubLITxeyVn4 WgWwd8Ja42E0mMPOl+6fUYxeQCSmAXvUkaQiJvOSmr1zmaX28NAarUYwKjLcuPiAnHal JQfxS4bD5O9LSXS0mKuszenjIqFbcVcdjVeElejQCNlwjRf5JkQTcu6ik9qYIhx12vZc FhhbVB35FfbpsZIUuvEvSLj2DDJW9q0+yR0TOTxrPPopcwf58lOJDrbEJDbSS2a6PEOa xi03pPYlAXeFPJuO9S35Aqdhpzr0Hoz9+bnSB28EZUiFJg/M2Kg6cZ0hyNcENI/EHmLt awKA== 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 g7si841841plk.909.2017.08.08.05.08.09; Tue, 08 Aug 2017 05:08:10 -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 S1752838AbdHHMII (ORCPT + 25 others); Tue, 8 Aug 2017 08:08:08 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:34126 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752049AbdHHMIE (ORCPT ); Tue, 8 Aug 2017 08:08:04 -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 E3B291B5E; Tue, 8 Aug 2017 05:08:03 -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 029CD3F577; Tue, 8 Aug 2017 05:07:55 -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 17/19] crypto: qce: move to generic async completion Date: Tue, 8 Aug 2017 15:03:48 +0300 Message-Id: <1502193834-11289-18-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 The qce driver starts several async crypto ops and waits for their completions. Move it over to generic code doing the same. Signed-off-by: Gilad Ben-Yossef --- drivers/crypto/qce/sha.c | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) -- 2.1.4 diff --git a/drivers/crypto/qce/sha.c b/drivers/crypto/qce/sha.c index 47e114a..53227d7 100644 --- a/drivers/crypto/qce/sha.c +++ b/drivers/crypto/qce/sha.c @@ -349,28 +349,12 @@ static int qce_ahash_digest(struct ahash_request *req) return qce->async_req_enqueue(tmpl->qce, &req->base); } -struct qce_ahash_result { - struct completion completion; - int error; -}; - -static void qce_digest_complete(struct crypto_async_request *req, int error) -{ - struct qce_ahash_result *result = req->data; - - if (error == -EINPROGRESS) - return; - - result->error = error; - complete(&result->completion); -} - static int qce_ahash_hmac_setkey(struct crypto_ahash *tfm, const u8 *key, unsigned int keylen) { unsigned int digestsize = crypto_ahash_digestsize(tfm); struct qce_sha_ctx *ctx = crypto_tfm_ctx(&tfm->base); - struct qce_ahash_result result; + struct crypto_wait wait; struct ahash_request *req; struct scatterlist sg; unsigned int blocksize; @@ -405,9 +389,9 @@ static int qce_ahash_hmac_setkey(struct crypto_ahash *tfm, const u8 *key, goto err_free_ahash; } - init_completion(&result.completion); + crypto_init_wait(&wait); ahash_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG, - qce_digest_complete, &result); + crypto_req_done, &wait); crypto_ahash_clear_flags(ahash_tfm, ~0); buf = kzalloc(keylen + QCE_MAX_ALIGN_SIZE, GFP_KERNEL); @@ -420,13 +404,7 @@ static int qce_ahash_hmac_setkey(struct crypto_ahash *tfm, const u8 *key, sg_init_one(&sg, buf, keylen); ahash_request_set_crypt(req, &sg, ctx->authkey, keylen); - ret = crypto_ahash_digest(req); - if (ret == -EINPROGRESS || ret == -EBUSY) { - ret = wait_for_completion_interruptible(&result.completion); - if (!ret) - ret = result.error; - } - + ret = crypto_wait_req(crypto_ahash_digest(req), &wait); if (ret) crypto_ahash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);