From patchwork Sun Jul 2 14:41:56 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: 106854 Delivered-To: patch@linaro.org Received: by 10.182.135.102 with SMTP id pr6csp8294071obb; Sun, 2 Jul 2017 07:45:46 -0700 (PDT) X-Received: by 10.98.163.203 with SMTP id q72mr5280258pfl.97.1499006746760; Sun, 02 Jul 2017 07:45:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499006746; cv=none; d=google.com; s=arc-20160816; b=o1GTqQoz8PQARIXvvZjwL/I4hRr7avTrOyJCNOB4uvxkQjM7ylUqT9iccGlNqfnOZB A4ApjIYKUd0TGMweygXHYqbsK7706U3yftOS6Qi9+FwOqycZdddkp0OaNenvTZWvIclB Oej8JjKPilvo18BgsoFxdZuFKgx6+FYZcilfGUe8jSg9gsjh9f8iH6UFNo3dE0AHhcJB P+t0Oi+Lk4iRx6y73GZN8fOS5Xtsu+GMwHq5EjuvDKfy1pXGIa644Tm+yNVaOo4377z5 f9I/hZQXYMEn7p9JZ41XKBeJOC2g0Gr8WvoTkcSatNUN5hGf5Y5yXKX+AQ3lZXPAz8J7 NLzg== 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=8yGWbKKEOdzYXLhBpYrs90p4S6mZKVD/hPBAgNOytcE=; b=YNY8uZdX8xFz/ezIGoKjB/UJF30JKHjr6fW/HJyi9R9Ov7/uvdV4hFPP89oAopj/O0 Kz4cFYR7r5LD/U4oayeWuZAtHDhKbEw6G6OmK1w9ZJbXJOXZivRGMj//MXvpyaw9VDvn tWE33pwoHb/t+L444VwiserTSY1IZhzwLyid3Qi6uFfp1dkOiCNZr9Q1jH0SzmTbpBIF QU1rvqgq6KLuYrClV8O7SAA4X0RaB7xM3atagFYh7xIbKwDgwopdpiYp0p6aHowZzwtJ jWSjWKJXn0odaVZfFuiT4EI/DOU5hKvDcWVyEy6JDCAG2xayO7bfBXgyy5A+9x1lJJgu MTAw== 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 p22si11118323pli.557.2017.07.02.07.45.46; Sun, 02 Jul 2017 07:45:46 -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 S1752282AbdGBOpn (ORCPT + 1 other); Sun, 2 Jul 2017 10:45:43 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:54124 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751934AbdGBOpj (ORCPT ); Sun, 2 Jul 2017 10:45:39 -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 9F1CF344; Sun, 2 Jul 2017 07:45:33 -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 8F1103F578; Sun, 2 Jul 2017 07:45:25 -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 , Eric Biggers Subject: [PATCH v3 14/28] crypto: introduce crypto wait for async op Date: Sun, 2 Jul 2017 17:41:56 +0300 Message-Id: <1499006535-19760-15-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 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 --- crypto/api.c | 13 +++++++++++++ include/linux/crypto.h | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 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..47e884a 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 -EIOCBQUEUED: + 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);