Received-SPF: pass (google.com: domain of linux-kernel+bounces-29950-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Gaurav Jain <gaurav.jain@nxp.com>
To: Herbert Xu <herbert@gondor.apana.org.au>,
	"David S . Miller" <davem@davemloft.net>,
	Eric Biggers <ebiggers@google.com>,
	Horia Geanta <horia.geanta@nxp.com>,
	Pankaj Gupta <pankaj.gupta@nxp.com>,
	Varun Sethi <V.Sethi@nxp.com>,
	Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>,
	Aisheng Dong <aisheng.dong@nxp.com>
Cc: Silvano Di Ninno <silvano.dininno@nxp.com>,
	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: fix asynchronous hash
Date: Thu, 18 Jan 2024 14:55:57 +0530
Message-Id: <20240118092557.1891120-1-gaurav.jain@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?ikAfnhuXgm6zfkl2qxZkMKz4yoIds+j/ZRyAjBqG3l/LOhx11FLjTXdS1yTS?=
 =?us-ascii?Q?lMs+n+uhfnrNqNSMpf4C3Tka2S1Gtn+zOwh6sDrAYzKRUMFC0UDpL3DFAXhT?=
 =?us-ascii?Q?dIwHLxIgHkI6SRJ0cfBsNJB7N9H5xoDMeSsHJ0uQgM71Fay2W8JzkVqbSRnp?=
 =?us-ascii?Q?UXl+XJeg+8A2LQp2uyd93W+6BibJvWwgLWgGee/dFD+V5WIJh0W2RWLzLvxn?=
 =?us-ascii?Q?HPXuP0j7yO5tT5rKtFJNs3iEkT392Bvl1xIoThv9Njs6kkm6yJ0viOrc9g5Q?=
 =?us-ascii?Q?bkpfj2fzRFtk36DBCB0mLqRZYW3ACAiKSaXlAGhcguH4xD+leJoRzKctzrMV?=
 =?us-ascii?Q?KTBtrECYjnPaPdRlTa8EmiJP/KTQXZ7+lscgZFMkIeXrzbLpHYYOUWM08YaX?=
 =?us-ascii?Q?I5D3jqCBzltdQvtTEZIF61VUevL8FyPdnx4l1uZT9UZoHk/8x0Ee08fECgAv?=
 =?us-ascii?Q?vQqySYxRJXHc/k4uj0lHbLUVbnq7gXenIq6sj15davhvjc1hKyX5ctOulUwt?=
 =?us-ascii?Q?KLadmRhN67Aj25Fei8N+80qHpapLUN3yMDA0dWAS1uukAq/+bBlDbQxaQbIq?=
 =?us-ascii?Q?CWCvwOfzQVcq6RqXEXTUHXZG8Cw76/twzcCTDzj9lqicphywC65tLCbmcAdZ?=
 =?us-ascii?Q?4TTW4d6wZ50JcIjJUDA/FLFs2KC1Fr0lkdsldU9QQNtv99htgVuXOdEAgxUd?=
 =?us-ascii?Q?ZrJcpC+cpbpB5jIal2hYanGB3eAKKqB0ZfAtIpfWkvcp1xcnBkHtfvbyIIyY?=
 =?us-ascii?Q?CyY+mZxMR6nsG7LEdWLJ5WcyjCeOq5dRlyBYrmRn1OTM/yEDqniR912q1Ry3?=
 =?us-ascii?Q?FM8xN1HOHLiRs38Ih46Bu0Lx2RlYxmLDLfKYULgqtiEMAdl/U7bk1yaQiLPC?=
 =?us-ascii?Q?n53TDb+gdFWj1bzBSfe2+zebdGLhv3CvREk9MPgFkCrPOqk+A7O//0HCIhX6?=
 =?us-ascii?Q?oJqwHW4Mx2UPKTh4hvu6RLbEIfyKMSilmdOLHHZ7p1SescwyGlMy1fZgXvIt?=
 =?us-ascii?Q?HwvlTcqj+DLSIcgkAX0Tkc3FXT2X1zA9Ns2HB4bA71wp0JjjvxbeguVxRsda?=
 =?us-ascii?Q?KkWRDIA4lbK//H1VUwQ1Vnjuch3X57rsMHkCL8ZTEiipBCgZ8gz0WTPlu6MR?=
 =?us-ascii?Q?K3DntjqtG74ZqNWMJ3TFwAbu7wVw0Prm7VwnBQRjOe1r3XFQc/ZUvf6yKRWf?=
 =?us-ascii?Q?bJMjyyy4n1V7GNhC7akIIvbQaMkSQW44f4WZSYw9j1qOAUWHj4vGVrKHJWVA?=
 =?us-ascii?Q?uchezAMF91bUTind2rgP1tb+HvAKekVOyLdKnn2krPFWMlofP0kZwBEBONJ9?=
 =?us-ascii?Q?+MKanYHC4owLK0LAZmEh/mxQ7Rqlvn/eyE7MxpNdA9xrl9FDGXYUNwi5W71E?=
 =?us-ascii?Q?FxGbs4uiOilolB7DYg8nhgcXfVRvdiLZaLkp1yWrYxbDgI8cvUBxidR/sxQ3?=
 =?us-ascii?Q?SJLIFUKhmlKlTgtiVk6RBNtKKRomHVrDMh/FR3VsSzbY2LHM5VRbQiaB5TpF?=
 =?us-ascii?Q?V/ZYqHc4iOZhdN76gf2KRRrFrAdWt4W/3/IiA4A4LVxAfYfwf3VGp5Ffjdc9?=
 =?us-ascii?Q?IL5qj5ToG0qLpd9RPGVSqiAgevHoFlCAKSQZFeDj?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3bf15599-6933-4e91-7b85-08dc18078808
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6004.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2024 09:26:20.7968
 (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: n/XIcqV1YYEoOq5OeNCwJnuu8Aj9M4AwH8wV0XCl+88S+sUe9waqjb98sJvJH/4P3Mbv3xLEedKI8qXQuSO9Vw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8318

ahash_alg->setkey is updated to ahash_nosetkey in ahash.c
so checking setkey() function to determine hmac algorithm is not valid.

to fix this added is_hmac variable in structure caam_hash_alg to determine
whether the algorithm is hmac or not.

Fixes: 2f1f34c1bf7b ("crypto: ahash - optimize performance when wrapping shash")
Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
---
changes in v2:
	- remove if condition based on crypto_hash_alg_has_setkey() funcion.
	- added is_hmac variable in caam_hash_alg and updated the if
	  condition for checking hmac algorithm.

 drivers/crypto/caam/caamalg_qi2.c | 7 +++++--
 drivers/crypto/caam/caamhash.c    | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/caam/caamalg_qi2.c b/drivers/crypto/caam/caamalg_qi2.c
index a148ff1f0872..a4f6884416a0 100644
--- a/drivers/crypto/caam/caamalg_qi2.c
+++ b/drivers/crypto/caam/caamalg_qi2.c
@@ -4545,6 +4545,7 @@ struct caam_hash_alg {
 	struct list_head entry;
 	struct device *dev;
 	int alg_type;
+	bool is_hmac;
 	struct ahash_alg ahash_alg;
 };
 
@@ -4571,7 +4572,7 @@ static int caam_hash_cra_init(struct crypto_tfm *tfm)
 
 	ctx->dev = caam_hash->dev;
 
-	if (alg->setkey) {
+	if (caam_hash->is_hmac) {
 		ctx->adata.key_dma = dma_map_single_attrs(ctx->dev, ctx->key,
 							  ARRAY_SIZE(ctx->key),
 							  DMA_TO_DEVICE,
@@ -4611,7 +4612,7 @@ static int caam_hash_cra_init(struct crypto_tfm *tfm)
 	 * For keyed hash algorithms shared descriptors
 	 * will be created later in setkey() callback
 	 */
-	return alg->setkey ? 0 : ahash_set_sh_desc(ahash);
+	return caam_hash->is_hmac ? 0 : ahash_set_sh_desc(ahash);
 }
 
 static void caam_hash_cra_exit(struct crypto_tfm *tfm)
@@ -4646,12 +4647,14 @@ static struct caam_hash_alg *caam_hash_alloc(struct device *dev,
 			 template->hmac_name);
 		snprintf(alg->cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
 			 template->hmac_driver_name);
+		t_alg->is_hmac = true;
 	} else {
 		snprintf(alg->cra_name, CRYPTO_MAX_ALG_NAME, "%s",
 			 template->name);
 		snprintf(alg->cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
 			 template->driver_name);
 		t_alg->ahash_alg.setkey = NULL;
+		t_alg->is_hmac = false;
 	}
 	alg->cra_module = THIS_MODULE;
 	alg->cra_init = caam_hash_cra_init;
diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c
index 290c8500c247..fdd724228c2f 100644
--- a/drivers/crypto/caam/caamhash.c
+++ b/drivers/crypto/caam/caamhash.c
@@ -1753,6 +1753,7 @@ static struct caam_hash_template driver_hash[] = {
 struct caam_hash_alg {
 	struct list_head entry;
 	int alg_type;
+	bool is_hmac;
 	struct ahash_engine_alg ahash_alg;
 };
 
@@ -1804,7 +1805,7 @@ static int caam_hash_cra_init(struct crypto_tfm *tfm)
 	} else {
 		if (priv->era >= 6) {
 			ctx->dir = DMA_BIDIRECTIONAL;
-			ctx->key_dir = alg->setkey ? DMA_TO_DEVICE : DMA_NONE;
+			ctx->key_dir = caam_hash->is_hmac ? DMA_TO_DEVICE : DMA_NONE;
 		} else {
 			ctx->dir = DMA_TO_DEVICE;
 			ctx->key_dir = DMA_NONE;
@@ -1862,7 +1863,7 @@ static int caam_hash_cra_init(struct crypto_tfm *tfm)
 	 * For keyed hash algorithms shared descriptors
 	 * will be created later in setkey() callback
 	 */
-	return alg->setkey ? 0 : ahash_set_sh_desc(ahash);
+	return caam_hash->is_hmac ? 0 : ahash_set_sh_desc(ahash);
 }
 
 static void caam_hash_cra_exit(struct crypto_tfm *tfm)
@@ -1915,12 +1916,14 @@ caam_hash_alloc(struct caam_hash_template *template,
 			 template->hmac_name);
 		snprintf(alg->cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
 			 template->hmac_driver_name);
+		t_alg->is_hmac = true;
 	} else {
 		snprintf(alg->cra_name, CRYPTO_MAX_ALG_NAME, "%s",
 			 template->name);
 		snprintf(alg->cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
 			 template->driver_name);
 		halg->setkey = NULL;
+		t_alg->is_hmac = false;
 	}
 	alg->cra_module = THIS_MODULE;
 	alg->cra_init = caam_hash_cra_init;
-- 
2.25.1