{"id":810150,"url":"http://patchwork.ozlabs.org/api/patches/810150/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/1504615144-29770-5-git-send-email-gilad@benyossef.com/","project":{"id":12,"url":"http://patchwork.ozlabs.org/api/projects/12/?format=json","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-5-git-send-email-gilad@benyossef.com>","list_archive_url":null,"date":"2017-09-05T12:38:43","name":"[v8,04/20] crypto: remove redundant backlog checks on EBUSY","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"56cdb371e1730cedc8de65b6c4894f5f7c41fa77","submitter":{"id":11198,"url":"http://patchwork.ozlabs.org/api/people/11198/?format=json","name":"Gilad Ben-Yossef","email":"gilad@benyossef.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/1504615144-29770-5-git-send-email-gilad@benyossef.com/mbox/","series":[{"id":1572,"url":"http://patchwork.ozlabs.org/api/series/1572/?format=json","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/810150/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810150/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xmmjQ6l0qz9t16\n\tfor ;\n\tTue, 5 Sep 2017 22:48:26 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751796AbdIEMkY (ORCPT );\n\tTue, 5 Sep 2017 08:40:24 -0400","from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:39102 \"EHLO\n\tfoss.arm.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1751678AbdIEMkU (ORCPT );\n\tTue, 5 Sep 2017 08:40:20 -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 29A411596;\n\tTue, 5 Sep 2017 05:40:19 -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\t3CE043F3E1; Tue, 5 Sep 2017 05:40:09 -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 04/20] crypto: remove redundant backlog checks on EBUSY","Date":"Tue, 5 Sep 2017 15:38:43 +0300","Message-Id":"<1504615144-29770-5-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":"","X-Mailing-List":"linux-cifs@vger.kernel.org"},"content":"Now that -EBUSY return code only indicates backlog queueing\nwe can safely remove the now redundant check for the\nCRYPTO_TFM_REQ_MAY_BACKLOG flag when -EBUSY is returned.\n\nSigned-off-by: Gilad Ben-Yossef \n---\n crypto/ahash.c | 12 +++---------\n crypto/cts.c | 6 ++----\n crypto/lrw.c | 8 ++------\n crypto/rsa-pkcs1pad.c | 16 ++++------------\n crypto/xts.c | 8 ++------\n 5 files changed, 13 insertions(+), 37 deletions(-)","diff":"diff --git a/crypto/ahash.c b/crypto/ahash.c\nindex 5e8666e..3a35d67 100644\n--- a/crypto/ahash.c\n+++ b/crypto/ahash.c\n@@ -334,9 +334,7 @@ static int ahash_op_unaligned(struct ahash_request *req,\n \t\treturn err;\n \n \terr = op(req);\n-\tif (err == -EINPROGRESS ||\n-\t (err == -EBUSY && (ahash_request_flags(req) &\n-\t\t\t CRYPTO_TFM_REQ_MAY_BACKLOG)))\n+\tif (err == -EINPROGRESS || err == -EBUSY)\n \t\treturn err;\n \n \tahash_restore_req(req, err);\n@@ -394,9 +392,7 @@ static int ahash_def_finup_finish1(struct ahash_request *req, int err)\n \treq->base.complete = ahash_def_finup_done2;\n \n \terr = crypto_ahash_reqtfm(req)->final(req);\n-\tif (err == -EINPROGRESS ||\n-\t (err == -EBUSY && (ahash_request_flags(req) &\n-\t\t\t CRYPTO_TFM_REQ_MAY_BACKLOG)))\n+\tif (err == -EINPROGRESS || err == -EBUSY)\n \t\treturn err;\n \n out:\n@@ -432,9 +428,7 @@ static int ahash_def_finup(struct ahash_request *req)\n \t\treturn err;\n \n \terr = tfm->update(req);\n-\tif (err == -EINPROGRESS ||\n-\t (err == -EBUSY && (ahash_request_flags(req) &\n-\t\t\t CRYPTO_TFM_REQ_MAY_BACKLOG)))\n+\tif (err == -EINPROGRESS || err == -EBUSY)\n \t\treturn err;\n \n \treturn ahash_def_finup_finish1(req, err);\ndiff --git a/crypto/cts.c b/crypto/cts.c\nindex 243f591..4773c18 100644\n--- a/crypto/cts.c\n+++ b/crypto/cts.c\n@@ -136,8 +136,7 @@ static void crypto_cts_encrypt_done(struct crypto_async_request *areq, int err)\n \t\tgoto out;\n \n \terr = cts_cbc_encrypt(req);\n-\tif (err == -EINPROGRESS ||\n-\t (err == -EBUSY && req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))\n+\tif (err == -EINPROGRESS || err == -EBUSY)\n \t\treturn;\n \n out:\n@@ -229,8 +228,7 @@ static void crypto_cts_decrypt_done(struct crypto_async_request *areq, int err)\n \t\tgoto out;\n \n \terr = cts_cbc_decrypt(req);\n-\tif (err == -EINPROGRESS ||\n-\t (err == -EBUSY && req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))\n+\tif (err == -EINPROGRESS || err == -EBUSY)\n \t\treturn;\n \n out:\ndiff --git a/crypto/lrw.c b/crypto/lrw.c\nindex a8bfae4..695cea9 100644\n--- a/crypto/lrw.c\n+++ b/crypto/lrw.c\n@@ -328,9 +328,7 @@ static int do_encrypt(struct skcipher_request *req, int err)\n \t\t crypto_skcipher_encrypt(subreq) ?:\n \t\t post_crypt(req);\n \n-\t\tif (err == -EINPROGRESS ||\n-\t\t (err == -EBUSY &&\n-\t\t req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))\n+\t\tif (err == -EINPROGRESS || err == -EBUSY)\n \t\t\treturn err;\n \t}\n \n@@ -380,9 +378,7 @@ static int do_decrypt(struct skcipher_request *req, int err)\n \t\t crypto_skcipher_decrypt(subreq) ?:\n \t\t post_crypt(req);\n \n-\t\tif (err == -EINPROGRESS ||\n-\t\t (err == -EBUSY &&\n-\t\t req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))\n+\t\tif (err == -EINPROGRESS || err == -EBUSY)\n \t\t\treturn err;\n \t}\n \ndiff --git a/crypto/rsa-pkcs1pad.c b/crypto/rsa-pkcs1pad.c\nindex 407c64b..2908f93 100644\n--- a/crypto/rsa-pkcs1pad.c\n+++ b/crypto/rsa-pkcs1pad.c\n@@ -279,9 +279,7 @@ static int pkcs1pad_encrypt(struct akcipher_request *req)\n \t\t\t\t req->dst, ctx->key_size - 1, req->dst_len);\n \n \terr = crypto_akcipher_encrypt(&req_ctx->child_req);\n-\tif (err != -EINPROGRESS &&\n-\t\t\t(err != -EBUSY ||\n-\t\t\t !(req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)))\n+\tif (err != -EINPROGRESS && err != -EBUSY)\n \t\treturn pkcs1pad_encrypt_sign_complete(req, err);\n \n \treturn err;\n@@ -383,9 +381,7 @@ static int pkcs1pad_decrypt(struct akcipher_request *req)\n \t\t\t\t ctx->key_size);\n \n \terr = crypto_akcipher_decrypt(&req_ctx->child_req);\n-\tif (err != -EINPROGRESS &&\n-\t\t\t(err != -EBUSY ||\n-\t\t\t !(req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)))\n+\tif (err != -EINPROGRESS && err != -EBUSY)\n \t\treturn pkcs1pad_decrypt_complete(req, err);\n \n \treturn err;\n@@ -440,9 +436,7 @@ static int pkcs1pad_sign(struct akcipher_request *req)\n \t\t\t\t req->dst, ctx->key_size - 1, req->dst_len);\n \n \terr = crypto_akcipher_sign(&req_ctx->child_req);\n-\tif (err != -EINPROGRESS &&\n-\t\t\t(err != -EBUSY ||\n-\t\t\t !(req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)))\n+\tif (err != -EINPROGRESS && err != -EBUSY)\n \t\treturn pkcs1pad_encrypt_sign_complete(req, err);\n \n \treturn err;\n@@ -561,9 +555,7 @@ static int pkcs1pad_verify(struct akcipher_request *req)\n \t\t\t\t ctx->key_size);\n \n \terr = crypto_akcipher_verify(&req_ctx->child_req);\n-\tif (err != -EINPROGRESS &&\n-\t\t\t(err != -EBUSY ||\n-\t\t\t !(req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)))\n+\tif (err != -EINPROGRESS && err != -EBUSY)\n \t\treturn pkcs1pad_verify_complete(req, err);\n \n \treturn err;\ndiff --git a/crypto/xts.c b/crypto/xts.c\nindex d86c11a..af68012 100644\n--- a/crypto/xts.c\n+++ b/crypto/xts.c\n@@ -269,9 +269,7 @@ static int do_encrypt(struct skcipher_request *req, int err)\n \t\t crypto_skcipher_encrypt(subreq) ?:\n \t\t post_crypt(req);\n \n-\t\tif (err == -EINPROGRESS ||\n-\t\t (err == -EBUSY &&\n-\t\t req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))\n+\t\tif (err == -EINPROGRESS || err == -EBUSY)\n \t\t\treturn err;\n \t}\n \n@@ -321,9 +319,7 @@ static int do_decrypt(struct skcipher_request *req, int err)\n \t\t crypto_skcipher_decrypt(subreq) ?:\n \t\t post_crypt(req);\n \n-\t\tif (err == -EINPROGRESS ||\n-\t\t (err == -EBUSY &&\n-\t\t req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))\n+\t\tif (err == -EINPROGRESS || err == -EBUSY)\n \t\t\treturn err;\n \t}\n \n","prefixes":["v8","04/20"]}