Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
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] crypto: caam: fix descriptor error when create ext4 fs on the device-mapper device
Date:   Tue,  9 Nov 2021 15:21:05 +0530
Message-Id: <20211109095105.203960-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?WVJpeWcrZk5qUENWMHozajlKb1BpQ1BWbjNIUzhja2xtd2hZWFdHUXdka1VL?=
 =?utf-8?B?b0t2R2c3SHpWbVp6OW5XbThFb3M0UVppWE1wcFkxS2lsREVwcXFWZlVzYkdH?=
 =?utf-8?B?WUNwN2ZHd3VBcFhaWGMrUkpQZFVzN2VmZlF6UHo5T2haaDVHQVJ1eU1UVjZN?=
 =?utf-8?B?ZEt6SFpqMlRLOFlyTmQ3bm5nY25EMUFzZVpNRkpzWjV3M282ZGFHKzcxUmNS?=
 =?utf-8?B?OXpKN0IzTUxRbDkyYk1KK1JnOVBKNFFuRFI5UmVONUlsbTNvR2lzdHRVYTd1?=
 =?utf-8?B?NUg4U2d6NzRDUUQvdyt3RkFwRUtPM0VyeHFTS0ExYmp1NnY3RGo1clpHSFBm?=
 =?utf-8?B?SVZZNjhOaTBtamFpS1IzYkh3VklnNjkyRGEvZGFrcUllalVlcllnTlNLWDB2?=
 =?utf-8?B?YjY3TEE4UklWOE5WcFQ2OVpKWDFQRlh1WjM1ek5NL0wyc1RmL0E0ZE9aVXlU?=
 =?utf-8?B?ZTRyc3F3TFdwbXdZUTRLVUcxQW9hYm5tY3hIblZSeXFINGJMOGxQUys2QUI3?=
 =?utf-8?B?NmU3THp1alROZXJqaEVzK2tRazRtellpSmFjbGxxMjc4N0IwM2ZGWUk0TE1V?=
 =?utf-8?B?NEtuWVh5VFcrNDk4clkxMlBkMjVHMTJ4eGlVdnBWem9TWUs2L0RkeHZJZUky?=
 =?utf-8?B?UXVueDVaZDRidVhOSW1hSGw5UXZtWVZjOG1iU2NjSkNwSnJZcU5OSGhVSGQ3?=
 =?utf-8?B?c2wzN3ZqSGxtMVV6azB0cm9kb2FHMUZNSk9pVk5JOEhLRzZzSE94THdIL3NO?=
 =?utf-8?B?dEV3bm9oYWtZZXJXaEF6eXZLWjZ1cGVLNXM2QkZrczl5YnU3cyt2Q3BUaXpF?=
 =?utf-8?B?dUlhdjM1aHJEN2I2UktOTEUvZFpvR3BqWEx2VVdPai92cE5Va2crZjdzamRh?=
 =?utf-8?B?MnhIY1VWa0M4UmkwNCtrWlhqYUx6SWFWZ0d6TnhwNHQvVjFoOFFNQ1llakRR?=
 =?utf-8?B?bGkrc0VCQlZjR2JHb0pNcGorRFMwL1Z3SFYxQjVjUTQyUFNTaWo5MkJqMzh3?=
 =?utf-8?B?M3BKYm5GajVZQUNxNlRLaUpsdHVvQ215ejZiQ0s1RGNtMWxXdE5kam9pUnZs?=
 =?utf-8?B?QnAzUEQrZGpTeUl3Vjh4TmNtVkxxYVU0U2Zha2J2enNlTjlUSVFkVVJoMUtm?=
 =?utf-8?B?MnYvWHo2SG9yRGNxUjRvbXpaN2RFZzNSNE9FYTltdU16aEtGVzlra0pHakNQ?=
 =?utf-8?B?d0ZPTFBWTStObHREeHY3TjBsYWVYV0ViK01xdVBWM1NsaUpTNUdXendaN2Zv?=
 =?utf-8?B?Qk1ubVVRVG1KeE5GbmplMUZpRUs0MWlQaitYZTUwU0NaQVVXRDdMWkRqRHdu?=
 =?utf-8?B?U0R5M3dBaUI3aEYwMGp4VDBaalYrazI4ajY1Q2RqcjhJK3Vpem9DQ2NaK1JH?=
 =?utf-8?B?ZEZTaEZKVW05WXVBeEJFNTVXcHpvQWlubUFVZE1DbjQxdHJKOC9FMGFXWUg3?=
 =?utf-8?B?Z1NHM0txWW1WQWRaQ09FM2NpYW9qRUNrZTNsN2tHL25BNWpUdHlJTWZCS2E2?=
 =?utf-8?B?UnRNTW44SzBJR0MyVmVBclJ6cDBSdWtueEZhSldjN1V3dHJGaDNmSk1hWEU2?=
 =?utf-8?B?TU1oUk1wV01FdDh4UFUvMkFpdHVUSEpzS2Fzd0R4QUMwbUxxaGR3c3Yvc3RB?=
 =?utf-8?B?aTJuNzFCRzVIOHlJc1lTV0Z3bTVIWW5uZm9QTEpwUktGUTRzTTkrK1BlaS9r?=
 =?utf-8?B?eitoODlBeHFLbFNDcE5SbEJZd2Fvd3RUV0c2L1lxZm1qUWxMVmlEaVJSRUlx?=
 =?utf-8?B?UmlPNUZBMGo2RmZmdjdEdCt2VGFZT0ZIeEQ5ZmN5dlJTVmxyTk5POEtZTzJK?=
 =?utf-8?B?ZGpMQnVPaGQzZFZLUHcxTlF0UWFoRG45Y1hMdVkwci9FTmRDdC9iNjd2a3VU?=
 =?utf-8?B?Wnpnd1JxR2pCVU5mSmpaUzhMWGd4TVRNcjdBSkFoNnlTM2F6T0V2WnFiSlB3?=
 =?utf-8?B?ZlZtZ0NZMS9oNE81bDh5M3gyWDk5Uk5yQXMxN0oyYTNvL3B0UWNJU0RXVlYz?=
 =?utf-8?B?MnZJSG5QMFNIaEE3enJlTGRkbHNNS0lBRmRlbkpHci9tWFlBWlpYNkVXWm1Y?=
 =?utf-8?B?N3J0ZTFXVmNibUFQMjh3RXVFek1TTlJVV0NEZG1YYUp1UnVCUEVLT216QjRS?=
 =?utf-8?B?NVp6OGVaTWlRVVUvTmsrWmxxdEVBUmJUZFhOdFBLYjlJNWFnM3YxVHBRUG8x?=
 =?utf-8?Q?4pPOKIyoEyt+3QcaaHY073s=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 58eb13d9-8618-4185-6e5e-08d9a3668e69
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 09:51:52.2490
 (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: ATune+oEOzNkWygxVQfKSQ7z/mE8iYMjiyfq8PlTP7zsgav8lLM4uwX1xkP+AdwuqXV50l1gIfKfqJaN4dU7PA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2509
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

Root cause:
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