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 80580C41535 for ; Tue, 19 Dec 2023 11:59:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 02A5D6B0080; Tue, 19 Dec 2023 06:59:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F1C5F6B0081; Tue, 19 Dec 2023 06:59:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DBE466B0082; Tue, 19 Dec 2023 06:59:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id C57416B0080 for ; Tue, 19 Dec 2023 06:59:53 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 9DF03A0A4C for ; Tue, 19 Dec 2023 11:59:53 +0000 (UTC) X-FDA: 81583423866.09.9E00E4C Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf29.hostedemail.com (Postfix) with ESMTP id AAEAF120009 for ; Tue, 19 Dec 2023 11:59:51 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qBwKpChM; spf=pass (imf29.hostedemail.com: domain of chrisl@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chrisl@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702987191; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=m/uyFYPyZoQlhl5m/rYdr+eHmz7Q2g5cPh2cqPP6IIg=; b=fg3ce+Zu+NhHSIC+Oc0k0fS02Df/ZZCJZ80QXuLIsuljzZG+qcX6oHncypEUca0rqO96U8 /Feqj2gvTsXvdOPmwuXvu222iRiUi/EZSnWptHyJx1zBvkeOKe5EwiPtg+5Ict6HH6ojCY HAK3ESYyqGxA39X65NH69bMD1NSLFP4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702987191; a=rsa-sha256; cv=none; b=ssHjTJGNf2QLbnWIuQvmQtsji9MDJazjW23V4a5zQpVqE85PDUnIGt7hLW0Ow4vhqXHKn9 EYuKrMSvXtcnfUsRoH5cp85A0pxabkQo9wHPyvOxbGmjN02EVYYb8R87qmRM+fM2IoMBT1 9BmF6Gfti3vc3KnJpLjqOnWbWfkCBaY= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qBwKpChM; spf=pass (imf29.hostedemail.com: domain of chrisl@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chrisl@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id AB3F361242 for ; Tue, 19 Dec 2023 11:59:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B3E4C433AB for ; Tue, 19 Dec 2023 11:59:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702987189; bh=oJowcKwzO3QepgxEcm9BX5vQpDDlCxEGWg7g6MAEbeg=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=qBwKpChMhRyZiuQLlZzAhvwRr4HeFK91FC7wiT+csQz2cf2m0sym9o+A3ypgokE5X lEfGIV5jMF8qFRbQTbNeqZsoGeGOv2ouuABxHjdCwD3X7Pa+CCMGvp/hIrk49pmzvJ 8AqmzHYd+7yL9cyGtJbw1QZ5/hy67WrwP7yBdBVhenJxjy6WHMMSZvwL8FK+cokx/c 6jW4eQaFEsn+fNdjpeGt+/STzbryb6Rphr5Ir+VQCHEzyfVmdiq1NhF8787V3loYXR ndJJwU8fVRhMsd1CxM4WtR1g/qrgnQdJU/DycYnBf/jwggyuK7gy1+zU2jA+mno0e8 nII5WKD2tZKwA== Received: by mail-oi1-f174.google.com with SMTP id 5614622812f47-3ba14203a34so4150583b6e.1 for ; Tue, 19 Dec 2023 03:59:49 -0800 (PST) X-Gm-Message-State: AOJu0YxyGYdHH3OhVXS4IMrJApr7OY9VL9uG6wFz07igduD2kLRFulhv QjZ83opqfdIuyivN/2AiaQmxJGrfIlDHd1pG4iSHWw== X-Google-Smtp-Source: AGHT+IFNPPz/4msH9tJhRKEu0t/nFdP+WnaInu0J+JBIwoL7nvfmI8JzSiJEiLX9jvNreoScENqGqAZt7MaeY/sYK/g= X-Received: by 2002:a05:6358:9490:b0:172:fe14:5876 with SMTP id i16-20020a056358949000b00172fe145876mr297921rwb.2.1702987188790; Tue, 19 Dec 2023 03:59:48 -0800 (PST) MIME-Version: 1.0 References: <20231213-zswap-dstmem-v3-0-4eac09b94ece@bytedance.com> <20231213-zswap-dstmem-v3-3-4eac09b94ece@bytedance.com> In-Reply-To: <20231213-zswap-dstmem-v3-3-4eac09b94ece@bytedance.com> From: Chris Li Date: Tue, 19 Dec 2023 03:59:37 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v3 3/6] mm/zswap: refactor out __zswap_load() To: Chengming Zhou Cc: Seth Jennings , Yosry Ahmed , Vitaly Wool , Dan Streetman , Johannes Weiner , Andrew Morton , Nhat Pham , linux-kernel@vger.kernel.org, linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: AAEAF120009 X-Rspam-User: X-Stat-Signature: kdoc6rzk91tzc9h8y7dz6wd6ioyykcx4 X-Rspamd-Server: rspam03 X-HE-Tag: 1702987191-598716 X-HE-Meta: U2FsdGVkX18M20bcOaVS8h8E3jbDE/K2f09/s7u7uv5oE65rFgDaIlrruR2yrzzEfAzWm+kPSs5pSOj9PIUpyctbxm9aDj03OTgefLulc9IOrORAIWRZQJ6+baeiJ9fmUh00mStuUvgUr6PX1lvu+FeobouKTX//6dWw4KSKT/SCQlYPb6gsIpiRMBxl2qOnMFiz79tz79pBxPtte0Uj65ye3001TTdNeSZrRH6meSE5g91fAKitGOwhAXGN4ppQKvjHeF2UeLsGt0q7+1BONKXroEICVW3f38pmJke+cjFY+alSEDMfawi3+8M50eWhggkQtKK46cQ81cUybcCArIJ8HBw+JzcWpGe2/loSc4ZfR1OwHWELUxugacwG1qBRM+BuIKot4g712Tyl/67MluS+7Xumn8fezzq6ake1Cg+rKFdBoL3nT+kIzemn5xQNnUcczyEUtM9FK+pXLU75nRUMmcwQHJWvmTSMkhVnJa2XXWEoV90Mb1TpaFlFyGFzLt6r62OWzveQyxgcRsLABOj63HWywPmiOfmW0Ktb5eVpBhqK/SZonq0/t2SIKFI34bHpg2oHQI3a8+EtPjU/ssHu1qioVPC4i4O2lPQdB2c5mb2/qO739keWM36h7rWfyp0aKyOW5B+07d4IzYlcFA9EG0uVoq9PDHhqWCm59Iw6b19cY1PyzJNBR+GXguppvhJqtbEGyzQus89zfbG9+2QHDit4EH2lV2q8ndOii5wJuUMYc4PdA1Q5kGuQnwY+PAIK3vjQVLikPPCO5RVsOB6w5rst9wxgqblbPPiKFZ/lELCU6pdoeBTOPZ+Q3A5iQKNSbyiJPgfp21Pjc/dk2pYhCunwtuOKKQeQ0+fDir0HwN2qTQHCwreVor0ydCB9uWFOOgVWBILhznVvedwqtwrdPpo0X8PxTTEounzf/+/DrtT31I2bF8d2bUs25SF9ZyysczH84fehqyl2g9j z/w1UBCN 03WMp/2O7rSOOq9RRDPN3lCmWKE/Z8At84KpUbIQyqSsZoDBjQxACpkwciVYxWON2jciE+KR3Zip0dRGUQcvudzdA26vEOasoDvnERhwQdHTU5C84WdZIUbowhgpnHyUULJ0crd0hnhDj390x9tHjMyeviOc8wAwZfFUV60K9Z7CX+EJEvFZIWY9iKd/e+uDRltSzHH0lPB2ibMD4LFMwBywdAfQUx1W5P/20N1LrVyneYXjFC1UGwD9O68HNBysIwkgv9eqtMJ892OYzRWn+O8lweMa8TOeixY7E2zd5w9KFISsajvSPY+OnI3rFyGp3hub1g9TEKu6Y4krn4QsADBurCCkgFV/7vq/JVf9MSjMrA0OTtF2/Q3IIZ2thu15ViCLZyvLrMhXh/mTVMVhTQFr7famnjLfXvR8M5nae/bIMt2M= 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: Acked-by: Chris Li (Google) Chris On Mon, Dec 18, 2023 at 3:50=E2=80=AFAM Chengming Zhou wrote: > > The zswap_load() and zswap_writeback_entry() have the same part that > decompress the data from zswap_entry to page, so refactor out the > common part as __zswap_load(entry, page). > > Reviewed-by: Nhat Pham > Reviewed-by: Yosry Ahmed > Signed-off-by: Chengming Zhou > --- > mm/zswap.c | 92 ++++++++++++++++++++++----------------------------------= ------ > 1 file changed, 32 insertions(+), 60 deletions(-) > > diff --git a/mm/zswap.c b/mm/zswap.c > index 6b872744e962..3433bd6b3cef 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -1392,6 +1392,35 @@ static int zswap_enabled_param_set(const char *val= , > return ret; > } > > +static void __zswap_load(struct zswap_entry *entry, struct page *page) > +{ > + struct zpool *zpool =3D zswap_find_zpool(entry); > + struct scatterlist input, output; > + struct crypto_acomp_ctx *acomp_ctx; > + u8 *src; > + > + acomp_ctx =3D raw_cpu_ptr(entry->pool->acomp_ctx); > + mutex_lock(acomp_ctx->mutex); > + > + src =3D zpool_map_handle(zpool, entry->handle, ZPOOL_MM_RO); > + if (!zpool_can_sleep_mapped(zpool)) { > + memcpy(acomp_ctx->dstmem, src, entry->length); > + src =3D acomp_ctx->dstmem; > + zpool_unmap_handle(zpool, entry->handle); > + } > + > + sg_init_one(&input, src, entry->length); > + sg_init_table(&output, 1); > + sg_set_page(&output, page, 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 !=3D PAGE_SIZE); > + mutex_unlock(acomp_ctx->mutex); > + > + if (zpool_can_sleep_mapped(zpool)) > + zpool_unmap_handle(zpool, entry->handle); > +} > + > /********************************* > * writeback code > **********************************/ > @@ -1413,12 +1442,7 @@ static int zswap_writeback_entry(struct zswap_entr= y *entry, > swp_entry_t swpentry =3D entry->swpentry; > struct page *page; > struct mempolicy *mpol; > - struct scatterlist input, output; > - struct crypto_acomp_ctx *acomp_ctx; > - struct zpool *pool =3D zswap_find_zpool(entry); > bool page_was_allocated; > - u8 *src; > - unsigned int dlen; > int ret; > struct writeback_control wbc =3D { > .sync_mode =3D WB_SYNC_NONE, > @@ -1456,31 +1480,7 @@ static int zswap_writeback_entry(struct zswap_entr= y *entry, > } > spin_unlock(&tree->lock); > > - /* decompress */ > - acomp_ctx =3D raw_cpu_ptr(entry->pool->acomp_ctx); > - dlen =3D PAGE_SIZE; > - mutex_lock(acomp_ctx->mutex); > - > - src =3D zpool_map_handle(pool, entry->handle, ZPOOL_MM_RO); > - if (!zpool_can_sleep_mapped(pool)) { > - memcpy(acomp_ctx->dstmem, src, entry->length); > - src =3D acomp_ctx->dstmem; > - zpool_unmap_handle(pool, entry->handle); > - } > - > - sg_init_one(&input, src, entry->length); > - sg_init_table(&output, 1); > - sg_set_page(&output, page, PAGE_SIZE, 0); > - acomp_request_set_params(acomp_ctx->req, &input, &output, entry->= length, dlen); > - ret =3D crypto_wait_req(crypto_acomp_decompress(acomp_ctx->req), = &acomp_ctx->wait); > - dlen =3D acomp_ctx->req->dlen; > - mutex_unlock(acomp_ctx->mutex); > - > - if (zpool_can_sleep_mapped(pool)) > - zpool_unmap_handle(pool, entry->handle); > - > - BUG_ON(ret); > - BUG_ON(dlen !=3D PAGE_SIZE); > + __zswap_load(entry, page); > > /* page is up to date */ > SetPageUptodate(page); > @@ -1758,11 +1758,7 @@ bool zswap_load(struct folio *folio) > struct page *page =3D &folio->page; > struct zswap_tree *tree =3D zswap_trees[type]; > struct zswap_entry *entry; > - struct scatterlist input, output; > - struct crypto_acomp_ctx *acomp_ctx; > - u8 *src, *dst; > - struct zpool *zpool; > - unsigned int dlen; > + u8 *dst; > bool ret; > > VM_WARN_ON_ONCE(!folio_test_locked(folio)); > @@ -1784,31 +1780,7 @@ bool zswap_load(struct folio *folio) > goto stats; > } > > - zpool =3D zswap_find_zpool(entry); > - > - /* decompress */ > - dlen =3D PAGE_SIZE; > - acomp_ctx =3D raw_cpu_ptr(entry->pool->acomp_ctx); > - mutex_lock(acomp_ctx->mutex); > - > - src =3D zpool_map_handle(zpool, entry->handle, ZPOOL_MM_RO); > - if (!zpool_can_sleep_mapped(zpool)) { > - memcpy(acomp_ctx->dstmem, src, entry->length); > - src =3D acomp_ctx->dstmem; > - zpool_unmap_handle(zpool, entry->handle); > - } > - > - sg_init_one(&input, src, entry->length); > - sg_init_table(&output, 1); > - sg_set_page(&output, page, PAGE_SIZE, 0); > - acomp_request_set_params(acomp_ctx->req, &input, &output, entry->= length, dlen); > - if (crypto_wait_req(crypto_acomp_decompress(acomp_ctx->req), &aco= mp_ctx->wait)) > - WARN_ON(1); > - mutex_unlock(acomp_ctx->mutex); > - > - if (zpool_can_sleep_mapped(zpool)) > - zpool_unmap_handle(zpool, entry->handle); > - > + __zswap_load(entry, page); > ret =3D true; > stats: > count_vm_event(ZSWPIN); > > -- > b4 0.10.1