From patchwork Mon May 29 08:22:50 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: 100630 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp230714qge; Mon, 29 May 2017 01:24:21 -0700 (PDT) X-Received: by 10.99.112.3 with SMTP id l3mr17397107pgc.13.1496046260958; Mon, 29 May 2017 01:24:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496046260; cv=none; d=google.com; s=arc-20160816; b=xMNfkzNL+F/zjfMzODPra4+ckI5VvfDLwQGMEG7CT+DfqU1yubkGTjMw4EaIjnQVTw NQ/9SJdxO3Gch2sMCJ52IEiiTC7nBcWLkPRZddZyvq5Ukxcs0OU3XzOdKCHbfr1gkbJ0 irqvGAv+S5K39RZiMJ8DZUbT/+17K7SZPa3ihKV7a1zkXzdChVTxgo3FJ7JHXu0lWV1t S/oWLGHJlL0VIJqNXck3G7pzY4Fw467heGRf62AvqCUe3MeVXCgvBFeF/4uNDEeorya0 YtlNiyY8m/ufEBtpLEf6e8+fq4D8GmKHWiW0Qy8taox0LdwUNCf5WuMjLHiExSIMzk9T VaKw== 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=uVGCKHc2uD3hicn0yfC02peYpdFzwFicU6prIu8exhI=; b=NPGG8EzRGOfu5sygQtnaDdzpDj46A4S5l+uJM9JX8F6VKPMN9pAFGoj0y/PS4jzN4E fzocaI7RkYID2ItlEU1OALjxyDRfOVpnhyUAiKa96iv2mgOi+lGS1cw23Rb1Zx+YrUmF w4SiQcqkKYXYuTdDWP0eraL7rTHvcD/+KXvbQCN2dOQrmg2EQROfJiOEu6hbIHYP6hn4 FSiyXFTdTCilmSqSbKFlIdpPeE2s5G97o5rYnxdgdVvZEv7/jIJ38MkVrnH65HYog5nz 1a4LvkUCKnNf56ymGPZBuwVauirJ0xlyfDiIG1RiiFWmYhVRNav25SH+2tQ/suGFPdvF 0NHw== 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 b27si9797556pfh.196.2017.05.29.01.24.20; Mon, 29 May 2017 01:24:20 -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 S1751167AbdE2IYA (ORCPT + 25 others); Mon, 29 May 2017 04:24:00 -0400 Received: from foss.arm.com ([217.140.101.70]:45854 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750863AbdE2IXy (ORCPT ); Mon, 29 May 2017 04:23:54 -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 3CD6880D; Mon, 29 May 2017 01:23:44 -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 6D8453F52A; Mon, 29 May 2017 01:23:37 -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 03/11] crypto: move pub key to generic async completion Date: Mon, 29 May 2017 11:22:50 +0300 Message-Id: <1496046180-21962-4-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 public_key_verify_signature() is starting an async crypto op and waiting for it to complete. Move it over to generic code doing the same. Signed-off-by: Gilad Ben-Yossef --- crypto/asymmetric_keys/public_key.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) -- 2.1.4 diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c index 3cd6e12..d916235 100644 --- a/crypto/asymmetric_keys/public_key.c +++ b/crypto/asymmetric_keys/public_key.c @@ -57,29 +57,13 @@ static void public_key_destroy(void *payload0, void *payload3) public_key_signature_free(payload3); } -struct public_key_completion { - struct completion completion; - int err; -}; - -static void public_key_verify_done(struct crypto_async_request *req, int err) -{ - struct public_key_completion *compl = req->data; - - if (err == -EINPROGRESS) - return; - - compl->err = err; - complete(&compl->completion); -} - /* * Verify a signature using a public key. */ int public_key_verify_signature(const struct public_key *pkey, const struct public_key_signature *sig) { - struct public_key_completion compl; + struct crypto_wait cwait; struct crypto_akcipher *tfm; struct akcipher_request *req; struct scatterlist sig_sg, digest_sg; @@ -131,20 +115,16 @@ int public_key_verify_signature(const struct public_key *pkey, sg_init_one(&digest_sg, output, outlen); akcipher_request_set_crypt(req, &sig_sg, &digest_sg, sig->s_size, outlen); - init_completion(&compl.completion); + crypto_init_wait(&cwait); akcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP, - public_key_verify_done, &compl); + crypto_req_done, &cwait); /* Perform the verification calculation. This doesn't actually do the * verification, but rather calculates the hash expected by the * signature and returns that to us. */ - ret = crypto_akcipher_verify(req); - if ((ret == -EINPROGRESS) || (ret == -EBUSY)) { - wait_for_completion(&compl.completion); - ret = compl.err; - } + ret = crypto_wait_req(crypto_akcipher_verify(req), &cwait); if (ret < 0) goto out_free_output;