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 5FB191F37D3; Fri, 1 Aug 2025 04:36:51 +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=1754023013; cv=none; b=ax8vPX2ZJV3R28weMLUj1749KsI0jBq1hpePCL6En2K3oltxOVkcJizfXaa881BIUVwA1xjotRUCe+1GOTU6XqUB7oMGeFRw9S3Mkcldxrkn1hbdJkyJHk99GlL4ButMmmMX+Bi03ls+n/daOUYIWIxm0q8KKf7MUal7qogyFJ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754023013; c=relaxed/simple; bh=Tfz94EJhl5ceOxVb2puBw1oVVyvE1c9obC/5A/EsyHQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Ot5OUtXIhwKf5m0s2zks4HZm7WtHV18sR779PDP9loXJcOMNg56svz6UGyK0yCZ+0R+eWOJ9PKC7k7ZrA4d5XnMFl1hWgSBHxlBE4fY3L0L7TQgDHay9iTZB71GLUe3zoVcCbBNpWDP1EAJiUYRkyU+ndfPnpLhxujPT4sbDvVQ= 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=PTJv8Q6K; 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="PTJv8Q6K" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1754023012; x=1785559012; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Tfz94EJhl5ceOxVb2puBw1oVVyvE1c9obC/5A/EsyHQ=; b=PTJv8Q6KY3QloYjnwcVq3cPi+VUrnXRdp6VKWe8ygi+LHvoCo5MH7DOo nnnWnbNA30QUknI4q/MfEjuVaQ3/9/mq3pA1T9ZzPgkiAoY4Xwa1qilH1 0Rb0GilgTUGRD4epDyN3wTunrqmH6yoZoWFG2fAUGt7n3xRd2GD1iNyxk n5YG0T7c27DLJcPp8fxDbfoQmd3emjheEB3rc8mLBgBJ9LvUcngJ7i9Ii 4Ni0lu+X02NrdnCWeyyshILEz+qIBt4uHOE6Ccm6bEfPrKqccj05pWg6s 3s8PLREroMnI5T5fMR7ysoNQgIxnY5Ha/JpuxVTBW8YSEigczFUdLZAtb g==; X-CSE-ConnectionGUID: DqoVPV8zR8idgcFfZ7hxPg== X-CSE-MsgGUID: gP1a34/+Qe+Y7vivJjcxNA== X-IronPort-AV: E=McAfee;i="6800,10657,11508"; a="73820211" X-IronPort-AV: E=Sophos;i="6.17,255,1747724400"; d="scan'208";a="73820211" 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: ADO720g5RLCFo59jOsCNKQ== X-CSE-MsgGUID: jl5RRdIuSnOTEpTUwTWu2A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.17,255,1747724400"; d="scan'208";a="163796242" 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 06/24] crypto: iaa - Simplify the code flow in iaa_compress() and iaa_decompress(). Date: Thu, 31 Jul 2025 21:36:24 -0700 Message-Id: <20250801043642.8103-7-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 commit simplifies and streamlines the logic in the core iaa_compress() and iaa_decompress() routines, eliminates branches, etc. This makes it easier to add improvements such as polling for job completions, essential to accomplish batching with hardware parallelism. Signed-off-by: Kanchana P Sridhar --- drivers/crypto/intel/iaa/iaa_crypto_main.c | 114 ++++++++++++--------- 1 file changed, 67 insertions(+), 47 deletions(-) diff --git a/drivers/crypto/intel/iaa/iaa_crypto_main.c b/drivers/crypto/in= tel/iaa/iaa_crypto_main.c index a12ea3dd5ba80..f80f3ab175a48 100644 --- a/drivers/crypto/intel/iaa/iaa_crypto_main.c +++ b/drivers/crypto/intel/iaa/iaa_crypto_main.c @@ -1792,7 +1792,34 @@ static int iaa_compress(struct crypto_tfm *tfm, stru= ct acomp_req *req, desc->src2_size =3D sizeof(struct aecs_comp_table_record); desc->completion_addr =3D idxd_desc->compl_dma; =20 - if (ctx->use_irq) { + if (likely(!ctx->use_irq)) { + ret =3D idxd_submit_desc(wq, idxd_desc); + if (ret) { + dev_dbg(dev, "submit_desc failed ret=3D%d\n", ret); + goto out; + } + + /* Update stats */ + update_total_comp_calls(); + update_wq_comp_calls(wq); + + if (ctx->async_mode) + return -EINPROGRESS; + + ret =3D check_completion(dev, idxd_desc->iax_completion, true, false); + if (ret) { + dev_dbg(dev, "check_completion failed ret=3D%d\n", ret); + goto out; + } + + *dlen =3D idxd_desc->iax_completion->output_size; + + /* Update stats */ + update_total_comp_bytes_out(*dlen); + update_wq_comp_bytes(wq, *dlen); + + *compression_crc =3D idxd_desc->iax_completion->crc; + } else { desc->flags |=3D IDXD_OP_FLAG_RCI; =20 idxd_desc->crypto.req =3D req; @@ -1800,40 +1827,23 @@ static int iaa_compress(struct crypto_tfm *tfm, str= uct 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; - } - - ret =3D idxd_submit_desc(wq, idxd_desc); - if (ret) { - dev_dbg(dev, "submit_desc failed ret=3D%d\n", ret); - goto err; - } =20 - /* Update stats */ - update_total_comp_calls(); - update_wq_comp_calls(wq); + ret =3D idxd_submit_desc(wq, idxd_desc); + if (ret) { + dev_dbg(dev, "submit_desc failed ret=3D%d\n", ret); + goto out; + } =20 - if (ctx->async_mode) { - ret =3D -EINPROGRESS; - goto out; - } + /* Update stats */ + update_total_comp_calls(); + update_wq_comp_calls(wq); =20 - ret =3D check_completion(dev, idxd_desc->iax_completion, true, false); - if (ret) { - dev_dbg(dev, "check_completion failed ret=3D%d\n", ret); - goto err; + return -EINPROGRESS; } =20 - *dlen =3D idxd_desc->iax_completion->output_size; - - /* Update stats */ - update_total_comp_bytes_out(*dlen); - update_wq_comp_bytes(wq, *dlen); - - *compression_crc =3D idxd_desc->iax_completion->crc; - -err: - idxd_free_desc(wq, idxd_desc); out: + idxd_free_desc(wq, idxd_desc); + return ret; } =20 @@ -1888,7 +1898,22 @@ static int iaa_decompress(struct crypto_tfm *tfm, st= ruct acomp_req *req, desc->src1_size =3D slen; desc->completion_addr =3D idxd_desc->compl_dma; =20 - if (ctx->use_irq) { + if (likely(!ctx->use_irq)) { + ret =3D idxd_submit_desc(wq, idxd_desc); + if (ret) { + dev_dbg(dev, "submit_desc failed ret=3D%d\n", ret); + goto fallback_software_decomp; + } + + /* Update stats */ + update_total_decomp_calls(); + update_wq_decomp_calls(wq); + + if (ctx->async_mode) + return -EINPROGRESS; + + ret =3D check_completion(dev, idxd_desc->iax_completion, false, false); + } else { desc->flags |=3D IDXD_OP_FLAG_RCI; =20 idxd_desc->crypto.req =3D req; @@ -1896,25 +1921,20 @@ static int iaa_decompress(struct crypto_tfm *tfm, s= truct 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; - } =20 - ret =3D idxd_submit_desc(wq, idxd_desc); - if (ret) { - dev_dbg(dev, "submit_desc failed ret=3D%d\n", ret); - goto fallback_software_decomp; - } + ret =3D idxd_submit_desc(wq, idxd_desc); + if (ret) { + dev_dbg(dev, "submit_desc failed ret=3D%d\n", ret); + goto fallback_software_decomp; + } =20 - /* Update stats */ - update_total_decomp_calls(); - update_wq_decomp_calls(wq); + /* Update stats */ + update_total_decomp_calls(); + update_wq_decomp_calls(wq); =20 - if (ctx->async_mode) { - ret =3D -EINPROGRESS; - goto out; + return -EINPROGRESS; } =20 - ret =3D check_completion(dev, idxd_desc->iax_completion, false, false); - fallback_software_decomp: if (ret) { dev_dbg(dev, "%s: desc allocation/submission/check_completion failed ret= =3D%d\n", __func__, ret); @@ -1929,7 +1949,7 @@ static int iaa_decompress(struct crypto_tfm *tfm, str= uct acomp_req *req, if (ret) { pr_err("%s: iaa decompress failed: deflate-generic fallback error ret= =3D%d\n", __func__, ret); - goto err; + goto out; } } else { req->dlen =3D idxd_desc->iax_completion->output_size; @@ -1941,10 +1961,10 @@ static int iaa_decompress(struct crypto_tfm *tfm, s= truct acomp_req *req, =20 *dlen =3D req->dlen; =20 -err: +out: if (idxd_desc) idxd_free_desc(wq, idxd_desc); -out: + return ret; } =20 --=20 2.27.0