From: Barry Song <21cnbao@gmail.com>
To: akpm@linux-foundation.org, davem@davemloft.net,
hannes@cmpxchg.org, herbert@gondor.apana.org.au,
linux-crypto@vger.kernel.org, linux-mm@kvack.org,
nphamcs@gmail.com, yosryahmed@google.com,
zhouchengming@bytedance.com
Cc: chriscli@google.com, chrisl@kernel.org, ddstreet@ieee.org,
linux-kernel@vger.kernel.org, sjenning@redhat.com,
vitaly.wool@konsulko.com, Barry Song <v-songbaohua@oppo.com>
Subject: [PATCH v3 2/3] mm/zswap: remove the memcpy if acomp is not sleepable
Date: Sat, 17 Feb 2024 17:51:01 +1300 [thread overview]
Message-ID: <20240217045102.55339-3-21cnbao@gmail.com> (raw)
In-Reply-To: <20240217045102.55339-1-21cnbao@gmail.com>
From: Barry Song <v-songbaohua@oppo.com>
Most compressors are actually CPU-based and won't sleep during
compression and decompression. We should remove the redundant
memcpy for them.
Signed-off-by: Barry Song <v-songbaohua@oppo.com>
Tested-by: Chengming Zhou <zhouchengming@bytedance.com>
Reviewed-by: Nhat Pham <nphamcs@gmail.com>
Acked-by: Yosry Ahmed <yosryahmed@google.com>
Reviewed-by: Chengming Zhou <zhouchengming@bytedance.com>
---
mm/zswap.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/mm/zswap.c b/mm/zswap.c
index 350dd2fc8159..6319d2281020 100644
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -168,6 +168,7 @@ struct crypto_acomp_ctx {
struct crypto_wait wait;
u8 *buffer;
struct mutex mutex;
+ bool is_sleepable;
};
/*
@@ -716,6 +717,7 @@ static int zswap_cpu_comp_prepare(unsigned int cpu, struct hlist_node *node)
goto acomp_fail;
}
acomp_ctx->acomp = acomp;
+ acomp_ctx->is_sleepable = acomp_is_sleepable(acomp);
req = acomp_request_alloc(acomp_ctx->acomp);
if (!req) {
@@ -1368,7 +1370,7 @@ static void __zswap_load(struct zswap_entry *entry, struct page *page)
mutex_lock(&acomp_ctx->mutex);
src = zpool_map_handle(zpool, entry->handle, ZPOOL_MM_RO);
- if (!zpool_can_sleep_mapped(zpool)) {
+ if (acomp_ctx->is_sleepable && !zpool_can_sleep_mapped(zpool)) {
memcpy(acomp_ctx->buffer, src, entry->length);
src = acomp_ctx->buffer;
zpool_unmap_handle(zpool, entry->handle);
@@ -1382,7 +1384,7 @@ static void __zswap_load(struct zswap_entry *entry, struct page *page)
BUG_ON(acomp_ctx->req->dlen != PAGE_SIZE);
mutex_unlock(&acomp_ctx->mutex);
- if (zpool_can_sleep_mapped(zpool))
+ if (!acomp_ctx->is_sleepable || zpool_can_sleep_mapped(zpool))
zpool_unmap_handle(zpool, entry->handle);
}
--
2.34.1
next prev parent reply other threads:[~2024-02-17 4:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-17 4:50 [PATCH v3 0/3] mm/zswap & crypto/compress: remove a couple of memcpy Barry Song
2024-02-17 4:51 ` [PATCH v3 1/3] crypto: introduce acomp_is_sleepable to expose if comp drivers might sleep Barry Song
2024-02-19 4:24 ` Herbert Xu
2024-02-19 23:07 ` Barry Song
2024-02-19 23:34 ` Barry Song
2024-02-17 4:51 ` Barry Song [this message]
2024-02-17 4:51 ` [PATCH v3 3/3] crypto: scompress: remove memcpy if sg_nents is 1 Barry Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240217045102.55339-3-21cnbao@gmail.com \
--to=21cnbao@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=chriscli@google.com \
--cc=chrisl@kernel.org \
--cc=davem@davemloft.net \
--cc=ddstreet@ieee.org \
--cc=hannes@cmpxchg.org \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=nphamcs@gmail.com \
--cc=sjenning@redhat.com \
--cc=v-songbaohua@oppo.com \
--cc=vitaly.wool@konsulko.com \
--cc=yosryahmed@google.com \
--cc=zhouchengming@bytedance.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox