From patchwork Mon May 29 08:22: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: 100628 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp230532qge; Mon, 29 May 2017 01:23:43 -0700 (PDT) X-Received: by 10.101.90.131 with SMTP id c3mr3474097pgt.34.1496046223219; Mon, 29 May 2017 01:23:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496046223; cv=none; d=google.com; s=arc-20160816; b=mDCKLwVLxB8JTaOq7x+OG5goz1iFaz27gNatei6Hb9JuaNxJeCQepTnv9nYiSodI74 YdU3w+ep6z8b03UvasQ8VSOxAtisLowVC2jIdS4hOuDqnb+CaoXVLL+WF98vf1x4q06+ K82i2/P3bomZY8WKhEUw/puQf6Krz0Z6awoATsxqFgjJae7Ww1SU8m0Sy+Z5RwhXribo hTKUWuwLoPgc4HU+bzeJFQPd4XX+L9llt4R7HrzkdO4XcQQ7amKqaNv+WygyZc8O5yIk ejLLhhHfgUV3OF4h73ehA8s+xPW8l+0dGdAqTrn0lSxAdXtGZ9m8ds+nxWQoFszZYt53 gyIg== 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=AZ96eNQ3UNDyf4KmR0fAuWUyKAy4akTlEP3a0Wm/juE=; b=Nt3QqAAECpX8GEiPBrudOY8Ch7bCuY7YxLConUUplcvLhj6iRzXTgffwvzCrWxVOu6 OsVm+D6pIXIu80BP81R+kliq7ok4X58zMSpYk8PeYWyAWPYQtnMeoeTxInc9uOccd9qI vD7nKKTi3ME+942nxxT0cIJt/BjdBjVlcEgRTdMdV6LRtbF15YIXwoGMoO4yNf+gxEip x4S520R8zSIZCMADC35hNiwr/GIXy5ZyoytjA8ctsr3bK4TUSAoZBxDlkQw1WjVC1+6H 86nCs9js6hp8JqfyU5OC1Fw8q3T9WdtqfGpsAuB9cegtDW8AqLsoPTCVjiKcqAOwfzH1 awZA== 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 b125si9652063pfg.149.2017.05.29.01.23.42; Mon, 29 May 2017 01:23:43 -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 S1751088AbdE2IX3 (ORCPT + 25 others); Mon, 29 May 2017 04:23:29 -0400 Received: from foss.arm.com ([217.140.101.70]:45786 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750846AbdE2IXZ (ORCPT ); Mon, 29 May 2017 04:23:25 -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 62B6380D; Mon, 29 May 2017 01:23:24 -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 921723F52A; Mon, 29 May 2017 01:23:17 -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 01/11] crypto: introduce crypto wait for async op Date: Mon, 29 May 2017 11:22:48 +0300 Message-Id: <1496046180-21962-2-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 Invoking a possibly async. crypto op and waiting for completion while correctly handling backlog processing is a common task in the crypto API implementation and outside users of it. This patch adds a generic implementation for doing so in preparation for using it across the board instead of hand rolled versions. Signed-off-by: Gilad Ben-Yossef CC: Eric Biggers CC: Ofir Drang --- crypto/api.c | 13 +++++++++++++ include/linux/crypto.h | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) -- 2.1.4 diff --git a/crypto/api.c b/crypto/api.c index 941cd4c..2a2479d 100644 --- a/crypto/api.c +++ b/crypto/api.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "internal.h" LIST_HEAD(crypto_alg_list); @@ -595,5 +596,17 @@ int crypto_has_alg(const char *name, u32 type, u32 mask) } EXPORT_SYMBOL_GPL(crypto_has_alg); +void crypto_req_done(struct crypto_async_request *req, int err) +{ + struct crypto_wait *wait = req->data; + + if (err == -EINPROGRESS) + return; + + wait->err = err; + complete(&wait->completion); +} +EXPORT_SYMBOL_GPL(crypto_req_done); + MODULE_DESCRIPTION("Cryptographic core API"); MODULE_LICENSE("GPL"); diff --git a/include/linux/crypto.h b/include/linux/crypto.h index 84da997..bb00186 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -24,6 +24,7 @@ #include #include #include +#include /* * Autoloaded crypto modules should only use a prefixed name to avoid allowing @@ -468,6 +469,45 @@ struct crypto_alg { } CRYPTO_MINALIGN_ATTR; /* + * A helper struct for waiting for completion of async crypto ops + */ +struct crypto_wait { + struct completion completion; + int err; +}; + +/* + * Macro for declaring a crypto op async wait object on stack + */ +#define DECLARE_CRYPTO_WAIT(_wait) \ + struct crypto_wait _wait = { \ + COMPLETION_INITIALIZER_ONSTACK((_wait).completion), 0 } + +/* + * Async ops completion helper functioons + */ +void crypto_req_done(struct crypto_async_request *req, int err); + +static inline int crypto_wait_req(int err, struct crypto_wait *wait) +{ + switch (err) { + case -EINPROGRESS: + case -EBUSY: + wait_for_completion(&wait->completion); + reinit_completion(&wait->completion); + err = wait->err; + break; + }; + + return err; +} + +static inline void crypto_init_wait(struct crypto_wait *wait) +{ + init_completion(&wait->completion); +} + +/* * Algorithm registration interface. */ int crypto_register_alg(struct crypto_alg *alg); @@ -1604,5 +1644,6 @@ static inline int crypto_comp_decompress(struct crypto_comp *tfm, src, slen, dst, dlen); } + #endif /* _LINUX_CRYPTO_H */