{"id":810139,"url":"http://patchwork.ozlabs.org/api/patches/810139/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1504615144-29770-15-git-send-email-gilad@benyossef.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504615144-29770-15-git-send-email-gilad@benyossef.com>","list_archive_url":null,"date":"2017-09-05T12:38:53","name":"[v8,14/20] cifs: move to generic async completion","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"f552150e56e809de2e16c948c3661fa22c7780a2","submitter":{"id":11198,"url":"http://patchwork.ozlabs.org/api/people/11198/?format=json","name":"Gilad Ben-Yossef","email":"gilad@benyossef.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1504615144-29770-15-git-send-email-gilad@benyossef.com/mbox/","series":[{"id":1573,"url":"http://patchwork.ozlabs.org/api/series/1573/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=1573","date":"2017-09-05T12:38:39","name":"simplify crypto wait for async op","version":8,"mbox":"http://patchwork.ozlabs.org/series/1573/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810139/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810139/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@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=netdev-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 3xmmfz5Fm8z9sRV\n\tfor ;\n\tTue, 5 Sep 2017 22:46:19 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752131AbdIEMmz (ORCPT );\n\tTue, 5 Sep 2017 08:42:55 -0400","from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:39688 \"EHLO\n\tfoss.arm.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1751149AbdIEMmo (ORCPT );\n\tTue, 5 Sep 2017 08:42:44 -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 50972165C;\n\tTue, 5 Sep 2017 05:42:44 -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\t624513F3E1; Tue, 5 Sep 2017 05:42:35 -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 14/20] cifs: move to generic async completion","Date":"Tue, 5 Sep 2017 15:38:53 +0300","Message-Id":"<1504615144-29770-15-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":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"cifs starts an async. crypto op and waits for their completion.\nMove it over to generic code doing the same.\n\nSigned-off-by: Gilad Ben-Yossef \nAcked-by: Pavel Shilovsky \n---\n fs/cifs/smb2ops.c | 30 ++++--------------------------\n 1 file changed, 4 insertions(+), 26 deletions(-)","diff":"diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c\nindex fb2934b..982b39d 100644\n--- a/fs/cifs/smb2ops.c\n+++ b/fs/cifs/smb2ops.c\n@@ -2066,22 +2066,6 @@ init_sg(struct smb_rqst *rqst, u8 *sign)\n \treturn sg;\n }\n \n-struct cifs_crypt_result {\n-\tint err;\n-\tstruct completion completion;\n-};\n-\n-static void cifs_crypt_complete(struct crypto_async_request *req, int err)\n-{\n-\tstruct cifs_crypt_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\n smb2_get_enc_key(struct TCP_Server_Info *server, __u64 ses_id, int enc, u8 *key)\n {\n@@ -2122,12 +2106,10 @@ crypt_message(struct TCP_Server_Info *server, struct smb_rqst *rqst, int enc)\n \tstruct aead_request *req;\n \tchar *iv;\n \tunsigned int iv_len;\n-\tstruct cifs_crypt_result result = {0, };\n+\tDECLARE_CRYPTO_WAIT(wait);\n \tstruct crypto_aead *tfm;\n \tunsigned int crypt_len = le32_to_cpu(tr_hdr->OriginalMessageSize);\n \n-\tinit_completion(&result.completion);\n-\n \trc = smb2_get_enc_key(server, tr_hdr->SessionId, enc, key);\n \tif (rc) {\n \t\tcifs_dbg(VFS, \"%s: Could not get %scryption key\\n\", __func__,\n@@ -2187,14 +2169,10 @@ crypt_message(struct TCP_Server_Info *server, struct smb_rqst *rqst, int enc)\n \taead_request_set_ad(req, assoc_data_len);\n \n \taead_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,\n-\t\t\t\t cifs_crypt_complete, &result);\n+\t\t\t\t crypto_req_done, &wait);\n \n-\trc = enc ? crypto_aead_encrypt(req) : crypto_aead_decrypt(req);\n-\n-\tif (rc == -EINPROGRESS || rc == -EBUSY) {\n-\t\twait_for_completion(&result.completion);\n-\t\trc = result.err;\n-\t}\n+\trc = crypto_wait_req(enc ? crypto_aead_encrypt(req)\n+\t\t\t\t: crypto_aead_decrypt(req), &wait);\n \n \tif (!rc && enc)\n \t\tmemcpy(&tr_hdr->Signature, sign, SMB2_SIGNATURE_SIZE);\n","prefixes":["v8","14/20"]}