From patchwork Thu Feb 27 10:15:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 13994057 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 8F154C021BE for ; Thu, 27 Feb 2025 10:15:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4D16628000B; Thu, 27 Feb 2025 05:15:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 45AC028000A; Thu, 27 Feb 2025 05:15:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2D54428000B; Thu, 27 Feb 2025 05:15:16 -0500 (EST) 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 0953F28000A for ; Thu, 27 Feb 2025 05:15:16 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A61F6B60BF for ; Thu, 27 Feb 2025 10:15:15 +0000 (UTC) X-FDA: 83165316990.19.14E95F8 Received: from abb.hmeau.com (abb.hmeau.com [144.6.53.87]) by imf26.hostedemail.com (Postfix) with ESMTP id D67B214003B for ; Thu, 27 Feb 2025 10:15:13 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=hmeau.com header.s=formenos header.b=Z7sMw0fg; dmarc=pass (policy=quarantine) header.from=apana.org.au; spf=pass (imf26.hostedemail.com: domain of herbert@gondor.apana.org.au designates 144.6.53.87 as permitted sender) smtp.mailfrom=herbert@gondor.apana.org.au ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740651314; a=rsa-sha256; cv=none; b=7uiO5NfOxYk+FIRLcEkCmj4wBTTdUR9BkqfEFCfGvfcUIKLNMRuykArlz5owvKB1TNZElm QD4YttCd5w4FXd01xT/wDk01UnDQ/KURzsxvtjt5l+qhw3h2f42kehgaqwLNFSOcrEtatv v5YZ8BUj7+gwC/vA7L7UpAKkCVqhIlc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740651314; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:dkim-signature; bh=X/COYPSBnxqacFq0opJtS5fN0VNbCBV4FqPa/0g+uW0=; b=BQv+7aVLEI7dPYy2Q6U+SUdZotdxG/J94/KcB3/lqJ0BgerYluOK1ZsbJlBbgzhZ4PG+rm SzkDKjf3/Lsv9BCt/+CCZg1Zvbmw47f+nc1sfQvorFbw6KCFEmj09Rtgx8rOrGaLkUIPn8 H2jUvYrMeAAbldUdaKixOqQwy0rgZC0= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=hmeau.com header.s=formenos header.b=Z7sMw0fg; dmarc=pass (policy=quarantine) header.from=apana.org.au; spf=pass (imf26.hostedemail.com: domain of herbert@gondor.apana.org.au designates 144.6.53.87 as permitted sender) smtp.mailfrom=herbert@gondor.apana.org.au DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hmeau.com; s=formenos; h=Cc:To:Subject:From:References:In-Reply-To:Message-Id:Date: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=X/COYPSBnxqacFq0opJtS5fN0VNbCBV4FqPa/0g+uW0=; b=Z7sMw0fg2Or5wgGuT/y40ULroe f60K2ja10VqUBJI2JgbgCgl+Q9xr7sYFCxC6GRDXcgjsqIgW8fvzIFHAIDsGhxLsj6hYJ/R1fLgrD hJkSqj2zDvxgZqs6c9Zw5Y8a2S0pEzMpy3+vOUu7mWHUx0fyadmf27RPg2x/XnFrb5twOq9CYPLxO l2Uoh2nG93hM2JulS2hbFYw9dFxJf3o4WDAxsThLOV7PHAuFplNHm01Ci06fgc3OrEKpIBj+9U4xH EWAg9SZ7cYAAustIzKjGxTXvUgITXSjt0ryklqVuh/wnk784rD/xJeEWM+NVdWswOK4oosMNgF8UU LocAv05A==; Received: from loth.rohan.me.apana.org.au ([192.168.167.2]) by formenos.hmeau.com with smtp (Exim 4.96 #2 (Debian)) id 1tnav7-002Drs-1X; Thu, 27 Feb 2025 18:15:10 +0800 Received: by loth.rohan.me.apana.org.au (sSMTP sendmail emulation); Thu, 27 Feb 2025 18:15:09 +0800 Date: Thu, 27 Feb 2025 18:15:09 +0800 Message-Id: <153c340a52090f2ff82f8f066203186a932d3f99.1740651138.git.herbert@gondor.apana.org.au> In-Reply-To: References: From: Herbert Xu Subject: [RFC PATCH 7/7] mm: zswap: Use acomp virtual address interface To: Linux Crypto Mailing List Cc: linux-mm@kvack.org, Yosry Ahmed X-Rspamd-Queue-Id: D67B214003B X-Rspamd-Server: rspam08 X-Rspam-User: X-Stat-Signature: cj1yaxj5ki7xc7tpuhtzehjmnc1rnc4r X-HE-Tag: 1740651313-171018 X-HE-Meta: U2FsdGVkX19HQXdbXapgOtwkNgtjBxHxRwBHLDjXR4/JeVsZUPh11k9BRzTaE7xMYYfsFFkcfKJ7x6Mdpy+nXP/DdloQB/axFTrPysEw/cN+tGvJjUXwDlKm0T/7kbOS20aRM/Bo9PimpQGtelxQlnoAM/7ZD23B0Nenh5y+36/+8L9utnFTsRAPUF8Isa9s1kiV9de6m9QCYnO8hkqcaryuxeYCXPWHYHw/CLKlE2clDipXilaBPGgztmayrzcDTqYTRBeQsuNQUgV/k3HgWQQVcbw5xu1jCDMBPv0myvf2mjfhZi4ReCzLE8YZua696wxMFtQvDnz3ySTZlRavrGFiwpZCuBecLa48L9uzSW4gk9TXbcUsUDZg4kME1/c6Fgsnyo8CI07BEb8zNa6PwIuk0i1nMZAK+d0+AntF1e68YSPZS0gwlyxueIs2aM2cLh5KOTIoGftXksR9VhE7VQpMlPK8WyxofdJatCokeR/FYPfaFiWaC7owoVCnulJ40e8HSLALQQoujHXB9fc1HorAITNjjutTji+68UGyC+Osgy4VufNxIy88pjGtUWNWWdNGDEZ15KnyY4HzdqyPjFR5JN7fl4YQ2WjwGHWJgRgegosP8CT0Hg70+t0X7l3yPoF8wpW02b711V7m4ap5kxNzVtosAbNLCLriDV6z5lyGIyWJ8cCvw+1YBoSnTxkM0UIp5yuMS5urBBxOOr509b0i3Pma5UQYqJJShvbUdqbR9YGGHB0RShPx1pEq09tLTRfKlttzonPeXhh+wP29GTpkxsdfI7uypt0Ni0+MoSrGoOkbJK1S0+vnRUW1NeRYBh75J4uvcIYECQ5nmA2ISMyIRa8qvm3VsX/ZCIB88IIGhvUk85Mhv2ZCFjlk2RXE+cgdM6kOKMWXu4fQ2QGEg+5LXblrIO4kXxN85VlraeRz28fowaQh6S2cYwY3OmXEL6s7zBD1R0T3Lr7xiYp Mlasur17 sYX9Zw1QybpePUsSokX89iMZkKo7pw9gziv3oH2xfyrER9C6Cet1VSzuymzteq+EUyrEYkDAA0zhZtBroSyz4Use73s9y2fyfacY9SR2uUJAEkGHB73bfhwQgxMZsgQsuYAXYzqryt2pjY4/l2/VYGbrnTrEI77h9z2NV/I5Sv2Y9Lg3ZzmDx5xKKfCdMsYglqFvlmqIpC+E2eRR4/R9xUvx4rw== 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: Use the acomp virtual address interface. Signed-off-by: Herbert Xu --- mm/zswap.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index 6504174fbc6a..2b5a2398a9be 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -925,27 +925,20 @@ static bool zswap_compress(struct page *page, struct zswap_entry *entry, struct zswap_pool *pool) { struct crypto_acomp_ctx *acomp_ctx; - struct scatterlist input, output; int comp_ret = 0, alloc_ret = 0; unsigned int dlen = PAGE_SIZE; unsigned long handle; struct zpool *zpool; + const u8 *src; char *buf; gfp_t gfp; u8 *dst; acomp_ctx = acomp_ctx_get_cpu_lock(pool); + src = kmap_local_page(page); dst = acomp_ctx->buffer; - sg_init_table(&input, 1); - sg_set_page(&input, page, PAGE_SIZE, 0); - /* - * We need PAGE_SIZE * 2 here since there maybe over-compression case, - * and hardware-accelerators may won't check the dst buffer size, so - * 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_virt(acomp_ctx->req, src, dst, PAGE_SIZE, dlen); /* * it maybe looks a little bit silly that we send an asynchronous request, @@ -960,6 +953,7 @@ static bool zswap_compress(struct page *page, struct zswap_entry *entry, * 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); + kunmap_local(src); dlen = acomp_ctx->req->dlen; if (comp_ret) goto unlock; @@ -994,9 +988,9 @@ static bool zswap_compress(struct page *page, struct zswap_entry *entry, static void zswap_decompress(struct zswap_entry *entry, struct folio *folio) { struct zpool *zpool = entry->pool->zpool; - struct scatterlist input, output; struct crypto_acomp_ctx *acomp_ctx; u8 *src; + u8 *dst; acomp_ctx = acomp_ctx_get_cpu_lock(entry->pool); src = zpool_map_handle(zpool, entry->handle, ZPOOL_MM_RO); @@ -1016,11 +1010,10 @@ static void zswap_decompress(struct zswap_entry *entry, struct folio *folio) 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); + dst = kmap_local_folio(folio, 0); + acomp_request_set_virt(acomp_ctx->req, src, dst, entry->length, PAGE_SIZE); BUG_ON(crypto_wait_req(crypto_acomp_decompress(acomp_ctx->req), &acomp_ctx->wait)); + kunmap_local(dst); BUG_ON(acomp_ctx->req->dlen != PAGE_SIZE); if (src != acomp_ctx->buffer)