From patchwork Mon May 29 08:22:58 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: 100638 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp231071qge; Mon, 29 May 2017 01:25:34 -0700 (PDT) X-Received: by 10.99.163.67 with SMTP id v3mr18263091pgn.210.1496046334523; Mon, 29 May 2017 01:25:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496046334; cv=none; d=google.com; s=arc-20160816; b=bl2IP3I1UaAGBQR0LZKzA/lG/1YPOmnwpvuBHmcZX8/CZHyd6fr4i+3nwJ9HfCs6bT yQR173WvMGYlDYpYA5k86TPK6WlvcrycUl/9iCRifiNbXwsPKBOlzwCDFjfHxIwXVTg3 lOtUYaLN7Hbez4e6Mm21HBBWGk6sM+I5RrasPCLuHz3zppPlWwy1WFIEt6xk0RUNFBh0 t/FRye2ggrgpFgDqvuEuLuxKlgMBdFlMAyZxJRs3hWrAwMHI60+7RjhBM11PeSF/B80+ fxLVz01D3nkmyaRfGswGRcosUJsLOl9kXqPPFqcQ1alhos72TS7YRZMNrTOGR7HLQ531 cmpw== 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=V04C6fXIh2TDcLkEvWdfiAcPwlV3BtDixsBfIBZaySU=; b=01ICCzih/zLmDEJGhBB7w47eCYNA8K7VA2mPTGSJNCycSXcXa8D94PXNPS5WO3flT+ hZ7SbmuNzoROCSQ10c/BrGZUxLEA3c09qGJnIA+oW2tVH6DEv/SnjvdPCP5f0mHfFJH0 MG6435z1ic+m04Mfp686rclwnymBxSTvuSLP1fflmfk2SlYqaVvGnhUZOfuzEVF4MQMY eEun18+ygJQ7ipmJx11wPZBgfO0SQKXqsNrdJLxgo3Ynk1EEnNuu/EoYx7CCc+YII2lz j3nBwAtW4CLiMpMxMLt434xsm8OhVKp3IH8Nod5d7IvGITyQD81nT1WIPzFYbIhXlN33 0A3Q== 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 14si10001409pgc.38.2017.05.29.01.25.34; Mon, 29 May 2017 01:25:34 -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 S1751382AbdE2IZ1 (ORCPT + 25 others); Mon, 29 May 2017 04:25:27 -0400 Received: from foss.arm.com ([217.140.101.70]:46170 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750891AbdE2IZW (ORCPT ); Mon, 29 May 2017 04:25:22 -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 880A580D; Mon, 29 May 2017 01:25:02 -0700 (PDT) Received: from gby.kfn.arm.com (unknown [10.45.48.155]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D05DD3F52A; Mon, 29 May 2017 01:24:55 -0700 (PDT) From: Gilad Ben-Yossef To: Herbert Xu , "David S. Miller" , Jonathan Corbet , David Howells , Alasdair Kergon , Mike Snitzer , dm-devel@redhat.com, Shaohua Li , Steve French , "Theodore Y. Ts'o" , Jaegeuk Kim , Mimi Zohar , Dmitry Kasatkin , James Morris , "Serge E. Hallyn" Cc: Eric Biggers , Ofir Drang , Pavel Shilovsky , linux-crypto@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, keyrings@vger.kernel.org, linux-raid@vger.kernel.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-fscrypt@vger.kernel.org, linux-ima-devel@lists.sourceforge.net, linux-ima-user@lists.sourceforge.net, linux-security-module@vger.kernel.org Subject: [PATCH v2 11/11] crypto: adapt api sample to use async. op wait Date: Mon, 29 May 2017 11:22:58 +0300 Message-Id: <1496046180-21962-12-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1496046180-21962-1-git-send-email-gilad@benyossef.com> References: <1496046180-21962-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 The code sample is waiting for an async. crypto op completion. Adapt sample to use the new generic infrastructure to do the same. This also fixes a possible data coruption bug created by the use of wait_for_completion_interruptible() without dealing correctly with an interrupt aborting the wait prior to the async op finishing. Signed-off-by: Gilad Ben-Yossef --- Documentation/crypto/api-samples.rst | 52 +++++++----------------------------- 1 file changed, 10 insertions(+), 42 deletions(-) -- 2.1.4 diff --git a/Documentation/crypto/api-samples.rst b/Documentation/crypto/api-samples.rst index d021fd9..73b466b 100644 --- a/Documentation/crypto/api-samples.rst +++ b/Documentation/crypto/api-samples.rst @@ -7,59 +7,27 @@ Code Example For Symmetric Key Cipher Operation :: - struct tcrypt_result { - struct completion completion; - int err; - }; - /* tie all data structures together */ struct skcipher_def { struct scatterlist sg; struct crypto_skcipher *tfm; struct skcipher_request *req; - struct tcrypt_result result; + struct crypto_wait wait; }; - /* Callback function */ - static void test_skcipher_cb(struct crypto_async_request *req, int error) - { - struct tcrypt_result *result = req->data; - - if (error == -EINPROGRESS) - return; - result->err = error; - complete(&result->completion); - pr_info("Encryption finished successfully\n"); - } - /* Perform cipher operation */ static unsigned int test_skcipher_encdec(struct skcipher_def *sk, int enc) { - int rc = 0; + int rc; if (enc) - rc = crypto_skcipher_encrypt(sk->req); + rc = crypto_wait_req(crypto_skcipher_encrypt(sk->req), &sk->wait); else - rc = crypto_skcipher_decrypt(sk->req); - - switch (rc) { - case 0: - break; - case -EINPROGRESS: - case -EBUSY: - rc = wait_for_completion_interruptible( - &sk->result.completion); - if (!rc && !sk->result.err) { - reinit_completion(&sk->result.completion); - break; - } - default: - pr_info("skcipher encrypt returned with %d result %d\n", - rc, sk->result.err); - break; - } - init_completion(&sk->result.completion); + rc = crypto_wait_req(crypto_skcipher_decrypt(sk->req), &sk->wait); + + if (rc) + pr_info("skcipher encrypt returned with result %d\n", rc); return rc; } @@ -89,8 +57,8 @@ Code Example For Symmetric Key Cipher Operation } skcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG, - test_skcipher_cb, - &sk.result); + crypto_req_done, + &sk.wait); /* AES 256 with random key */ get_random_bytes(&key, 32); @@ -122,7 +90,7 @@ Code Example For Symmetric Key Cipher Operation /* We encrypt one block */ sg_init_one(&sk.sg, scratchpad, 16); skcipher_request_set_crypt(req, &sk.sg, &sk.sg, 16, ivdata); - init_completion(&sk.result.completion); + crypto_init_wait(&sk.wait); /* encrypt data */ ret = test_skcipher_encdec(&sk, 1);