From patchwork Mon Aug 21 14:04:59 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: 110539 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp1331986qge; Mon, 21 Aug 2017 07:08:36 -0700 (PDT) X-Received: by 10.84.231.206 with SMTP id g14mr19689086pln.394.1503324516467; Mon, 21 Aug 2017 07:08:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503324516; cv=none; d=google.com; s=arc-20160816; b=QLSzXld/0we1XviWW6Ci788BHYOkLbRFer6KWbCJDRWcpY7mQIfPQptMrdDXW0MjJU ccfiRUihbWNhz9m83E3sAaPgjnc/XmqM6Y88pVfABXTEBwRlBIMaXbtNO8ji+zMtaEyZ NI1lkUzkk9XYMnez+VsMVBzkge2tV+G4IBJ4bT2MZNJwm7YLYArspu/0CP1T56jFaM6N Ien5yWF8fBk/ogldIAPm17Lx8BY6ffO+R471IXZ2B1X/v8cCEXs30Es1z/OYGdZmoUnG G63+GMb7ZlHcaGQDu9uuXTcPvHVuYLIF5/dFsfCMM/TRlQUwqyNrWKlhxGFY/DWcmvqD Au1Q== 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=GWns1hNSP5Hw+39AuDkzItF6g9pNRvzW/kFJi0SQ8PQ=; b=tGrPs4BJ9ZI3F1DF4zqNe75XglhmpgECqbVkHgtc0woadLlDeCmXfovd/UVdnM/sOC 2TuU62C8j3MoIoz2/SB46YnPOpxPzZGNo+ca0yshgbo6N5bBm4H6Pjjt3q6CUboi5LJ1 NByqWmXU+s7ex3b3hh5g6bet29msjyarevo4QgY7frbzXAHa9T8ATpNKJyZ+uf4RBx9a 19UpZYzackqfIUJb3MxUhDNhYwbK3O13R9lsYyo5n03Z+3riky74rETx1wJnns1Kmtwo uu71eYYmFiynFTD7z0vus74LjRdO3w045FdWFwkTR0fJNuCTBwpjhgD+fR2pkAo8T70+ Gt8w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 p9si4948335pll.80.2017.08.21.07.08.36; Mon, 21 Aug 2017 07:08:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754376AbdHUOId (ORCPT + 26 others); Mon, 21 Aug 2017 10:08:33 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:58344 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753859AbdHUOI0 (ORCPT ); Mon, 21 Aug 2017 10:08:26 -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 467E01B33; Mon, 21 Aug 2017 07:08:26 -0700 (PDT) Received: from gby.kfn.arm.com (unknown [10.45.48.132]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 906083F540; Mon, 21 Aug 2017 07:08:15 -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 Subject: [PATCH v6 13/19] cifs: move to generic async completion Date: Mon, 21 Aug 2017 17:04:59 +0300 Message-Id: <1503324309-13673-14-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1503324309-13673-1-git-send-email-gilad@benyossef.com> References: <1503324309-13673-1-git-send-email-gilad@benyossef.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org cifs starts an async. crypto op and waits for their completion. Move it over to generic code doing the same. Signed-off-by: Gilad Ben-Yossef Acked-by: Pavel Shilovsky --- fs/cifs/smb2ops.c | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) -- 2.1.4 diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index cfacf2c..16fb041 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -1878,22 +1878,6 @@ init_sg(struct smb_rqst *rqst, u8 *sign) return sg; } -struct cifs_crypt_result { - int err; - struct completion completion; -}; - -static void cifs_crypt_complete(struct crypto_async_request *req, int err) -{ - struct cifs_crypt_result *res = req->data; - - if (err == -EINPROGRESS) - return; - - res->err = err; - complete(&res->completion); -} - static int smb2_get_enc_key(struct TCP_Server_Info *server, __u64 ses_id, int enc, u8 *key) { @@ -1934,12 +1918,10 @@ crypt_message(struct TCP_Server_Info *server, struct smb_rqst *rqst, int enc) struct aead_request *req; char *iv; unsigned int iv_len; - struct cifs_crypt_result result = {0, }; + DECLARE_CRYPTO_WAIT(wait); struct crypto_aead *tfm; unsigned int crypt_len = le32_to_cpu(tr_hdr->OriginalMessageSize); - init_completion(&result.completion); - rc = smb2_get_enc_key(server, tr_hdr->SessionId, enc, key); if (rc) { cifs_dbg(VFS, "%s: Could not get %scryption key\n", __func__, @@ -1999,14 +1981,10 @@ crypt_message(struct TCP_Server_Info *server, struct smb_rqst *rqst, int enc) aead_request_set_ad(req, assoc_data_len); aead_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG, - cifs_crypt_complete, &result); + crypto_req_done, &wait); - rc = enc ? crypto_aead_encrypt(req) : crypto_aead_decrypt(req); - - if (rc == -EINPROGRESS || rc == -EBUSY) { - wait_for_completion(&result.completion); - rc = result.err; - } + rc = crypto_wait_req(enc ? crypto_aead_encrypt(req) + : crypto_aead_decrypt(req), &wait); if (!rc && enc) memcpy(&tr_hdr->Signature, sign, SMB2_SIGNATURE_SIZE);