From patchwork Sun Nov 3 03:21:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sridhar, Kanchana P" X-Patchwork-Id: 13860296 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 112C7E6780A for ; Sun, 3 Nov 2024 03:21:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 680686B0095; Sat, 2 Nov 2024 23:21:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 60D7F6B009B; Sat, 2 Nov 2024 23:21:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3EED06B009D; Sat, 2 Nov 2024 23:21:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 046AA6B0095 for ; Sat, 2 Nov 2024 23:21:25 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A3542141961 for ; Sun, 3 Nov 2024 03:21:25 +0000 (UTC) X-FDA: 82743331818.01.9E0D2B1 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by imf12.hostedemail.com (Postfix) with ESMTP id AE8704000D for ; Sun, 3 Nov 2024 03:21:09 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=BFLR4Onp; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf12.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 192.198.163.14 as permitted sender) smtp.mailfrom=kanchana.p.sridhar@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730603962; a=rsa-sha256; cv=none; b=iRVfHnIB2BKsNuRAHHanBfakm0BDNiurC1feidfk4/FZH6K2BpOY9Shu5TWsB9yGCkGnLR DViVsbeUtpBVD8GZuxkY2VZQ8UxzDAhLat//3TrKUaLJccYz1E0LqkY2rVx5Fbj5qIpHZd ZQfEYiB7Rq7DGuV50CzsuMWiSy3rkhM= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=BFLR4Onp; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf12.hostedemail.com: domain of kanchana.p.sridhar@intel.com designates 192.198.163.14 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=1730603962; 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=nikya7qF4DmUxGnRrNHV5jgQ9mjh0pUcnSNk84HjAn0=; b=12XoADW2wNMmqboNjFaj3M71m+uAusx6tQkK7EaiS9MG160NUOnU2t7MkhncdnYEc0mO/1 BAKshDiN48rMDizLYv6TkNNmyuowzdWiLXw2q5wsIVJc5HZgcCSwHrDNvw++YECjjmAO2b bUQEh0hEOfxNBJ9v0WaQkybpQAPLeSU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1730604083; x=1762140083; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Mv1j1WkxVMtwiYbBTrEKO+5plJ/chufvUAiSaGvBrMw=; b=BFLR4OnpLP7k8H44Mnbutu69OujLwC/2Dohyw4VIC0i2uwGvnbcC8mPt 3EEBrSTOE6KvlsuQgSQZiU1Et1hfGeXtM1YynXAGcvQmk/L0w3hqKAXZv lX8EspgAcCJB0kUZb3tTfepjbPzwtiO/3KZodLIhQTZzAejWZbBEHOzKj 04J1nxtXItA2RFm/0DKE6mG806bNWdOhbHbjizHweENkWEFr2KeLmY9I3 69Oq0NDkjrhlTMtAMx9jHa3osfR5CyqSFv/PrRSRJsltMjUlB4dIaYyIo WmkJFlGL01T1aEAhTZWV/XKu6pMZJrleRMYUG5mfpb05tp1tywAtx3CzK Q==; X-CSE-ConnectionGUID: 5B/oebOvQISst28oH1EHxg== X-CSE-MsgGUID: 7qTQr5vtSFes1elvkIYmiw== X-IronPort-AV: E=McAfee;i="6700,10204,11244"; a="30548347" X-IronPort-AV: E=Sophos;i="6.11,254,1725346800"; d="scan'208";a="30548347" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Nov 2024 20:21:14 -0700 X-CSE-ConnectionGUID: /wV0MMjJTpOp2HLAinTXkg== X-CSE-MsgGUID: 5gu66x9ZSmOJhWTIjpLa9g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,254,1725346800"; d="scan'208";a="83451903" Received: from unknown (HELO JF5300-B11A338T.jf.intel.com) ([10.242.51.115]) by orviesa006.jf.intel.com with ESMTP; 02 Nov 2024 20:21:14 -0700 From: Kanchana P Sridhar To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, hannes@cmpxchg.org, yosryahmed@google.com, nphamcs@gmail.com, chengming.zhou@linux.dev, usamaarif642@gmail.com, ryan.roberts@arm.com, ying.huang@intel.com, 21cnbao@gmail.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, zanussi@kernel.org Cc: wajdi.k.feghali@intel.com, vinodh.gopal@intel.com, kanchana.p.sridhar@intel.com Subject: [PATCH v2 11/13] mm: zswap: Allocate acomp_batch_ctx resources for a given zswap_pool. Date: Sat, 2 Nov 2024 20:21:09 -0700 Message-Id: <20241103032111.333282-12-kanchana.p.sridhar@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20241103032111.333282-1-kanchana.p.sridhar@intel.com> References: <20241103032111.333282-1-kanchana.p.sridhar@intel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: AE8704000D X-Stat-Signature: sdqn8g1ufrziso6x6snnftg5o9g3839b X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1730604069-160506 X-HE-Meta: U2FsdGVkX1/cUJFFSWSi0ndLOv5VmykOA33xGNkyGaKYY+B1boaHzt1RmWgiVCETqwbjc/P/2nhiYxkDPwMSdEdSBWrDsyEH57BdWRKfgfDuVQiZ07De42jT/qPyufWLVa3h8jNLk3o2kfaxeafn2FWvQITmImNSwjKaTovnIwXLsDzVAJKti1CZ+e7TbhLOMxH3ZXYna+BDDS96gvs4/gEjhfbtk7bIQYqqR1C99gZiOqhM8ltkCzHYj4PthLlJmubvH3B7Q1FIWEf2A8CBol9xEgqs9RgUa7WXfjkdYYfUlzAhTlGub1G9gAm2wOY1r0rw9Bg+uo+ijxwfJVsndIb5CHe/p31OcTm3lmn5U+EUTmnMqZVknWcbn0VIpnCFtMIIgZjBC88eh1tDgexFe4sySr2yi0IEmQSwkuiQ/JXyshcn8rJlGN+cxWK4Ycr5p5imI46VoqBpfIiaUO4r1OgqBfW8oD4nYDHkC2H1VfxQgLO50jVjGD3X2LjtTOr7Nfg+y9R2e0QPavcJtN2mp+SrPs/b2SQlPonp5NwdeSjKuVja9Ty+tIsiQ+aNWCSSxUe+zzGAqMo4bGHl2DyBWNUh8gdQDTMxHT+UgQ3Nz50IyoZ25CvIShzhg1nNPGrH/8UrXg4OFbDKlBRkLdpZ+Y+9I0/3QbpKjq0/h40GBE/Mv4EY+lKALSdHz7HeqJloXf2UUs66uFRX8WMUEmbd4CpezLKZo/e8TuognErfFvU5kHpcdxNTzJmkKse92RUGG9E3RALZI9N52jX7KFbud5wnSDDMKtualZNBZFiJ5KIr3coRSfow2rNG19UaKR6iu5H8vjUVbiYbWDmgVOVNlM0BkI6xbl8UwHfNjE4tUU90g6WwxUZtJ5MQfPdMerj65sTX6NX1OI7vmwZQK+SdleaBCzhc/kHoLigSNHX9mzOGGHJWKeEn7B++CO0FplINRO5TyRfs1lIGxD5ahRh mcwi2Day rWWo4Rp7iMbNv4fNM8VSWUv+Kd+0v7PUlHhyT9RXY5qfZOUNeQUrirjGLlboTJ03/zIFrGKwP8l4tZb2znukdEhZPcZVK+KaeQKkYXkBPIucpmvR2hfwFuVpLVtjWtx0mb7/wjsbj2GuXyuI0RysVqWbIZt2jTBv9rlg05cM+xj+6fjxggumZ94mdhEQ2W1N2VTy00KTJMh7CRZgYHJnrsC8DKubTDWEbjjjtz/bzDs2/LVhJQjwDDEKZegUyTsorU/+2 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: If the zswap_pool is associated with an acomp_alg/crypto_acomp that has registered batch_compress() and batch_decompress() API, we can allocate the necessary batching resources for the pool's acomp_batch_ctx. This patch makes the above determination on incurring the per-cpu memory footprint cost for batching, and if so, goes ahead and allocates SWAP_CRYPTO_BATCH_SIZE (i.e. 8) acomp_reqs/buffers for the pool->acomp_batch_ctx on that specific cpu. It also "remembers" the pool's batching readiness as a result of the above, through a new enum batch_comp_status can_batch_comp; member added to struct zswap_pool, for fast retrieval during zswap_store(). This allows us a way to only incur the memory footprint cost of the pool->acomp_batch_ctx resources for a given cpu on which zswap_store() needs to process a large folio. Suggested-by: Yosry Ahmed Suggested-by: Ying Huang Signed-off-by: Kanchana P Sridhar --- include/linux/zswap.h | 7 +++++++ mm/zswap.c | 49 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/include/linux/zswap.h b/include/linux/zswap.h index d961ead91bf1..9ad27ab3d222 100644 --- a/include/linux/zswap.h +++ b/include/linux/zswap.h @@ -7,6 +7,13 @@ struct lruvec; +/* + * For IAA compression batching: + * Maximum number of IAA acomp compress requests that will be processed + * in a batch: in parallel, if iaa_crypto async/no irq mode is enabled + * (the default); else sequentially, if iaa_crypto sync mode is in effect. + */ +#define SWAP_CRYPTO_BATCH_SIZE 8UL extern atomic_long_t zswap_stored_pages; #ifdef CONFIG_ZSWAP diff --git a/mm/zswap.c b/mm/zswap.c index 3ad81ec0f262..edd5910168c2 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -151,6 +151,12 @@ struct crypto_acomp_ctx { bool is_sleepable; }; +enum batch_comp_status { + UNINIT_BATCH_COMP = -1, + CANNOT_BATCH_COMP = 0, + BATCH_COMP_ENABLED = 1, +}; + /* * The lock ordering is zswap_tree.lock -> zswap_pool.lru_lock. * The only case where lru_lock is not acquired while holding tree.lock is @@ -159,6 +165,7 @@ struct crypto_acomp_ctx { */ struct zswap_pool { struct zpool *zpool; + enum batch_comp_status can_batch_comp; struct crypto_acomp_ctx __percpu *acomp_ctx; struct crypto_acomp_ctx __percpu *acomp_batch_ctx; struct percpu_ref ref; @@ -310,6 +317,7 @@ static struct zswap_pool *zswap_pool_create(char *type, char *compressor) goto ref_fail; INIT_LIST_HEAD(&pool->list); + pool->can_batch_comp = UNINIT_BATCH_COMP; zswap_pool_debug("created", pool); return pool; @@ -695,6 +703,36 @@ static int zswap_enabled_param_set(const char *val, return ret; } +/* Called only if sysctl vm.compress-batching is set to "1". */ +static __always_inline bool zswap_pool_can_batch(struct zswap_pool *pool) +{ + if (pool->can_batch_comp == BATCH_COMP_ENABLED) + return true; + + if (pool->can_batch_comp == CANNOT_BATCH_COMP) + return false; + + if ((pool->can_batch_comp == UNINIT_BATCH_COMP) && pool->acomp_batch_ctx) { + struct crypto_acomp_ctx *acomp_ctx = per_cpu_ptr( + pool->acomp_batch_ctx, + raw_smp_processor_id()); + if (!IS_ERR_OR_NULL(acomp_ctx)) { + if ((acomp_ctx->nr_reqs == SWAP_CRYPTO_BATCH_SIZE) || + (!acomp_ctx->nr_reqs && + !zswap_create_acomp_ctx(raw_smp_processor_id(), + acomp_ctx, + pool->tfm_name, + SWAP_CRYPTO_BATCH_SIZE))) { + pool->can_batch_comp = BATCH_COMP_ENABLED; + return true; + } + } + } + + pool->can_batch_comp = CANNOT_BATCH_COMP; + return false; +} + /********************************* * lru functions **********************************/ @@ -850,6 +888,17 @@ static int zswap_create_acomp_ctx(unsigned int cpu, acomp_ctx->acomp = acomp; acomp_ctx->is_sleepable = acomp_is_async(acomp); + /* + * Cannot create a batching ctx without the crypto acomp alg supporting + * batch_compress and batch_decompress API. + */ + if ((nr_reqs > 1) && (!acomp->batch_compress || !acomp->batch_decompress)) { + WARN_ONCE(1, "Cannot alloc acomp_ctx with %d reqs since crypto acomp %s\nhas not registered batch_compress() and/or batch_decompress()\n", + nr_reqs, tfm_name); + ret = -ENODEV; + goto buf_fail; + } + acomp_ctx->buffers = kmalloc_node(nr_reqs * sizeof(u8 *), GFP_KERNEL, cpu_to_node(cpu)); for (i = 0; i < nr_reqs; ++i) {