From patchwork Sun Oct 15 09:19: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: 115873 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2530025qgn; Sun, 15 Oct 2017 02:24:39 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBUJrnXoljphM1Jsalci26c1xF9ZZdqnAvuAMxs3aJHhyetL1GBkR6UCp6Zq5baFKHZYUCJ X-Received: by 10.99.43.71 with SMTP id r68mr5564432pgr.348.1508059479108; Sun, 15 Oct 2017 02:24:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508059479; cv=none; d=google.com; s=arc-20160816; b=g7F8c6Tx7EU0YXoBwevC5mqsNsGRUrFMoK//yGUbLrVU5ueQRmoGr9v5lDo93EkFkE VZ8IaGFYkgVFQcMXD0yxyYpcT5E1s5+Auwn9jOuaOkgiRlcyXXa0ZQqgQTJORL/nINa7 J7Mswx479tJz8aCM8zcULH3Jf2ICGOF7u/t/njeR6dNsz5fux/RPJzK6esO7CUVJA7vy YnC7gtpzGN4dEUBX9QpMRoJAV6+0LlUAQKhdktnPPdD/gvL6wvxrKyKLn4zDN1jYxgG2 b48YOaJyPF1CMP1Y63c5t/I+3wdMY+ihny0oT1qrPJKcjfeX1pc8wDvArK6a8qMH/Dhv L+uQ== 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=u3XMNwqRFqe0XhjHVtK3DWh/IPAkmsWcn4TJoVlgkSE=; b=C9DStDgqbdhHU1n6Gdwe9YURuo9mTHYwoZ4tcedgpD/oRY8eYU66BOlyqC+Cy2mp4A Ue3fN3EX2FqXerGjEws4WT/ZDj1roE0EGR87yelshof22KXKj9AwrjL/qRXBs/sQlM82 kIC0rPsNVva5zj3Q9LyTYqRUiFi1ltHeCZrvbMpdz9tXU/SdcJ6zkH08QvblR/93WI3k ojzWby3JXfhomo+6aURDJsf7McqmR1MO78jYIgppeVwVh91Q8y6lKqVc12Wzd+5gyZRJ /6OG/FB2+aK8P9+w81Np+pG+ROhh96y/qTWnDusyLnwT2XnyiHvIJ1o0u/yR6c52Po6V bcag== 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 i128si2910237pfg.17.2017.10.15.02.24.38; Sun, 15 Oct 2017 02:24:39 -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 S1752817AbdJOJYg (ORCPT + 27 others); Sun, 15 Oct 2017 05:24:36 -0400 Received: from foss.arm.com ([217.140.101.70]:47906 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751739AbdJOJYc (ORCPT ); Sun, 15 Oct 2017 05:24:32 -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 550E11A09; Sun, 15 Oct 2017 02:24:32 -0700 (PDT) Received: from localhost.localdomain (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6B4D93F3E1; Sun, 15 Oct 2017 02:24:23 -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, Steve French , "Theodore Y. Ts'o" , Jaegeuk Kim , Steffen Klassert , Alexey Kuznetsov , Hideaki YOSHIFUJI , Mimi Zohar , Dmitry Kasatkin , James Morris , "Serge E. Hallyn" Cc: Ofir Drang , 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-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-fscrypt@vger.kernel.org, netdev@vger.kernel.org, linux-ima-devel@lists.sourceforge.net, linux-ima-user@lists.sourceforge.net, linux-security-module@vger.kernel.org Subject: [PATCH v9 14/20] cifs: move to generic async completion Date: Sun, 15 Oct 2017 10:19:59 +0100 Message-Id: <1508059209-25529-15-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508059209-25529-1-git-send-email-gilad@benyossef.com> References: <1508059209-25529-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.7.4 diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index bdb963d..e067404 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -2087,22 +2087,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) { @@ -2143,12 +2127,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__, @@ -2208,14 +2190,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);