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 62D74C3DA6E for ; Thu, 28 Dec 2023 09:46:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CB7F86B00B5; Thu, 28 Dec 2023 04:46:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C69278D0009; Thu, 28 Dec 2023 04:46:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ABB376B00B7; Thu, 28 Dec 2023 04:46:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 8829C6B00B5 for ; Thu, 28 Dec 2023 04:46:28 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 524D0C0819 for ; Thu, 28 Dec 2023 09:46:28 +0000 (UTC) X-FDA: 81615746856.16.D473D1D Received: from out-182.mta0.migadu.com (out-182.mta0.migadu.com [91.218.175.182]) by imf14.hostedemail.com (Postfix) with ESMTP id 5EEA3100008 for ; Thu, 28 Dec 2023 09:46:26 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=bytedance.com (policy=quarantine); spf=pass (imf14.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.182 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703756786; a=rsa-sha256; cv=none; b=IizcvAx2matXrTUKaV9tqjGlxI308vgWHabxg2EIAXpc6rqxTuTAIolGJlu5Yfpmnjpns8 yEgBeZN7txsT0q6hOsQQRVJY9KmR6eWHPpRIqrpdT++YowYkHRlSItd+iIECjZbDdIXKnV l9MVDjDLXpvF1Ar4Tqmd4zqin68iIZw= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=bytedance.com (policy=quarantine); spf=pass (imf14.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.182 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703756786; 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; bh=fA8EENSpBF/MCxUayb+Fm/Vp/azeMRMIqDljRrP6nzM=; b=Vh/6pvC2HtRYMGthz54C52MDN0DcYjCxn4S7FCZeUmSWhMqvaochg/Oeij+7dtUSxwwCWA Vl2vFkfmw1r6S/0E3JRWHAKVcJ3MJd8CwaoyjJF0eUqT0NRRY6MBUD0mEy0YlyRrvqBDZH zftEb8zhSUFa/5H0JMgw7pNXCk7bym8= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Chengming Zhou Date: Thu, 28 Dec 2023 09:45:43 +0000 Subject: [PATCH v5 2/5] mm/zswap: refactor out __zswap_load() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20231213-zswap-dstmem-v5-2-9382162bbf05@bytedance.com> References: <20231213-zswap-dstmem-v5-0-9382162bbf05@bytedance.com> In-Reply-To: <20231213-zswap-dstmem-v5-0-9382162bbf05@bytedance.com> To: Barry Song <21cnbao@gmail.com>, Yosry Ahmed , Nhat Pham , Andrew Morton , Dan Streetman , Vitaly Wool , Johannes Weiner , Chris Li , Seth Jennings Cc: Yosry Ahmed , Nhat Pham , Chris Li , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Chengming Zhou X-Developer-Signature: v=1; a=ed25519-sha256; t=1703756775; l=4752; i=zhouchengming@bytedance.com; s=20231204; h=from:subject:message-id; bh=lnynlxAzoO/I6Zt1K1UK1+SZANl9aJDpvDvBQOGa6zI=; b=Mw2uecc/fI59Mx5V+rK/pUM1En4Pm8RmX3vEwb1MyZ0/cgeVN1t7roGLvcoNdg1G08Pdf9aa4 JejgLpSnatdD186CpB+LEGo7WHv27VAVnQK65dalGBCWdTDn/ViMoHk X-Developer-Key: i=zhouchengming@bytedance.com; a=ed25519; pk=xFTmRtMG3vELGJBUiml7OYNdM393WOMv0iWWeQEVVdA= X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 5EEA3100008 X-Stat-Signature: 38eeh7otj99o6xmb98qgzgsrrfxd4x4d X-Rspamd-Pre-Result: action=add header; module=dmarc; Action set by DMARC X-Rspam-User: X-Rspam: Yes X-HE-Tag: 1703756786-245743 X-HE-Meta: U2FsdGVkX18Xa6YkRQBNtlMiv3oBJVDVfallmRy623ls5lkCfflyHxKPXK8+dCkDeIavBv7f6xsSiIlEBnYoaSjIfrB9bz3EAaqqJh6qg5YRQ2y5WRmBfDaEKL/cfiC3A2Za60bm1oqWbFM4dFkA57CsC3F9Rh5soKXBnQw1eZWH7lbL+1jimGfjRr9+ajUGONO8Hf05024bOIPdquoii9vhiH8bG3ZhjlhXNZLg10iekYzGnwoSE7gdeDj5fqkoi1yvPjkuGR4qHngylAOLtPZ4LtC6ghALboZhT2/7nyZi+1K816YPBq8q+g3Fyvz81dyC1bb8L6duct1WEW/IVcZRSHLOOOaCD1bAS4vHdF6/5/87zfDFkSiJOpZY6yVP+Lsi9UIVLS4K9AARyjMlB0FUmel0JyIeSbHlUISO7Q4uw7CHIay8bdENDWd8Dry2XtpUNj9EA9a7YRdOoSum7UteidsJZmL3c76PISnlNuTj/GVQ8OYtTeTFgvNyA1+WNC5SU+Y5+4kJs1dG3TvIFECQibkmbM4d6Epz/COAx0LCbcTu5vQGiT+j1lQ+gBz4WQdxiDQd9BgL1XqAW6l6TFwIb6g1BBZHR/mU59grKyvRy2MRbOUN63U+1K6ETTqvWx+m8cGua8D8yM3Mvgr7gzKn/jNUf9Jn4EJPAA7CsMdUL7OfdABCXhCFQXhA+OHwqUpwddBm7NBkB/1DDtC/YoO0ZdfHlEZP81sUIiiR5HFxHVTwYbTHRqNyT6ya01LqgMI4bKjDXWgrNZTLrEqIvxumQzCvaheb4EikjVOrCkv6zztmew0QF6zT06b55qfiaL8mxykHk2Zr4HKgHMYwWOcnaELyM2h7jF5Kk0OMmY7sV0IJ2ack7074LSgoHUj5QrUfJfrCwxeRk5qLXHO8HSbZB96ziuXjbkfUIogXpCkA9/XpY4NBaCZ+y89AnbsVO+8opKJ20EXEwrRYxOI awrewJKC 3OmqxVq6GE4vTjQquM3K/vIZLeZp4gJ4/7eDEexY4aHX3yzPrxXHs7KvkkzT/DKaXh3o0Ju0cXIE1uCX7q9uwnuqNfMKu/2FS7W0MvRhiyWIGMr2RYjAxpDB0yMdNYMrDjJv2avorgdIbl+XBILknq3R6O1JKHuuYuvyw9D3/5Zp6pcR5hgcbX90q+LJXvWzO/1Dvg/8f7YPERylYi7ISFpCbm58PyZucUPjUgaOiFYCRAS7zk+BYfZiCZEKiohX46/zf6y61c4O+wHg2nKybc1Gs6szotXYQFcZjheCqPq0WgKd2tYd7oSkHr8BpFFa1mf8b9vI64FuxCeHU/rV+aK5O1LOmKz+MPgJ6jl3ajrWY2pU4RLH/8bHPzjJ6mJ0zYl3pRYAJOZkCZVfYn2rqK34d2EDCcHjh9lZ4eVBLiFSzTZacmXx6/ggWlfz7mvlwtsqheDIlnPz4TiRygj7/o6CLpPOGOi8Hc3/fdt54CX7rUC7ZqOhCS26vM441XBmrPH6aF3ZocQfwJVvWiMi95WUmlOLNfdqIcoVrXJm1h40MFkVMDtpXd1KC3odG4tk2GxzES3EPBJxeOdQ= 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: 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 Acked-by: Chris Li (Google) 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 41df2d97951b..b25d7d03851d 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 = zswap_find_zpool(entry); + struct scatterlist input, output; + struct crypto_acomp_ctx *acomp_ctx; + u8 *src; + + acomp_ctx = raw_cpu_ptr(entry->pool->acomp_ctx); + mutex_lock(acomp_ctx->mutex); + + src = zpool_map_handle(zpool, entry->handle, ZPOOL_MM_RO); + if (!zpool_can_sleep_mapped(zpool)) { + memcpy(acomp_ctx->dstmem, src, entry->length); + src = 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 != 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_entry *entry, swp_entry_t swpentry = entry->swpentry; struct page *page; struct mempolicy *mpol; - struct scatterlist input, output; - struct crypto_acomp_ctx *acomp_ctx; - struct zpool *pool = zswap_find_zpool(entry); bool page_was_allocated; - u8 *src; - unsigned int dlen; int ret; struct writeback_control wbc = { .sync_mode = WB_SYNC_NONE, @@ -1456,31 +1480,7 @@ static int zswap_writeback_entry(struct zswap_entry *entry, } spin_unlock(&tree->lock); - /* decompress */ - acomp_ctx = raw_cpu_ptr(entry->pool->acomp_ctx); - dlen = PAGE_SIZE; - mutex_lock(acomp_ctx->mutex); - - src = zpool_map_handle(pool, entry->handle, ZPOOL_MM_RO); - if (!zpool_can_sleep_mapped(pool)) { - memcpy(acomp_ctx->dstmem, src, entry->length); - src = 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 = crypto_wait_req(crypto_acomp_decompress(acomp_ctx->req), &acomp_ctx->wait); - dlen = 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 != PAGE_SIZE); + __zswap_load(entry, page); /* page is up to date */ SetPageUptodate(page); @@ -1759,11 +1759,7 @@ bool zswap_load(struct folio *folio) struct page *page = &folio->page; struct zswap_tree *tree = 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)); @@ -1785,31 +1781,7 @@ bool zswap_load(struct folio *folio) goto stats; } - zpool = zswap_find_zpool(entry); - - /* decompress */ - dlen = PAGE_SIZE; - acomp_ctx = raw_cpu_ptr(entry->pool->acomp_ctx); - mutex_lock(acomp_ctx->mutex); - - src = zpool_map_handle(zpool, entry->handle, ZPOOL_MM_RO); - if (!zpool_can_sleep_mapped(zpool)) { - memcpy(acomp_ctx->dstmem, src, entry->length); - src = 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), &acomp_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 = true; stats: count_vm_event(ZSWPIN); -- b4 0.10.1