From patchwork Fri Feb 28 10:00:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sridhar, Kanchana P" X-Patchwork-Id: 13996121 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 1BB9DC19776 for ; Fri, 28 Feb 2025 10:01:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C802E28000F; Fri, 28 Feb 2025 05:00:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C2F1C280012; Fri, 28 Feb 2025 05:00:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A5BEC28000F; Fri, 28 Feb 2025 05:00:44 -0500 (EST) 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 6BFC7280012 for ; Fri, 28 Feb 2025 05:00:44 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 12A79806CA for ; Fri, 28 Feb 2025 10:00:44 +0000 (UTC) X-FDA: 83168909208.02.F3AD3F7 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by imf24.hostedemail.com (Postfix) with ESMTP id 1EC5D18000F for ; Fri, 28 Feb 2025 10:00:40 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=muGgVPDL; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf24.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 192.198.163.18 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740736841; 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=bikwsSp64FBPkg6BHG0s0nLOAOFo3r/1Vlc0fabeB2E=; b=CLNbJQVyCPJxF5gw9WKfbwm6ajLPqNpzECJ8l8xhVu30mgUOEIly/ZPRwImjyHFwApPztV qfezZK9XVD0kaVVPSVe/GrNZGjiagAu210or62OCn/HMuTesh9oC4QbQODY5DgYJgNJxsq Le78uykKWkPBSxEtHvkCfXLoplDJqlw= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=muGgVPDL; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf24.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 192.198.163.18 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740736841; a=rsa-sha256; cv=none; b=Q8qdGu9bCI6bSvmEqhlro41qCGST7q7LaBjwwyBw+9tnjEheVQ21eV1PzDFw0TSIVFK/XN zUQ15SF2YjuHQDDayAZDrBc8pLfAg67jNf4FJDA7F8uOXFyDTJe6RlC9av7gYU4EeHHW4x ahQJJ/Gg/9EwRxX41NvbrbmJJiE+Jro= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1740736841; x=1772272841; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9EoxRBYCdba2ggIV7HlnyrqEHWRv9T6X+J8nbbYqe1A=; b=muGgVPDLbI995uCwCm83YNu4ngtuIC4o9DHAH5MV0eV2zBDlPsGwH75l 25PJKTUtwhE4eVSLb5bHMNppGlxR7Q6ER7hayv+25dvrJ+W8lx7M5YSz2 fxoWlPZ7FsDHHjiG4DUc7FsTAFuKJNnTYi4PZHpvvMAhC0/W8KZ2CZ7A1 tGtpImqaobGRWMti2IeEnQXwcb/NYvUWE3gnyAKruw5kENVUDdl/wZq4r X10E+nIK9Mrrzc03HhpEw866WMT59BwXnrpdi51fk6wc9XbpOP44uZT1b 96Cuhz1STeS7xDW5NCkLmFfU0HwXKoWhCHmwfEoyU79Kb4mIBnuu/lVae A==; X-CSE-ConnectionGUID: QivIvn9VRHi/cK7TwhgMXQ== X-CSE-MsgGUID: Q+KRcpLTRRqKyoMalXf/5A== X-IronPort-AV: E=McAfee;i="6700,10204,11358"; a="40902722" X-IronPort-AV: E=Sophos;i="6.13,322,1732608000"; d="scan'208";a="40902722" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2025 02:00:29 -0800 X-CSE-ConnectionGUID: pMzcQvOITtOWPzaQXSTBqw== X-CSE-MsgGUID: IXxfhbbtQEeK9DMYHChuYQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,322,1732608000"; d="scan'208";a="117325750" Received: from jf5300-b11a338t.jf.intel.com ([10.242.51.115]) by orviesa006.jf.intel.com with ESMTP; 28 Feb 2025 02:00:29 -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, 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 Cc: wajdi.k.feghali@intel.com, vinodh.gopal@intel.com, kanchana.p.sridhar@intel.com Subject: [PATCH v7 13/15] mm: zswap: Allocate pool batching resources if the compressor supports batching. Date: Fri, 28 Feb 2025 02:00:22 -0800 Message-Id: <20250228100024.332528-14-kanchana.p.sridhar@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20250228100024.332528-1-kanchana.p.sridhar@intel.com> References: <20250228100024.332528-1-kanchana.p.sridhar@intel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 1EC5D18000F X-Rspam-User: X-Stat-Signature: mjf1qk319sg1gz57jac4jwww1h91xda5 X-HE-Tag: 1740736840-439474 X-HE-Meta: U2FsdGVkX1+PYK7w2pHVvSKJRdaAcSJ3mftLdN3oHddxEGaNigsE6yHy3ILbd/gF95yuDMXmHkjn0Tbg5X1khrkvELsbm8dOeup3x0KE0hdFBSDv13kj0m17jvjs/9yYZUCX+nCKKnD9R+gaiPqVTPQ2YFY1g8S3hlXmJ8S07mpM4r8EanhQCrCk0Sr20GGLBcQGcgff1eON7cfkkp+Sf1XE/r8cVT/XD9x8eimZgxxaRsAXh9zPRIlDQtikiQeeO3AAu7vYiQQDhyhZ/1+py+/5OZKOSL2v5y/BuPIAvl+4I58G0kyu+efTKrlgpvfFKIffGafLP1glRZEEwH8oAtm1OWfLf4Lwnx+ZtPnYwjNEkOgr/Og/3CTU9fAfq8x1a7nmM6NzRMyu0vwC/oOtytrkQjujexo9yKpKfbL9JH/A3QCtBgIIaf9ht68jTcY5CALujOChlR4sg1wyJHDzF5yHzGt4rbxWjTQ20bKThz7Im38eNhfDbVqjL0itrxV5HteceJeQJnQyVQUmP6YR4+UXHzIa+w4qcDeAQ74FLZADhRlV/pcXsB8m323yLLdcPZ7HeJVOTqAKk7Rf5YY8BhnMHWdf6rGsswcIMw7MTWfqWzpObASSsdjGCGll1I+r3NC5XxmfPozqlRVLDyRxGKnSDQ85/twtj0EXxGBxNN5vUHBcGi5Av3AjMZCry7xrQ0an7ejgEN78v0Al2VH4NioZGnKNUGY/1FpkqI7vBpO6r0p+u0jxz+yAgR7GnfmIQHF6SyMCcGgrXZ7as2sYjgsThfgCsx6Ww/DI8pK19mo3Mjnswgob6Ts34BYBlzgLP63xyrriOpWXm6+rZi5qMo+e7hC7PazAMVQ2KH8dyW/DbkKEDakR60Fw8SREcWkCDjciWCpn0PiFPc5/v+kJJndfedudYc4Fx1mguNsiy+svFnvsMgQMRRV6Ar8dE6zQeslulwzCUDaD04/Jzkh YTymxW4t bKNjQdUSbdZRW5+geZqImQLM7nudjtZjqApHwx6yRjAkljW2gqocq+DwOGAryz/xCx+ta1FqmlbNpj56MWX7Uy1hx4DPzYWwOYoMMuEC3nr3JhU686r/1Q5wlIKOKzu/Ped/MBDFJlDmeHgOXzE0S2vqdDwqDAGOKiqeXJtT2lTzzuH60i2dWA/zSbw== 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 adds support for the per-CPU acomp_ctx to track multiple compression/decompression requests and multiple compression destination buffers. The zswap_cpu_comp_prepare() CPU onlining code will get the maximum batch-size the compressor supports. If so, it will allocate the necessary batching resources. However, zswap does not use more than one request yet. Follow-up patches will actually utilize the multiple acomp_ctx requests/buffers for batch compression/decompression of multiple pages. The newly added ZSWAP_MAX_BATCH_SIZE limits the amount of extra memory used for batching. There is a small extra memory overhead of allocating the "reqs" and "buffers" arrays for compressors that do not support batching. Signed-off-by: Kanchana P Sridhar --- mm/zswap.c | 100 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 69 insertions(+), 31 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index 3a93714a9327..6aa602b8514e 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -78,6 +78,16 @@ static bool zswap_pool_reached_full; #define ZSWAP_PARAM_UNSET "" +/* + * For compression batching of large folios: + * Maximum number of acomp compress requests that will be processed + * in a batch, iff the zswap compressor supports batching. + * This limit exists because we preallocate enough requests and buffers + * in the per-cpu acomp_ctx accordingly. Hence, a higher limit means higher + * memory usage. + */ +#define ZSWAP_MAX_BATCH_SIZE 8U + static int zswap_setup(void); /* Enable/disable zswap */ @@ -143,8 +153,8 @@ bool zswap_never_enabled(void) struct crypto_acomp_ctx { struct crypto_acomp *acomp; - struct acomp_req *req; - u8 *buffer; + struct acomp_req **reqs; + u8 **buffers; unsigned int nr_reqs; struct crypto_wait wait; struct mutex mutex; @@ -251,13 +261,22 @@ static void __zswap_pool_empty(struct percpu_ref *ref); static void acomp_ctx_dealloc(struct crypto_acomp_ctx *acomp_ctx) { if (!IS_ERR_OR_NULL(acomp_ctx) && acomp_ctx->nr_reqs) { + int i; + + if (acomp_ctx->reqs) { + for (i = 0; i < acomp_ctx->nr_reqs; ++i) + if (!IS_ERR_OR_NULL(acomp_ctx->reqs[i])) + acomp_request_free(acomp_ctx->reqs[i]); + kfree(acomp_ctx->reqs); + acomp_ctx->reqs = NULL; + } - if (!IS_ERR_OR_NULL(acomp_ctx->req)) - acomp_request_free(acomp_ctx->req); - acomp_ctx->req = NULL; - - kfree(acomp_ctx->buffer); - acomp_ctx->buffer = NULL; + if (acomp_ctx->buffers) { + for (i = 0; i < acomp_ctx->nr_reqs; ++i) + kfree(acomp_ctx->buffers[i]); + kfree(acomp_ctx->buffers); + acomp_ctx->buffers = NULL; + } if (!IS_ERR_OR_NULL(acomp_ctx->acomp)) crypto_free_acomp(acomp_ctx->acomp); @@ -270,7 +289,7 @@ static int zswap_cpu_comp_prepare(unsigned int cpu, struct hlist_node *node) { struct zswap_pool *pool = hlist_entry(node, struct zswap_pool, node); struct crypto_acomp_ctx *acomp_ctx = per_cpu_ptr(pool->acomp_ctx, cpu); - int ret = -ENOMEM; + int i, ret = -ENOMEM; /* * Just to be even more fail-safe against changes in assumptions and/or @@ -292,22 +311,41 @@ static int zswap_cpu_comp_prepare(unsigned int cpu, struct hlist_node *node) goto fail; } - acomp_ctx->nr_reqs = 1; + acomp_ctx->nr_reqs = min(ZSWAP_MAX_BATCH_SIZE, + crypto_acomp_batch_size(acomp_ctx->acomp)); - acomp_ctx->req = acomp_request_alloc(acomp_ctx->acomp); - if (!acomp_ctx->req) { - pr_err("could not alloc crypto acomp_request %s\n", - pool->tfm_name); - ret = -ENOMEM; + acomp_ctx->reqs = kcalloc_node(acomp_ctx->nr_reqs, sizeof(struct acomp_req *), + GFP_KERNEL, cpu_to_node(cpu)); + if (!acomp_ctx->reqs) goto fail; + + for (i = 0; i < acomp_ctx->nr_reqs; ++i) { + acomp_ctx->reqs[i] = acomp_request_alloc(acomp_ctx->acomp); + if (!acomp_ctx->reqs[i]) { + pr_err("could not alloc crypto acomp_request reqs[%d] %s\n", + i, pool->tfm_name); + goto fail; + } } - acomp_ctx->buffer = kmalloc_node(PAGE_SIZE * 2, GFP_KERNEL, cpu_to_node(cpu)); - if (!acomp_ctx->buffer) { - ret = -ENOMEM; + acomp_ctx->buffers = kcalloc_node(acomp_ctx->nr_reqs, sizeof(u8 *), + GFP_KERNEL, cpu_to_node(cpu)); + if (!acomp_ctx->buffers) goto fail; + + for (i = 0; i < acomp_ctx->nr_reqs; ++i) { + acomp_ctx->buffers[i] = kmalloc_node(PAGE_SIZE * 2, GFP_KERNEL, + cpu_to_node(cpu)); + if (!acomp_ctx->buffers[i]) + goto fail; } + /* + * The crypto_wait is used only in fully synchronous, i.e., with scomp + * or non-poll mode of acomp, hence there is only one "wait" per + * acomp_ctx, with callback set to reqs[0], under the assumption that + * there is at least 1 request per acomp_ctx. + */ crypto_init_wait(&acomp_ctx->wait); /* @@ -315,7 +353,7 @@ static int zswap_cpu_comp_prepare(unsigned int cpu, struct hlist_node *node) * crypto_wait_req(); if the backend of acomp is scomp, the callback * won't be called, crypto_wait_req() will return without blocking. */ - acomp_request_set_callback(acomp_ctx->req, CRYPTO_TFM_REQ_MAY_BACKLOG, + acomp_request_set_callback(acomp_ctx->reqs[0], CRYPTO_TFM_REQ_MAY_BACKLOG, crypto_req_done, &acomp_ctx->wait); acomp_ctx->is_sleepable = acomp_is_async(acomp_ctx->acomp); @@ -407,8 +445,8 @@ static struct zswap_pool *zswap_pool_create(char *type, char *compressor) struct crypto_acomp_ctx *acomp_ctx = per_cpu_ptr(pool->acomp_ctx, cpu); acomp_ctx->acomp = NULL; - acomp_ctx->req = NULL; - acomp_ctx->buffer = NULL; + acomp_ctx->reqs = NULL; + acomp_ctx->buffers = NULL; acomp_ctx->__online = false; acomp_ctx->nr_reqs = 0; mutex_init(&acomp_ctx->mutex); @@ -1026,7 +1064,7 @@ static bool zswap_compress(struct page *page, struct zswap_entry *entry, u8 *dst; acomp_ctx = acomp_ctx_get_cpu_lock(pool); - dst = acomp_ctx->buffer; + dst = acomp_ctx->buffers[0]; sg_init_table(&input, 1); sg_set_page(&input, page, PAGE_SIZE, 0); @@ -1036,7 +1074,7 @@ static bool zswap_compress(struct page *page, struct zswap_entry *entry, * giving the dst buffer with enough length to avoid buffer overflow. */ sg_init_one(&output, dst, PAGE_SIZE * 2); - acomp_request_set_params(acomp_ctx->req, &input, &output, PAGE_SIZE, dlen); + acomp_request_set_params(acomp_ctx->reqs[0], &input, &output, PAGE_SIZE, dlen); /* * it maybe looks a little bit silly that we send an asynchronous request, @@ -1050,8 +1088,8 @@ static bool zswap_compress(struct page *page, struct zswap_entry *entry, * but in different threads running on different cpu, we have different * acomp instance, so multiple threads can do (de)compression in parallel. */ - comp_ret = crypto_wait_req(crypto_acomp_compress(acomp_ctx->req), &acomp_ctx->wait); - dlen = acomp_ctx->req->dlen; + comp_ret = crypto_wait_req(crypto_acomp_compress(acomp_ctx->reqs[0]), &acomp_ctx->wait); + dlen = acomp_ctx->reqs[0]->dlen; if (comp_ret) goto unlock; @@ -1102,19 +1140,19 @@ static void zswap_decompress(struct zswap_entry *entry, struct folio *folio) */ if ((acomp_ctx->is_sleepable && !zpool_can_sleep_mapped(zpool)) || !virt_addr_valid(src)) { - memcpy(acomp_ctx->buffer, src, entry->length); - src = acomp_ctx->buffer; + memcpy(acomp_ctx->buffers[0], src, entry->length); + src = acomp_ctx->buffers[0]; zpool_unmap_handle(zpool, entry->handle); } sg_init_one(&input, src, entry->length); sg_init_table(&output, 1); sg_set_folio(&output, folio, PAGE_SIZE, 0); - acomp_request_set_params(acomp_ctx->req, &input, &output, entry->length, PAGE_SIZE); - BUG_ON(crypto_wait_req(crypto_acomp_decompress(acomp_ctx->req), &acomp_ctx->wait)); - BUG_ON(acomp_ctx->req->dlen != PAGE_SIZE); + acomp_request_set_params(acomp_ctx->reqs[0], &input, &output, entry->length, PAGE_SIZE); + BUG_ON(crypto_wait_req(crypto_acomp_decompress(acomp_ctx->reqs[0]), &acomp_ctx->wait)); + BUG_ON(acomp_ctx->reqs[0]->dlen != PAGE_SIZE); - if (src != acomp_ctx->buffer) + if (src != acomp_ctx->buffers[0]) zpool_unmap_handle(zpool, entry->handle); acomp_ctx_put_unlock(acomp_ctx); }