Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1726675

[PATCH v8 14/20] cifs: move to generic async completion

Show all headers | View raw

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 <gilad@benyossef.com>
Acked-by: Pavel Shilovsky <pshilov@microsoft.com>
---
 fs/cifs/smb2ops.c | 30 ++++--------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index fb2934b..982b39d 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -2066,22 +2066,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)
 {
@@ -2122,12 +2106,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__,
@@ -2187,14 +2169,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);
-- 
2.1.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v8 00/20] simplify crypto wait for async op Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:40 +0200
  [PATCH v8 09/20] crypto: move drbg to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200
  [PATCH v8 03/20] net: use -EAGAIN for transient busy indication Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200
  [PATCH v8 04/20] crypto: remove redundant backlog checks on EBUSY Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200
  [PATCH v8 14/20] cifs: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200
  [PATCH v8 12/20] fscrypt: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200
  [PATCH v8 20/20] crypto: adapt api sample to use async. op wait Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200
  [PATCH v8 02/20] crypto: ccp: use -EAGAIN for transient busy indication Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200
  [PATCH v8 05/20] crypto: marvell/cesa: remove redundant backlog checks on EBUSY Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200
  [PATCH v8 08/20] crypto: move pub key to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200
  [PATCH v8 10/20] crypto: move gcm to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200
  [PATCH v8 07/20] crypto: move algif to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200
  [PATCH v8 19/20] crypto: mediatek: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200
  [PATCH v8 17/20] crypto: talitos: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200
  [PATCH v8 06/20] crypto: introduce crypto wait for async op Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200
  [PATCH v8 13/20] dm: move dm-verity to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200
  [PATCH v8 18/20] crypto: qce: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200
  [PATCH v8 16/20] crypto: tcrypt: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200
  [PATCH v8 15/20] ima: move to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200
  [PATCH v8 11/20] crypto: move testmgr to generic async completion Gilad Ben-Yossef <gilad@benyossef.com> - 2017-09-05 14:50 +0200

csiph-web