From nobody Wed Dec 17 10:46:18 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) (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 17F2031195B; Tue, 4 Nov 2025 09:12:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762247562; cv=none; b=ZWchCPWag7M0IfmctXXnA5E8ZnK/w+PehV4QQVTDUgX4rW2Ja0GGJGWQRw0Vz26w4nKXNTy2aRqzkgbzI9c3pxUq9TJCP6Y/tD2GJimlzntjzbbE4GPwK1HniuaDnA+HiBBn3185pmLGampme7gISkiGtzbjG4BS6McKkAvvMmA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762247562; c=relaxed/simple; bh=eCl4EG1eBmLJuc5d8RhnsvBkJgwdr6FIQHonseSuOMg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Z7Zjj11InbCFnXS1TIvsRn0YKnOqA7aLtk59QQ5WOLDnZBIRU8fIMf5EUJAfPjig1Uy3oeteADO+Ig6itsjHOWqfZdeZKvG4WiPgRUdZRaGHgrGdVz50ym2CVN/2mrNUQdBBv6LIwCG74hRqPwmiswxe4OZRN8IYcgVK1K228H0= 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=hOOkcKI0; arc=none smtp.client-ip=192.198.163.7 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="hOOkcKI0" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1762247560; x=1793783560; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eCl4EG1eBmLJuc5d8RhnsvBkJgwdr6FIQHonseSuOMg=; b=hOOkcKI0ddVGLSd1ZcT7xL+TzQ8fAmtefvIA2im9XswE194xQxp3CSlX Hp0CzmOd+D78fnShEeEXQTZeereECCw2+fR98u5XfsPU6jCKeJSXUiixQ EtuAqG9CTuBdb5rrTzhpTRjXBhsGsM30dleL0yJQt1X08mIDJf1qIoYrh AGLPoIIrBlRFaPdpUCoVZA9OL2ZrF+nBCauTHk7UJ56yClBOk4Sjfxg1i 8C3ZTEO1zliezr7aMO4vJuR+YMpqTA+KNHEbSIFzN9xn+er2Mwn+uZ1lA ZWuH1oBS+AEqwY5ySsnj0PRKSbXVd/8MXT0LsSPX5D177f3EJMrEG1qNK A==; X-CSE-ConnectionGUID: YEQ75k2fTB+kyubxZTEvdQ== X-CSE-MsgGUID: Jdr9h63kR/GrgGwQtnoOTA== X-IronPort-AV: E=McAfee;i="6800,10657,11602"; a="89798675" X-IronPort-AV: E=Sophos;i="6.19,278,1754982000"; d="scan'208";a="89798675" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Nov 2025 01:12:36 -0800 X-CSE-ConnectionGUID: nmNo778lQxi/+j5yJsvhGg== X-CSE-MsgGUID: bdHmsEe7RASBUpp2c5c/Sw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,278,1754982000"; d="scan'208";a="186795781" Received: from jf5300-b11a338t.jf.intel.com ([10.242.51.115]) by orviesa009.jf.intel.com with ESMTP; 04 Nov 2025 01:12:37 -0800 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, sj@kernel.org, kasong@tencent.com, 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 v13 03/22] crypto: iaa - Simplify, consistency of function parameters, minor stats bug fix. Date: Tue, 4 Nov 2025 01:12:16 -0800 Message-Id: <20251104091235.8793-4-kanchana.p.sridhar@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20251104091235.8793-1-kanchana.p.sridhar@intel.com> References: <20251104091235.8793-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 9de7a8a4d7a8..44d4e2494bf3 100644 --- a/drivers/crypto/intel/iaa/iaa_crypto_main.c +++ b/drivers/crypto/intel/iaa/iaa_crypto_main.c @@ -1596,7 +1596,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); @@ -1620,10 +1620,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 @@ -1635,19 +1633,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); @@ -1670,14 +1660,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, @@ -1757,7 +1743,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; @@ -1783,7 +1769,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) @@ -1810,9 +1796,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 @@ -1838,21 +1824,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); @@ -1865,7 +1838,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 @@ -1883,15 +1855,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, @@ -1920,10 +1887,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 @@ -1947,21 +1914,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); @@ -1974,7 +1928,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 @@ -1996,23 +1949,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) @@ -2059,9 +2008,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) { @@ -2072,9 +2018,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); @@ -2089,7 +2032,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 @@ -2152,9 +2095,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) { @@ -2165,9 +2105,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