From nobody Sun Oct 5 18:16:43 2025 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CFDE81E3787; Fri, 1 Aug 2025 04:36:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754023010; cv=none; b=OwadIXb8PH8RHR7BNF3KFhf7z8pLlkGxj1811ZZBA51gPG9/0Fh+6ZrbDEWla2ZEghmr+iNWDhGKwETgBJkDQ7nD6txcyx8nC2gO4/YmBrRu8ReVUTzFNP/XHJjsQ0HjBUbS73cRXb3LPQQO5X8i7q9bJH0sXw8cu+l+4xRB+Cs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754023010; c=relaxed/simple; bh=erTRCgiW9fd483jvSWwU2S3tiPSwqtDUA8Bc8Iypv+M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MI5eho6A9y1cnJsMG4hWkvaMlxhL5A20DTBh34FiJ+n8oRJXXB4USIKuIy3xY/12QYv1Ju5Dn2MnrkuIwOyAlIKgZVc49mg6qavaobGgyYtDGtPg+v7rakfK7SQv0Jg6WQxF3t1t3jnzIoUaQGuc8e8bdNQeCe2HLC1ym4GW02c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=MrgvJMwr; arc=none smtp.client-ip=198.175.65.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="MrgvJMwr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1754023008; x=1785559008; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=erTRCgiW9fd483jvSWwU2S3tiPSwqtDUA8Bc8Iypv+M=; b=MrgvJMwre0B0PTedZ6DVrGZ58uldgdqF4tfMYfaRy63fBU1OISERACFj jsQU+ubfUxpi+seoNVMsje8o3kV30sWqrc3G2mqttgueuVccs0yGF4v58 NJuxA0eUSxQWXXkra/oIkD0Y7qc8vHE++WC1UNqdnDiC2tv1pfuEh1ocu g72EOVSK4jk8C4fYcBmvuU3rUhuAZFyaIFh5x5XZYodM40pnQK+zJ20Oy cc0WJ1naN+/6aSt1xdpS4Dx85uV1NjEcI/667/Cq9unDb26F2CyHXXNaH a6LvqI8yQ7GU9aTSFju3utm0YHGCXA5ksOJQXgdxy9zT5UnJVQ4DdVscS Q==; X-CSE-ConnectionGUID: 6xfCshRXSj+/o/E2xf0ImA== X-CSE-MsgGUID: s7/llcgES+S4VT5M7Bb80Q== X-IronPort-AV: E=McAfee;i="6800,10657,11508"; a="73820168" X-IronPort-AV: E=Sophos;i="6.17,255,1747724400"; d="scan'208";a="73820168" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Jul 2025 21:36:44 -0700 X-CSE-ConnectionGUID: q2OHbPJXQoagPDO9qOJySg== X-CSE-MsgGUID: MClL2KHlSZW+IuKjwzIguA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.17,255,1747724400"; d="scan'208";a="163796231" Received: from jf5300-b11a338t.jf.intel.com ([10.242.51.115]) by orviesa008.jf.intel.com with ESMTP; 31 Jul 2025 21:36:43 -0700 From: Kanchana P Sridhar To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, hannes@cmpxchg.org, yosry.ahmed@linux.dev, nphamcs@gmail.com, chengming.zhou@linux.dev, usamaarif642@gmail.com, ryan.roberts@arm.com, 21cnbao@gmail.com, ying.huang@linux.alibaba.com, akpm@linux-foundation.org, senozhatsky@chromium.org, linux-crypto@vger.kernel.org, herbert@gondor.apana.org.au, davem@davemloft.net, clabbe@baylibre.com, ardb@kernel.org, ebiggers@google.com, surenb@google.com, kristen.c.accardi@intel.com, vinicius.gomes@intel.com Cc: wajdi.k.feghali@intel.com, vinodh.gopal@intel.com, kanchana.p.sridhar@intel.com Subject: [PATCH v11 03/24] crypto: iaa - Simplify, consistency of function parameters, minor stats bug fix. Date: Thu, 31 Jul 2025 21:36:21 -0700 Message-Id: <20250801043642.8103-4-kanchana.p.sridhar@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20250801043642.8103-1-kanchana.p.sridhar@intel.com> References: <20250801043642.8103-1-kanchana.p.sridhar@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This patch further simplifies the code in some places and makes it more consistent and readable: 1) Change iaa_compress_verify() @dlen parameter to be a value instead of a pointer, because @dlen's value is only read, not modified by this procedure. 2) Simplify the success/error return paths in iaa_compress(), iaa_decompress() and iaa_compress_verify(). 3) Delete dev_dbg() statements to make the code more readable. 4) Change return value from descriptor allocation failures to be -ENODEV, for better maintainability. 5) Fix a minor statistics bug in iaa_decompress(), with the decomp_bytes getting updated in case of errors. Signed-off-by: Kanchana P Sridhar --- drivers/crypto/intel/iaa/iaa_crypto_main.c | 107 +++++---------------- 1 file changed, 22 insertions(+), 85 deletions(-) diff --git a/drivers/crypto/intel/iaa/iaa_crypto_main.c b/drivers/crypto/in= tel/iaa/iaa_crypto_main.c index c6db721eaa799..ed3325bb32918 100644 --- a/drivers/crypto/intel/iaa/iaa_crypto_main.c +++ b/drivers/crypto/intel/iaa/iaa_crypto_main.c @@ -1590,7 +1590,7 @@ static int iaa_remap_for_verify(struct device *dev, s= truct iaa_wq *iaa_wq, static int iaa_compress_verify(struct crypto_tfm *tfm, struct acomp_req *r= eq, struct idxd_wq *wq, dma_addr_t src_addr, unsigned int slen, - dma_addr_t dst_addr, unsigned int *dlen) + dma_addr_t dst_addr, unsigned int dlen) { struct iaa_device_compression_mode *active_compression_mode; struct iaa_compression_ctx *ctx =3D crypto_tfm_ctx(tfm); @@ -1614,10 +1614,8 @@ static int iaa_compress_verify(struct crypto_tfm *tf= m, struct acomp_req *req, =20 idxd_desc =3D idxd_alloc_desc(wq, IDXD_OP_BLOCK); if (IS_ERR(idxd_desc)) { - dev_dbg(dev, "idxd descriptor allocation failed\n"); - dev_dbg(dev, "iaa compress failed: ret=3D%ld\n", - PTR_ERR(idxd_desc)); - return PTR_ERR(idxd_desc); + dev_dbg(dev, "iaa compress_verify failed: idxd descriptor allocation fai= lure: ret=3D%ld\n", PTR_ERR(idxd_desc)); + return -ENODEV; } desc =3D idxd_desc->iax_hw; =20 @@ -1629,19 +1627,11 @@ static int iaa_compress_verify(struct crypto_tfm *t= fm, struct acomp_req *req, desc->priv =3D 0; =20 desc->src1_addr =3D (u64)dst_addr; - desc->src1_size =3D *dlen; + desc->src1_size =3D dlen; desc->dst_addr =3D (u64)src_addr; desc->max_dst_size =3D slen; desc->completion_addr =3D idxd_desc->compl_dma; =20 - dev_dbg(dev, "(verify) compression mode %s," - " desc->src1_addr %llx, desc->src1_size %d," - " desc->dst_addr %llx, desc->max_dst_size %d," - " desc->src2_addr %llx, desc->src2_size %d\n", - active_compression_mode->name, - desc->src1_addr, desc->src1_size, desc->dst_addr, - desc->max_dst_size, desc->src2_addr, desc->src2_size); - ret =3D idxd_submit_desc(wq, idxd_desc); if (ret) { dev_dbg(dev, "submit_desc (verify) failed ret=3D%d\n", ret); @@ -1664,14 +1654,10 @@ static int iaa_compress_verify(struct crypto_tfm *t= fm, struct acomp_req *req, goto err; } =20 - idxd_free_desc(wq, idxd_desc); -out: - return ret; err: idxd_free_desc(wq, idxd_desc); - dev_dbg(dev, "iaa compress failed: ret=3D%d\n", ret); =20 - goto out; + return ret; } =20 static void iaa_desc_complete(struct idxd_desc *idxd_desc, @@ -1751,7 +1737,7 @@ static void iaa_desc_complete(struct idxd_desc *idxd_= desc, } =20 ret =3D iaa_compress_verify(ctx->tfm, ctx->req, iaa_wq->wq, src_addr, - ctx->req->slen, dst_addr, &ctx->req->dlen); + ctx->req->slen, dst_addr, ctx->req->dlen); if (ret) { dev_dbg(dev, "%s: compress verify failed ret=3D%d\n", __func__, ret); err =3D -EIO; @@ -1777,7 +1763,7 @@ static void iaa_desc_complete(struct idxd_desc *idxd_= desc, iaa_wq_put(idxd_desc->wq); } =20 -static int iaa_compress(struct crypto_tfm *tfm, struct acomp_req *req, +static int iaa_compress(struct crypto_tfm *tfm, struct acomp_req *req, struct idxd_wq *wq, dma_addr_t src_addr, unsigned int slen, dma_addr_t dst_addr, unsigned int *dlen) @@ -1804,9 +1790,9 @@ static int iaa_compress(struct crypto_tfm *tfm, struc= t acomp_req *req, =20 idxd_desc =3D idxd_alloc_desc(wq, IDXD_OP_BLOCK); if (IS_ERR(idxd_desc)) { - dev_dbg(dev, "idxd descriptor allocation failed\n"); - dev_dbg(dev, "iaa compress failed: ret=3D%ld\n", PTR_ERR(idxd_desc)); - return PTR_ERR(idxd_desc); + dev_dbg(dev, "iaa compress failed: idxd descriptor allocation failure: r= et=3D%ld\n", + PTR_ERR(idxd_desc)); + return -ENODEV; } desc =3D idxd_desc->iax_hw; =20 @@ -1832,21 +1818,8 @@ static int iaa_compress(struct crypto_tfm *tfm, stru= ct acomp_req *req, idxd_desc->crypto.src_addr =3D src_addr; idxd_desc->crypto.dst_addr =3D dst_addr; idxd_desc->crypto.compress =3D true; - - dev_dbg(dev, "%s use_async_irq: compression mode %s," - " src_addr %llx, dst_addr %llx\n", __func__, - active_compression_mode->name, - src_addr, dst_addr); } =20 - dev_dbg(dev, "%s: compression mode %s," - " desc->src1_addr %llx, desc->src1_size %d," - " desc->dst_addr %llx, desc->max_dst_size %d," - " desc->src2_addr %llx, desc->src2_size %d\n", __func__, - active_compression_mode->name, - desc->src1_addr, desc->src1_size, desc->dst_addr, - desc->max_dst_size, desc->src2_addr, desc->src2_size); - ret =3D idxd_submit_desc(wq, idxd_desc); if (ret) { dev_dbg(dev, "submit_desc failed ret=3D%d\n", ret); @@ -1859,7 +1832,6 @@ static int iaa_compress(struct crypto_tfm *tfm, struc= t acomp_req *req, =20 if (ctx->async_mode) { ret =3D -EINPROGRESS; - dev_dbg(dev, "%s: returning -EINPROGRESS\n", __func__); goto out; } =20 @@ -1877,15 +1849,10 @@ static int iaa_compress(struct crypto_tfm *tfm, str= uct acomp_req *req, =20 *compression_crc =3D idxd_desc->iax_completion->crc; =20 - if (!ctx->async_mode) - idxd_free_desc(wq, idxd_desc); -out: - return ret; err: idxd_free_desc(wq, idxd_desc); - dev_dbg(dev, "iaa compress failed: ret=3D%d\n", ret); - - goto out; +out: + return ret; } =20 static int iaa_decompress(struct crypto_tfm *tfm, struct acomp_req *req, @@ -1914,10 +1881,10 @@ static int iaa_decompress(struct crypto_tfm *tfm, s= truct acomp_req *req, =20 idxd_desc =3D idxd_alloc_desc(wq, IDXD_OP_BLOCK); if (IS_ERR(idxd_desc)) { - dev_dbg(dev, "idxd descriptor allocation failed\n"); - dev_dbg(dev, "iaa decompress failed: ret=3D%ld\n", + ret =3D -ENODEV; + dev_dbg(dev, "%s: idxd descriptor allocation failed: ret=3D%ld\n", __fun= c__, PTR_ERR(idxd_desc)); - return PTR_ERR(idxd_desc); + return ret; } desc =3D idxd_desc->iax_hw; =20 @@ -1941,21 +1908,8 @@ static int iaa_decompress(struct crypto_tfm *tfm, st= ruct acomp_req *req, idxd_desc->crypto.src_addr =3D src_addr; idxd_desc->crypto.dst_addr =3D dst_addr; idxd_desc->crypto.compress =3D false; - - dev_dbg(dev, "%s: use_async_irq compression mode %s," - " src_addr %llx, dst_addr %llx\n", __func__, - active_compression_mode->name, - src_addr, dst_addr); } =20 - dev_dbg(dev, "%s: decompression mode %s," - " desc->src1_addr %llx, desc->src1_size %d," - " desc->dst_addr %llx, desc->max_dst_size %d," - " desc->src2_addr %llx, desc->src2_size %d\n", __func__, - active_compression_mode->name, - desc->src1_addr, desc->src1_size, desc->dst_addr, - desc->max_dst_size, desc->src2_addr, desc->src2_size); - ret =3D idxd_submit_desc(wq, idxd_desc); if (ret) { dev_dbg(dev, "submit_desc failed ret=3D%d\n", ret); @@ -1968,7 +1922,6 @@ static int iaa_decompress(struct crypto_tfm *tfm, str= uct acomp_req *req, =20 if (ctx->async_mode) { ret =3D -EINPROGRESS; - dev_dbg(dev, "%s: returning -EINPROGRESS\n", __func__); goto out; } =20 @@ -1990,23 +1943,19 @@ static int iaa_decompress(struct crypto_tfm *tfm, s= truct acomp_req *req, } } else { req->dlen =3D idxd_desc->iax_completion->output_size; + + /* Update stats */ + update_total_decomp_bytes_in(slen); + update_wq_decomp_bytes(wq, slen); } =20 *dlen =3D req->dlen; =20 - if (!ctx->async_mode) +err: + if (idxd_desc) idxd_free_desc(wq, idxd_desc); - - /* Update stats */ - update_total_decomp_bytes_in(slen); - update_wq_decomp_bytes(wq, slen); out: return ret; -err: - idxd_free_desc(wq, idxd_desc); - dev_dbg(dev, "iaa decompress failed: ret=3D%d\n", ret); - - goto out; } =20 static int iaa_comp_acompress(struct acomp_req *req) @@ -2053,9 +2002,6 @@ static int iaa_comp_acompress(struct acomp_req *req) goto out; } src_addr =3D sg_dma_address(req->src); - dev_dbg(dev, "dma_map_sg, src_addr %llx, nr_sgs %d, req->src %p," - " req->slen %d, sg_dma_len(sg) %d\n", src_addr, nr_sgs, - req->src, req->slen, sg_dma_len(req->src)); =20 nr_sgs =3D dma_map_sg(dev, req->dst, sg_nents(req->dst), DMA_FROM_DEVICE); if (nr_sgs <=3D 0 || nr_sgs > 1) { @@ -2066,9 +2012,6 @@ static int iaa_comp_acompress(struct acomp_req *req) goto err_map_dst; } dst_addr =3D sg_dma_address(req->dst); - dev_dbg(dev, "dma_map_sg, dst_addr %llx, nr_sgs %d, req->dst %p," - " req->dlen %d, sg_dma_len(sg) %d\n", dst_addr, nr_sgs, - req->dst, req->dlen, sg_dma_len(req->dst)); =20 ret =3D iaa_compress(tfm, req, wq, src_addr, req->slen, dst_addr, &req->dlen); @@ -2083,7 +2026,7 @@ static int iaa_comp_acompress(struct acomp_req *req) } =20 ret =3D iaa_compress_verify(tfm, req, wq, src_addr, req->slen, - dst_addr, &req->dlen); + dst_addr, req->dlen); if (ret) dev_dbg(dev, "asynchronous compress verification failed ret=3D%d\n", re= t); =20 @@ -2146,9 +2089,6 @@ static int iaa_comp_adecompress(struct acomp_req *req) goto out; } src_addr =3D sg_dma_address(req->src); - dev_dbg(dev, "dma_map_sg, src_addr %llx, nr_sgs %d, req->src %p," - " req->slen %d, sg_dma_len(sg) %d\n", src_addr, nr_sgs, - req->src, req->slen, sg_dma_len(req->src)); =20 nr_sgs =3D dma_map_sg(dev, req->dst, sg_nents(req->dst), DMA_FROM_DEVICE); if (nr_sgs <=3D 0 || nr_sgs > 1) { @@ -2159,9 +2099,6 @@ static int iaa_comp_adecompress(struct acomp_req *req) goto err_map_dst; } dst_addr =3D sg_dma_address(req->dst); - dev_dbg(dev, "dma_map_sg, dst_addr %llx, nr_sgs %d, req->dst %p," - " req->dlen %d, sg_dma_len(sg) %d\n", dst_addr, nr_sgs, - req->dst, req->dlen, sg_dma_len(req->dst)); =20 ret =3D iaa_decompress(tfm, req, wq, src_addr, req->slen, dst_addr, &req->dlen); --=20 2.27.0