Skip to content

Commit 79f504a

Browse files
Chunhai Guohsiangkao
authored andcommitted
erofs: allocate more short-lived pages from reserved pool first
This patch aims to allocate bvpages and short-lived compressed pages from the reserved pool first. After applying this patch, there are three benefits. 1. It reduces the page allocation time. The bvpages and short-lived compressed pages account for about 4% of the pages allocated from the system in the multi-app launch benchmarks [1]. It reduces the page allocation time accordingly and lowers the likelihood of blockage by page allocation in low memory scenarios. 2. The pages in the reserved pool will be allocated on demand. Currently, bvpages and short-lived compressed pages are short-lived pages allocated from the system, and the pages in the reserved pool all originate from short-lived pages. Consequently, the number of reserved pool pages will increase to z_erofs_rsv_nrpages over time. With this patch, all short-lived pages are allocated from the reserved pool first, so the number of reserved pool pages will only increase when there are not enough pages. Thus, even if z_erofs_rsv_nrpages is set to a large number for specific reasons, the actual number of reserved pool pages may remain low as per demand. In the multi-app launch benchmarks [1], z_erofs_rsv_nrpages is set at 256, while the number of reserved pool pages remains below 64. 3. When erofs cache decompression is disabled (EROFS_ZIP_CACHE_DISABLED), all pages will *only* be allocated from the reserved pool for erofs. This will significantly reduce the memory pressure from erofs. [1] For additional details on the multi-app launch benchmarks, please refer to commit 0f6273a ("erofs: add a reserved buffer pool for lz4 decompression"). Signed-off-by: Chunhai Guo <guochunhai@vivo.com> Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com> Reviewed-by: Chao Yu <chao@kernel.org> Link: https://lore.kernel.org/r/20240906121110.3701889-1-guochunhai@vivo.com Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
1 parent 2349d2f commit 79f504a

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

fs/erofs/zdata.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,8 @@ static int z_erofs_bvec_enqueue(struct z_erofs_bvec_iter *iter,
196196
struct page *nextpage = *candidate_bvpage;
197197

198198
if (!nextpage) {
199-
nextpage = erofs_allocpage(pagepool, GFP_KERNEL);
199+
nextpage = __erofs_allocpage(pagepool, GFP_KERNEL,
200+
true);
200201
if (!nextpage)
201202
return -ENOMEM;
202203
set_page_private(nextpage, Z_EROFS_SHORTLIVED_PAGE);
@@ -1464,7 +1465,7 @@ static void z_erofs_fill_bio_vec(struct bio_vec *bvec,
14641465
folio_unlock(folio);
14651466
folio_put(folio);
14661467
out_allocfolio:
1467-
page = erofs_allocpage(&f->pagepool, gfp);
1468+
page = __erofs_allocpage(&f->pagepool, gfp, true);
14681469
spin_lock(&pcl->obj.lockref.lock);
14691470
if (unlikely(pcl->compressed_bvecs[nr].page != zbv.page)) {
14701471
if (page)

0 commit comments

Comments
 (0)