From patchwork Tue Dec 26 15:54:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 13504907 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 60E2EC4706F for ; Tue, 26 Dec 2023 15:54:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0297E6B0080; Tue, 26 Dec 2023 10:54:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E7E906B0081; Tue, 26 Dec 2023 10:54:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D6DB36B0082; Tue, 26 Dec 2023 10:54:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id C3E626B0080 for ; Tue, 26 Dec 2023 10:54:58 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 9BD47160505 for ; Tue, 26 Dec 2023 15:54:58 +0000 (UTC) X-FDA: 81609417876.18.B0004E5 Received: from out-183.mta0.migadu.com (out-183.mta0.migadu.com [91.218.175.183]) by imf17.hostedemail.com (Postfix) with ESMTP id CC33040007 for ; Tue, 26 Dec 2023 15:54:56 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.183 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=bytedance.com (policy=quarantine) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703606097; 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=l+86cxEbcHQglJmKP3D0/ptU/ooniCJpeGNPcIFgpbo=; b=7JP1r0L0oC0dVTNvBzdiVW9Faoc8kBoYjNOdjkln6uYc2AJkRtz3/pPlLEVSUaMikcdFRu rl4OAOKSlb9FwYnGAaa3FdokYVBMYQYjFzETaWZtVLm7nJyrhXd5voJiWkDLH5FclASZSs 9nxwebGV87bGlf4GC+APHroY3BwZj3E= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703606097; a=rsa-sha256; cv=none; b=1ZL22DKFUxCBjRGbB20o/IPHpvOKcubVamO+SsfEqfGOMeSwCeuKqz6wIiikBqKJ/DYobk Ul8bNatKJ8/K58o/TPt6jQkFNACZo6ZJN2Iu1xc3hCzXNfztezLbgeyap05PiMN9KIPsSb YzTo0jfRA6sTL69p6XQXDxG0lEp+FJY= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.183 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=bytedance.com (policy=quarantine) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Chengming Zhou Date: Tue, 26 Dec 2023 15:54:10 +0000 Subject: [PATCH v4 3/6] mm/zswap: refactor out __zswap_load() MIME-Version: 1.0 Message-Id: <20231213-zswap-dstmem-v4-3-f228b059dd89@bytedance.com> References: <20231213-zswap-dstmem-v4-0-f228b059dd89@bytedance.com> In-Reply-To: <20231213-zswap-dstmem-v4-0-f228b059dd89@bytedance.com> To: Andrew Morton , Seth Jennings , Johannes Weiner , Vitaly Wool , Nhat Pham , Chris Li , Yosry Ahmed , Dan Streetman Cc: linux-kernel@vger.kernel.org, Chengming Zhou , linux-mm@kvack.org, Nhat Pham , Yosry Ahmed , Chris Li X-Developer-Signature: v=1; a=ed25519-sha256; t=1703606082; l=4752; i=zhouchengming@bytedance.com; s=20231204; h=from:subject:message-id; bh=rqaFBRN5T+K3BGykGqxbunVDkqGsdVLjPtenmvHXNns=; b=2whbnk++qzMgDfpxZEj6RN2GBW2XP2w/exd8KHJg/QUs3bQXx+0f1E7kPbE6TtAa+IGnjLVIP 4/8liyuX+0xCEjYzNGSZpQ+axcBpJmSX+TQmeVlzNI4BpBQ/XmcYob0 X-Developer-Key: i=zhouchengming@bytedance.com; a=ed25519; pk=xFTmRtMG3vELGJBUiml7OYNdM393WOMv0iWWeQEVVdA= X-Migadu-Flow: FLOW_OUT X-Rspamd-Pre-Result: action=add header; module=dmarc; Action set by DMARC X-Rspam-User: X-Rspamd-Queue-Id: CC33040007 X-Rspamd-Server: rspam11 X-Stat-Signature: 96afxjrthw15p476h3gyts88f3zzdfqp X-Rspam: Yes X-HE-Tag: 1703606096-485105 X-HE-Meta: U2FsdGVkX197lingr3zv90O9WzkbD0W5MCxlyZcBWJXluWYe64jQh0hySfguyVY6qP9wvRn+glN52KTczZDar9FKU5ahbTle5qzHUKeMdW7jVPLyHj7MpaZ+lObFIY4btVwCzRZpive6IJyER/h51XWFrZXphIEIcjbtyteBh1f7sXZQ+kUY8o/+Hg2oW8I+Nf/8WduK5HR+iSBh+FFTeUMvdEXg7UBpMuWqYTPGN+Oil1Yllf8ZoDLT/MxVmD6iOwYsGY0PM6DRFiq3otujumq15VBdCVZM2Pq8BiOO6PqyjEyVNdB35Hj+Jff1CVJ5Xl88IHBHeI5V1dwi3HDdK8Awbu4Cs/sqGG55iRtKBGAONBPkmMQnKElLzcEFmwOza93H8o1EzwYDpkcOEdD7/rVjaL2s5kigo2UmqJcNe3sGXyIBNLa864EL76kIbLRLZncg4/4Qu+h30UcG9Qdgzwww4SCRu9dJElBwU4ttb1Ehxs5YDMOJ4Gx7S9lF9Rxz/5MWc5NlbFq1tAz30ozpstxk6hb761pXCS8J0l7HEaTl96w2QJ7c/S9SFeUBb5+sSXuIsnHxsmjeGOaklgMqx8Go5fxRReCqJcL1LU7Ml7Uk+Z7jdeK0qLapz7n0aXdnadlI0m+LZc3cHwhtDgJXnll7Y70lpiN/YKxZa4uMwnzLt0RHF38/MgT8PXRVeEz4HdC/RWYBXyKkRMVAYBqDDuZzT+0/qiE8OV7vKY4E2zEr5mi2ZVUfT8EGiJzk7VIFQnYZih/X6LswtegJ9OQgA5MnqMhOEYBJ+/+USNG13MEBOQ0OeyETtrZESYlrYFJpzstEB3Ei+zSHVQZnuhV8nU2jfCQ5qLre9HCJV8ZsqccSYFfjg6PJ7pz0WffBHTSCWSRZGq7aIPZufgmSrJY0GBSfFBKw6d0U9+MxOguq2vBsoQah2Qt1gtPR5KjE+S+JVClO6S1qV9kmlqMHO/T n1zymiOZ ZGGKbFU0TL6kSikpLwQsWiwmhlMVLZ6YHhTaH1Q0T8iELGLr2hm9thJt4B7VxVC+jeoU8WNktcWfMK/Fv0Xju9hv36wDZt+aoj2Y+ 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 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 = 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); @@ -1758,11 +1758,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)); @@ -1784,31 +1780,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);