{"id":810133,"url":"http://patchwork.ozlabs.org/api/patches/810133/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/1504615144-29770-21-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-21-git-send-email-gilad@benyossef.com>","list_archive_url":null,"date":"2017-09-05T12:38:59","name":"[v8,20/20] crypto: adapt api sample to use async. op wait","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"33b7a894a6726b244e092f4f300d3dd0c1c4feb7","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-21-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/810133/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810133/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 3xmmcj0GbMz9sRm\n\tfor ;\n\tTue, 5 Sep 2017 22:44:21 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752377AbdIEMoT (ORCPT );\n\tTue, 5 Sep 2017 08:44:19 -0400","from foss.arm.com ([217.140.101.70]:40036 \"EHLO foss.arm.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1752374AbdIEMoN (ORCPT );\n\tTue, 5 Sep 2017 08:44:13 -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 948581684;\n\tTue, 5 Sep 2017 05:44:12 -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\t44B1E3F3E1; Tue, 5 Sep 2017 05:44:03 -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 20/20] crypto: adapt api sample to use async. op wait","Date":"Tue, 5 Sep 2017 15:38:59 +0300","Message-Id":"<1504615144-29770-21-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":"The code sample is waiting for an async. crypto op completion.\nAdapt sample to use the new generic infrastructure to do the same.\n\nThis also fixes a possible data coruption bug created by the\nuse of wait_for_completion_interruptible() without dealing\ncorrectly with an interrupt aborting the wait prior to the\nasync op finishing.\n\nSigned-off-by: Gilad Ben-Yossef \n---\n Documentation/crypto/api-samples.rst | 52 +++++++-----------------------------\n 1 file changed, 10 insertions(+), 42 deletions(-)","diff":"diff --git a/Documentation/crypto/api-samples.rst b/Documentation/crypto/api-samples.rst\nindex 2531948..006827e 100644\n--- a/Documentation/crypto/api-samples.rst\n+++ b/Documentation/crypto/api-samples.rst\n@@ -7,59 +7,27 @@ Code Example For Symmetric Key Cipher Operation\n ::\n \n \n- struct tcrypt_result {\n- struct completion completion;\n- int err;\n- };\n-\n /* tie all data structures together */\n struct skcipher_def {\n struct scatterlist sg;\n struct crypto_skcipher *tfm;\n struct skcipher_request *req;\n- struct tcrypt_result result;\n+ struct crypto_wait wait;\n };\n \n- /* Callback function */\n- static void test_skcipher_cb(struct crypto_async_request *req, int error)\n- {\n- struct tcrypt_result *result = req->data;\n-\n- if (error == -EINPROGRESS)\n- return;\n- result->err = error;\n- complete(&result->completion);\n- pr_info(\"Encryption finished successfully\\n\");\n- }\n-\n /* Perform cipher operation */\n static unsigned int test_skcipher_encdec(struct skcipher_def *sk,\n int enc)\n {\n- int rc = 0;\n+ int rc;\n \n if (enc)\n- rc = crypto_skcipher_encrypt(sk->req);\n+ rc = crypto_wait_req(crypto_skcipher_encrypt(sk->req), &sk->wait);\n else\n- rc = crypto_skcipher_decrypt(sk->req);\n-\n- switch (rc) {\n- case 0:\n- break;\n- case -EINPROGRESS:\n- case -EBUSY:\n- rc = wait_for_completion_interruptible(\n- &sk->result.completion);\n- if (!rc && !sk->result.err) {\n- reinit_completion(&sk->result.completion);\n- break;\n- }\n- default:\n- pr_info(\"skcipher encrypt returned with %d result %d\\n\",\n- rc, sk->result.err);\n- break;\n- }\n- init_completion(&sk->result.completion);\n+ rc = crypto_wait_req(crypto_skcipher_decrypt(sk->req), &sk->wait);\n+\n+\tif (rc)\n+\t\tpr_info(\"skcipher encrypt returned with result %d\\n\", rc);\n \n return rc;\n }\n@@ -89,8 +57,8 @@ Code Example For Symmetric Key Cipher Operation\n }\n \n skcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,\n- test_skcipher_cb,\n- &sk.result);\n+ crypto_req_done,\n+ &sk.wait);\n \n /* AES 256 with random key */\n get_random_bytes(&key, 32);\n@@ -122,7 +90,7 @@ Code Example For Symmetric Key Cipher Operation\n /* We encrypt one block */\n sg_init_one(&sk.sg, scratchpad, 16);\n skcipher_request_set_crypt(req, &sk.sg, &sk.sg, 16, ivdata);\n- init_completion(&sk.result.completion);\n+ crypto_init_wait(&sk.wait);\n \n /* encrypt data */\n ret = test_skcipher_encdec(&sk, 1);\n","prefixes":["v8","20/20"]}