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 EEFD7C83030 for ; Fri, 4 Jul 2025 04:23:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BF3DE440150; Fri, 4 Jul 2025 00:23:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B2EA6440156; Fri, 4 Jul 2025 00:23:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 86E5A440150; Fri, 4 Jul 2025 00:23:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 749AF440154 for ; Fri, 4 Jul 2025 00:23:35 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id EBF9A1615A4 for ; Fri, 4 Jul 2025 04:23:34 +0000 (UTC) X-FDA: 83625288348.20.CF12B95 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by imf01.hostedemail.com (Postfix) with ESMTP id BD4A440008 for ; Fri, 4 Jul 2025 04:23:32 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=JO4T4AQw; spf=pass (imf01.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=1751603013; 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=mQxFMDKaMnuJUTvJUTzp1+nDWDI4sN2uLjWxSsftVlw=; b=LklkW2/VbXU85a1zQNa0OiSi8mMtqZykJoxWDOqDtOrW7j3Dx5Rfv1/siXvOAMgPMICu5l EcR6weU25++gHLqE1FNYumxTtWVrggFRN2jLdHB9KANPKjiDV/aspEHdgAGWUz6/Y74StO skakuihBA8NajpL69NQFstb03nbwprA= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=JO4T4AQw; spf=pass (imf01.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=1751603013; a=rsa-sha256; cv=none; b=JpmDePszS8Eu5/YstR4uKCe0kulu43uu49Kzi8ENt+6n0ZZb4jDbdM65Ept7/EZDYAhuhM p37K0naT8mGYzmkhMZot80DdA1FVHmFd31VTY8s9HxUTirWxt5HpWP7Na7NXObM2jAHT6L u6WeziY4/56S7wNX+M69ln7LSnfKWY4= 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=EPL5S98VoLAqAh2UYrP8Oz5fkSzagZAWrSt2nHoXZfk=; b=JO4T4AQwAykbB9dLv8ozMGvxzXMJQifoN4chj+INqtE0+jFlwwtFizZn DErpQ4DE9zr57/9k2AbxYpXOyPEdDxieTknovWHMwLG8Zt6AYo0RumMaS k9pd+EEtCefQFQ0ra/CNJ4LmtDResJDHrvVc7MKj2vCIVmZSaCxeHUjIp 5cFI+k7/PRB6ORaFx8dZNfxqmbEH+wNLtFwE1oS/WOknErSsefWxlF3L3 Po3oS0+YQDYbEzvVKz2vz3G36FOl0iW/qRa7y8W6xyJrTnidEpZsNrLjB BTIgnEMxYvogEGHwQ/3x2ZtjJR4JBlJ5lu8RlSXFBE22VerXE2njp13ol g==; X-CSE-ConnectionGUID: Iypvm1bPTD2Ni3RpfXGVpw== X-CSE-MsgGUID: XOSVyZALS2inVRYtEWNVnw== X-IronPort-AV: E=McAfee;i="6800,10657,11483"; a="53909000" X-IronPort-AV: E=Sophos;i="6.16,286,1744095600"; d="scan'208";a="53909000" 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: RyryTXxqRbqKWZ2duULtng== X-CSE-MsgGUID: 2kqonjzKScmmEB5BIWmcaQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,286,1744095600"; d="scan'208";a="153968673" 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 05/25] crypto: iaa - iaa_wq uses percpu_refs for get/put reference counting. Date: Thu, 3 Jul 2025 21:23:03 -0700 Message-Id: <20250704042323.10318-6-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: paemozbjyctwtmcoyx3ums43azhjdfcc X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: BD4A440008 X-HE-Tag: 1751603012-997118 X-HE-Meta: U2FsdGVkX1+yBS5//fHFh+ZGYve74kFritq4yfL4/sucSykDg8RNhmTy2G1Svp6l51U01FZOWFLOv02fr3QHT/JInDGKN9ewxZQB6+QjHPDdpXEMQ04d+H4mG9/iqUNr70VoIXEfFCYdIXxTUCJf8h8AScByW/sCvMLd/pnbThdiB9b5i50LIdSVL26v6ffNxOQKPb5g5lBwUL0g17t7LJRqMltH/jcavBKxfaA4/CdsPaxHVj9PnKqtvnnB6vrtl6S8BimY8r6OvWBJ08bxHxutez8K1zpaU5aVGA2G7QfZChTekSh5T5Zc6jh6N214ugXZj5SDo8LEBaTdE7zw7msXG6OS6KYkgcW7pRKjERdxL+5whNxwVkd7t4mKN9OJNDXp5kcbFW54p/vf2GPdmHUp7KKwuq93+DZWHM7FbJFtDkzG6hU1hDZBpsMTYQX7YsnRk0gLZLIGZQRAOFC4bQHK7C1HP3pCee5G9QFgw+Q8N2r/Q8ZImZ7eNr+BCfMpz4n1HQQKYTReUixigV6nUl60m/vdpYygt0P9YsYB5zSdUAb7npaPVMy1QCJ1VFuO37noCnDvOdEOPdL6MYuAgnuJglMsXXWbYgn1KSsi7s45RgpXeRuaA5QAPqwJheuy8BOt3mL2vk43gldSSB3NZdekRqZQ5beRTLQ3/nYV3aEcpZnvx/hJbwyQlwOvPMd8K+FO9iiqSZ0qclqxYcaBFtieJGuyxjDTvOKPth4m4O0tQMPh69KVeYf7ZrRmVb6P1frZnYqh1rq0mCGumUui5h+hL+BpqT+aTB0rg93osjUicQDx7tgjxnOj31YIa5Z7ZomWe3U2ATO0fNCoNxpg7mnqFcIRBpnPmRzVA+yOPStg/NzbTi1EsXh7wfYfiRq9tPoDQzmJjfgxhhSdOCqK2+3NtUTSt+2qWBULpbaNwtalI4GijMM6nNGZMxMH7Tp8F63/VIUdMN3mNKLjFBX sQ3weBc0 s8ItgPjJlj7SAp76AllmA0Ql/SrSDwRpCk+9xytortTuOOF5//784DFD8JJQzPkTlSwxjacmPGyWiZm8EzXK9HfdBVD4L7290dSbYhm/XVUhAb2K2o37/htpNLNTOGg6GBQqV2hPxXmYQGvxVT2O70us2nd8C9AqQo8GnBZKw6x1qymQ6dWz5xezhFMUfXG+IhOY96xzJoM2Rmj5zWTRg8S/Bk8p72C2TWETb 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 patch modifies the reference counting on "struct iaa_wq" to be a percpu_ref in atomic mode, instead of an "int refcount" combined with the "idxd->dev_lock" spin_lock currently used as a synchronization mechanism to achieve get/put semantics. This enables a more light-weight, cleaner and effective refcount implementation for the iaa_wq, significantly reducing latency per compress/decompress job submitted to the IAA accelerator: p50: -136 ns p99: -880 ns Signed-off-by: Kanchana P Sridhar --- drivers/crypto/intel/iaa/iaa_crypto.h | 4 +- drivers/crypto/intel/iaa/iaa_crypto_main.c | 119 +++++++-------------- 2 files changed, 41 insertions(+), 82 deletions(-) diff --git a/drivers/crypto/intel/iaa/iaa_crypto.h b/drivers/crypto/intel/iaa/iaa_crypto.h index cc76a047b54ad..9611f2518f42c 100644 --- a/drivers/crypto/intel/iaa/iaa_crypto.h +++ b/drivers/crypto/intel/iaa/iaa_crypto.h @@ -47,8 +47,8 @@ struct iaa_wq { struct list_head list; struct idxd_wq *wq; - int ref; - bool remove; + struct percpu_ref ref; + bool free; bool mapped; struct iaa_device *iaa_device; diff --git a/drivers/crypto/intel/iaa/iaa_crypto_main.c b/drivers/crypto/intel/iaa/iaa_crypto_main.c index 1de8b93185ca4..d32b345ed8097 100644 --- a/drivers/crypto/intel/iaa/iaa_crypto_main.c +++ b/drivers/crypto/intel/iaa/iaa_crypto_main.c @@ -701,7 +701,7 @@ static void del_iaa_device(struct iaa_device *iaa_device) static void free_iaa_device(struct iaa_device *iaa_device) { - if (!iaa_device) + if (!iaa_device || iaa_device->n_wq) return; remove_device_compression_modes(iaa_device); @@ -731,6 +731,13 @@ static bool iaa_has_wq(struct iaa_device *iaa_device, struct idxd_wq *wq) return false; } +static void __iaa_wq_release(struct percpu_ref *ref) +{ + struct iaa_wq *iaa_wq = container_of(ref, typeof(*iaa_wq), ref); + + iaa_wq->free = true; +} + static int add_iaa_wq(struct iaa_device *iaa_device, struct idxd_wq *wq, struct iaa_wq **new_wq) { @@ -738,11 +745,20 @@ static int add_iaa_wq(struct iaa_device *iaa_device, struct idxd_wq *wq, struct pci_dev *pdev = idxd->pdev; struct device *dev = &pdev->dev; struct iaa_wq *iaa_wq; + int ret; iaa_wq = kzalloc(sizeof(*iaa_wq), GFP_KERNEL); if (!iaa_wq) return -ENOMEM; + ret = percpu_ref_init(&iaa_wq->ref, __iaa_wq_release, + PERCPU_REF_INIT_ATOMIC, GFP_KERNEL); + + if (ret) { + kfree(iaa_wq); + return -ENOMEM; + } + iaa_wq->wq = wq; iaa_wq->iaa_device = iaa_device; idxd_wq_set_private(wq, iaa_wq); @@ -818,6 +834,9 @@ static void __free_iaa_wq(struct iaa_wq *iaa_wq) if (!iaa_wq) return; + WARN_ON(!percpu_ref_is_zero(&iaa_wq->ref)); + percpu_ref_exit(&iaa_wq->ref); + iaa_device = iaa_wq->iaa_device; if (iaa_device->n_wq == 0) free_iaa_device(iaa_wq->iaa_device); @@ -912,53 +931,6 @@ static int save_iaa_wq(struct idxd_wq *wq) return 0; } -static int iaa_wq_get(struct idxd_wq *wq) -{ - struct idxd_device *idxd = wq->idxd; - struct iaa_wq *iaa_wq; - int ret = 0; - - spin_lock(&idxd->dev_lock); - iaa_wq = idxd_wq_get_private(wq); - if (iaa_wq && !iaa_wq->remove) { - iaa_wq->ref++; - idxd_wq_get(wq); - } else { - ret = -ENODEV; - } - spin_unlock(&idxd->dev_lock); - - return ret; -} - -static int iaa_wq_put(struct idxd_wq *wq) -{ - struct idxd_device *idxd = wq->idxd; - struct iaa_wq *iaa_wq; - bool free = false; - int ret = 0; - - spin_lock(&idxd->dev_lock); - iaa_wq = idxd_wq_get_private(wq); - if (iaa_wq) { - iaa_wq->ref--; - if (iaa_wq->ref == 0 && iaa_wq->remove) { - idxd_wq_set_private(wq, NULL); - free = true; - } - idxd_wq_put(wq); - } else { - ret = -ENODEV; - } - spin_unlock(&idxd->dev_lock); - if (free) { - __free_iaa_wq(iaa_wq); - kfree(iaa_wq); - } - - return ret; -} - /*************************************************************** * Mapping IAA devices and wqs to cores with per-cpu wq_tables. ***************************************************************/ @@ -1765,7 +1737,7 @@ static void iaa_desc_complete(struct idxd_desc *idxd_desc, if (free_desc) idxd_free_desc(idxd_desc->wq, idxd_desc); - iaa_wq_put(idxd_desc->wq); + percpu_ref_put(&iaa_wq->ref); } static int iaa_compress(struct crypto_tfm *tfm, struct acomp_req *req, @@ -1996,19 +1968,13 @@ static int iaa_comp_acompress(struct acomp_req *req) cpu = get_cpu(); wq = comp_wq_table_next_wq(cpu); put_cpu(); - if (!wq) { - pr_debug("no wq configured for cpu=%d\n", cpu); - return -ENODEV; - } - ret = iaa_wq_get(wq); - if (ret) { + iaa_wq = wq ? idxd_wq_get_private(wq) : NULL; + if (!iaa_wq || !percpu_ref_tryget(&iaa_wq->ref)) { pr_debug("no wq available for cpu=%d\n", cpu); return -ENODEV; } - iaa_wq = idxd_wq_get_private(wq); - dev = &wq->idxd->pdev->dev; nr_sgs = dma_map_sg(dev, req->src, sg_nents(req->src), DMA_TO_DEVICE); @@ -2061,7 +2027,7 @@ static int iaa_comp_acompress(struct acomp_req *req) err_map_dst: dma_unmap_sg(dev, req->src, sg_nents(req->src), DMA_TO_DEVICE); out: - iaa_wq_put(wq); + percpu_ref_put(&iaa_wq->ref); return ret; } @@ -2083,19 +2049,13 @@ static int iaa_comp_adecompress(struct acomp_req *req) cpu = get_cpu(); wq = decomp_wq_table_next_wq(cpu); put_cpu(); - if (!wq) { - pr_debug("no wq configured for cpu=%d\n", cpu); - return -ENODEV; - } - ret = iaa_wq_get(wq); - if (ret) { + iaa_wq = wq ? idxd_wq_get_private(wq) : NULL; + if (!iaa_wq || !percpu_ref_tryget(&iaa_wq->ref)) { pr_debug("no wq available for cpu=%d\n", cpu); - return -ENODEV; + return deflate_generic_decompress(req); } - iaa_wq = idxd_wq_get_private(wq); - dev = &wq->idxd->pdev->dev; nr_sgs = dma_map_sg(dev, req->src, sg_nents(req->src), DMA_TO_DEVICE); @@ -2130,7 +2090,7 @@ static int iaa_comp_adecompress(struct acomp_req *req) err_map_dst: dma_unmap_sg(dev, req->src, sg_nents(req->src), DMA_TO_DEVICE); out: - iaa_wq_put(wq); + percpu_ref_put(&iaa_wq->ref); return ret; } @@ -2303,7 +2263,6 @@ static void iaa_crypto_remove(struct idxd_dev *idxd_dev) struct idxd_wq *wq = idxd_dev_to_wq(idxd_dev); struct idxd_device *idxd = wq->idxd; struct iaa_wq *iaa_wq; - bool free = false; atomic_set(&iaa_crypto_enabled, 0); idxd_wq_quiesce(wq); @@ -2324,18 +2283,18 @@ static void iaa_crypto_remove(struct idxd_dev *idxd_dev) goto out; } - if (iaa_wq->ref) { - iaa_wq->remove = true; - } else { - wq = iaa_wq->wq; - idxd_wq_set_private(wq, NULL); - free = true; - } + /* Drop the initial reference. */ + percpu_ref_kill(&iaa_wq->ref); + + while (!iaa_wq->free) + cpu_relax(); + + __free_iaa_wq(iaa_wq); + + idxd_wq_set_private(wq, NULL); spin_unlock(&idxd->dev_lock); - if (free) { - __free_iaa_wq(iaa_wq); - kfree(iaa_wq); - } + + kfree(iaa_wq); idxd_drv_disable_wq(wq); -- 2.27.0