{"id":810116,"url":"http://patchwork.ozlabs.org/api/patches/810116/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/1504615144-29770-8-git-send-email-gilad@benyossef.com/","project":{"id":12,"url":"http://patchwork.ozlabs.org/api/projects/12/?format=json","name":"Linux CIFS Client","link_name":"linux-cifs-client","list_id":"linux-cifs.vger.kernel.org","list_email":"linux-cifs@vger.kernel.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504615144-29770-8-git-send-email-gilad@benyossef.com>","list_archive_url":null,"date":"2017-09-05T12:38:46","name":"[v8,07/20] crypto: move algif to generic async completion","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"fbda331ac0026c83d7e6bf7f9666addea61d20fa","submitter":{"id":11198,"url":"http://patchwork.ozlabs.org/api/people/11198/?format=json","name":"Gilad Ben-Yossef","email":"gilad@benyossef.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/1504615144-29770-8-git-send-email-gilad@benyossef.com/mbox/","series":[{"id":1572,"url":"http://patchwork.ozlabs.org/api/series/1572/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/list/?series=1572","date":"2017-09-05T12:38:39","name":"simplify crypto wait for async op","version":8,"mbox":"http://patchwork.ozlabs.org/series/1572/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810116/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810116/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=linux-cifs-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xmmY03wKpz9sRV\n\tfor ;\n\tTue, 5 Sep 2017 22:41:08 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751500AbdIEMlG (ORCPT );\n\tTue, 5 Sep 2017 08:41:06 -0400","from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:39284 \"EHLO\n\tfoss.arm.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1751386AbdIEMlC (ORCPT );\n\tTue, 5 Sep 2017 08:41:02 -0400","from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249])\n\tby usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 417ED1684;\n\tTue, 5 Sep 2017 05:41:01 -0700 (PDT)","from gby.kfn.arm.com (unknown [10.45.48.140])\n\tby usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id\n\t1A5893F3E1; Tue, 5 Sep 2017 05:40:51 -0700 (PDT)"],"From":"Gilad Ben-Yossef ","To":"Herbert Xu ,\n\t\"David S. Miller\" ,\n\tJonathan Corbet , David Howells ,\n\tTom Lendacky , Gary Hook ,\n\tBoris Brezillon ,\n\tArnaud Ebalard ,\n\tMatthias Brugger ,\n\tAlasdair Kergon ,\n\tMike Snitzer , dm-devel@redhat.com,\n\tShaohua Li , Steve French ,\n\t\"Theodore Y. Ts'o\" , Jaegeuk Kim ,\n\tSteffen Klassert ,\n\tAlexey Kuznetsov ,\n\tHideaki YOSHIFUJI ,\n\tMimi Zohar ,\n\tDmitry Kasatkin ,\n\tJames Morris ,\n\t\"Serge E. Hallyn\" , linux-crypto@vger.kernel.org,\n\tlinux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,\n\tkeyrings@vger.kernel.org, linux-arm-kernel@lists.infradead.org,\n\tlinux-mediatek@lists.infradead.org, linux-raid@vger.kernel.org,\n\tlinux-cifs@vger.kernel.org, samba-technical@lists.samba.org,\n\tlinux-fscrypt@vger.kernel.org, netdev@vger.kernel.org,\n\tlinux-ima-devel@lists.sourceforge.net,\n\tlinux-ima-user@lists.sourceforge.net,\n\tlinux-security-module@vger.kernel.org","Cc":"Ofir Drang ","Subject":"[PATCH v8 07/20] crypto: move algif to generic async completion","Date":"Tue, 5 Sep 2017 15:38:46 +0300","Message-Id":"<1504615144-29770-8-git-send-email-gilad@benyossef.com>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504615144-29770-1-git-send-email-gilad@benyossef.com>","References":"<1504615144-29770-1-git-send-email-gilad@benyossef.com>","Sender":"linux-cifs-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"linux-cifs@vger.kernel.org"},"content":"algif starts several async crypto ops and waits for their completion.\nMove it over to generic code doing the same.\n\nSigned-off-by: Gilad Ben-Yossef \n---\n crypto/af_alg.c | 27 ---------------------------\n crypto/algif_aead.c | 8 ++++----\n crypto/algif_hash.c | 30 ++++++++++++++----------------\n crypto/algif_skcipher.c | 9 ++++-----\n include/crypto/if_alg.h | 15 +--------------\n 5 files changed, 23 insertions(+), 66 deletions(-)","diff":"diff --git a/crypto/af_alg.c b/crypto/af_alg.c\nindex ffa9f4c..cf312ed 100644\n--- a/crypto/af_alg.c\n+++ b/crypto/af_alg.c\n@@ -481,33 +481,6 @@ int af_alg_cmsg_send(struct msghdr *msg, struct af_alg_control *con)\n }\n EXPORT_SYMBOL_GPL(af_alg_cmsg_send);\n \n-int af_alg_wait_for_completion(int err, struct af_alg_completion *completion)\n-{\n-\tswitch (err) {\n-\tcase -EINPROGRESS:\n-\tcase -EBUSY:\n-\t\twait_for_completion(&completion->completion);\n-\t\treinit_completion(&completion->completion);\n-\t\terr = completion->err;\n-\t\tbreak;\n-\t};\n-\n-\treturn err;\n-}\n-EXPORT_SYMBOL_GPL(af_alg_wait_for_completion);\n-\n-void af_alg_complete(struct crypto_async_request *req, int err)\n-{\n-\tstruct af_alg_completion *completion = req->data;\n-\n-\tif (err == -EINPROGRESS)\n-\t\treturn;\n-\n-\tcompletion->err = err;\n-\tcomplete(&completion->completion);\n-}\n-EXPORT_SYMBOL_GPL(af_alg_complete);\n-\n /**\n * af_alg_alloc_tsgl - allocate the TX SGL\n *\ndiff --git a/crypto/algif_aead.c b/crypto/algif_aead.c\nindex 516b38c..aacae08 100644\n--- a/crypto/algif_aead.c\n+++ b/crypto/algif_aead.c\n@@ -278,11 +278,11 @@ static int _aead_recvmsg(struct socket *sock, struct msghdr *msg,\n \t\t/* Synchronous operation */\n \t\taead_request_set_callback(&areq->cra_u.aead_req,\n \t\t\t\t\t CRYPTO_TFM_REQ_MAY_BACKLOG,\n-\t\t\t\t\t af_alg_complete, &ctx->completion);\n-\t\terr = af_alg_wait_for_completion(ctx->enc ?\n+\t\t\t\t\t crypto_req_done, &ctx->wait);\n+\t\terr = crypto_wait_req(ctx->enc ?\n \t\t\t\tcrypto_aead_encrypt(&areq->cra_u.aead_req) :\n \t\t\t\tcrypto_aead_decrypt(&areq->cra_u.aead_req),\n-\t\t\t\t\t\t &ctx->completion);\n+\t\t\t\t&ctx->wait);\n \t}\n \n \t/* AIO operation in progress */\n@@ -554,7 +554,7 @@ static int aead_accept_parent_nokey(void *private, struct sock *sk)\n \tctx->merge = 0;\n \tctx->enc = 0;\n \tctx->aead_assoclen = 0;\n-\taf_alg_init_completion(&ctx->completion);\n+\tcrypto_init_wait(&ctx->wait);\n \n \task->private = ctx;\n \ndiff --git a/crypto/algif_hash.c b/crypto/algif_hash.c\nindex 3b3c154..d2ab8de 100644\n--- a/crypto/algif_hash.c\n+++ b/crypto/algif_hash.c\n@@ -26,7 +26,7 @@ struct hash_ctx {\n \n \tu8 *result;\n \n-\tstruct af_alg_completion completion;\n+\tstruct crypto_wait wait;\n \n \tunsigned int len;\n \tbool more;\n@@ -102,8 +102,7 @@ static int hash_sendmsg(struct socket *sock, struct msghdr *msg,\n \t\tif ((msg->msg_flags & MSG_MORE))\n \t\t\thash_free_result(sk, ctx);\n \n-\t\terr = af_alg_wait_for_completion(crypto_ahash_init(&ctx->req),\n-\t\t\t\t\t\t&ctx->completion);\n+\t\terr = crypto_wait_req(crypto_ahash_init(&ctx->req), &ctx->wait);\n \t\tif (err)\n \t\t\tgoto unlock;\n \t}\n@@ -124,8 +123,8 @@ static int hash_sendmsg(struct socket *sock, struct msghdr *msg,\n \n \t\tahash_request_set_crypt(&ctx->req, ctx->sgl.sg, NULL, len);\n \n-\t\terr = af_alg_wait_for_completion(crypto_ahash_update(&ctx->req),\n-\t\t\t\t\t\t &ctx->completion);\n+\t\terr = crypto_wait_req(crypto_ahash_update(&ctx->req),\n+\t\t\t\t &ctx->wait);\n \t\taf_alg_free_sg(&ctx->sgl);\n \t\tif (err)\n \t\t\tgoto unlock;\n@@ -143,8 +142,8 @@ static int hash_sendmsg(struct socket *sock, struct msghdr *msg,\n \t\t\tgoto unlock;\n \n \t\tahash_request_set_crypt(&ctx->req, NULL, ctx->result, 0);\n-\t\terr = af_alg_wait_for_completion(crypto_ahash_final(&ctx->req),\n-\t\t\t\t\t\t &ctx->completion);\n+\t\terr = crypto_wait_req(crypto_ahash_final(&ctx->req),\n+\t\t\t\t &ctx->wait);\n \t}\n \n unlock:\n@@ -185,7 +184,7 @@ static ssize_t hash_sendpage(struct socket *sock, struct page *page,\n \t} else {\n \t\tif (!ctx->more) {\n \t\t\terr = crypto_ahash_init(&ctx->req);\n-\t\t\terr = af_alg_wait_for_completion(err, &ctx->completion);\n+\t\t\terr = crypto_wait_req(err, &ctx->wait);\n \t\t\tif (err)\n \t\t\t\tgoto unlock;\n \t\t}\n@@ -193,7 +192,7 @@ static ssize_t hash_sendpage(struct socket *sock, struct page *page,\n \t\terr = crypto_ahash_update(&ctx->req);\n \t}\n \n-\terr = af_alg_wait_for_completion(err, &ctx->completion);\n+\terr = crypto_wait_req(err, &ctx->wait);\n \tif (err)\n \t\tgoto unlock;\n \n@@ -229,17 +228,16 @@ static int hash_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,\n \tahash_request_set_crypt(&ctx->req, NULL, ctx->result, 0);\n \n \tif (!result && !ctx->more) {\n-\t\terr = af_alg_wait_for_completion(\n-\t\t\t\tcrypto_ahash_init(&ctx->req),\n-\t\t\t\t&ctx->completion);\n+\t\terr = crypto_wait_req(crypto_ahash_init(&ctx->req),\n+\t\t\t\t &ctx->wait);\n \t\tif (err)\n \t\t\tgoto unlock;\n \t}\n \n \tif (!result || ctx->more) {\n \t\tctx->more = 0;\n-\t\terr = af_alg_wait_for_completion(crypto_ahash_final(&ctx->req),\n-\t\t\t\t\t\t &ctx->completion);\n+\t\terr = crypto_wait_req(crypto_ahash_final(&ctx->req),\n+\t\t\t\t &ctx->wait);\n \t\tif (err)\n \t\t\tgoto unlock;\n \t}\n@@ -490,13 +488,13 @@ static int hash_accept_parent_nokey(void *private, struct sock *sk)\n \tctx->result = NULL;\n \tctx->len = len;\n \tctx->more = 0;\n-\taf_alg_init_completion(&ctx->completion);\n+\tcrypto_init_wait(&ctx->wait);\n \n \task->private = ctx;\n \n \tahash_request_set_tfm(&ctx->req, hash);\n \tahash_request_set_callback(&ctx->req, CRYPTO_TFM_REQ_MAY_BACKLOG,\n-\t\t\t\t af_alg_complete, &ctx->completion);\n+\t\t\t\t crypto_req_done, &ctx->wait);\n \n \tsk->sk_destruct = hash_sock_destruct;\n \ndiff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c\nindex 8ae4170..9954b07 100644\n--- a/crypto/algif_skcipher.c\n+++ b/crypto/algif_skcipher.c\n@@ -129,12 +129,11 @@ static int _skcipher_recvmsg(struct socket *sock, struct msghdr *msg,\n \t\tskcipher_request_set_callback(&areq->cra_u.skcipher_req,\n \t\t\t\t\t CRYPTO_TFM_REQ_MAY_SLEEP |\n \t\t\t\t\t CRYPTO_TFM_REQ_MAY_BACKLOG,\n-\t\t\t\t\t af_alg_complete,\n-\t\t\t\t\t &ctx->completion);\n-\t\terr = af_alg_wait_for_completion(ctx->enc ?\n+\t\t\t\t\t crypto_req_done, &ctx->wait);\n+\t\terr = crypto_wait_req(ctx->enc ?\n \t\t\tcrypto_skcipher_encrypt(&areq->cra_u.skcipher_req) :\n \t\t\tcrypto_skcipher_decrypt(&areq->cra_u.skcipher_req),\n-\t\t\t\t\t\t &ctx->completion);\n+\t\t\t\t\t\t &ctx->wait);\n \t}\n \n \t/* AIO operation in progress */\n@@ -388,7 +387,7 @@ static int skcipher_accept_parent_nokey(void *private, struct sock *sk)\n \tctx->more = 0;\n \tctx->merge = 0;\n \tctx->enc = 0;\n-\taf_alg_init_completion(&ctx->completion);\n+\tcrypto_init_wait(&ctx->wait);\n \n \task->private = ctx;\n \ndiff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h\nindex 75ec9c6..6abf0a3 100644\n--- a/include/crypto/if_alg.h\n+++ b/include/crypto/if_alg.h\n@@ -40,11 +40,6 @@ struct alg_sock {\n \tvoid *private;\n };\n \n-struct af_alg_completion {\n-\tstruct completion completion;\n-\tint err;\n-};\n-\n struct af_alg_control {\n \tstruct af_alg_iv *iv;\n \tint op;\n@@ -152,7 +147,7 @@ struct af_alg_ctx {\n \tvoid *iv;\n \tsize_t aead_assoclen;\n \n-\tstruct af_alg_completion completion;\n+\tstruct crypto_wait wait;\n \n \tsize_t used;\n \tsize_t rcvused;\n@@ -177,19 +172,11 @@ void af_alg_link_sg(struct af_alg_sgl *sgl_prev, struct af_alg_sgl *sgl_new);\n \n int af_alg_cmsg_send(struct msghdr *msg, struct af_alg_control *con);\n \n-int af_alg_wait_for_completion(int err, struct af_alg_completion *completion);\n-void af_alg_complete(struct crypto_async_request *req, int err);\n-\n static inline struct alg_sock *alg_sk(struct sock *sk)\n {\n \treturn (struct alg_sock *)sk;\n }\n \n-static inline void af_alg_init_completion(struct af_alg_completion *completion)\n-{\n-\tinit_completion(&completion->completion);\n-}\n-\n /**\n * Size of available buffer for sending data from user space to kernel.\n *\n","prefixes":["v8","07/20"]}