[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <Y+WTD3TrxaJOPdRg@kernel.org>
Date: Fri, 10 Feb 2023 02:42:55 +0200
From: Jarkko Sakkinen <jarkko@...nel.org>
To: Herbert Xu <herbert@...dor.apana.org.au>
Cc: Linux Crypto Mailing List <linux-crypto@...r.kernel.org>,
Alasdair Kergon <agk@...hat.com>,
Mike Snitzer <snitzer@...nel.org>, dm-devel@...hat.com,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>, netdev@...r.kernel.org,
Tyler Hicks <code@...icks.com>, ecryptfs@...r.kernel.org,
Marcel Holtmann <marcel@...tmann.org>,
Johan Hedberg <johan.hedberg@...il.com>,
Luiz Augusto von Dentz <luiz.dentz@...il.com>,
linux-bluetooth@...r.kernel.org,
Steffen Klassert <steffen.klassert@...unet.com>,
Jon Maloy <jmaloy@...hat.com>,
Ying Xue <ying.xue@...driver.com>,
Boris Pismenny <borisp@...dia.com>,
John Fastabend <john.fastabend@...il.com>,
David Howells <dhowells@...hat.com>, keyrings@...r.kernel.org
Subject: Re: [PATCH 3/17] fs: ecryptfs: Use crypto_wait_req
On Mon, Feb 06, 2023 at 06:22:17PM +0800, Herbert Xu wrote:
> This patch replaces the custom crypto completion function with
> crypto_req_done.
nit: "Replace the custom crypto ..."
>
> Signed-off-by: Herbert Xu <herbert@...dor.apana.org.au>
> ---
>
> fs/ecryptfs/crypto.c | 30 +++---------------------------
> 1 file changed, 3 insertions(+), 27 deletions(-)
>
> diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
> index e3f5d7f3c8a0..c3057539f088 100644
> --- a/fs/ecryptfs/crypto.c
> +++ b/fs/ecryptfs/crypto.c
> @@ -260,22 +260,6 @@ int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg,
> return i;
> }
>
> -struct extent_crypt_result {
> - struct completion completion;
> - int rc;
> -};
> -
> -static void extent_crypt_complete(struct crypto_async_request *req, int rc)
> -{
> - struct extent_crypt_result *ecr = req->data;
> -
> - if (rc == -EINPROGRESS)
> - return;
> -
> - ecr->rc = rc;
> - complete(&ecr->completion);
> -}
> -
> /**
> * crypt_scatterlist
> * @crypt_stat: Pointer to the crypt_stat struct to initialize.
> @@ -293,7 +277,7 @@ static int crypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat,
> unsigned char *iv, int op)
> {
> struct skcipher_request *req = NULL;
> - struct extent_crypt_result ecr;
> + DECLARE_CRYPTO_WAIT(ecr);
> int rc = 0;
>
> if (unlikely(ecryptfs_verbosity > 0)) {
> @@ -303,8 +287,6 @@ static int crypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat,
> crypt_stat->key_size);
> }
>
> - init_completion(&ecr.completion);
> -
> mutex_lock(&crypt_stat->cs_tfm_mutex);
> req = skcipher_request_alloc(crypt_stat->tfm, GFP_NOFS);
> if (!req) {
> @@ -315,7 +297,7 @@ static int crypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat,
>
> skcipher_request_set_callback(req,
> CRYPTO_TFM_REQ_MAY_BACKLOG | CRYPTO_TFM_REQ_MAY_SLEEP,
> - extent_crypt_complete, &ecr);
> + crypto_req_done, &ecr);
> /* Consider doing this once, when the file is opened */
> if (!(crypt_stat->flags & ECRYPTFS_KEY_SET)) {
> rc = crypto_skcipher_setkey(crypt_stat->tfm, crypt_stat->key,
> @@ -334,13 +316,7 @@ static int crypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat,
> skcipher_request_set_crypt(req, src_sg, dst_sg, size, iv);
> rc = op == ENCRYPT ? crypto_skcipher_encrypt(req) :
> crypto_skcipher_decrypt(req);
> - if (rc == -EINPROGRESS || rc == -EBUSY) {
> - struct extent_crypt_result *ecr = req->base.data;
> -
> - wait_for_completion(&ecr->completion);
> - rc = ecr->rc;
> - reinit_completion(&ecr->completion);
> - }
> + rc = crypto_wait_req(rc, &ecr);
> out:
> skcipher_request_free(req);
> return rc;
Acked-by: Jarkko Sakkinen <jarkko@...nel.org>
BR, Jarkko
Powered by blists - more mailing lists