From patchwork Sun Jul 2 14:42:07 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: 106864 Delivered-To: patch@linaro.org Received: by 10.182.135.102 with SMTP id pr6csp8296298obb; Sun, 2 Jul 2017 07:48:36 -0700 (PDT) X-Received: by 10.98.72.194 with SMTP id q63mr5501011pfi.23.1499006916149; Sun, 02 Jul 2017 07:48:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499006916; cv=none; d=google.com; s=arc-20160816; b=GLq6ZN0lZVLbSbLEg4y8qReYngPz9nVmll/3p8rFYFDjkxLcQPwdGsw1GBitP6S4d6 h1MRy//QDAIhzDaWCSXeAgvUDks/PxgUqDOpM/ncTJsFS2aSLfLOEKD5p4qW48kdKJ+V E40E80gXyzcpaUHf+iu4wAvAb653KqReKUwzhF8v8QGB1ujJ1DQcxONyH1EzjLQDjI78 xvFfsRxx/fcyKHzUrNTPMKxLgJrPQao5cgknzZwT2BwCNpJr1sSNhM996XxNTxSWTSs/ NG0W3AMk50YhDh2nAWgqSqxhuSTdU5M/YMvGsBAbEoorU5l39Vh0Yv9ZbcOczP69Zecb lNww== 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=OT/TNElTP1m27nipjV74NgcmxauSxLzDpZ2KR3V3zno=; b=q/oGqWMLMbwsOuFzfdRyH8oVAtACBu4ZdszttLA52toQnQbKd9ZT08DjnK1wkgCi86 IfWERe73ARB6czLuGhNd5qRqWt8pqBP6lKhYQAVlZAi1UXCMe/edEXXgLDwHheEBAeJJ OIrPoYzj4CueymtvxgXNPHfkxAWSBy6HnnNIoWodx9/F3JjK9AHV7mOvXoLD+fNsy18o 2K+LV1IJLE5LbtI+kAmAjno3q8EpA6UaFT9l4BsPdjeVt7pS/KcjF5jU4UV4wIvxKxxV d5neFtjATjjsmYCW4oYyuiQjxsT1HlKazJm/hO//+IMJTcXMYZZXSJbXNQa5scG0JNe3 0Y9Q== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r15si10835723plj.408.2017.07.02.07.48.35; Sun, 02 Jul 2017 07:48:36 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752677AbdGBOsN (ORCPT + 1 other); Sun, 2 Jul 2017 10:48:13 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:54720 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751717AbdGBOsJ (ORCPT ); Sun, 2 Jul 2017 10:48: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 807E815B2; Sun, 2 Jul 2017 07:48:03 -0700 (PDT) Received: from localhost.localdomain (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id AB1FD3F578; Sun, 2 Jul 2017 07:47: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 v3 25/28] crypto: talitos: move to generic async completion Date: Sun, 2 Jul 2017 17:42:07 +0300 Message-Id: <1499006535-19760-26-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1499006535-19760-1-git-send-email-gilad@benyossef.com> References: <1499006535-19760-1-git-send-email-gilad@benyossef.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org The talitos 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/talitos.c | 39 +++++---------------------------------- 1 file changed, 5 insertions(+), 34 deletions(-) -- 2.1.4 diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index 0ab3c4d..bf80d3b 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -2037,22 +2037,6 @@ static int ahash_import(struct ahash_request *areq, const void *in) return 0; } -struct keyhash_result { - struct completion completion; - int err; -}; - -static void keyhash_complete(struct crypto_async_request *req, int err) -{ - struct keyhash_result *res = req->data; - - if (err == -EINPROGRESS) - return; - - res->err = err; - complete(&res->completion); -} - static int keyhash(struct crypto_ahash *tfm, const u8 *key, unsigned int keylen, u8 *hash) { @@ -2060,10 +2044,10 @@ static int keyhash(struct crypto_ahash *tfm, const u8 *key, unsigned int keylen, struct scatterlist sg[1]; struct ahash_request *req; - struct keyhash_result hresult; + struct crypto_wait wait; int ret; - init_completion(&hresult.completion); + crypto_init_wait(&wait); req = ahash_request_alloc(tfm, GFP_KERNEL); if (!req) @@ -2072,25 +2056,12 @@ static int keyhash(struct crypto_ahash *tfm, const u8 *key, unsigned int keylen, /* Keep tfm keylen == 0 during hash of the long key */ ctx->keylen = 0; ahash_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG, - keyhash_complete, &hresult); + crypto_req_done, &wait); sg_init_one(&sg[0], key, keylen); - ahash_request_set_crypt(req, sg, hash, keylen); - ret = crypto_ahash_digest(req); - switch (ret) { - case 0: - break; - case -EINPROGRESS: - case -EIOCBQUEUED: - ret = wait_for_completion_interruptible( - &hresult.completion); - if (!ret) - ret = hresult.err; - break; - default: - break; - } + ret = crypto_wait_req(crypto_ahash_digest(req), &wait); + ahash_request_free(req); return ret;