From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38C46C83F09 for ; Fri, 4 Jul 2025 04:23:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DEE5D440152; Fri, 4 Jul 2025 00:23:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DC73A440150; Fri, 4 Jul 2025 00:23:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BCD47440152; Fri, 4 Jul 2025 00:23:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id A8FC9440150 for ; Fri, 4 Jul 2025 00:23:34 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 77F501A160F for ; Fri, 4 Jul 2025 04:23:34 +0000 (UTC) X-FDA: 83625288348.12.779FC54 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by imf11.hostedemail.com (Postfix) with ESMTP id 5849640002 for ; Fri, 4 Jul 2025 04:23:32 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=ZcWHtoNM; spf=pass (imf11.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 198.175.65.17 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751603012; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LfrWhERl/+X+9RBpOEFS7dz55wM4DQJuVu4labxJ67Y=; b=IXonxzJ4eR58uH9swFQSBzp+XIL/9JGwchCNIz9MfFFIKSD4VnHzxkN/+Vwak0DZi1xAnn 7nXfUOLYRj54Gj4sqjuzkbfKmVJW2RhD/7BJzkf/xFGHyYLWg5X8epGrZX6CQUlEMOU50J 82AdFkdAUxGznMusHaM/J4L+If0jGsg= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=ZcWHtoNM; spf=pass (imf11.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 198.175.65.17 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751603012; a=rsa-sha256; cv=none; b=dVXbBvornd50+YM8gdzNM7h8VaNku/0TBJEFVW2cB5hbjsZUkOUMKiTMvBjs/HASN8mNGP jkuwavu0dvGVGsCgCKG0vGc5hgeEfm/sLOFmB2jR0Khpzb5t5hWYDWSLGx3ItU5phLWbHd x+LUDQKWHa4shrGUs6toBZqBgLNadsI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1751603013; x=1783139013; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=H/7P7dUjgupZfnLQkzeutseRD/7xP2+rRTYEsLxZsJI=; b=ZcWHtoNMEumieIX8CUSAnzw1cYr7reJwpNJyHDyc4n49vetqI/WB/MHT 0ztemtLDBKuozhH6IFa/ezEaFDvhJWG+yMqUWzfIEjc369HrJ7QQf5JUD hRZk4Iz4RXAZ700j4RuBvkbeGRM9c5MT6SDv8XTbBCocrYBJmnbJcNTQ/ YLLmbsoUIV+Wt2qa0tubQGKELYb4zayrsWs+FDwtpnSR8g+swGVNxTrEr eTGBXro7AmxbZyOZOT5vGLYa6kqI/M+P4pIhp66kRgefYxi4DiaaK137h TsEACgUons9AUDdoAWIENu/51ZgUWztsRNYKI5U0DLxSn91fc8ad4vJcb Q==; X-CSE-ConnectionGUID: bUfUhw4AQwmTsVu4f0gwGw== X-CSE-MsgGUID: VxxetLawR7SwdeIC11qkUg== X-IronPort-AV: E=McAfee;i="6800,10657,11483"; a="53909002" X-IronPort-AV: E=Sophos;i="6.16,286,1744095600"; d="scan'208";a="53909002" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2025 21:23:25 -0700 X-CSE-ConnectionGUID: jw7zH1osSEmLNtZahrwyKA== X-CSE-MsgGUID: gmJBt54TQ9+fVCQWOqraXQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,286,1744095600"; d="scan'208";a="153968676" Received: from jf5300-b11a338t.jf.intel.com ([10.242.51.115]) by orviesa006.jf.intel.com with ESMTP; 03 Jul 2025 21:23:24 -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 v10 06/25] crypto: iaa - Simplify the code flow in iaa_compress() and iaa_decompress(). Date: Thu, 3 Jul 2025 21:23:04 -0700 Message-Id: <20250704042323.10318-7-kanchana.p.sridhar@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20250704042323.10318-1-kanchana.p.sridhar@intel.com> References: <20250704042323.10318-1-kanchana.p.sridhar@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: rdk3wd7ojqqmxqgb344r7j4ma4uaxjbb X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 5849640002 X-HE-Tag: 1751603012-902486 X-HE-Meta: U2FsdGVkX1/XizwZQB6+tkSZ+kJs+f5u+YT0luF+RpqWIcwVxlV/q+odqeEbDe6dZcA/ZdHCY30LvDZNW+/15/v9lEtwyFvsMtazTidf9RB91ya3ULXiA8QQm6SUdzfnpIfIMqiQnHskS+/otBK9CoZ1Pf95zHOcbqMOxWKGgOrp2rIrOxNS8NXA3BPuj6qI9eJ86iOtsRDs5F/AB8GNpg3k7Nnfa8i9zQX3mwx0uxHBz5oz02cXSSHv9TtCOrZgx03wjqT+BZSVTS8zK5Ifx/2PRU9FEEYoFqLDV6jQkJU79V7e+BwhU6O2/kztJ2qg0gdFoZfTyDdRF6TkwbdKYrIqbVmwbp3Hpa3nKd8FQyTIaxJ1ODejlShVfItnF3bBvf6Drx1qKLGkg5pQprt+B8oPLABguByICWqHptX0YA2jjQ6+2mtVE2GAJKkDz0za1xPn94LK4ZFZ4rwzDf929LWxxj8bRy/ByuDR27XWKJ0ksRvCDKaK04HghPquz+vkGkerOUfls3SAZIimAJNIyRWja8CDr1PvJ+9j2CuaVHTnieAsX2DF/DwXRwDLF5bkWp2bTSP3MwDFeGhtufMrdQsriia68CZYdNAnLLf5jcsi04tKB/LIQRL9OSZf90vqvPeCXwgzwtM5p6sm0YXm2kfWFIRkYTR6XEMum2MpBKX6BPf+4+oAt6OZL/xqrSaZuPhqOdfwhSkfmMZCKEQSHTldec45Bkd0I8ZZzUPVxzZLWKO+8vBmFSeJXvftGGFr5qIO/TYTIS/eAUh0ZbDvXOSDKl+wTtCdpD6mQ8xy/S4cM9rXiQqk/2JERJ0yg3zABTYlKeIF+bTRQy6ee1vhBX0gsNw2wiS5DgThSGtUIf4pDEJCCEGi7BEqoZiUua+dfZrWC7yKW22Ns//hwwovtZu/MlDDtpK/qWa07Xp8lFkcHS6J6XZha4iMjqKwJnz/yA2qjguOvbH9zzCDEJ3 WpgEwzYH vmQn5ncvbpeY+v9xJ0+6Iuvdh/K7D/9HKbDePWflYwLvB087WZWnJ6xRKPRokrMJG14ZvS2a9fRxnSSCdyqxXRMK8DqfDUw7+qFwp81N7BpGa4AKNQUzWieclICKXQUgT7eaISyggZEGwyrpqnWMgyNgdFuE88IPxRaP+Zs0ictp6s8ZVR0GQV4YzPPDPCtn065D1 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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/intel/iaa/iaa_crypto_main.c index d32b345ed8097..6018d0f43daae 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, struct acomp_req *req, desc->src2_size = sizeof(struct aecs_comp_table_record); desc->completion_addr = idxd_desc->compl_dma; - if (ctx->use_irq) { + if (likely(!ctx->use_irq)) { + ret = idxd_submit_desc(wq, idxd_desc); + if (ret) { + dev_dbg(dev, "submit_desc failed ret=%d\n", ret); + goto out; + } + + /* Update stats */ + update_total_comp_calls(); + update_wq_comp_calls(wq); + + if (ctx->async_mode) + return -EINPROGRESS; + + ret = check_completion(dev, idxd_desc->iax_completion, true, false); + if (ret) { + dev_dbg(dev, "check_completion failed ret=%d\n", ret); + goto out; + } + + *dlen = idxd_desc->iax_completion->output_size; + + /* Update stats */ + update_total_comp_bytes_out(*dlen); + update_wq_comp_bytes(wq, *dlen); + + *compression_crc = idxd_desc->iax_completion->crc; + } else { desc->flags |= IDXD_OP_FLAG_RCI; idxd_desc->crypto.req = req; @@ -1800,40 +1827,23 @@ static int iaa_compress(struct crypto_tfm *tfm, struct acomp_req *req, idxd_desc->crypto.src_addr = src_addr; idxd_desc->crypto.dst_addr = dst_addr; idxd_desc->crypto.compress = true; - } - - ret = idxd_submit_desc(wq, idxd_desc); - if (ret) { - dev_dbg(dev, "submit_desc failed ret=%d\n", ret); - goto err; - } - /* Update stats */ - update_total_comp_calls(); - update_wq_comp_calls(wq); + ret = idxd_submit_desc(wq, idxd_desc); + if (ret) { + dev_dbg(dev, "submit_desc failed ret=%d\n", ret); + goto out; + } - if (ctx->async_mode) { - ret = -EINPROGRESS; - goto out; - } + /* Update stats */ + update_total_comp_calls(); + update_wq_comp_calls(wq); - ret = check_completion(dev, idxd_desc->iax_completion, true, false); - if (ret) { - dev_dbg(dev, "check_completion failed ret=%d\n", ret); - goto err; + return -EINPROGRESS; } - *dlen = idxd_desc->iax_completion->output_size; - - /* Update stats */ - update_total_comp_bytes_out(*dlen); - update_wq_comp_bytes(wq, *dlen); - - *compression_crc = idxd_desc->iax_completion->crc; - -err: - idxd_free_desc(wq, idxd_desc); out: + idxd_free_desc(wq, idxd_desc); + return ret; } @@ -1888,7 +1898,22 @@ static int iaa_decompress(struct crypto_tfm *tfm, struct acomp_req *req, desc->src1_size = slen; desc->completion_addr = idxd_desc->compl_dma; - if (ctx->use_irq) { + if (likely(!ctx->use_irq)) { + ret = idxd_submit_desc(wq, idxd_desc); + if (ret) { + dev_dbg(dev, "submit_desc failed ret=%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 = check_completion(dev, idxd_desc->iax_completion, false, false); + } else { desc->flags |= IDXD_OP_FLAG_RCI; idxd_desc->crypto.req = req; @@ -1896,25 +1921,20 @@ static int iaa_decompress(struct crypto_tfm *tfm, struct acomp_req *req, idxd_desc->crypto.src_addr = src_addr; idxd_desc->crypto.dst_addr = dst_addr; idxd_desc->crypto.compress = false; - } - ret = idxd_submit_desc(wq, idxd_desc); - if (ret) { - dev_dbg(dev, "submit_desc failed ret=%d\n", ret); - goto fallback_software_decomp; - } + ret = idxd_submit_desc(wq, idxd_desc); + if (ret) { + dev_dbg(dev, "submit_desc failed ret=%d\n", ret); + goto fallback_software_decomp; + } - /* Update stats */ - update_total_decomp_calls(); - update_wq_decomp_calls(wq); + /* Update stats */ + update_total_decomp_calls(); + update_wq_decomp_calls(wq); - if (ctx->async_mode) { - ret = -EINPROGRESS; - goto out; + return -EINPROGRESS; } - ret = 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=%d\n", __func__, ret); @@ -1929,7 +1949,7 @@ static int iaa_decompress(struct crypto_tfm *tfm, struct acomp_req *req, if (ret) { pr_err("%s: iaa decompress failed: deflate-generic fallback error ret=%d\n", __func__, ret); - goto err; + goto out; } } else { req->dlen = idxd_desc->iax_completion->output_size; @@ -1941,10 +1961,10 @@ static int iaa_decompress(struct crypto_tfm *tfm, struct acomp_req *req, *dlen = req->dlen; -err: +out: if (idxd_desc) idxd_free_desc(wq, idxd_desc); -out: + return ret; } -- 2.27.0