From patchwork Mon May 30 13:32:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 9141449 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 513BB60754 for ; Mon, 30 May 2016 13:33:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 296D12819E for ; Mon, 30 May 2016 13:33:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CAF928222; Mon, 30 May 2016 13:33:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD31D2819E for ; Mon, 30 May 2016 13:33:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933074AbcE3Nct (ORCPT ); Mon, 30 May 2016 09:32:49 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36148 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932930AbcE3Nc0 (ORCPT ); Mon, 30 May 2016 09:32:26 -0400 Received: by mail-wm0-f66.google.com with SMTP id q62so22805437wmg.3; Mon, 30 May 2016 06:32:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dD3v97bsBSE+JYfQGTPIG5B8bqEkPDD+mRodofw6cEc=; b=swckp5IB3xeJqTuSFMN1/2JP1TXLsCGGl2T6n2+XX0gSRvVqGZ3pzbokVXqM3Ojs5l Sm0eOJvt+ZJGUttCvl1674VenpzteKc8ms6DttGfcmFr1+sjqYWvGSvkehRBJKIbXbye BuonG5Y5V/fjxqEXG2dhZheDC4WfnVIpO+BgNDWcDCFef3MFU0mOfu+IIM1jb+6yHmea zgXLs9k06+outOyX5Z1waJ1gWdvBwlTTTMP/NMcH9W1/iN/r2KByleX86Xe0fUAqXrYO YAkIzNN0ptVm30hhHb9zlWA+r2JZvcDiNtyd+HBbg1RtOVnrwfEBuhpyNwks5OV1Lo/K Jcug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dD3v97bsBSE+JYfQGTPIG5B8bqEkPDD+mRodofw6cEc=; b=W2htw3oijLTIh1PrsYEd3sQo6hFoSALwbBAanWhBh5ECVCtal6V3xllvxsVnPY1NF0 UB2G+Wm00mrhxfeZ3lIEXyIRfqf0u2JojDuH2LsyJAJ/Lh4LccyiUDSweVdC/WGkfvSo IzU4Xgbg1G/PXxi3QtrDk9OtvAdIf/IS/ja8CIf57UgNBICpCbyEB7gwIoZeCpsMMX8S 7ffOjNi0oMELfkjE0+tj4fXdFSm7wUdCIC0tpxVUV1pGGLGwJtYmoQRCkTEJv8Znfsgx EKlZ8Q7IL9nf2vPVv3yNhbwY/DzxWReMh6kBSYjAVSuIzCMmeaD/1IsvjbHfmU0lR6d2 5eZg== X-Gm-Message-State: ALyK8tKnT1xFFDqsNV++y1znefGOW+DszP6W2dD+fZgvmp1Ac0WH90gVSraE/lDxlaJKWQ== X-Received: by 10.194.246.7 with SMTP id xs7mr5054178wjc.45.1464615144961; Mon, 30 May 2016 06:32:24 -0700 (PDT) Received: from Red.local (ANice-651-1-275-203.w86-193.abo.wanadoo.fr. [86.193.135.203]) by smtp.googlemail.com with ESMTPSA id b201sm20669178wmb.9.2016.05.30.06.32.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 May 2016 06:32:24 -0700 (PDT) From: LABBE Corentin To: herbert@gondor.apana.org.au, davem@davemloft.net, baolin.wang@linaro.org Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, LABBE Corentin Subject: [PATCH v2 1/2] crypto: engine: permit to enqueue ashash_request Date: Mon, 30 May 2016 15:32:01 +0200 Message-Id: <1464615122-16685-2-git-send-email-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1464615122-16685-1-git-send-email-clabbe.montjoie@gmail.com> References: <1464615122-16685-1-git-send-email-clabbe.montjoie@gmail.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The current crypto engine allow only ablkcipher_request to be enqueued. Thus denying any use of it for hardware that also handle hash algo. This patch convert all ablkcipher_request references to the more general crypto_async_request. Signed-off-by: LABBE Corentin Reviewed-by: Baolin Wang --- crypto/crypto_engine.c | 17 +++++++---------- include/crypto/algapi.h | 14 +++++++------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/crypto/crypto_engine.c b/crypto/crypto_engine.c index a55c82d..b658cb8 100644 --- a/crypto/crypto_engine.c +++ b/crypto/crypto_engine.c @@ -19,7 +19,7 @@ #define CRYPTO_ENGINE_MAX_QLEN 10 void crypto_finalize_request(struct crypto_engine *engine, - struct ablkcipher_request *req, int err); + struct crypto_async_request *req, int err); /** * crypto_pump_requests - dequeue one request from engine queue to process @@ -34,7 +34,6 @@ static void crypto_pump_requests(struct crypto_engine *engine, bool in_kthread) { struct crypto_async_request *async_req, *backlog; - struct ablkcipher_request *req; unsigned long flags; bool was_busy = false; int ret; @@ -82,9 +81,7 @@ static void crypto_pump_requests(struct crypto_engine *engine, if (!async_req) goto out; - req = ablkcipher_request_cast(async_req); - - engine->cur_req = req; + engine->cur_req = async_req; if (backlog) backlog->complete(backlog, -EINPROGRESS); @@ -142,7 +139,7 @@ static void crypto_pump_work(struct kthread_work *work) * @req: the request need to be listed into the engine queue */ int crypto_transfer_request(struct crypto_engine *engine, - struct ablkcipher_request *req, bool need_pump) + struct crypto_async_request *req, bool need_pump) { unsigned long flags; int ret; @@ -154,7 +151,7 @@ int crypto_transfer_request(struct crypto_engine *engine, return -ESHUTDOWN; } - ret = ablkcipher_enqueue_request(&engine->queue, req); + ret = crypto_enqueue_request(&engine->queue, req); if (!engine->busy && need_pump) queue_kthread_work(&engine->kworker, &engine->pump_requests); @@ -171,7 +168,7 @@ EXPORT_SYMBOL_GPL(crypto_transfer_request); * @req: the request need to be listed into the engine queue */ int crypto_transfer_request_to_engine(struct crypto_engine *engine, - struct ablkcipher_request *req) + struct crypto_async_request *req) { return crypto_transfer_request(engine, req, true); } @@ -184,7 +181,7 @@ EXPORT_SYMBOL_GPL(crypto_transfer_request_to_engine); * @err: error number */ void crypto_finalize_request(struct crypto_engine *engine, - struct ablkcipher_request *req, int err) + struct crypto_async_request *req, int err) { unsigned long flags; bool finalize_cur_req = false; @@ -208,7 +205,7 @@ void crypto_finalize_request(struct crypto_engine *engine, spin_unlock_irqrestore(&engine->queue_lock, flags); } - req->base.complete(&req->base, err); + req->complete(req, err); queue_kthread_work(&engine->kworker, &engine->pump_requests); } diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h index eeafd21..d720a2a 100644 --- a/include/crypto/algapi.h +++ b/include/crypto/algapi.h @@ -173,26 +173,26 @@ struct crypto_engine { int (*unprepare_crypt_hardware)(struct crypto_engine *engine); int (*prepare_request)(struct crypto_engine *engine, - struct ablkcipher_request *req); + struct crypto_async_request *req); int (*unprepare_request)(struct crypto_engine *engine, - struct ablkcipher_request *req); + struct crypto_async_request *req); int (*crypt_one_request)(struct crypto_engine *engine, - struct ablkcipher_request *req); + struct crypto_async_request *req); struct kthread_worker kworker; struct task_struct *kworker_task; struct kthread_work pump_requests; void *priv_data; - struct ablkcipher_request *cur_req; + struct crypto_async_request *cur_req; }; int crypto_transfer_request(struct crypto_engine *engine, - struct ablkcipher_request *req, bool need_pump); + struct crypto_async_request *req, bool need_pump); int crypto_transfer_request_to_engine(struct crypto_engine *engine, - struct ablkcipher_request *req); + struct crypto_async_request *req); void crypto_finalize_request(struct crypto_engine *engine, - struct ablkcipher_request *req, int err); + struct crypto_async_request *req, int err); int crypto_engine_start(struct crypto_engine *engine); int crypto_engine_stop(struct crypto_engine *engine); struct crypto_engine *crypto_engine_alloc_init(struct device *dev, bool rt);