From:   Gaurav Jain <gaurav.jain@nxp.com>
To:     Horia Geanta <horia.geanta@nxp.com>,
        Pankaj Gupta <pankaj.gupta@nxp.com>,
        Varun Sethi <V.Sethi@nxp.com>,
        Herbert Xu <herbert@gondor.apana.org.au>,
        "David S . Miller" <davem@davemloft.net>,
        Iuliana Prodan <iuliana.prodan@nxp.com>
Cc:     linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-imx@nxp.com, Gaurav Jain <gaurav.jain@nxp.com>
Subject: [PATCH v2] crypto: caam: save caam memory to support crypto engine retry mechanism.
Date:   Mon, 22 Nov 2021 17:02:34 +0530
Message-Id: <20211122113234.851618-1-gaurav.jain@nxp.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cDZLbFo5NGpYWTFnRHdBbHFUdmh5S3lHK2EwV1RpQTVYcU5veFQ3R2pUK0dv?=
 =?utf-8?B?Vmh1b3dic1FZKzlPZkIrSEhPMCtxV04wMHp6N25pL3pHTzVIVTJubWUyNzkv?=
 =?utf-8?B?RU1na1BZSTVVVHNaRmNrTHpZOGYxZWIwMjQzN3I2cFJmRFVDMGJaZURmcVdr?=
 =?utf-8?B?OHBGV3UwYnJZZXVDbjZOOUxRV015dnBRQkY0VzFla2xEWnh0TFFhSlNOSHJM?=
 =?utf-8?B?cXoydnNkWmN4U2NaQmZCcFVTQmFHVTVaaDlDcDdsRFZmZVAxV0RuVWV3QmJQ?=
 =?utf-8?B?a1R3NTBTZmdsMjJZY1Z6MVh5U1FwQzBNYUN1YVdGZVpGenVJN0VjTldJTkxy?=
 =?utf-8?B?RDMyTC9qZ0RDeDRYSFZ5Y0dSTVBvRmRLL3hnamlKSG1JLzhvemZTdzJsOWph?=
 =?utf-8?B?TWE4Z0dtekQ3YTByb3NqTzFMNmlVWmFjWjRoems0cS9ScmtiT2RQZWpnOUE0?=
 =?utf-8?B?b1AvSlJxbFVuakdNM3Jzb2V2bW9XVXNhT1FJekhCeFFVYS9MYUxWNnVUVzVC?=
 =?utf-8?B?eko3QUZ1YjFnNnhoaEpzNk56T2V6M2U4eXJxdW8vRTJHWWFvZUdzQXlBL2RZ?=
 =?utf-8?B?S1U4Zk9KY1lveHd6RmF0ZElVYXRNb1k3QXJscStXV29wOHVaMzUxVmhQVVJV?=
 =?utf-8?B?WWZ5M01Od2NqT3JaeHVDMDVHbERmamJxNWUwcHJ2d0U5bU1jN1dTY0ZyZXBu?=
 =?utf-8?B?L09nY05VbGZOSmltdjN3UWNjdHhYMFlWbkZ2U0FweG5zN2pBTXdveWpVYk9Z?=
 =?utf-8?B?L0pxMlVLSzIzRU5TcmZQc0pkdE14TGIzMCtEMXg3WXZuZHpUaUtIRkh1QnE2?=
 =?utf-8?B?TkR3bjg3V1JNTVpoaWxMeEU3TVF5TGUxdytVdmhLS2RyY29RNzZsR0ViYjl4?=
 =?utf-8?B?OUtUT0VnTUZRWXZ5YzQvVjRzSnZ5a1FPVUdkak9nRXF4ZUxnTEtXTjFFZ2N1?=
 =?utf-8?B?amswMm5YajkvbWYrVEMzRjJJUnBTNFpjdm8xcXlxeDhIcFFpeWo2THlROFVU?=
 =?utf-8?B?Yk1sKytsd0FqZzNvRkVUNThHSDMxZHl3dk9KTENMUVozaGxMYjMxYTgwMDYx?=
 =?utf-8?B?NThRZ2V0R2ZUUGx1eFFjcmdIcG1ZQi9OeVFTak1UMzdUS0FiZDZaNnhid3Bz?=
 =?utf-8?B?NTJHZjBiV0sxRWZxeVJsb3p2MDlodWhpSi9SUUVpM3l3eC9xejB5ZXBIbGVm?=
 =?utf-8?B?UXp3cVR1YUsva0xIN001RW9PL3MveHdaV0hsMWlEaEErWnROenlxQ2FhMUNh?=
 =?utf-8?B?OUp2dGQwSlZ5dERCY0d4L0F3bVU0aEFSOGhoVngzcGJSVXlIQTd5ZkhHT2hh?=
 =?utf-8?B?aHQ0bHJSbERPb0VMMzdXbG1xNjI3SkJ3bzVhQjJPZTBYSHVhcExWU3FPU2Vj?=
 =?utf-8?B?RXhWUThMdTVvMFA2ekN0QlBHL3lRT2tmWk5reEFTbnkybFk5QWU2WExuV2c0?=
 =?utf-8?B?eHk2a29NYVNMWjNyNlFTaEYya2JpcnlnRXZuemNVd2FrMmFhWEhsVGFJNW5L?=
 =?utf-8?B?S0dNTzByZElSdmNVVnVZSS9Gb2VkbXlNdHBBd3FsMkMzWUhxOVRqdFJxZTFB?=
 =?utf-8?B?ak9sYXJpY1NUc0U4YUdhNWNaTkcrRjU3b1gyNkd6c3lBM1V1aVphaFlSTk9k?=
 =?utf-8?B?VlVWSDBsY09CN3RxZVpISmI4M3ExVUQ3K1BSd0ZnSFB5cnR5MzZQaXNGVFN1?=
 =?utf-8?B?elZBNWxOOVhSTmpPc1F1NDd3N0JjYjZtaXJra0dnTHV0b3ozaHZhZWk0Zzhy?=
 =?utf-8?B?WVErbUtCVUZhMGlxSTJSQVpIcUpibnpSZ096YWtUeDJCVTljVFFUdEgwMzVG?=
 =?utf-8?B?ZE9XS1NWdEF3N2l0bTh5T2g5N0FkQVdOUWZJd1hBSFFYZGhHajQ0VFZsSFFC?=
 =?utf-8?B?a0ZUQXozdkkvOXpiNFlsWmRmOS91b0c1Y1Rmai9QcnErNVJ5Zi93YWJza2M0?=
 =?utf-8?B?QXRWWkFOTmxWRGRvcG5tajhycEd1YnNJcHJjQk0wK3BJWGdvY2licEd2MXQv?=
 =?utf-8?B?VUxSUkltOVdVT3ljcTJueE5nb1U2d0h3K3BEWnVvNUV3SUpRcmN0SkQ4SVFZ?=
 =?utf-8?B?Zk5hcmF6aTNZdXBRWFpTNDYzRWJaRHI4UzhDR2Y0OU9vRlhydmZCTy9HdFB1?=
 =?utf-8?B?aDF1eHdrMkVDd0hGT2dNS0xvazFoNlJ2SlBGWHV2RDJUWkp4U1VlS2VzdHJ6?=
 =?utf-8?Q?qOGhiQXuSXcGz+cJ85X8c+o=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ea3588df-12cf-4a2f-3b6c-08d9adabdb7f
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2021 11:33:08.4926
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 2HH5+MFC3Bzj+WGXjbDa1MfQL9ExhwawSNuQPDXid4agx92wfrl4CQNONTxHJiFLao5X2WeaPs3wECM6jTMIeg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5502
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

When caam queue is full (-ENOSPC), caam frees descriptor memory.
crypto-engine checks if retry support is true and h/w queue
is full(-ENOSPC), then requeue the crypto request.
During processing the requested descriptor again, caam gives below error.
(caam_jr 30902000.jr: 40000006: DECO: desc idx 0: Invalid KEY Command).

This patch adds a check to return when caam input ring is full
and retry support is true. so descriptor memory is not freed
and requeued request can be processed again.

Fixes: 2d653936eb2cf ("crypto: caam - enable crypto-engine retry mechanism")
Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
---
 drivers/crypto/caam/caamalg.c  | 6 ++++++
 drivers/crypto/caam/caamhash.c | 3 +++
 drivers/crypto/caam/caampkc.c  | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index 8697ae53b063..d3d8bb0a6990 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -1533,6 +1533,9 @@ static int aead_do_one_req(struct crypto_engine *engine, void *areq)
 
 	ret = caam_jr_enqueue(ctx->jrdev, desc, aead_crypt_done, req);
 
+	if (ret == -ENOSPC && engine->retry_support)
+		return ret;
+
 	if (ret != -EINPROGRESS) {
 		aead_unmap(ctx->jrdev, rctx->edesc, req);
 		kfree(rctx->edesc);
@@ -1762,6 +1765,9 @@ static int skcipher_do_one_req(struct crypto_engine *engine, void *areq)
 
 	ret = caam_jr_enqueue(ctx->jrdev, desc, skcipher_crypt_done, req);
 
+	if (ret == -ENOSPC && engine->retry_support)
+		return ret;
+
 	if (ret != -EINPROGRESS) {
 		skcipher_unmap(ctx->jrdev, rctx->edesc, req);
 		kfree(rctx->edesc);
diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c
index e8a6d8bc43b5..36ef738e4a18 100644
--- a/drivers/crypto/caam/caamhash.c
+++ b/drivers/crypto/caam/caamhash.c
@@ -765,6 +765,9 @@ static int ahash_do_one_req(struct crypto_engine *engine, void *areq)
 
 	ret = caam_jr_enqueue(jrdev, desc, state->ahash_op_done, req);
 
+	if (ret == -ENOSPC && engine->retry_support)
+		return ret;
+
 	if (ret != -EINPROGRESS) {
 		ahash_unmap(jrdev, state->edesc, req, 0);
 		kfree(state->edesc);
diff --git a/drivers/crypto/caam/caampkc.c b/drivers/crypto/caam/caampkc.c
index bf6275ffc4aa..886727576710 100644
--- a/drivers/crypto/caam/caampkc.c
+++ b/drivers/crypto/caam/caampkc.c
@@ -380,6 +380,9 @@ static int akcipher_do_one_req(struct crypto_engine *engine, void *areq)
 
 	ret = caam_jr_enqueue(jrdev, desc, req_ctx->akcipher_op_done, req);
 
+	if (ret == -ENOSPC && engine->retry_support)
+		return ret;
+
 	if (ret != -EINPROGRESS) {
 		rsa_pub_unmap(jrdev, req_ctx->edesc, req);
 		rsa_io_unmap(jrdev, req_ctx->edesc, req);
-- 
2.25.1