From: Iuliana Prodan <iuliana.prodan@nxp.com>
To: Herbert Xu <herbert@gondor.apana.org.au>,
Horia Geanta <horia.geanta@nxp.com>,
Aymen Sghaier <aymen.sghaier@nxp.com>
Cc: "David S. Miller" <davem@davemloft.net>,
Tom Lendacky <thomas.lendacky@amd.com>,
Gary Hook <gary.hook@amd.com>,
linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-imx <linux-imx@nxp.com>,
Iuliana Prodan <iuliana.prodan@nxp.com>
Subject: [PATCH 09/12] crypto: caam - bypass crypto-engine sw queue, if empty
Date: Mon, 18 Nov 2019 00:30:42 +0200 [thread overview]
Message-ID: <1574029845-22796-10-git-send-email-iuliana.prodan@nxp.com> (raw)
In-Reply-To: <1574029845-22796-1-git-send-email-iuliana.prodan@nxp.com>
Bypass crypto-engine software queue, if empty, and send the request
directly to hardware. If this returns -ENOSPC, transfer the request to
crypto-engine and let it handle it.
Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
---
drivers/crypto/caam/jr.c | 29 ++++++++++++++++++++++++++---
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c
index 5c55d3d..ddf3d39 100644
--- a/drivers/crypto/caam/jr.c
+++ b/drivers/crypto/caam/jr.c
@@ -476,10 +476,33 @@ int caam_jr_enqueue(struct device *dev, u32 *desc,
struct caam_drv_private_jr *jrpriv = dev_get_drvdata(dev);
struct caam_jr_request_entry *jrentry = areq;
struct crypto_async_request *req = jrentry->base;
+ int ret;
- if (req->flags & CRYPTO_TFM_REQ_MAY_BACKLOG)
- return transfer_request_to_engine(jrpriv->engine, req);
-
+ if (req->flags & CRYPTO_TFM_REQ_MAY_BACKLOG) {
+ if (crypto_queue_len(&jrpriv->engine->queue) == 0) {
+ /*
+ * send the request to CAAM, if crypto-engine queue
+ * is empty
+ */
+ ret = caam_jr_enqueue_no_bklog(dev, desc, cbk, jrentry);
+ if (ret == -ENOSPC)
+ /*
+ * CAAM has no space, so transfer the request
+ * to crypto-engine
+ */
+ return transfer_request_to_engine(jrpriv->engine,
+ req);
+ else
+ return ret;
+ } else {
+ /*
+ * crypto-engine queue is not empty, so transfer the
+ * request to crypto-engine, to keep the order
+ * of requests
+ */
+ return transfer_request_to_engine(jrpriv->engine, req);
+ }
+ }
return caam_jr_enqueue_no_bklog(dev, desc, cbk, jrentry);
}
EXPORT_SYMBOL(caam_jr_enqueue);
--
2.1.0
next prev parent reply other threads:[~2019-11-17 22:31 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-17 22:30 [PATCH 00/12] crypto: caam - backlogging support Iuliana Prodan
2019-11-17 22:30 ` [PATCH 01/12] crypto: add helper function for akcipher_request Iuliana Prodan
2019-11-18 13:29 ` Corentin Labbe
2019-11-19 14:27 ` Horia Geanta
2019-11-19 15:10 ` Gary R Hook
2019-11-22 9:08 ` Herbert Xu
2019-11-22 10:29 ` Iuliana Prodan
2019-11-22 10:34 ` Herbert Xu
2019-11-17 22:30 ` [PATCH 02/12] crypto: caam - refactor skcipher/aead/gcm/chachapoly {en,de}crypt functions Iuliana Prodan
2019-11-19 14:41 ` Horia Geanta
2019-11-17 22:30 ` [PATCH 03/12] crypto: caam - refactor ahash_done callbacks Iuliana Prodan
2019-11-19 14:56 ` Horia Geanta
2019-11-17 22:30 ` [PATCH 04/12] crypto: caam - refactor ahash_edesc_alloc Iuliana Prodan
2019-11-19 15:05 ` Horia Geanta
2019-11-17 22:30 ` [PATCH 05/12] crypto: caam - refactor RSA private key _done callbacks Iuliana Prodan
2019-11-19 15:06 ` Horia Geanta
2019-11-17 22:30 ` [PATCH 06/12] crypto: caam - change return code in caam_jr_enqueue function Iuliana Prodan
2019-11-19 15:21 ` Horia Geanta
2019-12-10 11:56 ` Bastian Krause
2019-12-10 12:28 ` Iuliana Prodan
2019-11-17 22:30 ` [PATCH 07/12] crypto: caam - refactor caam_jr_enqueue Iuliana Prodan
2019-11-19 17:55 ` Horia Geanta
2019-11-19 22:49 ` Iuliana Prodan
2019-11-20 6:48 ` Horia Geanta
2019-11-17 22:30 ` [PATCH 08/12] crypto: caam - support crypto_engine framework for SKCIPHER algorithms Iuliana Prodan
2019-11-21 11:46 ` Horia Geanta
2019-11-22 10:33 ` Herbert Xu
2019-11-22 11:05 ` Iuliana Prodan
2019-11-22 11:09 ` Herbert Xu
2019-11-22 14:11 ` Iuliana Prodan
2019-11-22 14:31 ` Herbert Xu
2019-12-10 15:27 ` Bastian Krause
2019-12-11 12:20 ` Iuliana Prodan
2019-12-11 13:33 ` Bastian Krause
2019-11-17 22:30 ` Iuliana Prodan [this message]
2019-11-21 11:53 ` [PATCH 09/12] crypto: caam - bypass crypto-engine sw queue, if empty Horia Geanta
2019-11-17 22:30 ` [PATCH 10/12] crypto: caam - add crypto_engine support for AEAD algorithms Iuliana Prodan
2019-11-21 16:46 ` Horia Geanta
2019-11-17 22:30 ` [PATCH 11/12] crypto: caam - add crypto_engine support for RSA algorithms Iuliana Prodan
2019-11-21 16:53 ` Horia Geanta
2019-11-17 22:30 ` [PATCH 12/12] crypto: caam - add crypto_engine support for HASH algorithms Iuliana Prodan
2019-11-21 17:06 ` Horia Geanta
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=1574029845-22796-10-git-send-email-iuliana.prodan@nxp.com \
--to=iuliana.prodan@nxp.com \
--cc=aymen.sghaier@nxp.com \
--cc=davem@davemloft.net \
--cc=gary.hook@amd.com \
--cc=herbert@gondor.apana.org.au \
--cc=horia.geanta@nxp.com \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=thomas.lendacky@amd.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;
as well as URLs for NNTP newsgroup(s).