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 4292AC4332F for ; Tue, 12 Dec 2023 23:13:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C8E476B02F7; Tue, 12 Dec 2023 18:13:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C3EBD6B02F8; Tue, 12 Dec 2023 18:13:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B05D36B02F9; Tue, 12 Dec 2023 18:13:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id A22C56B02F7 for ; Tue, 12 Dec 2023 18:13:37 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 801D8140899 for ; Tue, 12 Dec 2023 23:13:37 +0000 (UTC) X-FDA: 81559720074.27.975D846 Received: from mail-io1-f43.google.com (mail-io1-f43.google.com [209.85.166.43]) by imf15.hostedemail.com (Postfix) with ESMTP id B9B0AA0016 for ; Tue, 12 Dec 2023 23:13:35 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=NsWH50Gi; spf=pass (imf15.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.166.43 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702422815; 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=2yKkUH4ttv5kn1OVlzPtWcAYwRMyQOcULtuLd7pN7WM=; b=SQMONjXeB3r69n/M5f8rApQ695AmBQZo2ZdMDlG6NpNPdbTs/E+XmjKbshB6vfzwSThxn/ c7yuCftJZ5LnUhU3KfUMYl8qizjzlIaHndaRVu/cRLAcC4pP9TY7LxqHRwp3fXWiknSDoB FhnjCpqoNkvbbfLuS0YiA9FhE33aFi4= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=NsWH50Gi; spf=pass (imf15.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.166.43 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702422815; a=rsa-sha256; cv=none; b=SAfOSwk7JgXfdbMfV1FdvpA5Vz9NPdvMGnKTxeXOQuyYXiMcSNxVGdjfhEzBA2rcWIr9vt hMaJGO8osmxKjMry8N25mWJIIDgBKnnIfu3pcvEjevb0nrxgjhVf2sJVt+l5bnIBk6rWOj DsYDnHf41iuMJ7sy6Pfe5WOLL58HdU8= Received: by mail-io1-f43.google.com with SMTP id ca18e2360f4ac-7b6f43740b4so255648539f.1 for ; Tue, 12 Dec 2023 15:13:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702422815; x=1703027615; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=2yKkUH4ttv5kn1OVlzPtWcAYwRMyQOcULtuLd7pN7WM=; b=NsWH50Gi8EjCDtpOC6PKwS1jIsaDibgwy+U3rierqJMktlEvhEqQ6/hjOFpE95lYcL hC8YN4xsC0S6t3qZIA0a1JVlU2vC8XLVrsVpVDcNDCqhR2Dcgl4BUvtVD/dojjDhhYkK YSSXPxBxnTlSmcjyCqPxrFhaJSZigt2M4EmYXZkR8RQT2Q1LY2qNvpnKT047BUgr7A3W 81F19tq1bmtuGQQUlpog996GuNO4BDgBAtyzK0m7kh16KTZ2MiWu+eh66CsxSdJ8T7aA DdAwocrPisW+QoS9mODcUKe1e2KRKevlVHEBXMsnpoU69OXI3MC413nOD7M+x5v8n/fX /kIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702422815; x=1703027615; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2yKkUH4ttv5kn1OVlzPtWcAYwRMyQOcULtuLd7pN7WM=; b=sp+sNf2B/EiIRaUsJHYvxFY0URzOzU/u7C8bZpzTCsP2SVCvZmCXjIZbgIAtVgR6M/ E47hMbvCw5VxyXO8PvKb1SGJ9Doj8uR5OBw3n//wkYLBChqJJ0VzEL/BHx9IIO94+mC0 Wo0Gc4+g809DTZ2TpGfXsKxtqtQ59v9sArvA7cud+jSo+xEuPd/D8w4t25mw4W6MJ+no 8mdaD+rgBzE+lkA/7KmQbo0JdCNcRnE43WD3od+/kVFISbDzrZtybOYuPOSmsDJRuW3R LxwRprY0n5S5N1OHtrTIvuCXZ6OFYuV04CV9gv75abXiDuQ7zu/IyvBEvmH6WkHZvBXH 1ccg== X-Gm-Message-State: AOJu0Yw6BUw32LrbSqJmo9XUwFSn47/WDD4bS/BzqFXv2LVkOmXPfVnT oTgONDH5Zkd/OXtSKKRnC2SX6gn3n0ZsT2ABf4A= X-Google-Smtp-Source: AGHT+IE+lbniKpziMlK5GHQNqCuorEoY2h0xLtALVCgmnIk7X5wKZ5sLaPC3AQib1iX8zJ6jE6syU/oonRX4DC+zSUM= X-Received: by 2002:a6b:5015:0:b0:7b7:ae3:43c with SMTP id e21-20020a6b5015000000b007b70ae3043cmr7456801iob.42.1702422814772; Tue, 12 Dec 2023 15:13:34 -0800 (PST) MIME-Version: 1.0 References: <20231206-zswap-lock-optimize-v1-0-e25b059f9c3a@bytedance.com> <20231206-zswap-lock-optimize-v1-5-e25b059f9c3a@bytedance.com> In-Reply-To: <20231206-zswap-lock-optimize-v1-5-e25b059f9c3a@bytedance.com> From: Nhat Pham Date: Tue, 12 Dec 2023 15:13:23 -0800 Message-ID: Subject: Re: [PATCH 5/7] mm/zswap: refactor out __zswap_load() To: Chengming Zhou Cc: Vitaly Wool , Johannes Weiner , Michal Hocko , Seth Jennings , Dan Streetman , Andrew Morton , Yosry Ahmed , linux-mm@kvack.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: B9B0AA0016 X-Rspam-User: X-Stat-Signature: matg64c1rfc3jsout45ckz6kz49sip9q X-Rspamd-Server: rspam01 X-HE-Tag: 1702422815-395452 X-HE-Meta: U2FsdGVkX1/iTKhfUOxDYq1Qgw/9jFaJba3A55gqx+pRryCXhmuUGHIAH4GYdQsNX2EAeokmkIyRVBdSzYHop/mnuMF7jz8PNrQxHoZM/bqXcfWUBOTz7wHutlUEyY5feCF3Q7YmavUHtC72Nk6vmeTTnomqUAcuNkgIDKzN1MqT8tb9PfgNzMe518HlkF4Uq7rLS4BDS6A7xA66Gv6rjfLR3W2P3/rqV9K8r9FRJIU5/yqA8mYBsW52B8mz70kC/4CNYmZioDRyCTAU2nM+hiAVtp/TrAiXf0gjoiexwTENb/0UDAx9SNOGbM67SNdda9SEvrwGdLa0yuTOxyTTYbY41EVhK8+b4XKZ1As5PMY/2KlAulLBftGeQ9bq2uqdUXjimr6nIOAXaozoRbdl98TKAI4drJj4QOUoSsHoRukv0P9PFbhZU3WkNE7Mb1q7Vnmn9nrBB0a3yQA9a9nh9idLveGtIb9kkecRLH86DIHJU8a7gbRFSpCacDkPtdX5gj+g1iEkTZT1cCciG97VDMusKgBaLApyMwXStEe2hHWG3BApxN/gKUuAvv/6N9H8f4ohfLuDtfbftAuz/XzZYeAubQt4oZB+I/zeCh6C72o1AB2nBewToqQ90e4X7hrd8+9uuzzdPOli1K8aCaa2bu26ohnettAwbB83LQpEb/6ZrTmfl6GkjjE/2kXgQob52PSU3+sn7uAMTi7IhoCVxO7fX7uotsgrRfFZ5GCZEAqOYb1VxWc0chnUl4x5rTHceVigOiXaNY4zLVISy3KicK9aWHtiAsOUm5QALSJ87yAUK5U7P2UvreNIu0skEvszUipv0tqAgXOU920d78XcW9Je27CEQiOLudv1iHNpLV6mE5KXcAyF5W/s6H3yMezgMZH6xXaFOeT9E4vQmTKsLS6YPKtUQK9BIFvExKF/yAlomPRPfaBvj9AVnM6julmqTGcMtg1H5RYBVFmuLwq 31PrWpVH qldG5V17HZnzwgHQIbahX954c7viel79vKBF4gXxIn+5InAHVqtsbKJgbPq93ZRKR1jANMee47zYPNs5CdlYFVgBXk6H2OeWx8dJtvJTGE4pOiJaHx83unrhcmJt0bmi9lLGSk5N+YuVvvis/GYXQ6DMx+A+bDs/UcWc2YlH1MqA5u9fseEuioiAxl1qUVcC+8BpDidPdJw2uNP+MyGiq/uDT0wVAsycR+X9l1AIUXoImoFUxCUC7XsfiXR9uylmQHzToIYuHfk0r8v8vPmrYiA/xT8PAiOitKD6Af9G0BLaHTv5RE76k9MHTbBvkrvk2JkcLzRWT1RALel1Jfgt0PD8HJzviFP/0Q5NNFJNrwkp7wksQjZ1lljk0zIa08Oe2rqXos5sn+W/NZ2rqllRbqVbhggebDde6hh6CrIp1K6FU3yQ7x+zmgJuEWIMt4FmgDKYKXmVXWqRr6yq0dFcu+mYjkYgkh0XszhH8vB37GFgaDRGT3ER+Y13vWcOJ3wpHmKN+ 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: On Wed, Dec 6, 2023 at 1:46=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). I love this refactoring a lot :) No reason why we should duplicate the decompression logic shared between load and writeback. > > Signed-off-by: Chengming Zhou > --- > mm/zswap.c | 108 ++++++++++++++++++++++---------------------------------= ------ > 1 file changed, 39 insertions(+), 69 deletions(-) > > diff --git a/mm/zswap.c b/mm/zswap.c > index 999671dcb469..667b66a3911b 100644 > --- a/mm/zswap.c > +++ b/mm/zswap.c > @@ -1380,6 +1380,42 @@ static int zswap_enabled_param_set(const char *val= , > return ret; > } > > +static void __zswap_load(struct zswap_entry *entry, struct page *page) > +{ > + struct scatterlist input, output; > + unsigned int dlen =3D PAGE_SIZE; > + struct crypto_acomp_ctx *acomp_ctx; > + struct zpool *zpool; > + u8 *src; > + int ret; > + > + /* decompress */ nit: I guess all this function does is decompression right? Doesn't seem like this comment is necessary anymore... But this is just nitpicking. > + acomp_ctx =3D raw_cpu_ptr(entry->pool->acomp_ctx); > + mutex_lock(acomp_ctx->mutex); > + > + zpool =3D zswap_find_zpool(entry); > + 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); > + 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(zpool)) > + zpool_unmap_handle(zpool, entry->handle); > + > + BUG_ON(ret); > + BUG_ON(dlen !=3D PAGE_SIZE); > +} > + > /********************************* > * writeback code > **********************************/ > @@ -1401,23 +1437,12 @@ static int zswap_writeback_entry(struct zswap_ent= ry *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, *tmp =3D NULL; > - unsigned int dlen; > int ret; > struct writeback_control wbc =3D { > .sync_mode =3D WB_SYNC_NONE, > }; > > - if (!zpool_can_sleep_mapped(pool)) { > - tmp =3D kmalloc(PAGE_SIZE, GFP_KERNEL); > - if (!tmp) > - return -ENOMEM; > - } > - Sweet. Less allocation =3D=3D more efficient + less failure case :) > /* try to allocate swap cache page */ > mpol =3D get_task_policy(current); > page =3D __read_swap_cache_async(swpentry, GFP_KERNEL, mpol, > @@ -1450,33 +1475,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; > - > - src =3D zpool_map_handle(pool, entry->handle, ZPOOL_MM_RO); > - if (!zpool_can_sleep_mapped(pool)) { > - memcpy(tmp, src, entry->length); > - src =3D tmp; > - zpool_unmap_handle(pool, entry->handle); > - } > - > - mutex_lock(acomp_ctx->mutex); > - 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)) > - kfree(tmp); > - else > - 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); > @@ -1496,9 +1495,6 @@ static int zswap_writeback_entry(struct zswap_entry= *entry, > return ret; > > fail: > - if (!zpool_can_sleep_mapped(pool)) > - kfree(tmp); > - > /* > * If we get here because the page is already in swapcache, a > * load may be happening concurrently. It is safe and okay to > @@ -1755,11 +1751,7 @@ bool zswap_load(struct folio *folio) > struct page *page =3D &folio->page; > struct zswap_tree *tree =3D swap_zswap_tree(swp); > struct zswap_entry *entry; > - struct scatterlist input, output; > - struct crypto_acomp_ctx *acomp_ctx; > - unsigned int dlen =3D PAGE_SIZE; > - u8 *src, *dst; > - struct zpool *zpool; > + u8 *dst; > bool ret; > > VM_WARN_ON_ONCE(!folio_test_locked(folio)); > @@ -1781,29 +1773,7 @@ bool zswap_load(struct folio *folio) > goto stats; > } > > - /* decompress */ > - acomp_ctx =3D raw_cpu_ptr(entry->pool->acomp_ctx); > - mutex_lock(acomp_ctx->mutex); > - > - zpool =3D zswap_find_zpool(entry); > - 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 Can't find anything wrong with this patch, so: Reviewed-by: Nhat Pham