{"id":810127,"url":"http://patchwork.ozlabs.org/api/patches/810127/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/1504615144-29770-18-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-18-git-send-email-gilad@benyossef.com>","list_archive_url":null,"date":"2017-09-05T12:38:56","name":"[v8,17/20] crypto: talitos: move to generic async completion","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"71d6b3b3c8cef50fb59e77da278b9af6afc9ae11","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-18-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/810127/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810127/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 3xmmbs20yBz9t1t\n\tfor ;\n\tTue, 5 Sep 2017 22:43:37 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752243AbdIEMnf (ORCPT );\n\tTue, 5 Sep 2017 08:43:35 -0400","from foss.arm.com ([217.140.101.70]:39866 \"EHLO foss.arm.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1752182AbdIEMna (ORCPT );\n\tTue, 5 Sep 2017 08:43:30 -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 52B27165D;\n\tTue, 5 Sep 2017 05:43:29 -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\t97D1F3F3E1; Tue, 5 Sep 2017 05:43:17 -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 17/20] crypto: talitos: move to generic async completion","Date":"Tue, 5 Sep 2017 15:38:56 +0300","Message-Id":"<1504615144-29770-18-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":"The talitos driver starts several async crypto ops and waits for their\ncompletions. Move it over to generic code doing the same.\n\nSigned-off-by: Gilad Ben-Yossef \n---\n drivers/crypto/talitos.c | 38 +++++---------------------------------\n 1 file changed, 5 insertions(+), 33 deletions(-)","diff":"diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c\nindex 79791c6..194a307 100644\n--- a/drivers/crypto/talitos.c\n+++ b/drivers/crypto/talitos.c\n@@ -2037,22 +2037,6 @@ static int ahash_import(struct ahash_request *areq, const void *in)\n \treturn 0;\n }\n \n-struct keyhash_result {\n-\tstruct completion completion;\n-\tint err;\n-};\n-\n-static void keyhash_complete(struct crypto_async_request *req, int err)\n-{\n-\tstruct keyhash_result *res = req->data;\n-\n-\tif (err == -EINPROGRESS)\n-\t\treturn;\n-\n-\tres->err = err;\n-\tcomplete(&res->completion);\n-}\n-\n static int keyhash(struct crypto_ahash *tfm, const u8 *key, unsigned int keylen,\n \t\t u8 *hash)\n {\n@@ -2060,10 +2044,10 @@ static int keyhash(struct crypto_ahash *tfm, const u8 *key, unsigned int keylen,\n \n \tstruct scatterlist sg[1];\n \tstruct ahash_request *req;\n-\tstruct keyhash_result hresult;\n+\tstruct crypto_wait wait;\n \tint ret;\n \n-\tinit_completion(&hresult.completion);\n+\tcrypto_init_wait(&wait);\n \n \treq = ahash_request_alloc(tfm, GFP_KERNEL);\n \tif (!req)\n@@ -2072,25 +2056,13 @@ static int keyhash(struct crypto_ahash *tfm, const u8 *key, unsigned int keylen,\n \t/* Keep tfm keylen == 0 during hash of the long key */\n \tctx->keylen = 0;\n \tahash_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,\n-\t\t\t\t keyhash_complete, &hresult);\n+\t\t\t\t crypto_req_done, &wait);\n \n \tsg_init_one(&sg[0], key, keylen);\n \n \tahash_request_set_crypt(req, sg, hash, keylen);\n-\tret = crypto_ahash_digest(req);\n-\tswitch (ret) {\n-\tcase 0:\n-\t\tbreak;\n-\tcase -EINPROGRESS:\n-\tcase -EBUSY:\n-\t\tret = wait_for_completion_interruptible(\n-\t\t\t&hresult.completion);\n-\t\tif (!ret)\n-\t\t\tret = hresult.err;\n-\t\tbreak;\n-\tdefault:\n-\t\tbreak;\n-\t}\n+\tret = crypto_wait_req(crypto_ahash_digest(req), &wait);\n+\n \tahash_request_free(req);\n \n \treturn ret;\n","prefixes":["v8","17/20"]}