From: Gilad Ben-Yossef <gilad@benyossef.com>
To: Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
Jonathan Corbet <corbet@lwn.net>,
David Howells <dhowells@redhat.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
Gary Hook <gary.hook@amd.com>,
Boris Brezillon <boris.brezillon@free-electrons.com>,
Arnaud Ebalard <arno@natisbad.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Alasdair Kergon <agk@redhat.com>,
Mike Snitzer <snitzer@redhat.com>,
dm-devel@redhat.com, Steve French <sfrench@samba.org>,
"Theodore Y. Ts'o" <tytso@mit.edu>,
Jaegeuk Kim <jaegeuk@kernel.org>,
Steffen Klassert <steffen.klassert@secunet.com>,
Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
Mimi Zohar <zohar@linux.vnet.ibm.com>,
Dmitry Kasatkin <dmitry.ka
Cc: Ofir Drang <ofir.drang@arm.com>,
linux-crypto@vger.kernel.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org, keyrings@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, linux-cifs@vger.kernel.org,
samba-technical@lists.samba.org, linux-fscrypt@vger.kernel.org,
netdev@vger.kernel.org, linux-ima-devel@lists.sourceforge.net,
linux-ima-user@lists.sourceforge.net,
linux-security-module@vger.kernel.org
Subject: [PATCH v10 01/20] crypto: change transient busy return code to -ENOSPC
Date: Wed, 18 Oct 2017 08:00:33 +0100 [thread overview]
Message-ID: <1508310057-25369-2-git-send-email-gilad@benyossef.com> (raw)
In-Reply-To: <1508310057-25369-1-git-send-email-gilad@benyossef.com>
The crypto API was using the -EBUSY return value to indicate
both a hard failure to submit a crypto operation into a
transformation provider when the latter was busy and the backlog
mechanism was not enabled as well as a notification that the
operation was queued into the backlog when the backlog mechanism
was enabled.
Having the same return code indicate two very different conditions
depending on a flag is both error prone and requires extra runtime
check like the following to discern between the cases:
if (err == -EINPROGRESS ||
(err == -EBUSY && (ahash_request_flags(req) &
CRYPTO_TFM_REQ_MAY_BACKLOG)))
This patch changes the return code used to indicate a crypto op
failed due to the transformation provider being transiently busy
to -ENOSPC.
Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
---
crypto/algapi.c | 6 ++++--
crypto/cryptd.c | 4 +---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/crypto/algapi.c b/crypto/algapi.c
index aa699ff..60d7366 100644
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -897,9 +897,11 @@ int crypto_enqueue_request(struct crypto_queue *queue,
int err = -EINPROGRESS;
if (unlikely(queue->qlen >= queue->max_qlen)) {
- err = -EBUSY;
- if (!(request->flags & CRYPTO_TFM_REQ_MAY_BACKLOG))
+ if (!(request->flags & CRYPTO_TFM_REQ_MAY_BACKLOG)) {
+ err = -ENOSPC;
goto out;
+ }
+ err = -EBUSY;
if (queue->backlog == &queue->list)
queue->backlog = &request->list;
}
diff --git a/crypto/cryptd.c b/crypto/cryptd.c
index 0508c48..bd43cf5 100644
--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -137,16 +137,14 @@ static int cryptd_enqueue_request(struct cryptd_queue *queue,
int cpu, err;
struct cryptd_cpu_queue *cpu_queue;
atomic_t *refcnt;
- bool may_backlog;
cpu = get_cpu();
cpu_queue = this_cpu_ptr(queue->cpu_queue);
err = crypto_enqueue_request(&cpu_queue->queue, request);
refcnt = crypto_tfm_ctx(request->tfm);
- may_backlog = request->flags & CRYPTO_TFM_REQ_MAY_BACKLOG;
- if (err == -EBUSY && !may_backlog)
+ if (err == -ENOSPC)
goto out_put_cpu;
queue_work_on(cpu, kcrypto_wq, &cpu_queue->work);
--
2.7.4
next prev parent reply other threads:[~2017-10-18 7:00 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-18 7:00 [PATCH v10 00/20] simplify crypto wait for async op Gilad Ben-Yossef
2017-10-18 7:00 ` Gilad Ben-Yossef [this message]
2017-10-18 7:00 ` [PATCH v10 02/20] crypto: ccp: use -ENOSPC for transient busy indication Gilad Ben-Yossef
2017-10-18 7:00 ` [PATCH v10 03/20] net: " Gilad Ben-Yossef
2017-10-18 7:00 ` [PATCH v10 04/20] crypto: remove redundant backlog checks on EBUSY Gilad Ben-Yossef
2017-10-18 7:00 ` [PATCH v10 05/20] crypto: marvell/cesa: " Gilad Ben-Yossef
2017-10-18 7:00 ` [PATCH v10 06/20] crypto: introduce crypto wait for async op Gilad Ben-Yossef
2017-10-18 7:00 ` [PATCH v10 07/20] crypto: move algif to generic async completion Gilad Ben-Yossef
2017-10-18 7:00 ` [PATCH v10 08/20] crypto: move pub key " Gilad Ben-Yossef
2017-10-18 7:00 ` [PATCH v10 09/20] crypto: move drbg " Gilad Ben-Yossef
2017-10-18 7:00 ` [PATCH v10 10/20] crypto: move gcm " Gilad Ben-Yossef
2017-10-18 7:00 ` [PATCH v10 11/20] crypto: move testmgr " Gilad Ben-Yossef
2017-10-18 7:00 ` [PATCH v10 12/20] fscrypt: move " Gilad Ben-Yossef
2017-10-18 7:00 ` [PATCH v10 13/20] dm: move dm-verity " Gilad Ben-Yossef
2017-10-18 7:00 ` [PATCH v10 14/20] cifs: move " Gilad Ben-Yossef
2017-10-18 7:00 ` [PATCH v10 15/20] ima: " Gilad Ben-Yossef
2017-10-18 7:00 ` [PATCH v10 16/20] crypto: tcrypt: " Gilad Ben-Yossef
2017-10-18 7:00 ` [PATCH v10 17/20] crypto: talitos: " Gilad Ben-Yossef
2017-10-18 7:00 ` [PATCH v10 18/20] crypto: qce: " Gilad Ben-Yossef
2017-10-18 7:00 ` [PATCH v10 19/20] crypto: mediatek: " Gilad Ben-Yossef
2017-10-18 7:00 ` [PATCH v10 20/20] crypto: adapt api sample to use async. op wait Gilad Ben-Yossef
2017-11-03 14:25 ` [PATCH v10 00/20] simplify crypto wait for async op Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1508310057-25369-2-git-send-email-gilad@benyossef.com \
--to=gilad@benyossef.com \
--cc=agk@redhat.com \
--cc=arno@natisbad.org \
--cc=boris.brezillon@free-electrons.com \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=dhowells@redhat.com \
--cc=dm-devel@redhat.com \
--cc=gary.hook@amd.com \
--cc=herbert@gondor.apana.org.au \
--cc=jaegeuk@kernel.org \
--cc=keyrings@vger.kernel.org \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-fscrypt@vger.kernel.org \
--cc=linux-ima-devel@lists.sourceforge.net \
--cc=linux-ima-user@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-security-module@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=ofir.drang@arm.com \
--cc=samba-technical@lists.samba.org \
--cc=sfrench@samba.org \
--cc=snitzer@redhat.com \
--cc=steffen.klassert@secunet.com \
--cc=thomas.lendacky@amd.com \
--cc=tytso@mit.edu \
--cc=yoshfuji@linux-ipv6.org \
--cc=zohar@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox