From: Chunhai Guo via Linux-erofs <linux-erofs@lists.ozlabs.org>
To: xiang@kernel.org
Cc: huyue2@coolpad.com, Chunhai Guo <guochunhai@vivo.com>,
linux-erofs@lists.ozlabs.org
Subject: [PATCH v2] erofs: do not use pagepool in z_erofs_gbuf_growsize()
Date: Tue, 2 Apr 2024 03:27:57 -0600 [thread overview]
Message-ID: <20240402092757.2635257-1-guochunhai@vivo.com> (raw)
Let's use alloc_pages_bulk_array() for simplicity and get rid of
unnecessary pagepool.
Signed-off-by: Chunhai Guo <guochunhai@vivo.com>
---
fs/erofs/zutil.c | 67 ++++++++++++++++++++++--------------------------
1 file changed, 31 insertions(+), 36 deletions(-)
diff --git a/fs/erofs/zutil.c b/fs/erofs/zutil.c
index e13806681763..9687cad8be96 100644
--- a/fs/erofs/zutil.c
+++ b/fs/erofs/zutil.c
@@ -60,63 +60,58 @@ void z_erofs_put_gbuf(void *ptr) __releases(gbuf->lock)
int z_erofs_gbuf_growsize(unsigned int nrpages)
{
static DEFINE_MUTEX(gbuf_resize_mutex);
- struct page *pagepool = NULL;
- int delta, ret, i, j;
+ struct page **tmp_pages = NULL;
+ struct z_erofs_gbuf *gbuf;
+ void *ptr, *old_ptr;
+ int last, i, j;
mutex_lock(&gbuf_resize_mutex);
- delta = nrpages - z_erofs_gbuf_nrpages;
- ret = 0;
/* avoid shrinking gbufs, since no idea how many fses rely on */
- if (delta <= 0)
- goto out;
+ if (nrpages <= z_erofs_gbuf_nrpages) {
+ mutex_unlock(&gbuf_resize_mutex);
+ return 0;
+ }
for (i = 0; i < z_erofs_gbuf_count; ++i) {
- struct z_erofs_gbuf *gbuf = &z_erofs_gbufpool[i];
- struct page **pages, **tmp_pages;
- void *ptr, *old_ptr = NULL;
-
- ret = -ENOMEM;
+ gbuf = &z_erofs_gbufpool[i];
tmp_pages = kcalloc(nrpages, sizeof(*tmp_pages), GFP_KERNEL);
if (!tmp_pages)
- break;
- for (j = 0; j < nrpages; ++j) {
- tmp_pages[j] = erofs_allocpage(&pagepool, GFP_KERNEL);
- if (!tmp_pages[j])
- goto free_pagearray;
- }
+ goto out;
+
+ for (j = 0; j < gbuf->nrpages; ++j)
+ tmp_pages[j] = gbuf->pages[j];
+ do {
+ last = j;
+ j = alloc_pages_bulk_array(GFP_KERNEL, nrpages,
+ tmp_pages);
+ if (last == j)
+ goto out;
+ } while (j != nrpages);
+
ptr = vmap(tmp_pages, nrpages, VM_MAP, PAGE_KERNEL);
if (!ptr)
- goto free_pagearray;
+ goto out;
- pages = tmp_pages;
spin_lock(&gbuf->lock);
+ kfree(gbuf->pages);
+ gbuf->pages = tmp_pages;
old_ptr = gbuf->ptr;
gbuf->ptr = ptr;
- tmp_pages = gbuf->pages;
- gbuf->pages = pages;
- j = gbuf->nrpages;
gbuf->nrpages = nrpages;
spin_unlock(&gbuf->lock);
- ret = 0;
- if (!tmp_pages) {
- DBG_BUGON(old_ptr);
- continue;
- }
-
if (old_ptr)
vunmap(old_ptr);
-free_pagearray:
- while (j)
- erofs_pagepool_add(&pagepool, tmp_pages[--j]);
- kfree(tmp_pages);
- if (ret)
- break;
}
z_erofs_gbuf_nrpages = nrpages;
- erofs_release_pages(&pagepool);
out:
+ if (i < z_erofs_gbuf_count && tmp_pages) {
+ for (j = 0; j < nrpages; ++j)
+ if (tmp_pages[j] && tmp_pages[j] != gbuf->pages[j])
+ __free_page(tmp_pages[j]);
+ kfree(tmp_pages);
+ }
mutex_unlock(&gbuf_resize_mutex);
- return ret;
+ return i < z_erofs_gbuf_count ? -ENOMEM : 0;
}
int __init z_erofs_gbuf_init(void)
--
2.25.1
next reply other threads:[~2024-04-02 9:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-02 9:27 Chunhai Guo via Linux-erofs [this message]
2024-04-02 9:22 ` [PATCH v2] erofs: do not use pagepool in z_erofs_gbuf_growsize() Gao Xiang
2024-04-02 9:25 ` Chunhai Guo via Linux-erofs
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=20240402092757.2635257-1-guochunhai@vivo.com \
--to=linux-erofs@lists.ozlabs.org \
--cc=guochunhai@vivo.com \
--cc=huyue2@coolpad.com \
--cc=xiang@kernel.org \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).