Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/810144/?format=api
{ "id": 810144, "url": "http://patchwork.ozlabs.org/api/patches/810144/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-cifs-client/patch/1504615144-29770-13-git-send-email-gilad@benyossef.com/", "project": { "id": 12, "url": "http://patchwork.ozlabs.org/api/projects/12/?format=api", "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-13-git-send-email-gilad@benyossef.com>", "list_archive_url": null, "date": "2017-09-05T12:38:51", "name": "[v8,12/20] fscrypt: move to generic async completion", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "2ffa7623a99a59bfc2ff1eb7a3be81ecb03651c9", "submitter": { "id": 11198, "url": "http://patchwork.ozlabs.org/api/people/11198/?format=api", "name": "Gilad Ben-Yossef", "email": "gilad@benyossef.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linux-cifs-client/patch/1504615144-29770-13-git-send-email-gilad@benyossef.com/mbox/", "series": [ { "id": 1572, "url": "http://patchwork.ozlabs.org/api/series/1572/?format=api", "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/810144/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/810144/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<linux-cifs-owner@vger.kernel.org>", "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=<UNKNOWN>)", "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xmmgc0sTkz9sRV\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 5 Sep 2017 22:46:52 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751456AbdIEMmV (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);\n\tTue, 5 Sep 2017 08:42:21 -0400", "from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:39592 \"EHLO\n\tfoss.arm.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1751149AbdIEMmR (ORCPT <rfc822;linux-cifs@vger.kernel.org>);\n\tTue, 5 Sep 2017 08:42:17 -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 5D5BF1688;\n\tTue, 5 Sep 2017 05:42:16 -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\t83E0D3F3E1; Tue, 5 Sep 2017 05:42:06 -0700 (PDT)" ], "From": "Gilad Ben-Yossef <gilad@benyossef.com>", "To": "Herbert Xu <herbert@gondor.apana.org.au>,\n\t\"David S. Miller\" <davem@davemloft.net>,\n\tJonathan Corbet <corbet@lwn.net>, David Howells <dhowells@redhat.com>,\n\tTom Lendacky <thomas.lendacky@amd.com>, Gary Hook <gary.hook@amd.com>,\n\tBoris Brezillon <boris.brezillon@free-electrons.com>,\n\tArnaud Ebalard <arno@natisbad.org>,\n\tMatthias Brugger <matthias.bgg@gmail.com>,\n\tAlasdair Kergon <agk@redhat.com>,\n\tMike Snitzer <snitzer@redhat.com>, dm-devel@redhat.com,\n\tShaohua Li <shli@kernel.org>, Steve French <sfrench@samba.org>,\n\t\"Theodore Y. Ts'o\" <tytso@mit.edu>, Jaegeuk Kim <jaegeuk@kernel.org>,\n\tSteffen Klassert <steffen.klassert@secunet.com>,\n\tAlexey Kuznetsov <kuznet@ms2.inr.ac.ru>,\n\tHideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,\n\tMimi Zohar <zohar@linux.vnet.ibm.com>,\n\tDmitry Kasatkin <dmitry.kasatkin@gmail.com>,\n\tJames Morris <james.l.morris@oracle.com>,\n\t\"Serge E. Hallyn\" <serge@hallyn.com>, 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 <ofir.drang@arm.com>", "Subject": "[PATCH v8 12/20] fscrypt: move to generic async completion", "Date": "Tue, 5 Sep 2017 15:38:51 +0300", "Message-Id": "<1504615144-29770-13-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": "<linux-cifs.vger.kernel.org>", "X-Mailing-List": "linux-cifs@vger.kernel.org" }, "content": "fscrypt starts several async. crypto ops and waiting for them to\ncomplete. Move it over to generic code doing the same.\n\nSigned-off-by: Gilad Ben-Yossef <gilad@benyossef.com>\n---\n fs/crypto/crypto.c | 28 ++++------------------------\n fs/crypto/fname.c | 36 ++++++------------------------------\n fs/crypto/fscrypt_private.h | 10 ----------\n fs/crypto/keyinfo.c | 21 +++------------------\n 4 files changed, 13 insertions(+), 82 deletions(-)", "diff": "diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c\nindex c7835df..80a3cad 100644\n--- a/fs/crypto/crypto.c\n+++ b/fs/crypto/crypto.c\n@@ -126,21 +126,6 @@ struct fscrypt_ctx *fscrypt_get_ctx(const struct inode *inode, gfp_t gfp_flags)\n }\n EXPORT_SYMBOL(fscrypt_get_ctx);\n \n-/**\n- * page_crypt_complete() - completion callback for page crypto\n- * @req: The asynchronous cipher request context\n- * @res: The result of the cipher operation\n- */\n-static void page_crypt_complete(struct crypto_async_request *req, int res)\n-{\n-\tstruct fscrypt_completion_result *ecr = req->data;\n-\n-\tif (res == -EINPROGRESS)\n-\t\treturn;\n-\tecr->res = res;\n-\tcomplete(&ecr->completion);\n-}\n-\n int fscrypt_do_page_crypto(const struct inode *inode, fscrypt_direction_t rw,\n \t\t\t u64 lblk_num, struct page *src_page,\n \t\t\t struct page *dest_page, unsigned int len,\n@@ -151,7 +136,7 @@ int fscrypt_do_page_crypto(const struct inode *inode, fscrypt_direction_t rw,\n \t\tu8 padding[FS_IV_SIZE - sizeof(__le64)];\n \t} iv;\n \tstruct skcipher_request *req = NULL;\n-\tDECLARE_FS_COMPLETION_RESULT(ecr);\n+\tDECLARE_CRYPTO_WAIT(wait);\n \tstruct scatterlist dst, src;\n \tstruct fscrypt_info *ci = inode->i_crypt_info;\n \tstruct crypto_skcipher *tfm = ci->ci_ctfm;\n@@ -179,7 +164,7 @@ int fscrypt_do_page_crypto(const struct inode *inode, fscrypt_direction_t rw,\n \n \tskcipher_request_set_callback(\n \t\treq, CRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,\n-\t\tpage_crypt_complete, &ecr);\n+\t\tcrypto_req_done, &wait);\n \n \tsg_init_table(&dst, 1);\n \tsg_set_page(&dst, dest_page, len, offs);\n@@ -187,14 +172,9 @@ int fscrypt_do_page_crypto(const struct inode *inode, fscrypt_direction_t rw,\n \tsg_set_page(&src, src_page, len, offs);\n \tskcipher_request_set_crypt(req, &src, &dst, len, &iv);\n \tif (rw == FS_DECRYPT)\n-\t\tres = crypto_skcipher_decrypt(req);\n+\t\tres = crypto_wait_req(crypto_skcipher_decrypt(req), &wait);\n \telse\n-\t\tres = crypto_skcipher_encrypt(req);\n-\tif (res == -EINPROGRESS || res == -EBUSY) {\n-\t\tBUG_ON(req->base.data != &ecr);\n-\t\twait_for_completion(&ecr.completion);\n-\t\tres = ecr.res;\n-\t}\n+\t\tres = crypto_wait_req(crypto_skcipher_encrypt(req), &wait);\n \tskcipher_request_free(req);\n \tif (res) {\n \t\tprintk_ratelimited(KERN_ERR\ndiff --git a/fs/crypto/fname.c b/fs/crypto/fname.c\nindex ad9f814..a80a0d3 100644\n--- a/fs/crypto/fname.c\n+++ b/fs/crypto/fname.c\n@@ -15,21 +15,6 @@\n #include \"fscrypt_private.h\"\n \n /**\n- * fname_crypt_complete() - completion callback for filename crypto\n- * @req: The asynchronous cipher request context\n- * @res: The result of the cipher operation\n- */\n-static void fname_crypt_complete(struct crypto_async_request *req, int res)\n-{\n-\tstruct fscrypt_completion_result *ecr = req->data;\n-\n-\tif (res == -EINPROGRESS)\n-\t\treturn;\n-\tecr->res = res;\n-\tcomplete(&ecr->completion);\n-}\n-\n-/**\n * fname_encrypt() - encrypt a filename\n *\n * The caller must have allocated sufficient memory for the @oname string.\n@@ -40,7 +25,7 @@ static int fname_encrypt(struct inode *inode,\n \t\t\tconst struct qstr *iname, struct fscrypt_str *oname)\n {\n \tstruct skcipher_request *req = NULL;\n-\tDECLARE_FS_COMPLETION_RESULT(ecr);\n+\tDECLARE_CRYPTO_WAIT(wait);\n \tstruct fscrypt_info *ci = inode->i_crypt_info;\n \tstruct crypto_skcipher *tfm = ci->ci_ctfm;\n \tint res = 0;\n@@ -76,17 +61,12 @@ static int fname_encrypt(struct inode *inode,\n \t}\n \tskcipher_request_set_callback(req,\n \t\t\tCRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,\n-\t\t\tfname_crypt_complete, &ecr);\n+\t\t\tcrypto_req_done, &wait);\n \tsg_init_one(&sg, oname->name, cryptlen);\n \tskcipher_request_set_crypt(req, &sg, &sg, cryptlen, iv);\n \n \t/* Do the encryption */\n-\tres = crypto_skcipher_encrypt(req);\n-\tif (res == -EINPROGRESS || res == -EBUSY) {\n-\t\t/* Request is being completed asynchronously; wait for it */\n-\t\twait_for_completion(&ecr.completion);\n-\t\tres = ecr.res;\n-\t}\n+\tres = crypto_wait_req(crypto_skcipher_encrypt(req), &wait);\n \tskcipher_request_free(req);\n \tif (res < 0) {\n \t\tprintk_ratelimited(KERN_ERR\n@@ -110,7 +90,7 @@ static int fname_decrypt(struct inode *inode,\n \t\t\t\tstruct fscrypt_str *oname)\n {\n \tstruct skcipher_request *req = NULL;\n-\tDECLARE_FS_COMPLETION_RESULT(ecr);\n+\tDECLARE_CRYPTO_WAIT(wait);\n \tstruct scatterlist src_sg, dst_sg;\n \tstruct fscrypt_info *ci = inode->i_crypt_info;\n \tstruct crypto_skcipher *tfm = ci->ci_ctfm;\n@@ -131,7 +111,7 @@ static int fname_decrypt(struct inode *inode,\n \t}\n \tskcipher_request_set_callback(req,\n \t\tCRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,\n-\t\tfname_crypt_complete, &ecr);\n+\t\tcrypto_req_done, &wait);\n \n \t/* Initialize IV */\n \tmemset(iv, 0, FS_CRYPTO_BLOCK_SIZE);\n@@ -140,11 +120,7 @@ static int fname_decrypt(struct inode *inode,\n \tsg_init_one(&src_sg, iname->name, iname->len);\n \tsg_init_one(&dst_sg, oname->name, oname->len);\n \tskcipher_request_set_crypt(req, &src_sg, &dst_sg, iname->len, iv);\n-\tres = crypto_skcipher_decrypt(req);\n-\tif (res == -EINPROGRESS || res == -EBUSY) {\n-\t\twait_for_completion(&ecr.completion);\n-\t\tres = ecr.res;\n-\t}\n+\tres = crypto_wait_req(crypto_skcipher_decrypt(req), &wait);\n \tskcipher_request_free(req);\n \tif (res < 0) {\n \t\tprintk_ratelimited(KERN_ERR\ndiff --git a/fs/crypto/fscrypt_private.h b/fs/crypto/fscrypt_private.h\nindex a1d5021..c0f1881 100644\n--- a/fs/crypto/fscrypt_private.h\n+++ b/fs/crypto/fscrypt_private.h\n@@ -69,16 +69,6 @@ typedef enum {\n #define FS_CTX_REQUIRES_FREE_ENCRYPT_FL\t\t0x00000001\n #define FS_CTX_HAS_BOUNCE_BUFFER_FL\t\t0x00000002\n \n-struct fscrypt_completion_result {\n-\tstruct completion completion;\n-\tint res;\n-};\n-\n-#define DECLARE_FS_COMPLETION_RESULT(ecr) \\\n-\tstruct fscrypt_completion_result ecr = { \\\n-\t\tCOMPLETION_INITIALIZER_ONSTACK((ecr).completion), 0 }\n-\n-\n /* crypto.c */\n extern int fscrypt_initialize(unsigned int cop_flags);\n extern struct workqueue_struct *fscrypt_read_workqueue;\ndiff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c\nindex 018c588..3c84cac 100644\n--- a/fs/crypto/keyinfo.c\n+++ b/fs/crypto/keyinfo.c\n@@ -17,17 +17,6 @@\n \n static struct crypto_shash *essiv_hash_tfm;\n \n-static void derive_crypt_complete(struct crypto_async_request *req, int rc)\n-{\n-\tstruct fscrypt_completion_result *ecr = req->data;\n-\n-\tif (rc == -EINPROGRESS)\n-\t\treturn;\n-\n-\tecr->res = rc;\n-\tcomplete(&ecr->completion);\n-}\n-\n /**\n * derive_key_aes() - Derive a key using AES-128-ECB\n * @deriving_key: Encryption key used for derivation.\n@@ -42,7 +31,7 @@ static int derive_key_aes(u8 deriving_key[FS_AES_128_ECB_KEY_SIZE],\n {\n \tint res = 0;\n \tstruct skcipher_request *req = NULL;\n-\tDECLARE_FS_COMPLETION_RESULT(ecr);\n+\tDECLARE_CRYPTO_WAIT(wait);\n \tstruct scatterlist src_sg, dst_sg;\n \tstruct crypto_skcipher *tfm = crypto_alloc_skcipher(\"ecb(aes)\", 0, 0);\n \n@@ -59,7 +48,7 @@ static int derive_key_aes(u8 deriving_key[FS_AES_128_ECB_KEY_SIZE],\n \t}\n \tskcipher_request_set_callback(req,\n \t\t\tCRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,\n-\t\t\tderive_crypt_complete, &ecr);\n+\t\t\tcrypto_req_done, &wait);\n \tres = crypto_skcipher_setkey(tfm, deriving_key,\n \t\t\t\t\tFS_AES_128_ECB_KEY_SIZE);\n \tif (res < 0)\n@@ -69,11 +58,7 @@ static int derive_key_aes(u8 deriving_key[FS_AES_128_ECB_KEY_SIZE],\n \tsg_init_one(&dst_sg, derived_raw_key, source_key->size);\n \tskcipher_request_set_crypt(req, &src_sg, &dst_sg, source_key->size,\n \t\t\t\t NULL);\n-\tres = crypto_skcipher_encrypt(req);\n-\tif (res == -EINPROGRESS || res == -EBUSY) {\n-\t\twait_for_completion(&ecr.completion);\n-\t\tres = ecr.res;\n-\t}\n+\tres = crypto_wait_req(crypto_skcipher_encrypt(req), &wait);\n out:\n \tskcipher_request_free(req);\n \tcrypto_free_skcipher(tfm);\n", "prefixes": [ "v8", "12/20" ] }